[oe-commits] [openembedded-core] 110/122: mesa-demos: Require X11 distro feature

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit cd4a9e7d7e90bc5ef92f140929e1b057ab9ce8dc
Author: Jussi Kukkonen <jussi.kukkonen at intel.com>
AuthorDate: Mon Jul 18 14:54:48 2016 +0300

    mesa-demos: Require X11 distro feature
    
    Mesa-demos theoretically does not require X11 (apart from xdemos/)
    but reality is that every other binary requires glut. So:
     * 'non-glut' part of mesa-demos requires X11
     * current freeglut recipe also depends on X11
    
    There is apparently wayland support in freeglut now: This recipe
    should be modified when meta-oe freeglut recipe has that feature.
    
    The change became necessary now because mesa no longer mistakenly
    installs GL files when X11 is disabled (and mesa-demos configure
    currently requires GL).
    
    Signed-off-by: Jussi Kukkonen <jussi.kukkonen at intel.com>
---
 meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb
index ee0bb02..fab0bdb 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb
@@ -24,10 +24,10 @@ SRC_URI[sha256sum] = "c173154bbd0d5fb53d732471984def42fb1b14ac85fcb834138fb9518b
 
 inherit autotools pkgconfig distro_features_check
 # depends on virtual/egl, virtual/libgl ...
-REQUIRED_DISTRO_FEATURES = "opengl"
+REQUIRED_DISTRO_FEATURES = "opengl x11"
 
 PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \
-                  ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glew glu glx', '', d)}"
+                  x11 glew glu glx"
 
 # The Wayland code doesn't work with Wayland 1.0, so disable it for now
 #${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.