From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Mon, 28 Aug 2017 12:46:37 +0000 (+0300)
Subject: xserver-xorg: Enable xwayland only with opengl
X-Git-Tag: 2017-10~401
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=38d4672ee9fe2d9ef341875434562be8bca7d9bb;p=openembedded-core.git

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.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 1650c7994c..863d80ce43 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)} \
 "