Update from upstream package

4 files changed, 65 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3e530cdef4c..8418d80baf04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 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.2.r108909.g16af424bf9
+	pkgver = 6.1.r111306.g915701939c
 	pkgrel = 1
 	url = https://www.ffmpeg.org/
 	arch = x86_64
@@ -111,7 +111,6 @@ pkgbase = ffmpeg-amd-full-git
 	depends = flite1
 	depends = libklvanc-git
 	depends = librist
-	depends = pocketsphinx
 	depends = shine
 	depends = uavs3d-git
 	depends = vo-amrwbenc
@@ -130,13 +129,17 @@ pkgbase = ffmpeg-amd-full-git
 	provides = ffmpeg-git
 	conflicts = ffmpeg
 	source = git+https://git.ffmpeg.org/ffmpeg.git
-	source = 030-ffmpeg-add-svt-vp9-gd9ef3cc.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/d9ef3cc13159143b9afc776c04f67cdfa6284046/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
+	source = 006-ffmpeg-add-svt-vp9-gaaa8140.patch
+	source = 010-ffmpeg-add-svt-hevc-geb24a06.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/eb24a06ba4ee4948f219a3246b88439a8090bd37/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
+	source = 030-ffmpeg-add-svt-vp9-gaaa8140.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/aaa8140c8cdf6c073eaa6aaa5d003d1535fd0059/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
 	source = 040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
 	source = 060-ffmpeg-fix-segfault-with-avisynthplus.patch
 	source = LICENSE
 	sha256sums = SKIP
-	sha256sums = e310eedb3dc88c8ad6ffcd6cb6bde1f593ded330ea99b0356724c9d22bcfde4c
-	sha256sums = 2df82046908015bf26bc1303275cf52ba01fa380029a54ea6415373e389e423c
+	sha256sums = b04d0707e14f43df1243a403d74cab434197ece9491d6590523a184e776496ba
+	sha256sums = e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a
+	sha256sums = d8b91ea5f07d0208cbe0290567083808708014a1953fda322d13cb619349c9ee
+	sha256sums = d1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9
 	sha256sums = 0d6b53940a81ebaf4e6b1a2208a178eb8a824d6a3d8e863bf9c4c7e0060d88ec
 	sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
 
diff --git a/006-ffmpeg-add-svt-vp9-gaaa8140.patch b/006-ffmpeg-add-svt-vp9-gaaa8140.patch
new file mode 100644
index 000000000000..cdbcb54a0e7c
--- /dev/null
+++ b/006-ffmpeg-add-svt-vp9-gaaa8140.patch
@@ -0,0 +1,38 @@
+--- 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
+ +++ b/libavcodec/Makefile
+-@@ -1123,6 +1123,7 @@ OBJS-$(CONFIG_LIBVPX_VP8_DECODER)         += libvpxdec.o
++@@ -1123,6 +1123,7 @@ OBJS-$(CONFIG_LIBVPX_VP8_DECODER)
+  OBJS-$(CONFIG_LIBVPX_VP8_ENCODER)         += libvpxenc.o
+- OBJS-$(CONFIG_LIBVPX_VP9_DECODER)         += libvpxdec.o libvpx.o
+- OBJS-$(CONFIG_LIBVPX_VP9_ENCODER)         += libvpxenc.o libvpx.o
++ OBJS-$(CONFIG_LIBVPX_VP9_DECODER)         += libvpxdec.o
++ OBJS-$(CONFIG_LIBVPX_VP9_ENCODER)         += libvpxenc.o
+ +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/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch b/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
index 83fd707e65d0..b6eb1d7394b5 100644
--- a/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
+++ b/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
@@ -1,8 +1,8 @@
 --- a/libavformat/avformat.h
 +++ b/libavformat/avformat.h
-@@ -1128,6 +1128,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
-  */
+@@ -1019,6 +1019,10 @@ attribute_deprecated
  int64_t    av_stream_get_end_pts(const AVStream *st);
