Fix svt-vp9 patch and update ffnvcodec-headers dependency

The stable version of ffnvcodec-headers in the official
repositories was updated and now gives support for
av1_nvenc.

3 files changed, 28 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3a243946559..84aee99b5123 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ffmpeg-full-git
 	pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)
-	pkgver = 5.2.r109965.ge50a02b0f6
+	pkgver = 5.2.r110024.g14719b7939
 	pkgrel = 1
 	url = https://www.ffmpeg.org/
 	arch = x86_64
@@ -8,7 +8,7 @@ pkgbase = ffmpeg-full-git
 	makedepends = git
 	makedepends = clang
 	makedepends = amf-headers
-	makedepends = ffnvcodec-headers-git
+	makedepends = ffnvcodec-headers
 	makedepends = nasm
 	makedepends = opencl-headers
 	makedepends = vulkan-headers
@@ -140,7 +140,7 @@ pkgbase = ffmpeg-full-git
 	source = 060-ffmpeg-fix-segfault-with-avisynthplus.patch
 	source = LICENSE
 	sha256sums = SKIP
-	sha256sums = 71a2d73579b5ee3d1cfd812bacd3c229785f5adcb5d8ff0590fc55b89f6fd5e2
+	sha256sums = b04d0707e14f43df1243a403d74cab434197ece9491d6590523a184e776496ba
 	sha256sums = e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a
 	sha256sums = d8b91ea5f07d0208cbe0290567083808708014a1953fda322d13cb619349c9ee
 	sha256sums = d1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9
diff --git a/006-ffmpeg-add-svt-vp9-gaaa8140.patch b/006-ffmpeg-add-svt-vp9-gaaa8140.patch
index e4b7e4956bcb..cdbcb54a0e7c 100644
--- a/006-ffmpeg-add-svt-vp9-gaaa8140.patch
+++ b/006-ffmpeg-add-svt-vp9-gaaa8140.patch
@@ -1,5 +1,14 @@
 --- a/030-ffmpeg-add-svt-vp9-gaaa8140.patch
 +++ b/030-ffmpeg-add-svt-vp9-gaaa8140.patch
+@@ -44,7 +44,7 @@ index 932805ccf3..45306434fb 100755
+  libwebp_encoder_deps="libwebp"
+  libwebp_anim_encoder_deps="libwebp"
+  libx262_encoder_deps="libx262"
+-@@ -6715,6 +6718,7 @@ enabled libvpx            && {
++@@ -6721,6 +6724,7 @@ enabled libvpx            && {
+      fi
+  }
+  
 @@ -56,10 +56,10 @@ diff --git a/libavcodec/Makefile b/libav
  index 389253f5d0..1573ae4c34 100644
  --- a/libavcodec/Makefile
@@ -14,3 +23,16 @@
  +OBJS-$(CONFIG_LIBSVT_VP9_ENCODER)         += libsvt_vp9.o
   OBJS-$(CONFIG_LIBWEBP_ENCODER)            += libwebpenc_common.o libwebpenc.o
   OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER)       += libwebpenc_common.o libwebpenc_animencoder.o
+@@ -68,10 +68,10 @@ diff --git a/libavcodec/allcodecs.c b/li
+ index e593ad19af..a5396c0477 100644
+ --- a/libavcodec/allcodecs.c
+ +++ b/libavcodec/allcodecs.c
+-@@ -799,6 +799,7 @@ extern const FFCodec ff_libvpx_vp8_encoder;
++@@ -799,6 +799,7 @@ extern const FFCodec ff_libvpx_vp8_encod
+  extern const FFCodec ff_libvpx_vp8_decoder;
+  extern FFCodec ff_libvpx_vp9_encoder;
+- extern FFCodec ff_libvpx_vp9_decoder;
++ extern const FFCodec ff_libvpx_vp9_decoder;
+ +extern FFCodec ff_libsvt_vp9_encoder;
+  /* preferred over libwebp */
+  extern const FFCodec ff_libwebp_anim_encoder;
diff --git a/PKGBUILD b/PKGBUILD
index be9943c90e88..0f4486bb551f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=ffmpeg-full-git
-pkgver=5.2.r109965.ge50a02b0f6
+pkgver=5.2.r110024.g14719b7939
 pkgrel=1
 _svt_hevc_ver='eb24a06ba4ee4948f219a3246b88439a8090bd37'
 _svt_vp9_ver='aaa8140c8cdf6c073eaa6aaa5d003d1535fd0059'
@@ -118,7 +118,7 @@ depends=(
     'xavs'
     'xavs2'
 )
-makedepends=('git' 'clang' 'amf-headers' 'ffnvcodec-headers-git' 'nasm' 'opencl-headers'
+makedepends=('git' 'clang' 'amf-headers' 'ffnvcodec-headers' 'nasm' 'opencl-headers'
              'vulkan-headers' 'decklink-sdk')
 provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
           'libavutil.so' 'libpostproc.so' 'libswscale.so' 'libswresample.so'
@@ -133,7 +133,7 @@ source=('git+https://git.ffmpeg.org/ffmpeg.git'
         '060-ffmpeg-fix-segfault-with-avisynthplus.patch'
         'LICENSE')
 sha256sums=('SKIP'
-            '71a2d73579b5ee3d1cfd812bacd3c229785f5adcb5d8ff0590fc55b89f6fd5e2'
+            'b04d0707e14f43df1243a403d74cab434197ece9491d6590523a184e776496ba'
             'e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a'
             'd8b91ea5f07d0208cbe0290567083808708014a1953fda322d13cb619349c9ee'
             'd1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9'