Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2021-01-11 21:57:12 +0100
committerErich Eckner <git@eckner.net>2021-01-11 21:57:12 +0100
commit0066b01fd0eb3bf9267694964405eb43bc4284ed (patch)
tree2bae4da98c0236992619026a777f6cb7e02d9c01
parent9f73e226a52af44a97d4a1a1e80cc66907207a0b (diff)
extra/mesa: do not remove pkgnames, but short-circuit package_$pkgname() instead
-rw-r--r--extra/mesa/PKGBUILD20
1 files changed, 11 insertions, 9 deletions
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index d00f76ac..db37ecce 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -38,15 +38,6 @@ 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 | \
@@ -58,3 +49,14 @@ 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