From dd1ecc339a2b67907f24beb28b299c85711093ef Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Fri, 20 Dec 2013 23:27:55 +0100
Subject: [PATCH] package/opengl/libopenvg: 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>
---
 package/opengl/Config.in              | 4 +---
 package/opengl/libopenvg/Config.in    | 6 ++++++
 package/opengl/libopenvg/libopenvg.mk | 5 +----
 package/rpi-userland/Config.in        | 3 +++
 4 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 package/opengl/libopenvg/Config.in

diff --git a/package/opengl/Config.in b/package/opengl/Config.in
index 396008274..109cde8ad 100644
--- a/package/opengl/Config.in
+++ b/package/opengl/Config.in
@@ -1,8 +1,6 @@
 source "package/opengl/libegl/Config.in"
 source "package/opengl/libgles/Config.in"
-
-config BR2_PACKAGE_HAS_OPENVG
-	bool
+source "package/opengl/libopenvg/Config.in"
 
 config BR2_PACKAGE_HAS_OPENMAX
 	bool
diff --git a/package/opengl/libopenvg/Config.in b/package/opengl/libopenvg/Config.in
new file mode 100644
index 000000000..9d3152533
--- /dev/null
+++ b/package/opengl/libopenvg/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HAS_OPENVG
+	bool
+
+config BR2_PACKAGE_PROVIDES_OPENVG
+	depends on BR2_PACKAGE_HAS_OPENVG
+	string
diff --git a/package/opengl/libopenvg/libopenvg.mk b/package/opengl/libopenvg/libopenvg.mk
index 3296f6391..ffd9d6861 100644
--- a/package/opengl/libopenvg/libopenvg.mk
+++ b/package/opengl/libopenvg/libopenvg.mk
@@ -5,10 +5,7 @@
 ################################################################################
 
 LIBOPENVG_SOURCE =
-
-ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
-LIBOPENVG_DEPENDENCIES += rpi-userland
-endif
+LIBOPENVG_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENVG))
 
 ifeq ($(LIBOPENVG_DEPENDENCIES),)
 define LIBOPENVG_CONFIGURE_CMDS
diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in
index b8860d6c9..271c71d6d 100644
--- a/package/rpi-userland/Config.in
+++ b/package/rpi-userland/Config.in
@@ -25,6 +25,9 @@ config BR2_PACKAGE_PROVIDES_OPENGL_EGL
 config BR2_PACKAGE_PROVIDES_OPENGL_ES
 	default "rpi-userland"
 
+config BR2_PACKAGE_PROVIDES_OPENVG
+	default "rpi-userland"
+
 endif
 
 comment "rpi-userland needs a toolchain w/ C++, largefile, threads"