Backport changes from upstream... Sorry for missing them for so long D:

2 files changed, 24 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8fc9b5de5131..1298729d5d3c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = ffmpeg-amd-full-git
 	pkgdesc = Complete solution to record, convert and stream audio and video (all possible features for AMD; git version)
-	pkgver = 5.1.r105288.g45e45a6060
+	pkgver = 5.1.r106749.g55e0b041b3
 	pkgrel = 1
 	url = https://www.ffmpeg.org/
-	arch = i686
 	arch = x86_64
 	license = custom: nonfree and unredistributable
 	makedepends = git
@@ -21,9 +20,10 @@ pkgbase = ffmpeg-amd-full-git
 	depends = gmp
 	depends = gnutls
 	depends = ladspa
-	depends = libass
+	depends = lcms2
 	depends = aom
 	depends = aribb24
+	depends = libass
 	depends = libbluray
 	depends = libbs2b
 	depends = libcaca
@@ -44,6 +44,7 @@ pkgbase = ffmpeg-amd-full-git
 	depends = libiec61883
 	depends = libilbc
 	depends = jack
+	depends = libjxl-git
 	depends = kvazaar
 	depends = libmodplug
 	depends = lame
@@ -62,9 +63,7 @@ pkgbase = ffmpeg-amd-full-git
 	depends = speex
 	depends = srt
 	depends = libssh
-	depends = svt-hevc
 	depends = svt-av1
-	depends = svt-vp9
 	depends = tesseract
 	depends = libtheora
 	depends = twolame
@@ -101,12 +100,12 @@ pkgbase = ffmpeg-amd-full-git
 	depends = libdrm
 	depends = libva
 	depends = libvdpau
-	depends = chromaprint
+	depends = chromaprint-fftw
 	depends = davs2
-	depends = flite1-patched
+	depends = flite1
 	depends = libklvanc-git
 	depends = openh264
-	depends = libopenmpt-svn
+	depends = libopenmpt
 	depends = librist
 	depends = shine
 	depends = uavs3d-git
@@ -128,14 +127,8 @@ pkgbase = ffmpeg-amd-full-git
 	provides = ffmpeg-git
 	conflicts = ffmpeg
 	source = git+https://git.ffmpeg.org/ffmpeg.git
-	source = 010-ffmpeg-fix-vmaf-model-path.patch
-	source = 020-ffmpeg-add-svt-hevc-g31014e9.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/31014e960e599f0e7769b293ed44a3ed8d3c8543/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
-	source = 040-ffmpeg-add-svt-vp9-g308ef44.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/308ef4464568a824f1f84c4491cb08ab4f535f6c/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
 	source = LICENSE
 	sha256sums = SKIP
-	sha256sums = 52778c70d9fe6e3a10941b99b96ac7749cec325dc1b9ee11ab75332b5ff68e50
-	sha256sums = bed8df383c796bda7d3df7d1778faa459c2bdd179d2201b03de38cba962abbff
-	sha256sums = 9565b3eed177ce5d109876f2a56f3781a2c7fae41e32601bf6ec805ea199d21b
 	sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
 
 pkgname = ffmpeg-amd-full-git
diff --git a/PKGBUILD b/PKGBUILD
index e217dd3d0cff..8d2101e8ad0d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,31 +5,30 @@
 
 pkgname=ffmpeg-amd-full-git
 _srcname=ffmpeg
