From daf01a38be705ada7ce3e083f096d424ead5544c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 26 Feb 2023 13:23:36 +0100 Subject: [PATCH] package/x11r7/xwayland: xlib_libxshmfence is mandatory xlib_libxshmfence is mandatory, not optional, since the addition of the package in commit 05c3177493aa8447d5cb568c8c13e0c09eded18b: ../miext/sync/misyncshm.c:36:10: fatal error: X11/xshmfence.h: No such file or directory 36 | #include | ^~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/cccc8f97d452ed2adbcbc4624f159a00287a3d38 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/weston/Config.in | 4 ++++ package/wlroots/Config.in | 4 ++++ package/x11r7/xwayland/Config.in | 5 +++++ package/x11r7/xwayland/xwayland.mk | 5 +++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 09119edaaa..d5dbf27bbd 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -114,6 +114,8 @@ config BR2_PACKAGE_WESTON_XWAYLAND depends on BR2_USE_MMU # xwayland depends on !BR2_STATIC_LIBS # xwayland depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 @@ -125,6 +127,8 @@ comment "XWayland support needs libepoxy and X.org enabled" comment "XWayland support needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS # Weston needs at least one shell; this can be one of the bundled ones, diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index b2d3f3c3b1..fb23e9069c 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -47,6 +47,8 @@ config BR2_PACKAGE_WLROOTS_XWAYLAND depends on BR2_USE_MMU # xwayland depends on !BR2_STATIC_LIBS # xwayland depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XCB_UTIL_WM select BR2_PACKAGE_XWAYLAND @@ -58,6 +60,8 @@ comment "XWayland support needs X.org enabled" comment "XWayland support needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS endif diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in index 4f14f2cc36..241ab73ad3 100644 --- a/package/x11r7/xwayland/Config.in +++ b/package/x11r7/xwayland/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_XWAYLAND # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of # them, otherwise, use the small libsha1 library. + depends on !BR2_RISCV_32 # xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xlib_libxshmfence select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_WAYLAND @@ -14,6 +16,7 @@ config BR2_PACKAGE_XWAYLAND select BR2_PACKAGE_XLIB_LIBXFONT2 select BR2_PACKAGE_XLIB_LIBXKBFILE select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_LIBXSHMFENCE select BR2_PACKAGE_XLIB_XTRANS select BR2_PACKAGE_XORGPROTO help @@ -23,4 +26,6 @@ config BR2_PACKAGE_XWAYLAND comment "xwayland needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 174b440b07..7aef1156d3 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -18,6 +18,7 @@ XWAYLAND_DEPENDENCIES = \ xlib_libXfont2 \ xlib_libxkbfile \ xlib_libXrandr \ + xlib_libxshmfence \ xlib_xtrans \ xorgproto XWAYLAND_CONF_OPTS = \ @@ -77,9 +78,9 @@ XWAYLAND_CONF_OPTS += -Dsha1=libsha1 XWAYLAND_DEPENDENCIES += libsha1 endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_LIBDRM),yy) +ifeq ($(BR2_PACKAGE_LIBDRM),y) XWAYLAND_CONF_OPTS += -Ddri3=true -XWAYLAND_DEPENDENCIES += xlib_libxshmfence libdrm +XWAYLAND_DEPENDENCIES += libdrm else XWAYLAND_CONF_OPTS += -Ddri3=false endif