From 0de96c1124886c5c4473d9ad48797d07780e7d3b Mon Sep 17 00:00:00 2001 From: Tasos Sahanidis Date: Sun, 7 Apr 2024 19:21:30 +0300 Subject: extra/ffmpeg: Fix patching --- extra/ffmpeg/PKGBUILD | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 53170066..7035be65 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,24 +1,37 @@ -# disable LTO (breaks with too few registers in error: 'asm' operand has impossible constraints +Disable mfx - libmfx does not compile +depends=(${depends[@]//libmfx/}) eval "$( -declare -f build | \ - sed ' - s/--enable-lto/--disable-lto/ - ' + declare -f build | \ + sed ' + s/--enable-libmfx/--disable-libmfx/ + ' )" -# also disable mfx - libmfx does not compile -depends=(${depends[@]//libmfx/}) +# also disable onevpl, it does not compile +depends=(${depends[@]//onevpl/}) eval "$( declare -f build | \ sed ' - s/--enable-libmfx/--disable-libmfx/ + s/--enable-libvpl/--disable-libvpl/ ' )" +# Disable cuda llvm and nvenc. No idea why the latter fails. +eval "$( + declare -f build | \ + sed ' + s/--enable-cuda-llvm/--disable-cuda-llvm/;s/--enable-nvenc/--disable-nvenc/ + ' +)" + +# Remove above dependencies +makedepends=(${makedepends[@]//onevpl/}) +makedepends=(${makedepends[@]//clang/}) + # no vamf for non-pentium4 if [ "$CARCH" == 'i686' ] || [ "$CARCH" == 'i486' ]; then depends=(${depends[@]//vmaf/}) - + eval "$( declare -f prepare | \ sed ' @@ -29,14 +42,14 @@ if [ "$CARCH" == 'i686' ] || [ "$CARCH" == 'i486' ]; then eval "$( declare -f build | \ sed ' - s/--enable-libvmaf/--disable-libvmaf/ + s/--enable-libvmaf// ' )" fi # force picking of a modern libvpx and not libvpx1.3 needed for steam -makedepends+=('libvpx>=1.8.2') +#makedepends+=('libvpx>=1.8.2') # no AviSynthPlus on i486 (uses Intel intrinsics and cmake support for # disabling it is broken) -- cgit v1.2.3-54-g00ecf