1 files changed, 10 insertions, 12 deletions

diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index db37ecce..4e8039b3 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -38,9 +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
+    )
+  )
 fi
 eval "$(
-  declare -f package_vulkan-intel package_vulkan-radeon | \
+  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[@]}" | \
@@ -49,14 +58,3 @@ eval "$(
       )"')
     '
 )"
-for _pkgn in $(
-  printf '%s\n' "${pkgname[@]}" \
-  | grep -x 'vulkan-\S\+\|opencl-mesa\|libva-mesa-driver\|mesa-vdpau'
-); do
-  eval "$(
-    declare -f "package_${_pkgn}" \
-    | sed '
-      2a [ "${CARCH}" != i486 ] || return
-    '
-  )"
-done