From 4ae077510c7322b87a42d08456b75b10c30d7c4f Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Fri, 5 Apr 2024 16:01:53 +0200 Subject: [PATCH] package/weston: fix xcb-util-cursor dependency for xwayland Run-time dependency xcb-cursor found: NO (tried pkgconfig and cmake) ../../br-test-pkg/bootlin-armv7-glibc/build/weston-13.0.0/tests/meson.build:340:2: ERROR: Problem encountered: xcb and xcb-cursor required for running xwayland tests Fixes: - https://bugs.busybox.net/show_bug.cgi?id=15766 Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard (cherry picked from commit fb952e1116dc4f02d9d64402d05b55280d5da178) Signed-off-by: Peter Korsgaard --- package/weston/Config.in | 1 + package/weston/weston.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index db6a78ee8a..385f712a40 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -133,6 +133,7 @@ config BR2_PACKAGE_WESTON_XWAYLAND depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_CURSOR select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_XWAYLAND diff --git a/package/weston/weston.mk b/package/weston/weston.mk index b07e798765..b2d54b71b4 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -108,7 +108,7 @@ WESTON_CONF_OPTS += -Dbackend-default=$(call qstrip,$(BR2_PACKAGE_WESTON_DEFAULT ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y) WESTON_CONF_OPTS += -Dxwayland=true -WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor xwayland +WESTON_DEPENDENCIES += cairo libepoxy libxcb xcb-util-cursor xlib_libX11 xlib_libXcursor xwayland else WESTON_CONF_OPTS += -Dxwayland=false endif