deepcrayon
/
buildroot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <X11/xshmfence.h>
      |          ^~~~~~~~~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/cccc8f97d452ed2adbcbc4624f159a00287a3d38

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023.02.x
Fabrice Fontaine 2023-02-26 13:23:36 +01:00 committed by Peter Korsgaard
parent 93f5ba3853
commit daf01a38be
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/weston/Config.in
View File

@ -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,

4
package/wlroots/Config.in
View File

@ -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

5
package/x11r7/xwayland/Config.in
View File

@ -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

5
package/x11r7/xwayland/xwayland.mk
View File

@ -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