Update svt-hevc and svt-vp9 patches

5 files changed, 29 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82d11fffe7e8..c3a243946559 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.r109920.gac6eec1fc2
+	pkgver = 5.2.r109965.ge50a02b0f6
 	pkgrel = 1
 	url = https://www.ffmpeg.org/
 	arch = x86_64
@@ -133,18 +133,16 @@ pkgbase = ffmpeg-full-git
 	provides = ffmpeg-git
 	conflicts = ffmpeg
 	source = git+https://git.ffmpeg.org/ffmpeg.git
-	source = 005-ffmpeg-add-svt-hevc-g7771d7c.patch
-	source = 006-ffmpeg-add-svt-vp9-gd9ef3cc.patch
-	source = 010-ffmpeg-add-svt-hevc-g7771d7c.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/7771d7c1ec60cf21d84894260a4b14e9034c7156/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
-	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 = 797fd82276b9c31267412105d663eca9c3dcef6d823b228487a14b70565b8563
-	sha256sums = 6e2b0b2da4e7db2c3d66a2796c5eed2d986a9ef404ad0323e2581c02e5c6aeb7
-	sha256sums = e9ae5d753169f56bbc7fe53615398032f985caaeae6b89bd952c4e4bc9ec8531
-	sha256sums = e310eedb3dc88c8ad6ffcd6cb6bde1f593ded330ea99b0356724c9d22bcfde4c
+	sha256sums = 71a2d73579b5ee3d1cfd812bacd3c229785f5adcb5d8ff0590fc55b89f6fd5e2
+	sha256sums = e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a
+	sha256sums = d8b91ea5f07d0208cbe0290567083808708014a1953fda322d13cb619349c9ee
 	sha256sums = d1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9
 	sha256sums = bf563193f450ece58a93db6840c0db33875df945fa81477b9b02fb209d3bf57a
 	sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
diff --git a/005-ffmpeg-add-svt-hevc-g7771d7c.patch b/005-ffmpeg-add-svt-hevc-g7771d7c.patch
deleted file mode 100644
index 85f16fdd2433..000000000000
--- a/005-ffmpeg-add-svt-hevc-g7771d7c.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/010-ffmpeg-add-svt-hevc-g7771d7c.patch
-+++ b/010-ffmpeg-add-svt-hevc-g7771d7c.patch
-@@ -38,15 +38,15 @@ index 0f3042b8a7..655eaf6848 100755
-      libtensorflow
-      libtesseract
-      libtheora
--@@ -3399,6 +3401,7 @@ libx264_encoder_select="atsc_a53"
-- libx264rgb_encoder_deps="libx264"
-+@@ -3400,6 +3405,7 @@ libx264rgb_encoder_deps="libx264"
-  libx264rgb_encoder_select="libx264_encoder"
-  libx265_encoder_deps="libx265"
-+ libx265_encoder_select="atsc_a53"
- +libsvt_hevc_encoder_deps="libsvthevc"
-  libxavs_encoder_deps="libxavs"
-  libxavs2_encoder_deps="libxavs2"
-  libxvid_encoder_deps="libxvid"
--@@ -6680,6 +6683,7 @@ enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp
-+@@ -6681,6 +6687,7 @@ enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp
-  enabled libspeex          && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
-  enabled libsrt            && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket
-  enabled libsvtav1         && require_pkg_config libsvtav1 "SvtAv1Enc >= 0.9.0" EbSvtAv1Enc.h svt_av1_enc_init_handle
diff --git a/006-ffmpeg-add-svt-vp9-gaaa8140.patch b/006-ffmpeg-add-svt-vp9-gaaa8140.patch
new file mode 100644
index 000000000000..e4b7e4956bcb
--- /dev/null
+++ b/006-ffmpeg-add-svt-vp9-gaaa8140.patch
@@ -0,0 +1,16 @@
+--- a/030-ffmpeg-add-svt-vp9-gaaa8140.patch
++++ b/030-ffmpeg-add-svt-vp9-gaaa8140.patch
+@@ -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
diff --git a/006-ffmpeg-add-svt-vp9-gd9ef3cc.patch b/006-ffmpeg-add-svt-vp9-gd9ef3cc.patch
deleted file mode 100644
index a5c817173a98..000000000000
--- a/006-ffmpeg-add-svt-vp9-gd9ef3cc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/030-ffmpeg-add-svt-vp9-gd9ef3cc.patch
-+++ b/030-ffmpeg-add-svt-vp9-gd9ef3cc.patch
-@@ -773,7 +773,7 @@ index 0000000000..a7da7023d2
- +    .init             = eb_enc_init,
- +    FF_CODEC_RECEIVE_PACKET_CB(eb_receive_packet),
- +    .close            = eb_enc_close,
--+    .p.capabilities   = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS,
-++    .p.capabilities   = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS,
- +    .p.pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P,
- +                                                    AV_PIX_FMT_NONE },
- +    .p.priv_class     = &class,
diff --git a/PKGBUILD b/PKGBUILD
index f265b5f82d2f..be9943c90e88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=ffmpeg-full-git
-pkgver=5.2.r109920.gac6eec1fc2
+pkgver=5.2.r109965.ge50a02b0f6
 pkgrel=1
-_svt_hevc_ver='7771d7c1ec60cf21d84894260a4b14e9034c7156'
-_svt_vp9_ver='d9ef3cc13159143b9afc776c04f67cdfa6284046'
+_svt_hevc_ver='eb24a06ba4ee4948f219a3246b88439a8090bd37'
+_svt_vp9_ver='aaa8140c8cdf6c073eaa6aaa5d003d1535fd0059'
 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)'
 arch=('x86_64')
 url='https://www.ffmpeg.org/'
@@ -125,7 +125,6 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
           'ffmpeg' 'ffmpeg-full' 'ffmpeg-git')
 conflicts=('ffmpeg')
 source=('git+https://git.ffmpeg.org/ffmpeg.git'
-        "005-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.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"
@@ -134,21 +133,17 @@ source=('git+https://git.ffmpeg.org/ffmpeg.git'
         '060-ffmpeg-fix-segfault-with-avisynthplus.patch'
         'LICENSE')
 sha256sums=('SKIP'
-            '797fd82276b9c31267412105d663eca9c3dcef6d823b228487a14b70565b8563'
-            '6e2b0b2da4e7db2c3d66a2796c5eed2d986a9ef404ad0323e2581c02e5c6aeb7'
-            'e9ae5d753169f56bbc7fe53615398032f985caaeae6b89bd952c4e4bc9ec8531'
-            'e310eedb3dc88c8ad6ffcd6cb6bde1f593ded330ea99b0356724c9d22bcfde4c'
+            '71a2d73579b5ee3d1cfd812bacd3c229785f5adcb5d8ff0590fc55b89f6fd5e2'
+            'e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a'
+            'd8b91ea5f07d0208cbe0290567083808708014a1953fda322d13cb619349c9ee'
             'd1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9'
             'bf563193f450ece58a93db6840c0db33875df945fa81477b9b02fb209d3bf57a'
             '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
 
 prepare() {
     rm -f ffmpeg/libavcodec/libsvt_{hevc,vp9}.c
-    cp --remove-destination "$(readlink "010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch")" \
-        "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 "005-ffmpeg-add-svt-hevc-g${_svt_hevc_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"