summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.lock@collabora.co.uk>2015-10-13 17:15:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:39:29 +0000
commit80f4d71fb50523ec46d60423b1734a96c9fe4f2d (patch)
tree69081c6698719c0a675dbd3ef6b9bc672a95c97d
parent883ab0f6ec0f039d78430b7289fe41e8726ea208 (diff)
downloadpoky-80f4d71fb50523ec46d60423b1734a96c9fe4f2d.tar.gz
weston: add a PACKAGECONFIG option for xwayland support
(From OE-Core rev: e9b843d3b3dba6d118e57a7e0dd225dc4004a31a) Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/wayland/weston_1.8.0.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-graphics/wayland/weston_1.8.0.bb b/meta/recipes-graphics/wayland/weston_1.8.0.bb
index 6234a8c6f5..40df6e1936 100644
--- a/meta/recipes-graphics/wayland/weston_1.8.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.8.0.bb
@@ -26,7 +26,6 @@ DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
26DEPENDS += "wayland libinput virtual/egl pango" 26DEPENDS += "wayland libinput virtual/egl pango"
27 27
28EXTRA_OECONF = "--enable-setuid-install \ 28EXTRA_OECONF = "--enable-setuid-install \
29 --disable-xwayland \
30 --enable-simple-clients \ 29 --enable-simple-clients \
31 --enable-clients \ 30 --enable-clients \
32 --enable-demo-clients-install \ 31 --enable-demo-clients-install \
@@ -74,6 +73,8 @@ PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
74PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" 73PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind"
75# Weston with systemd-login support 74# Weston with systemd-login support
76PACKAGECONFIG[systemd] = "--enable-systemd-login,--disable-systemd-login,systemd dbus" 75PACKAGECONFIG[systemd] = "--enable-systemd-login,--disable-systemd-login,systemd dbus"
76# Weston with Xwayland support
77PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,libxcb libxcursor cairo"
77 78
78do_install_append() { 79do_install_append() {
79 # Weston doesn't need the .la files to load modules, so wipe them 80 # Weston doesn't need the .la files to load modules, so wipe them