package/opengl/libopenmax: switch to package-defined providers

For the underlying reasons, see previous patch, titled:
    package/opengl/libegl: switch to package-defined providers

Reported-by: David Corvoysier <david.corvoysier@orange.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/bellagio/Config.in b/package/bellagio/Config.in
index e3da4323c6dd6830fc4c4168b14bfe779272637d..2beb6587a535a2a1c00a83afeb5d49a7e35c3696 100644 (file)
--- a/package/bellagio/Config.in
+++ b/package/bellagio/Config.in
@@ -17,5 +17,12 @@ config BR2_PACKAGE_BELLAGIO
 
          http://omxil.sourceforge.net/
 
+if BR2_PACKAGE_BELLAGIO
+
+config BR2_PACKAGE_PROVIDES_OPENMAX
+       default "bellagio"
+
+endif
+
 comment "bellagio needs a toolchain w/ C++, threads, dynamic library"
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB

diff --git a/package/opengl/Config.in b/package/opengl/Config.in
index 109cde8addb5788b9301382279010a2da502ef81..ed818353750e953efd67df423d34fda574261ecb 100644 (file)
--- a/package/opengl/Config.in
+++ b/package/opengl/Config.in
@@ -1,6 +1,4 @@
 source "package/opengl/libegl/Config.in"
 source "package/opengl/libgles/Config.in"
 source "package/opengl/libopenvg/Config.in"
-
-config BR2_PACKAGE_HAS_OPENMAX
-       bool
+source "package/opengl/libopenmax/Config.in"

diff --git a/package/opengl/libopenmax/Config.in b/package/opengl/libopenmax/Config.in
new file mode 100644 (file)
index 0000000..105c53e
--- /dev/null
+++ b/package/opengl/libopenmax/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HAS_OPENMAX
+       bool
+
+config BR2_PACKAGE_PROVIDES_OPENMAX
+       depends on BR2_PACKAGE_HAS_OPENMAX
+       string

diff --git a/package/opengl/libopenmax/libopenmax.mk b/package/opengl/libopenmax/libopenmax.mk
index 9e6f89aaa62c316ee3c86306467b27c3ea85f691..c4f1f7117dd5e8645c7ed22047858ec1bc594cc5 100644 (file)
--- a/package/opengl/libopenmax/libopenmax.mk
+++ b/package/opengl/libopenmax/libopenmax.mk
@@ -5,14 +5,7 @@
 ################################################################################
 
 LIBOPENMAX_SOURCE =
-
-ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
-LIBOPENMAX_DEPENDENCIES += rpi-userland
-endif
-
-ifeq ($(BR2_PACKAGE_BELLAGIO),y)
-LIBOPENMAX_DEPENDENCIES += bellagio
-endif
+LIBOPENMAX_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENMAX))
 
 ifeq ($(LIBOPENMAX_DEPENDENCIES),)
 define LIBOPENMAX_CONFIGURE_CMDS

diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in
index 271c71d6d50e691dabd5646080195e883dd89f16..230394249ba51dc7ecd696c081a1972ef4b4b250 100644 (file)
--- a/package/rpi-userland/Config.in
+++ b/package/rpi-userland/Config.in
@@ -28,6 +28,9 @@ config BR2_PACKAGE_PROVIDES_OPENGL_ES
 config BR2_PACKAGE_PROVIDES_OPENVG
        default "rpi-userland"
 
+config BR2_PACKAGE_PROVIDES_OPENMAX
+       default "rpi-userland"
+
 endif
 
 comment "rpi-userland needs a toolchain w/ C++, largefile, threads"