+ #endif
  
 +// Chromium: We use the internal field first_dts vvv
 +int64_t    av_stream_get_first_dts(const AVStream *st);
diff --git a/PKGBUILD b/PKGBUILD
index 9fee34c4aee6..f749e0a13cac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=ffmpeg-amd-full-git
 _srcname=ffmpeg
-pkgver=5.2.r108909.g16af424bf9
+pkgver=6.1.r111306.g915701939c
 pkgrel=1
 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features for AMD; git version)'
 arch=('x86_64')
@@ -24,7 +24,7 @@ depends=('alsa-lib' 'aom' 'aribb24' 'avisynthplus' 'bzip2' 'celt' 'codec2'
          'sndio' 'speex' 'spirv-tools' 'srt' 'svt-av1' 'svt-hevc' 'svt-vp9' 'tesseract'
          'twolame' 'v4l-utils' 'vapoursynth' 'vid.stab' 'vmaf' 'vulkan-icd-loader' 'x264'
          'x265' 'xvidcore' 'xz' 'zeromq' 'zimg' 'zlib' 'zvbi'
-         'chromaprint-fftw' 'davs2' 'flite1' 'libklvanc-git' 'librist' 'pocketsphinx'
+         'chromaprint-fftw' 'davs2' 'flite1' 'libklvanc-git' 'librist'
          'shine' 'uavs3d-git' 'vo-amrwbenc' 'xavs' 'xavs2')
 makedepends=('git' 'clang' 'amf-headers' 'nasm' 'opencl-headers'
              'vulkan-headers' 'decklink-sdk')
@@ -32,24 +32,30 @@ 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='b62f72e752243cee4104cfb41dc7ee409d3ac3e9'
-_svt_vp9_ver='d9ef3cc13159143b9afc776c04f67cdfa6284046'
+_svt_hevc_ver='eb24a06ba4ee4948f219a3246b88439a8090bd37'
+_svt_vp9_ver='aaa8140c8cdf6c073eaa6aaa5d003d1535fd0059'
 source=('git+https://git.ffmpeg.org/ffmpeg.git'
-        #"010-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"
+        "006-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
+        "010-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-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"
         "030-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-av_stream_get_first_dts-for-chromium.patch'
         '060-ffmpeg-fix-segfault-with-avisynthplus.patch'
         'LICENSE')
 sha256sums=('SKIP'
-            'e310eedb3dc88c8ad6ffcd6cb6bde1f593ded330ea99b0356724c9d22bcfde4c'
-            '2df82046908015bf26bc1303275cf52ba01fa380029a54ea6415373e389e423c'
+            'b04d0707e14f43df1243a403d74cab434197ece9491d6590523a184e776496ba'
+            'e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a'
+            'd8b91ea5f07d0208cbe0290567083808708014a1953fda322d13cb619349c9ee'
+            'd1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9'
             '0d6b53940a81ebaf4e6b1a2208a178eb8a824d6a3d8e863bf9c4c7e0060d88ec'
             '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
 
 prepare() {
     rm -f ffmpeg/libavcodec/libsvt_{hevc,vp9}.c
-    #patch -d ffmpeg -Np1 -i "${srcdir}/010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"
+    cp --remove-destination "$(readlink "030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch")" \
+        "030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
+    patch -Np1 -i "006-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
+    patch -d ffmpeg -Np1 -i "${srcdir}/010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"
     #patch -d ffmpeg -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"
     patch -d ffmpeg -Np1 -i "${srcdir}/030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
     patch -d ffmpeg -Np1 -i "${srcdir}/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch"
@@ -70,6 +76,8 @@ build() {
     ./configure \
         --prefix='/usr' \
         --enable-lto \
+         --cc=$CC \
+         --cxx=$CXX \
         \
         --disable-rpath \
         --enable-gpl \
@@ -180,7 +188,7 @@ build() {
         --enable-opencl \
         --enable-opengl \
         --disable-openssl \
-        --enable-pocketsphinx \
+        --disable-pocketsphinx \
         --enable-sndio \
         --enable-sdl2 \
         --enable-vapoursynth \