Updated to version 4.3

2 files changed, 38 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f7354aa20582..80371425ae8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,17 @@
 pkgbase = ffmpeg-full
 	pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)
-	pkgver = 4.2.3
-	pkgrel = 2
+	pkgver = 4.3
+	pkgrel = 1
 	url = https://www.ffmpeg.org/
 	arch = x86_64
 	license = custom: nonfree and unredistributable
 	makedepends = nasm
 	makedepends = opencl-headers
+	makedepends = vulkan-headers
 	makedepends = ffnvcodec-headers
+	makedepends = clang
 	makedepends = decklink-sdk
+	makedepends = amf-headers
 	depends = alsa-lib
 	depends = avisynthplus
 	depends = bzip2
@@ -33,6 +36,7 @@ pkgbase = ffmpeg-full
 	depends = fontconfig
 	depends = freetype2
 	depends = fribidi
+	depends = glslang
 	depends = libgme
 	depends = gsm
 	depends = libiec61883
@@ -46,6 +50,8 @@ pkgbase = ffmpeg-full
 	depends = openjpeg2
 	depends = opus
 	depends = pulseaudio
+	depends = librabbitmq-c
+	depends = rav1e
 	depends = librsvg
 	depends = rubberband
 	depends = rtmpdump
@@ -56,7 +62,6 @@ pkgbase = ffmpeg-full
 	depends = libssh
 	depends = svt-hevc
 	depends = svt-av1
-	depends = svt-vp9
 	depends = tensorflow
 	depends = tesseract
 	depends = libtheora
@@ -86,6 +91,7 @@ pkgbase = ffmpeg-full
 	depends = sndio
 	depends = sdl2
 	depends = vapoursynth
+	depends = vulkan-icd-loader
 	depends = libxv
 	depends = libx11
 	depends = libxext
@@ -119,24 +125,20 @@ pkgbase = ffmpeg-full
 	provides = libswresample.so
 	provides = ffmpeg
 	conflicts = ffmpeg
-	source = https://ffmpeg.org/releases/ffmpeg-4.2.3.tar.xz
-	source = https://ffmpeg.org/releases/ffmpeg-4.2.3.tar.xz.asc
+	source = https://ffmpeg.org/releases/ffmpeg-4.3.tar.xz
+	source = https://ffmpeg.org/releases/ffmpeg-4.3.tar.xz.asc
 	source = 010-ffmpeg-fix-vmaf-model-path.patch
-	source = 011-ffmpeg-add-decklink-11.5-support.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f32f9231dd4f74d9f95eef575b838bdc3e06a234
-	source = 012-ffmpeg-dont-adjust-mp3-start-time.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/460132c9980f8a1f501a1f69477bca49e1641233
 	source = 020-ffmpeg-add-svt-hevc-1.4.3.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.3/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
 	source = 030-ffmpeg-add-svt-hevc-docs-1.4.3.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.3/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
-	source = 040-ffmpeg-add-svt-av1-0.8.3.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v0.8.3/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
+	source = 040-ffmpeg-add-svt-av1-gc40ee24.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/c40ee249286f182f29bab717686c300e2912adfe/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
 	source = LICENSE
 	validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
-	sha256sums = 9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31
+	sha256sums = 1d0ad06484f44bcb97eba5e93c40bcb893890f9f64aeb43e46cd9bb4cbd6795d
 	sha256sums = SKIP
 	sha256sums = b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02
-	sha256sums = d23dedb5a275d1d753d30fd544a46d5b609868ad5d384b9c8c2ecc1a02281828
-	sha256sums = 269555538ec6d410b42ec43d22edd3eff2006208a1d4cbc8a028d9a432b81577
 	sha256sums = 878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6
 	sha256sums = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
-	sha256sums = cbcf51f37b17355b228b62862cfde141b0701f260d8bc3502a922f0f91303f9e
+	sha256sums = 69e0456b56429a422977d24a914e7e167a38397b2ab40aec575eee332b0e739c
 	sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
 
 pkgname = ffmpeg-full
diff --git a/PKGBUILD b/PKGBUILD
index fc47476ded0c..afe4814c0e5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 # Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
 
 _svt_hevc_ver='1.4.3'
-_svt_av1_ver='0.8.3'
+_svt_av1_ver='c40ee249286f182f29bab717686c300e2912adfe'
 
 pkgname=ffmpeg-full
-pkgver=4.2.3
-pkgrel=2
+pkgver=4.3
+pkgrel=1
 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)'
 arch=('x86_64')
 url='https://www.ffmpeg.org/'
