1 files changed, 34 insertions, 44 deletions

diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 4e8039b3..122512e9 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,60 +1,50 @@
-# disable openswf as it requires AVX, makes no sense with old CPUs
-# disable every new software rasterizer and take the old ones
-# see also FS32#39
-eval "$(
+# defaults changed to SSE2 enabled by default, disable it
+if [ "$CARCH" = 'i686' -o "$CARCH" = 'i486' ]; then
+  eval "$(
   declare -f build | \
-    sed '
-      /arch-meson/s/\(gallium-drivers=.*\),swrast,swr/\1,swrast/
-      /arch-meson/s/\(-D swr-arches=\)avx,avx2/\1/
-    '
-  declare -f package_mesa | \
-    sed '
-      s@_install fakeinstall/usr/lib/libswrAVX.*@#\0@g
-    '
-)"
+  sed '
+    s/arch-meson /arch-meson -Dsse2=false /
+  '
+  )"
+fi
+
+# LTO on i486 results in out-of-memory
+if [ "$CARCH" == 'i486' ]; then
+  eval "$(
+    declare -f build | \
+      sed '
+        s/-D b_lto=true/-D b_lto=false/
+      '
+  )"
+fi
 
+# See https://bugs.freedesktop.org/show_bug.cgi?id=93089
 # do not build/package vulkan on i486
 # do not build i915,i965 on i486
 if [ "$CARCH" = 'i486' ]; then
   eval "$(
     declare -f build | \
       sed '
-        s/\(-D gallium-drivers=\)\S\+ /\1 /
-        s/-D gallium-omx=bellagio //
-        s/-D gallium-opencl=\S\+ //
-        s/-D osmesa=gallium //
-        s/\(-D gallium-\S\+=\)enabled /\1disabled /g
-        s/\(-D gallium-nine=\)true /\1false /g
         s/\(-D vulkan-drivers=\)\S\+ /\1 /
-        s/\(-D dri-drivers=\(\S\+,\)\?\)i915,/\1/
-        s/\(-D dri-drivers=\(\S\+,\)\?\)i965,/\1/
       '
     declare -f package_mesa | \
       sed '
         \,rm .*/vulkan;,d
-        \,bellagio,d
-        \,fakeinstall/usr/lib/d3d,d
-        \,fakeinstall/usr/lib/libOSMesa\.so\*,d
-        \,fakeinstall/usr/lib/libxatracker\.so\*,d
+      '
+    declare -f package_vulkan-intel | \
+      sed '
+        3 i if false; then
+        $ i fi      
+      '
+    declare -f package_vulkan-radeon | \
+      sed '
+        3 i if false; then
+        $ i fi      
+      '
+    declare -f package_vulkan-swrast | \
+      sed '
+        3 i if false; then
+        $ i fi      
       '
   )"
-  pkgname=(
-    $(
-      printf '%s\n' "${pkgname[@]}" \
-      | grep -v '^vulkan-' \
-      | grep -vxF opencl-mesa \
-      | grep -vxF libva-mesa-driver \
-      | grep -vxF mesa-vdpau
-    )
-  )
 fi
-eval "$(
-  declare -f package_vulkan-intel package_vulkan-radeon package_opencl-mesa package_libva-mesa-driver package_mesa-vdpau | \
-    sed '
-      /^\s*{\s*$/ a arch=('"$(
-        printf '%s\n' "${arch[@]}" | \
-          grep -vxF 'i486' | \
-          tr '\n' ' '
-      )"')
-    '
-)"