Update svt patches, refresh other patches and update license

Also:
- explicitly disable libshaderc, since it is mutually exclusive
  with libglslang
- prioritize openvino pkgconfig search path

5 files changed, 27 insertions, 126 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bcca936de051..869d1c51029e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = ffmpeg-full-git
 	pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)
-	pkgver = 6.2.r113226.g9109273e3b
+	pkgver = 6.2.r114236.g95a6788314
 	pkgrel = 1
 	url = https://www.ffmpeg.org/
 	arch = x86_64
-	license = custom: nonfree and unredistributable
+	license = LicenseRef-nonfree-and-unredistributable
 	makedepends = git
 	makedepends = clang
 	makedepends = amf-headers
@@ -144,20 +144,18 @@ pkgbase = ffmpeg-full-git
 	provides = ffmpeg-git
 	conflicts = ffmpeg
 	source = git+https://git.ffmpeg.org/ffmpeg.git
-	source = 005-ffmpeg-add-svt-hevc-g6cca5b9.patch
-	source = 010-ffmpeg-add-svt-hevc-g6cca5b9.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/6cca5b932623d3a1953b165ae6b093ca1325ac44/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
-	source = 020-ffmpeg-add-svt-hevc-docs-g6cca5b9.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/6cca5b932623d3a1953b165ae6b093ca1325ac44/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
-	source = 030-ffmpeg-add-svt-vp9-g43ef8e5.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/43ef8e5e96932421858762392adbbab57c84aebf/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
+	source = 010-ffmpeg-add-svt-hevc-g78bcaa7.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/78bcaa7bdefa0dd593149517ce41842d528d596f/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
+	source = 020-ffmpeg-add-svt-hevc-docs-g78bcaa7.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/78bcaa7bdefa0dd593149517ce41842d528d596f/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
+	source = 030-ffmpeg-add-svt-vp9-g3ecdf8f.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/3ecdf8f88037367e175198adda6e43662129af0b/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 = 7d7a53ee6826acf44d6729d337f30fa8ebb85011a2793261575b7bad230835cb
-	sha256sums = e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a
+	sha256sums = 0d02cd40a3e742cae2f1af87025e2a4f68644a86cc1f4b67af125e0bb0c53332
 	sha256sums = a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81
-	sha256sums = 0433016c8523c7ce159523946a76c8fa06a926f33f94b70e8de7c2082d14178c
-	sha256sums = 06afdb3bc83b670c213f508f4f9fd27d0b4f9005fa00c3f5cf9b648dd8ec2d48
-	sha256sums = 0e277c0d5e33612ca7a11025958133b17bfbe23168b0aee5bd07f674f6fd7440
+	sha256sums = 81daf4d5ecfd505f4492981af5105d2786368be21d29329dd244d6c455c945c7
+	sha256sums = 62509a98460d3d48afcb0ce26250def7dfed124b82acc95a3b84a2802910c1fa
+	sha256sums = 910902a23df8f9b01de76949405ed3705bbd70624f7afedfc445194a5148e4a0
 	sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
 
 pkgname = ffmpeg-full-git