@@ -16,14 +16,15 @@ depends=(
         'alsa-lib' 'avisynthplus' 'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls'
         'ladspa' 'libass' 'aom' 'aribb24' 'libbluray' 'libbs2b' 'libcaca' 'celt'
         'libcdio-paranoia' 'codec2' 'dav1d' 'libdc1394' 'libavc1394' 'libfdk-aac'
-        'fontconfig' 'freetype2' 'fribidi' 'libgme' 'gsm' 'libiec61883' 'libilbc'
-        'jack' 'kvazaar' 'lensfun' 'libmodplug' 'lame' 'opencore-amr' 'openjpeg2'
-        'opus' 'pulseaudio' 'librsvg' 'rubberband' 'rtmpdump' 'snappy' 'libsoxr'
-        'speex' 'srt' 'libssh' 'svt-hevc' 'svt-av1' 'svt-vp9' 'tensorflow' 'tesseract'
-        'libtheora' 'twolame' 'v4l-utils' 'vid.stab' 'vmaf' 'libvorbis' 'libvpx'
-        'wavpack' 'libwebp' 'x264' 'x265' 'libxcb' 'xvidcore' 'libxml2' 'zimg'
-        'zeromq' 'zvbi' 'lv2' 'lilv' 'xz' 'libmysofa' 'openal' 'ocl-icd' 'libgl'
-        'sndio' 'sdl2' 'vapoursynth' 'libxv' 'libx11'  'libxext' 'zlib' 'cuda'
+        'fontconfig' 'freetype2' 'fribidi' 'glslang' 'libgme' 'gsm' 'libiec61883'
+        'libilbc' 'jack' 'kvazaar' 'lensfun' 'libmodplug' 'lame' 'opencore-amr'
+        'openjpeg2' 'opus' 'pulseaudio' 'librabbitmq-c' 'rav1e' 'librsvg' 'rubberband'
+        'rtmpdump' 'snappy' 'libsoxr' 'speex' 'srt' 'libssh' 'svt-hevc' 'svt-av1'
+        'tensorflow' 'tesseract' 'libtheora' 'twolame' 'v4l-utils'
+        'vid.stab' 'vmaf' 'libvorbis' 'libvpx' 'wavpack' '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' 'cuda'
         'libomxil-bellagio' 'libdrm' 'intel-media-sdk' 'libva' 'libvdpau'
     # AUR:
         'chromaprint-fftw' 'davs2' 'flite1-patched' 'libklvanc-git' 'openh264'
@@ -32,9 +33,9 @@ depends=(
 )
 makedepends=(
     # official repositories:
-        'nasm' 'opencl-headers' 'ffnvcodec-headers'
+        'nasm' 'opencl-headers' 'vulkan-headers' 'ffnvcodec-headers' 'clang'
     # AUR:
-        'decklink-sdk'
+        'decklink-sdk' 'amf-headers'
 )
 provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
           'libavutil.so' 'libpostproc.so' 'libavresample.so' 'libswscale.so'
@@ -42,31 +43,25 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
 conflicts=('ffmpeg')
 source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
         '010-ffmpeg-fix-vmaf-model-path.patch'
-        '011-ffmpeg-add-decklink-11.5-support.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f32f9231dd4f74d9f95eef575b838bdc3e06a234'
-        '012-ffmpeg-dont-adjust-mp3-start-time.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/460132c9980f8a1f501a1f69477bca49e1641233'
         "020-ffmpeg-add-svt-hevc-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
         "030-ffmpeg-add-svt-hevc-docs-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch"
-        "040-ffmpeg-add-svt-av1-${_svt_av1_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v${_svt_av1_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch"
+        "040-ffmpeg-add-svt-av1-g${_svt_av1_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/${_svt_av1_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch"
         'LICENSE')
-sha256sums=('9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31'
+sha256sums=('1d0ad06484f44bcb97eba5e93c40bcb893890f9f64aeb43e46cd9bb4cbd6795d'
             'SKIP'
             'b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02'
-            'd23dedb5a275d1d753d30fd544a46d5b609868ad5d384b9c8c2ecc1a02281828'
-            '269555538ec6d410b42ec43d22edd3eff2006208a1d4cbc8a028d9a432b81577'
             '878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6'
             '1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0'
-            'cbcf51f37b17355b228b62862cfde141b0701f260d8bc3502a922f0f91303f9e'
+            '69e0456b56429a422977d24a914e7e167a38397b2ab40aec575eee332b0e739c'
             '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
 
 prepare() {
     rm -f "ffmpeg-${pkgver}/libavcodec/"libsvt_{hevc,av1}.c
     patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/010-ffmpeg-fix-vmaf-model-path.patch"
-    patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/011-ffmpeg-add-decklink-11.5-support.patch"
-    patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/012-ffmpeg-dont-adjust-mp3-start-time.patch"
     patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-${_svt_hevc_ver}.patch"
     patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/030-ffmpeg-add-svt-hevc-docs-${_svt_hevc_ver}.patch"
-    patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/040-ffmpeg-add-svt-av1-${_svt_av1_ver}.patch"
+    patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/040-ffmpeg-add-svt-av1-g${_svt_av1_ver:0:7}.patch"
 }
 
 build() {
@@ -125,6 +120,7 @@ build() {
         --enable-fontconfig \
         --enable-libfreetype \
         --enable-libfribidi \
+        --enable-libglslang \
         --enable-libgme \
         --enable-libgsm \
         --enable-libiec61883 \
@@ -143,6 +139,8 @@ build() {
         --enable-libopenmpt \
         --enable-libopus \
         --enable-libpulse \
+        --enable-librabbitmq \
+        --enable-librav1e \
         --enable-librsvg \
         --enable-librubberband \
         --enable-librtmp  \
@@ -194,10 +192,13 @@ build() {
         --enable-sndio \
         --enable-sdl2 \
         --enable-vapoursynth \
+        --enable-vulkan \
         --enable-xlib \
         --enable-zlib \
         \
+        --enable-amf \
         --enable-cuda-nvcc \
+        --enable-cuda-llvm \
         --enable-cuvid \
         --enable-ffnvcodec \
         --enable-libdrm \
@@ -206,7 +207,6 @@ build() {
         --enable-nvdec \
         --enable-nvenc \
         --enable-omx \
-        --enable-omx-rpi \
         --enable-rkmpp \
         --enable-v4l2-m2m \
         --enable-vaapi \