NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "package/x11r7/xlib_libxshmfence: disable on riscv32"

Browse Source 
This reverts (partial) commit
e39ad96136, and
26642e4cc0, but also fixed additional
sites where the !BR2_RISCV_32 dependency is no longer needed, thanks
to the recently added
0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch in
xlib_libxshmfence.

Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit f30da3dc2181f157c25b742e6785b4b79f5deedf)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Devoogdt 2024-05-19 11:16:27 +02:00 committed by Peter Korsgaard
parent 34eb79a4af
commit c544ddbf74
6 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/mesa3d/Config.in
View File

@ -99,7 +99,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV
bool "Gallium Etnaviv driver"
depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
select BR2_PACKAGE_LIBDRM_ETNAVIV
help
@ -135,7 +135,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA
bool "Gallium lima driver"
depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
help
Mesa driver for ARM Mali Utgard GPUs.
@ -151,7 +151,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST
bool "Gallium panfrost driver"
depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
help
Mesa driver for ARM Mali Midgard and Bifrost GPUs.

2
package/weston/Config.in
View File

@ -129,7 +129,6 @@ 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
@ -143,7 +142,6 @@ 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

2
package/wlroots/Config.in
View File

@ -49,7 +49,6 @@ 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
@ -62,7 +61,6 @@ 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

3
package/x11r7/xlib_libxshmfence/Config.in
View File

@ -1,8 +1,5 @@
config BR2_PACKAGE_XLIB_LIBXSHMFENCE
bool "libxshmfence"
# Due to use of SYS_futex - can be enabled again when upstream
# adds SYS_futex64 as an alternative
depends on !BR2_RISCV_32
depends on BR2_TOOLCHAIN_HAS_SYNC_4
select BR2_PACKAGE_XORGPROTO
help

3
package/x11r7/xserver_xorg-server/Config.in
View File

@ -49,8 +49,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
depends on BR2_INSTALL_LIBSTDCPP
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_LIBPCIACCESS
select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \
(BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32)
select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_TOOLCHAIN_HAS_SYNC_4
help
This variant of the X.org server is the full-blown variant,
as used by desktop GNU/Linux distributions. The drivers (for

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

@ -6,7 +6,6 @@ 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_LIBDRM
select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT)
@ -27,6 +26,5 @@ 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