From: Yann E. MORIN <yann.morin.1998@free.fr>
Date: Fri, 20 Dec 2013 22:27:54 +0000 (+0100)
Subject: package/opengl/libgles: switch to package-defined providers
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=79879de692616dfe174f3d8117dfecfa3f6b2516;p=buildroot.git

package/opengl/libgles: 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/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
index 68380a2996..e084568aa1 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in
@@ -27,6 +27,9 @@ if BR2_PACKAGE_GPU_VIV_BIN_MX6Q
 config BR2_PACKAGE_PROVIDES_OPENGL_EGL
 	default "gpu-viv-bin-mx6q"
 
+config BR2_PACKAGE_PROVIDES_OPENGL_ES
+	default "gpu-viv-bin-mx6q"
+
 config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_EXAMPLES
 	bool "install examples"
 	help
diff --git a/package/opengl/Config.in b/package/opengl/Config.in
index 686543b27f..3960082747 100644
--- a/package/opengl/Config.in
+++ b/package/opengl/Config.in
@@ -1,7 +1,5 @@
 source "package/opengl/libegl/Config.in"
-
-config BR2_PACKAGE_HAS_OPENGL_ES
-	bool
+source "package/opengl/libgles/Config.in"
 
 config BR2_PACKAGE_HAS_OPENVG
 	bool
diff --git a/package/opengl/libgles/Config.in b/package/opengl/libgles/Config.in
new file mode 100644
index 0000000000..75ccfc899c
--- /dev/null
+++ b/package/opengl/libgles/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HAS_OPENGL_ES
+	bool
+
+config BR2_PACKAGE_PROVIDES_OPENGL_ES
+	depends on BR2_PACKAGE_HAS_OPENGL_ES
+	string
diff --git a/package/opengl/libgles/libgles.mk b/package/opengl/libgles/libgles.mk
index ec157ac506..0dcbaa7ddb 100644
--- a/package/opengl/libgles/libgles.mk
+++ b/package/opengl/libgles/libgles.mk
@@ -5,22 +5,7 @@
 ################################################################################
 
 LIBGLES_SOURCE =
-
-ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
-LIBGLES_DEPENDENCIES += rpi-userland
-endif
-
-ifeq ($(BR2_PACKAGE_TI_GFX),y)
-LIBGLES_DEPENDENCIES += ti-gfx
-endif
-
-ifeq ($(BR2_PACKAGE_SUNXI_MALI),y)
-LIBGLES_DEPENDENCIES += sunxi-mali
-endif
-
-ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y)
-LIBGLES_DEPENDENCIES += gpu-viv-bin-mx6q
-endif
+LIBGLES_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_ES))
 
 ifeq ($(LIBGLES_DEPENDENCIES),)
 define LIBGLES_CONFIGURE_CMDS
diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in
index 3c8959e293..b8860d6c9d 100644
--- a/package/rpi-userland/Config.in
+++ b/package/rpi-userland/Config.in
@@ -22,6 +22,9 @@ if BR2_PACKAGE_RPI_USERLAND
 config BR2_PACKAGE_PROVIDES_OPENGL_EGL
 	default "rpi-userland"
 
+config BR2_PACKAGE_PROVIDES_OPENGL_ES
+	default "rpi-userland"
+
 endif
 
 comment "rpi-userland needs a toolchain w/ C++, largefile, threads"
diff --git a/package/sunxi-mali/Config.in b/package/sunxi-mali/Config.in
index 7f07647d6a..9f188a315a 100644
--- a/package/sunxi-mali/Config.in
+++ b/package/sunxi-mali/Config.in
@@ -21,6 +21,9 @@ if BR2_PACKAGE_SUNXI_MALI
 config BR2_PACKAGE_PROVIDES_OPENGL_EGL
 	default "sunxi-mali"
 
+config BR2_PACKAGE_PROVIDES_OPENGL_ES
+	default "sunxi-mali"
+
 config BR2_PACKAGE_SUNXI_MALI_DBG
 	bool "install malitest and maliver tools"
 	help
diff --git a/package/ti-gfx/Config.in b/package/ti-gfx/Config.in
index e89660f3e7..929247b241 100644
--- a/package/ti-gfx/Config.in
+++ b/package/ti-gfx/Config.in
@@ -14,6 +14,9 @@ if BR2_PACKAGE_TI_GFX
 config BR2_PACKAGE_PROVIDES_OPENGL_EGL
 	default "ti-gfx"
 
+config BR2_PACKAGE_PROVIDES_OPENGL_ES
+	default "ti-gfx"
+
 config BR2_PACKAGE_TI_GFX_DEBUG
 	bool "enable debug support"
 	help