extra/libva: trying to break cycle with mesa

2 files changed, 17 insertions, 0 deletions

diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 7c2a7aed..82881216 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,3 +1,11 @@
+# disable LTO (breaks with too few registers in error: 'asm' operand has impossible constraints
+eval "$(
+declare -f build | \
+  sed '
+	s/--enable-lto/--disable-lto/
+  '
+)"
+
 # no vamf for non-pentium4
 if [ "$CARCH" == 'i686' ] || [ "$CARCH" == 'i486' ]; then
   depends=(${depends[@]//vmaf/})
diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD
new file mode 100644
index 00000000..5977f711
--- /dev/null
+++ b/extra/libva/PKGBUILD
@@ -0,0 +1,9 @@
+# break cycle with conflicting installation files between mesa and libglvnd
+# (indirect dependency via libva)
+# i486-specific
+makedepends=(${makedepends[@]//mesa/})
+makedepends_i686+=(mesa)
+makedepends_pentium4=("${makedepends_i686[@]}")
+makedepends=(${makedepends[@]//libglvnd/})
+makedepends_i686+=(libglvnd)
+makedepends_pentium4=("${makedepends_i686[@]}")