| Message ID | 20240405140153.1625987-1-thomas@devoogdt.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1] package/weston: fix xcb-util-cursor dependency for xwayland | expand |
>>>>> "Thomas" == Thomas Devoogdt <thomas@devoogdt.com> writes: > 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 <thomas@devoogdt.com> It is a bit annoying that this is only for the tests, but OK - There is currently no way to build weston without the tests. Committed, thanks.
>>>>> "Thomas" == Thomas Devoogdt <thomas@devoogdt.com> writes: > 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 <thomas@devoogdt.com> Committed to 2024.02.x, thanks.
diff --git a/package/weston/Config.in b/package/weston/Config.in index 1b282fb362..e83eeb0f74 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -132,6 +132,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 5ae9c22973..f87f1598c2 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -107,7 +107,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
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 <thomas@devoogdt.com> --- package/weston/Config.in | 1 + package/weston/weston.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)