summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2016-05-26 16:44:58 -0300
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-05-27 23:06:10 +0200
commit36366add9754244730607a3397c9393c4fbe8f5a (patch)
tree4f138911458bade04877ae70294495729de77181
parente6af110aaba55f7b1fb9b746e4852649d3571f20 (diff)
downloadbuildroot-36366add9754244730607a3397c9393c4fbe8f5a.tar.gz
buildroot-36366add9754244730607a3397c9393c4fbe8f5a.zip
weston: add support for XWayland
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/weston/Config.in12
-rw-r--r--package/weston/weston.mk8
2 files changed, 19 insertions, 1 deletions
diff --git a/package/weston/Config.in b/package/weston/Config.in
index 44f954abe0..0812279cf7 100644
--- a/package/weston/Config.in
+++ b/package/weston/Config.in
@@ -92,4 +92,16 @@ config BR2_PACKAGE_WESTON_X11
comment "X11 compositor needs X.org enabled"
depends on !BR2_PACKAGE_XORG7
+config BR2_PACKAGE_WESTON_XWAYLAND
+ bool "XWayland support"
+ depends on BR2_PACKAGE_XORG7
+ depends on BR2_PACKAGE_LIBEPOXY
+ select BR2_PACKAGE_CAIRO
+ select BR2_PACKAGE_LIBXCB
+ select BR2_PACKAGE_XLIB_LIBX11
+ select BR2_PACKAGE_XLIB_LIBXCURSOR
+
+comment "XWayland support needs libepoxy and X.org enabled"
+ depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY
+
endif
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
index 3a0189f1ae..38a0d37020 100644
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -18,7 +18,6 @@ WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \
WESTON_CONF_OPTS = \
--with-dtddir=$(STAGING_DIR)/usr/share/wayland \
- --disable-xwayland \
--disable-wayland-compositor \
--disable-headless-compositor \
--disable-colord \
@@ -111,6 +110,13 @@ else
WESTON_CONF_OPTS += --disable-x11-compositor
endif
+ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y)
+WESTON_CONF_OPTS += --enable-xwayland
+WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor
+else
+WESTON_CONF_OPTS += --disable-xwayland
+endif
+
ifeq ($(BR2_PACKAGE_LIBVA),y)
WESTON_CONF_OPTS += --enable-vaapi-recorder
WESTON_DEPENDENIES += libva
OpenPOWER on IntegriCloud