@@ -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.
@@ -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
@@ -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
This reverts (partial) commit e39ad96136a8c340b3aea6b036024e28f14584f3, and 26642e4cc09666110d5105e7867579a0e48cfa09. Fixed by 0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch. Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com> --- v2: n/a v3: n/a --- package/mesa3d/Config.in | 6 +++--- package/x11r7/xlib_libxshmfence/Config.in | 3 --- package/x11r7/xserver_xorg-server/Config.in | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-)