From 5945a71d87c988cb6b864600dd8dbecae0ef30fd Mon Sep 17 00:00:00 2001 From: Raphael Pavlidis Date: Thu, 16 Feb 2023 19:33:22 +0100 Subject: [PATCH] package/wlroots: add XWayland support The new option enables the XWayland support, so X11 application can be running on a wlroots based compositor. Also, do not enable the XWayland support if the X11 backend is active, as it is unrelated to it. Signed-off-by: Raphael Pavlidis Signed-off-by: Peter Korsgaard --- package/wlroots/Config.in | 19 +++++++++++++++++++ package/wlroots/wlroots.mk | 6 +++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 84a4ef846e..b2d3f3c3b1 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -41,4 +41,23 @@ config BR2_PACKAGE_WLROOTS_X11 help Support Wayland sessions nested inside a X11 window +config BR2_PACKAGE_WLROOTS_XWAYLAND + bool "XWayland support" + depends on BR2_PACKAGE_XORG7 # libxcb, xcb-util-wm, xwayland + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_XWAYLAND + help + Support for running X11 applications under wayland + +comment "XWayland support needs X.org enabled" + depends on !BR2_PACKAGE_XORG7 + +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + endif diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 4f14d20b11..5b930a51be 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -30,8 +30,12 @@ WLROOTS_BACKENDS = libinput drm ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) WLROOTS_BACKENDS += x11 -WLROOTS_CONF_OPTS += -Dxwayland=enabled WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11 +endif + +ifeq ($(BR2_PACKAGE_WLROOTS_XWAYLAND),y) +WLROOTS_CONF_OPTS += -Dxwayland=enabled +WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xwayland else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif