diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-08-28 15:46:37 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-30 11:14:26 +0100 |
commit | a3211222b28cad850db6b763d9c20ff55afecdb0 (patch) | |
tree | b266b478bd0f1e8db57524e9ccbf6f4a8ace5ad5 /meta/recipes-graphics | |
parent | 15a9f32ed400fdb361550c721eb2324084b11faa (diff) | |
download | poky-a3211222b28cad850db6b763d9c20ff55afecdb0.tar.gz |
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>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/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 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 \ | |||
123 | OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" | 123 | OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" |
124 | PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \ | 124 | PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \ |
125 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ | 125 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ |
126 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'xwayland', '', d)} \ | 126 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'xwayland', '', d)} \ |
127 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ | 127 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ |
128 | " | 128 | " |
129 | 129 | ||