1 files changed, 36 insertions, 19 deletions

diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 1d7b118b..66b37523 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -38,26 +38,18 @@ if [ "$CARCH" = 'i486' ]; then
         \,fakeinstall/usr/lib/libxatracker\.so\*,d
       '
   )"
-  pkgname=(
-    $(
-      printf '%s\n' "${pkgname[@]}" \
-      | grep -v '^vulkan-' \
-      | grep -vxF opencl-mesa \
-      | grep -vxF libva-mesa-driver \
-      | grep -vxF mesa-vdpau
-    )
-  )
+else
+  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' ' '
+        )"')
+      '
+  )"
 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' ' '
-      )"')
-    '
-)"
 
 # break cycle with conflicting installation files between mesa and libglvnd
 # (indirect dependency via libva)
@@ -91,5 +83,30 @@ if [ "$CARCH" = 'i486' ]; then
     {
        true
     }
+    package_vulkan-intel()
+    {
+       true
+    }
+    package_vulkan-radeon()
+    {
+       true	
+	}
+    package_opencl-mesa()
+    {
+       true
+    }
+    package_libva-mesa-driver()
+    {
+       true
+    }
+    package_libva-mesa-vdpau()
+    {
+       true
+    }
+    package_mesa-vdpau()
+    {
+       true
+    }
+  )
   "
 fi