From db4b9774b34154f92246b12365bb5ecde9f16c6d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 5 Apr 2014 17:21:41 +0200 Subject: [PATCH] package/libopenvg: rename the _HAS and _PROVIDES variables The basic rule for a package is to have its options named after the package name. There is no reason this should not also be the case for virtual packages. Besides, renaming the package will allow us to switch libopenvg to use the soon-to-be-introduced virtual-package infrastructure. Signed-off-by: "Yann E. MORIN" Cc: Eric Le Bihan Cc: Thomas Petazzoni Cc: Thomas De Schampheleire Cc: Mike Zick Reviewed-by: Samuel Martin Cc: Jerzy Grzegorek Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/cairo/cairo.mk | 2 +- package/opengl/libopenvg/Config.in | 6 +++--- package/opengl/libopenvg/libopenvg.mk | 4 ++-- package/rpi-userland/Config.in | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index ee58aff0e..43238cac6 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -61,7 +61,7 @@ else CAIRO_CONF_OPT += --disable-glesv2 endif -ifeq ($(BR2_PACKAGE_HAS_OPENVG),y) +ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) CAIRO_CONF_OPT += --enable-vg CAIRO_DEPENDENCIES += libopenvg else diff --git a/package/opengl/libopenvg/Config.in b/package/opengl/libopenvg/Config.in index 9d3152533..53cde6a88 100644 --- a/package/opengl/libopenvg/Config.in +++ b/package/opengl/libopenvg/Config.in @@ -1,6 +1,6 @@ -config BR2_PACKAGE_HAS_OPENVG +config BR2_PACKAGE_HAS_LIBOPENVG bool -config BR2_PACKAGE_PROVIDES_OPENVG - depends on BR2_PACKAGE_HAS_OPENVG +config BR2_PACKAGE_PROVIDES_LIBOPENVG + depends on BR2_PACKAGE_HAS_LIBOPENVG string diff --git a/package/opengl/libopenvg/libopenvg.mk b/package/opengl/libopenvg/libopenvg.mk index f81db5ef1..1c6f9298b 100644 --- a/package/opengl/libopenvg/libopenvg.mk +++ b/package/opengl/libopenvg/libopenvg.mk @@ -5,9 +5,9 @@ ################################################################################ LIBOPENVG_SOURCE = -LIBOPENVG_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENVG)) +LIBOPENVG_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_LIBOPENVG)) -ifeq ($(BR2_PACKAGE_HAS_OPENVG),y) +ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) ifeq ($(LIBOPENVG_DEPENDENCIES),) $(error No libOpenVG implementation selected. Configuration error.) endif diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in index 68ac1f609..aeee5e11b 100644 --- a/package/rpi-userland/Config.in +++ b/package/rpi-userland/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_RPI_USERLAND depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_HAS_OPENVG + select BR2_PACKAGE_HAS_LIBOPENVG select BR2_PACKAGE_HAS_LIBOPENMAX help Raspberry Pi Userland contains the necessary library to use the @@ -25,7 +25,7 @@ config BR2_PACKAGE_PROVIDES_LIBEGL config BR2_PACKAGE_PROVIDES_LIBGLES default "rpi-userland" -config BR2_PACKAGE_PROVIDES_OPENVG +config BR2_PACKAGE_PROVIDES_LIBOPENVG default "rpi-userland" config BR2_PACKAGE_PROVIDES_LIBOPENMAX