Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2021-01-22 19:38:58 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2021-01-22 19:38:58 +0100
commit0cb2650f3a9f93b201db3ae47db96054444718e1 (patch)
tree849e59b4bab3fbae53f2405788286c013f085e56
parent47fdca91c775c5e37df0b74f6476c883daca8542 (diff)
extra/mesa: breaking cycle with libva and libglvnd on i486
-rw-r--r--extra/mesa/PKGBUILD26
1 files changed, 26 insertions, 0 deletions
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 4e8039b3..22b59586 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -58,3 +58,29 @@ eval "$(
)"')
'
)"
+
+# break cycle with conflicting installation files between mesa and libglvnd
+# (indirect dependency via libva)
+# i486-specific
+makedepends=(${makedepends[@]//libva/})
+makedepends_i686+=(libva)
+makedepends_pentium4=("${makedepends_i686[@]}")
+makedepends=(${makedepends[@]//libglvnd/})
+makedepends_i686+=(libglvnd)
+makedepends_pentium4=("${makedepends_i686[@]}")
+if [ "$CARCH" = 'i486' ]; then
+ eval "$(
+ declare -f build | \
+ sed '
+ s/\(-D glvnd=\)true /\1false /g
+ '
+ declare -f package_mesa | \
+ sed '
+ s/'libglvnd'//g
+ s/.*glvnd.*//g
+ s/.*libGLX_mesa.so.*//g
+ s/.*libEGL_mesa.so.*//g
+ s/.*find fakeinstall.*//g
+ '
+ )"
+fi