From a3211222b28cad850db6b763d9c20ff55afecdb0 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Mon, 28 Aug 2017 15:46:37 +0300 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-graphics') 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)} \ " -- cgit v1.2.3-54-g00ecf