Ver Fonte

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 <thomas@devoogdt.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit fb952e1116dc4f02d9d64402d05b55280d5da178)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Thomas Devoogdt há 1 ano atrás
pai
commit
4ae077510c
2 ficheiros alterados com 2 adições e 1 exclusões
  1. 1 0
      package/weston/Config.in
  2. 1 1
      package/weston/weston.mk

+ 1 - 0
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

+ 1 - 1
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