From 0cb2650f3a9f93b201db3ae47db96054444718e1 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Fri, 22 Jan 2021 19:38:58 +0100 Subject: extra/mesa: breaking cycle with libva and libglvnd on i486 --- extra/mesa/PKGBUILD | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) 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 -- cgit v1.2.3-70-g09d2