summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2021-01-21 18:04:42 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2021-01-21 18:04:42 +0100
commitb5c666bd67904fa27fba2380c34e03e3b903356e (patch)
treebe729eed96027c3f88e5ba3915029516dc5f682b
parent6aa67d2ff5056f5927afe61210c56977cfbab034 (diff)
downloadpackages-b5c666bd67904fa27fba2380c34e03e3b903356e.tar.xz
extra/libva: trying to break cycle with mesa
-rw-r--r--extra/ffmpeg/PKGBUILD8
-rw-r--r--extra/libva/PKGBUILD9
2 files changed, 17 insertions, 0 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 7c2a7ae..8288121 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 0000000..5977f71
--- /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[@]}")