-pkgver=5.1.r105288.g45e45a6060
+pkgver=5.1.r106749.g55e0b041b3
 pkgrel=1
 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features for AMD; git version)'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='https://www.ffmpeg.org/'
 license=('custom: nonfree and unredistributable')
 depends=(
     # official repositories:
         'alsa-lib' 'avisynthplus' 'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls'
-        'ladspa' 'libass' 'aom' 'aribb24' 'libbluray' 'libbs2b' 'libcaca' 'celt'
+        'ladspa' 'lcms2' 'aom' 'aribb24' 'libass' 'libbluray' 'libbs2b' 'libcaca' 'celt'
         'libcdio-paranoia' 'codec2' 'dav1d' 'libdc1394' 'libavc1394' 'libfdk-aac'
         'fontconfig' 'freetype2' 'fribidi' 'glslang' 'spirv-tools' 'libgme' 'gsm'
-        'libiec61883' 'libilbc' 'jack' 'kvazaar' 'libmodplug' 'lame'
+        'libiec61883' 'libilbc' 'jack' 'libjxl-git' 'kvazaar' 'libmodplug' 'lame'
         'opencore-amr' 'openjpeg2' 'opus' 'libpulse' 'librabbitmq-c' 'rav1e' 'librsvg'
         'rubberband' 'rtmpdump' 'smbclient' 'snappy' 'libsoxr' 'speex' 'srt' 'libssh'
-        'svt-hevc' 'svt-av1' 'svt-vp9' 'tesseract' 'libtheora' 'twolame'
+        'svt-av1' 'tesseract' 'libtheora' 'twolame'
         'v4l-utils' 'vid.stab' 'vmaf' 'libvorbis' 'libvpx' 'libwebp' 'x264' 'x265'
         'libxcb' 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'lv2' 'lilv' 'xz'
         'libmysofa' 'openal' 'ocl-icd' 'libgl' 'sndio' 'sdl2' 'vapoursynth'
         'vulkan-icd-loader' 'libxv' 'libx11'  'libxext' 'zlib'
         'libomxil-bellagio' 'libdrm' 'libva' 'libvdpau'
-        'chromaprint'
     # AUR:
-        'davs2' 'flite1-patched' 'libklvanc-git' 'openh264'
-        'libopenmpt-svn' 'librist' 'shine' 'uavs3d-git' 'vo-amrwbenc' 'xavs'
+        'chromaprint-fftw' 'davs2' 'flite1' 'libklvanc-git' 'openh264'
+        'libopenmpt' 'librist' 'shine' 'uavs3d-git' 'vo-amrwbenc' 'xavs'
         'xavs2' 'pocketsphinx' 'lensfun-git'
 )
 makedepends=(
@@ -42,28 +41,24 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
           'libavutil.so' 'libpostproc.so' 'libswscale.so'
           'libswresample.so' 'ffmpeg' 'ffmpeg-full' 'ffmpeg-git')
 conflicts=('ffmpeg')
-_svt_hevc_ver='31014e960e599f0e7769b293ed44a3ed8d3c8543'
-_svt_vp9_ver='308ef4464568a824f1f84c4491cb08ab4f535f6c'
+_svt_hevc_ver='6e677e0017cb27bfdd62effcfd2a0dc83b48bb16'
+_svt_vp9_ver='41819e71950883655dcfa2a8b60cf0a75d50db74'
 source=('git+https://git.ffmpeg.org/ffmpeg.git'
-        '010-ffmpeg-fix-vmaf-model-path.patch'
-        "020-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
+        #"020-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
         #"030-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch"
-        "040-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch"
+        #"040-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch"
         'LICENSE')
 sha256sums=('SKIP'
-            '52778c70d9fe6e3a10941b99b96ac7749cec325dc1b9ee11ab75332b5ff68e50'
-            'bed8df383c796bda7d3df7d1778faa459c2bdd179d2201b03de38cba962abbff'
-            '9565b3eed177ce5d109876f2a56f3781a2c7fae41e32601bf6ec805ea199d21b'
+            #'778030cdd6a097c013e562d3be091280ff92fbd625e5336cd075fbee93589ed0'
+            #'1cdedb9e8c2912986d6acf20dd9d8ef0f1e21995d9b1898120dc55b714b4de0d'
             '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
 
 prepare() {
     # add svt codec support for hevc and av1
-    #sed -i 's/general.texi/general_contents.texi/g' "030-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"
     rm -f ffmpeg/libavcodec/libsvt_{hevc,vp9}.c
-    patch -d ffmpeg -Np1 -i "${srcdir}/010-ffmpeg-fix-vmaf-model-path.patch"
-    patch -d ffmpeg -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"
+    #patch -d ffmpeg -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"
     #patch -d ffmpeg -Np1 -i "${srcdir}/030-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"
-    patch -d ffmpeg -Np1 -i "${srcdir}/040-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
+    #patch -d ffmpeg -Np1 -i "${srcdir}/040-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
 }
 
 pkgver() { 
@@ -100,6 +95,7 @@ build() {
         --enable-gnutls \
         --enable-iconv \
         --enable-ladspa \
+        --enable-lcms2 \
         --enable-libaom \
         --enable-libaribb24 \
         --enable-libass \
@@ -123,6 +119,7 @@ build() {
         --enable-libiec61883 \
         --enable-libilbc \
         --enable-libjack \
+        --enable-libjxl \
         --enable-libklvanc \
         --enable-libkvazaar \
         --enable-liblensfun \
@@ -150,7 +147,6 @@ build() {
         --enable-libspeex \
         --enable-libsrt \
         --enable-libssh \
-        --enable-libsvthevc \
         --enable-libsvtav1 \
         --disable-libtensorflow \
         --enable-libtesseract \
@@ -164,7 +160,6 @@ build() {
         --enable-libvo-amrwbenc \
         --enable-libvorbis \
         --enable-libvpx \
-        --enable-libsvtvp9 \
         --enable-libwebp \
         --enable-libx264 \
         --enable-libx265 \