weston: add support for XWayland

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/weston/Config.in b/package/weston/Config.in
index 44f954abe06b045bca7b8ae41799d0514a3a8f47..0812279cf7e65520a67a94ba5a57924768662be5 100644 (file)
--- 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 3a0189f1ae4f29565e3410e3d39ff763f00e7dcf..38a0d37020595573a7b2c086f6cff2f5e5a42de3 100644 (file)
--- 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