diff --git a/005-ffmpeg-add-svt-hevc-g6cca5b9.patch b/005-ffmpeg-add-svt-hevc-g6cca5b9.patch
deleted file mode 100644
index 19e1d33aba5d..000000000000
--- a/005-ffmpeg-add-svt-hevc-g6cca5b9.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- a/010-ffmpeg-add-svt-hevc-g6cca5b9.patch
-+++ b/010-ffmpeg-add-svt-hevc-g6cca5b9.patch
-@@ -1,36 +1,14 @@
--From 673e67dfff221da589e28216927fe5efd5b40586 Mon Sep 17 00:00:00 2001
--From: Jing Sun <jing.a.sun@intel.com>
--Date: Wed, 21 Nov 2018 11:33:04 +0800
--Subject: [PATCH] lavc/svt_hevc: add libsvt hevc encoder wrapper
--
--Signed-off-by: Zhengxu Huang <zhengxu.huang@intel.com>
--Signed-off-by: Hassene Tmar <hassene.tmar@intel.com>
--Signed-off-by: Jun Zhao <jun.zhao@intel.com>
--Signed-off-by: Jing Sun <jing.a.sun@intel.com>
--Signed-off-by: Austin Hu <austin.hu@intel.com>
--Signed-off-by: Christopher Degawa <ccom@randomderp.com>
--Signed-off-by: Guo Jiansheng <jiansheng.guo@intel.com>
-----
-- configure                |   4 +
-- libavcodec/Makefile      |   1 +
-- libavcodec/allcodecs.c   |   1 +
-- libavcodec/libsvt_hevc.c | 585 +++++++++++++++++++++++++++++++++++++++
-- 4 files changed, 591 insertions(+)
-- create mode 100644 libavcodec/libsvt_hevc.c
--
--diff --git a/configure b/configure
--index c726076da1..c00fcd0294 100755
- --- a/configure
- +++ b/configure
--@@ -291,6 +291,7 @@ External library support:
-+@@ -289,6 +289,7 @@ External library support:
-    --enable-libwebp         enable WebP encoding via libwebp [no]
-    --enable-libx264         enable H.264 encoding via x264 [no]
-    --enable-libx265         enable HEVC encoding via x265 [no]
- +  --enable-libsvthevc      enable HEVC encoding via svt [no]
-+   --enable-libxeve         enable EVC encoding via libxeve [no]
-+   --enable-libxevd         enable EVC decoding via libxevd [no]
-    --enable-libxavs         enable AVS encoding via xavs [no]
--   --enable-libxavs2        enable AVS2 encoding via xavs2 [no]
--   --enable-libxcb          enable X11 grabbing using XCB [autodetect]
--@@ -1852,6 +1853,7 @@ EXTERNAL_LIBRARY_LIST="
-+@@ -1893,6 +1894,7 @@ EXTERNAL_LIBRARY_LIST="
-      libsrt
-      libssh
-      libsvtav1
-@@ -38,7 +16,7 @@ index c726076da1..c00fcd0294 100755
-      libtensorflow
-      libtesseract
-      libtheora
--@@ -3404,6 +3406,7 @@ vapoursynth_demuxer_deps="vapoursynth"
-+@@ -3470,6 +3472,7 @@ vapoursynth_demuxer_deps="vapoursynth"
-  videotoolbox_suggest="coreservices"
-  videotoolbox_deps="corefoundation coremedia corevideo"
-  videotoolbox_encoder_deps="videotoolbox VTCompressionSessionPrepareToEncodeFrames"
-@@ -46,7 +24,7 @@ index c726076da1..c00fcd0294 100755
-  
-  # demuxers / muxers
-  ac3_demuxer_select="ac3_parser"
--@@ -6678,6 +6681,7 @@ enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp
-+@@ -6828,6 +6831,7 @@ enabled libssh            && require_pkg_config libssh "libssh >= 0.6.0" libssh/
-  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
-@@ -54,30 +32,26 @@ index c726076da1..c00fcd0294 100755
-  enabled libtensorflow     && require libtensorflow tensorflow/c/c_api.h TF_Version -ltensorflow
-  enabled libtesseract      && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
-  enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
--diff --git a/libavcodec/Makefile b/libavcodec/Makefile
--index 1fb963f820..77c9926ea6 100644
- --- a/libavcodec/Makefile
- +++ b/libavcodec/Makefile
--@@ -1126,6 +1126,7 @@ OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER)       += libwebpenc_common.o libwebpenc_anim
-+@@ -1147,6 +1147,7 @@ OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER)       += libwebpenc_common.o libwebpenc_anim
-  OBJS-$(CONFIG_LIBX262_ENCODER)            += libx264.o
-  OBJS-$(CONFIG_LIBX264_ENCODER)            += libx264.o
-  OBJS-$(CONFIG_LIBX265_ENCODER)            += libx265.o
- +OBJS-$(CONFIG_LIBSVT_HEVC_ENCODER)        += libsvt_hevc.o
-  OBJS-$(CONFIG_LIBXAVS_ENCODER)            += libxavs.o
-  OBJS-$(CONFIG_LIBXAVS2_ENCODER)           += libxavs2.o
-- OBJS-$(CONFIG_LIBXVID_ENCODER)            += libxvid.o
--diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
--index ff82423a88..57f085415c 100644
-+ OBJS-$(CONFIG_LIBXEVD_DECODER)            += libxevd.o
- --- a/libavcodec/allcodecs.c
- +++ b/libavcodec/allcodecs.c
--@@ -812,6 +812,7 @@ extern LIBX264_CONST FFCodec ff_libx264_encoder;
-+@@ -821,6 +821,7 @@ extern LIBX264_CONST FFCodec ff_libx264_encoder;
-  #endif
-  extern const FFCodec ff_libx264rgb_encoder;
-  extern FFCodec ff_libx265_encoder;
- +extern FFCodec ff_libsvt_hevc_encoder;
-+ extern const FFCodec ff_libxeve_encoder;
-+ extern const FFCodec ff_libxevd_decoder;
-  extern const FFCodec ff_libxavs_encoder;
-- extern const FFCodec ff_libxavs2_encoder;
-- extern const FFCodec ff_libxvid_encoder;
- diff --git a/libavcodec/libsvt_hevc.c b/libavcodec/libsvt_hevc.c
- new file mode 100644
- index 0000000000..739144ca0c
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 9e8ea7d36322..13c32d35020d 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
-@@ -1107,6 +1107,10 @@ attribute_deprecated
- int64_t    av_stream_get_end_pts(const AVStream *st);
- #endif
+@@ -1170,6 +1170,10 @@ typedef struct AVStreamGroup {
+ 
+ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
  
 +// Chromium: We use the internal field first_dts vvv
 +int64_t    av_stream_get_first_dts(const AVStream *st);
diff --git a/060-ffmpeg-fix-segfault-with-avisynthplus.patch b/060-ffmpeg-fix-segfault-with-avisynthplus.patch
index 9e2ddb399c9e..10113f059e43 100644
--- a/060-ffmpeg-fix-segfault-with-avisynthplus.patch
+++ b/060-ffmpeg-fix-segfault-with-avisynthplus.patch
@@ -1,6 +1,6 @@
 --- a/libavformat/avisynth.c
 +++ b/libavformat/avisynth.c
-@@ -142,7 +142,7 @@ static av_cold void avisynth_atexit_handler(void);
+@@ -143,7 +143,7 @@ static av_cold void avisynth_atexit_handler(void);
  
  static av_cold int avisynth_load_library(void)
  {
diff --git a/PKGBUILD b/PKGBUILD
index c817d72fac40..047dcb83a802 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=ffmpeg-full-git
-pkgver=6.2.r113226.g9109273e3b
+pkgver=6.2.r114236.g95a6788314
 pkgrel=1
-_svt_hevc_ver='6cca5b932623d3a1953b165ae6b093ca1325ac44'
-_svt_vp9_ver='43ef8e5e96932421858762392adbbab57c84aebf'
+_svt_hevc_ver='78bcaa7bdefa0dd593149517ce41842d528d596f'
+_svt_vp9_ver='3ecdf8f88037367e175198adda6e43662129af0b'
 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/'
-license=('custom: nonfree and unredistributable')
+license=('LicenseRef-nonfree-and-unredistributable')
 depends=(
     'alsa-lib'
     'aom'
@@ -136,7 +136,7 @@ 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"
+        #"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"
@@ -145,19 +145,18 @@ source=('git+https://git.ffmpeg.org/ffmpeg.git'
         '060-ffmpeg-fix-segfault-with-avisynthplus.patch'
         'LICENSE')
 sha256sums=('SKIP'
-            '7d7a53ee6826acf44d6729d337f30fa8ebb85011a2793261575b7bad230835cb'
-            'e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a'
+            '0d02cd40a3e742cae2f1af87025e2a4f68644a86cc1f4b67af125e0bb0c53332'
             'a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81'
-            '0433016c8523c7ce159523946a76c8fa06a926f33f94b70e8de7c2082d14178c'
-            '06afdb3bc83b670c213f508f4f9fd27d0b4f9005fa00c3f5cf9b648dd8ec2d48'
-            '0e277c0d5e33612ca7a11025958133b17bfbe23168b0aee5bd07f674f6fd7440'
+            '81daf4d5ecfd505f4492981af5105d2786368be21d29329dd244d6c455c945c7'
+            '62509a98460d3d48afcb0ce26250def7dfed124b82acc95a3b84a2802910c1fa'
+            '910902a23df8f9b01de76949405ed3705bbd70624f7afedfc445194a5148e4a0'
             '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"
-    patch -Np1 -i "005-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"
+    #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"
+    #patch -Np1 -i "005-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"
@@ -178,7 +177,7 @@ build() {
     cd ffmpeg
     printf '%s\n' '  -> Running ffmpeg configure script...'
     
-    export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}:}/opt/intel/openvino/runtime/lib/intel64/pkgconfig"
+    export PKG_CONFIG_PATH="/opt/intel/openvino/runtime/lib/intel64/pkgconfig${PKG_CONFIG_PATH:+":${PKG_CONFIG_PATH}"}"
     
     ./configure \
         --prefix='/usr' \
@@ -255,6 +254,7 @@ build() {
         --enable-librsvg \
         --enable-librubberband \
         --enable-librtmp  \
+        --disable-libshaderc \
         --enable-libshine \
         --enable-libsmbclient \
         --enable-libsnappy \