[OE-core] [PATCH 1/2] libepoxy: fix PACKAGECONFIG to get rid of required opengl distro feature

[Chen Qi]

The 'virtual/libgl' dependency was introduced by the following commit
without saying why.

  "libepoxy: update to version 1.5.0"

And it's added if 'x11' is enabled. That does not seem right. Restore
its previous dependency to only depend on virtual/libx11.

Also, do not unconditionally enable egl PACKAGECONFIG, enable it if
opengl is in DISTRO_FEATURES. Remove the required distro feature
setting accordingly.

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
---
 meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb
index 1067212..be1b86a 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb
@@ -11,12 +11,11 @@ SRC_URI[md5sum] = "4a6b9e581da229dee74c2263c84b1eca"
 SRC_URI[sha256sum] = "a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8"
 UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases"
 
-inherit meson pkgconfig distro_features_check
-
-REQUIRED_DISTRO_FEATURES = "opengl"
+inherit meson pkgconfig
 
 PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl"
-PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no, virtual/libx11 virtual/libgl"
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl"
+PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no, virtual/libx11"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'egl', '', d)}"
 
 EXTRA_OEMESON += "-Dtests=false"
-- 
1.9.1