diff --git a/srcpkgs/libGL/patches/fix-armv7l.patch b/srcpkgs/libGL/patches/fix-armv7l.patch new file mode 100644 index 00000000000..9e87b7d60d0 --- /dev/null +++ b/srcpkgs/libGL/patches/fix-armv7l.patch @@ -0,0 +1,24 @@ +Reverts https://gitlab.freedesktop.org/mesa/mesa/commit/f072585522a137b3b01cb08d624f6e3f340e6583 which breaks building. + +diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build +index 0d7a03c..cb922b6 100644 +--- src/gallium/drivers/vc4/meson.build ++++ src/gallium/drivers/vc4/meson.build +@@ -84,7 +84,7 @@ files_libvc4 = files( + vc4_c_args = [] + + libvc4_neon = [] +-if host_machine.cpu_family() == 'arm' ++if with_asm_arch == 'arm' + libvc4_neon = static_library( + 'vc4_neon', + 'vc4_tiling_lt_neon.c', +@@ -93,7 +93,6 @@ if host_machine.cpu_family() == 'arm' + ], + c_args : '-mfpu=neon', + ) +- vc4_c_args += '-DUSE_ARM_ASM' + endif + + dep_simpenrose = dependency('simpenrose', required : false) + diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index 0641cdc279c..335a1efb72f 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -1,7 +1,7 @@ # Template file for 'libGL' pkgname=libGL -version=18.3.2 -revision=3 +version=18.3.3 +revision=1 wrksrc="mesa-${version}" build_style=meson configure_args="-Dshared-glapi=true -Dgbm=true -Degl=true @@ -21,7 +21,7 @@ license="MIT, LGPL-2.1-or-later" homepage="https://www.mesa3d.org/" changelog="https://www.mesa3d.org/relnotes/${version}.html" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" -checksum=f7ce7181c07b6d8e0132da879af1729523a6c8aa87f79a9d59dfd064024cfb35 +checksum=2ab6886a6966c532ccbcc3b240925e681464b658244f0cbed752615af3936299 # Set subpackages manually to set proper rdeps in 32bit pkgs. subpackages="libglapi libgbm libEGL libGLES libOSMesa"