diff --git a/srcpkgs/libGL/patches/fix-armv7l.patch b/srcpkgs/libGL/patches/fix-armv7l.patch deleted file mode 100644 index 9e87b7d60d0..00000000000 --- a/srcpkgs/libGL/patches/fix-armv7l.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 a9550f23b4e..b150902c3c5 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -1,6 +1,6 @@ # Template file for 'libGL' pkgname=libGL -version=18.3.3 +version=18.3.4 revision=1 wrksrc="mesa-${version}" build_style=meson @@ -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=2ab6886a6966c532ccbcc3b240925e681464b658244f0cbed752615af3936299 +checksum=32314da4365d37f80d84f599bd9625b00161c273c39600ba63b45002d500bb07 # Set subpackages manually to set proper rdeps in 32bit pkgs. subpackages="libglapi libgbm libEGL libGLES libOSMesa"