[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7444/8267] xserver-xorg: Enable xwayland only with opengl

[Emmanuele Bassi <ebassi src gnome org>]

commit a3211222b28cad850db6b763d9c20ff55afecdb0
Author: Jussi Kukkonen <jussi kukkonen intel com>
Date:   Mon Aug 28 15:46:37 2017 +0300

    xserver-xorg: Enable xwayland only with opengl
    
    This is a bit academic as building with wayland without opengl
    should be uncommon: still, libepoxy needs opengl so we shouldn't
    depend on it without opengl.
    
    (From OE-Core rev: 38d4672ee9fe2d9ef341875434562be8bca7d9bb)
    
    Signed-off-by: Jussi Kukkonen <jussi kukkonen intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 1650c79..863d80c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -123,7 +123,7 @@ EXTRA_OECONF += "--with-fop=no \
 OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
 PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'xwayland', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'xwayland', '', d)} \
                    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
 "