Apply patch to build with libharfbuzz by fbrennan

Updates other patches

5 files changed, 23 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8418d80baf04..182b0805c62a 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 = 6.1.r111306.g915701939c
+	pkgver = 6.1.r112502.g6e4030a07b
 	pkgrel = 1
 	url = https://www.ffmpeg.org/
 	arch = x86_64
@@ -28,6 +28,7 @@ pkgbase = ffmpeg-amd-full-git
 	depends = gmp
 	depends = gnutls
 	depends = gsm
+	depends = harfbuzz
 	depends = jack
 	depends = kvazaar
 	depends = ladspa
@@ -129,18 +130,18 @@ pkgbase = ffmpeg-amd-full-git
 	provides = ffmpeg-git
 	conflicts = ffmpeg
 	source = git+https://git.ffmpeg.org/ffmpeg.git
-	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 = 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 = 040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
 	source = 060-ffmpeg-fix-segfault-with-avisynthplus.patch
 	source = LICENSE
 	sha256sums = SKIP
-	sha256sums = b04d0707e14f43df1243a403d74cab434197ece9491d6590523a184e776496ba
 	sha256sums = e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a
-	sha256sums = d8b91ea5f07d0208cbe0290567083808708014a1953fda322d13cb619349c9ee
-	sha256sums = d1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9
-	sha256sums = 0d6b53940a81ebaf4e6b1a2208a178eb8a824d6a3d8e863bf9c4c7e0060d88ec
+	sha256sums = a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81
+	sha256sums = 0433016c8523c7ce159523946a76c8fa06a926f33f94b70e8de7c2082d14178c
+	sha256sums = 9b94b90a33dc8ac9693d72c825e9c444df914428fce7cca61117146ee8f8c07b
+	sha256sums = 0e277c0d5e33612ca7a11025958133b17bfbe23168b0aee5bd07f674f6fd7440
 	sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
 
 pkgname = ffmpeg-amd-full-git
diff --git a/006-ffmpeg-add-svt-vp9-gaaa8140.patch b/006-ffmpeg-add-svt-vp9-gaaa8140.patch
deleted file mode 100644
index cdbcb54a0e7c..000000000000
--- a/006-ffmpeg-add-svt-vp9-gaaa8140.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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 b6eb1d7394b5..3f4605d968ab 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,6 +1,6 @@
 --- a/libavformat/avformat.h
 +++ b/libavformat/avformat.h
-@@ -1019,6 +1019,10 @@ attribute_deprecated
+@@ -1020,6 +1020,10 @@ attribute_deprecated
  int64_t    av_stream_get_end_pts(const AVStream *st);
  #endif
  
@@ -13,7 +13,7 @@
  /**
 --- a/libavformat/utils.c
 +++ b/libavformat/utils.c
-@@ -55,6 +55,13 @@ int ff_unlock_avformat(void)
+@@ -56,6 +56,13 @@ int ff_unlock_avformat(void)
      return ff_mutex_unlock(&avformat_mutex) ? -1 : 0;
  }
  
diff --git a/060-ffmpeg-fix-segfault-with-avisynthplus.patch b/060-ffmpeg-fix-segfault-with-avisynthplus.patch
index 8a8f9c743565..9e2ddb399c9e 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
-@@ -125,7 +125,7 @@ static av_cold void avisynth_atexit_handler(void);
+@@ -142,7 +142,7 @@ static av_cold void avisynth_atexit_handler(void);
  
  static av_cold int avisynth_load_library(void)
  {
diff --git a/PKGBUILD b/PKGBUILD
index f749e0a13cac..7a0c70870322 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=ffmpeg-amd-full-git
 _srcname=ffmpeg
-pkgver=6.1.r111306.g915701939c
+pkgver=6.1.r112502.g6e4030a07b
 pkgrel=1
 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features for AMD; git version)'
 arch=('x86_64')
@@ -13,7 +13,7 @@ url='https://www.ffmpeg.org/'
 license=('custom: nonfree and unredistributable')
 depends=('alsa-lib' 'aom' 'aribb24' 'avisynthplus' 'bzip2' 'celt' 'codec2'
          'dav1d' 'fontconfig' 'freetype2' 'fribidi' 'glslang' 'frei0r-plugins' 'gmp'
-         'gnutls' 'gsm' 'jack' 'kvazaar' 'ladspa' 'lame' 'libavc1394'
+         'gnutls' 'gsm' 'harfbuzz' 'jack' 'kvazaar' 'ladspa' 'lame' 'libavc1394'
          'lcms2' 'lensfun-git' 'libass' 'libbluray' 'libbs2b' 'libcaca' 'libcdio-paranoia'
          'libdc1394' 'libdrm' 'libfdk-aac' 'libgme' 'libgl' 'libgcrypt' 'libiec61883'
          'libilbc' 'libjxl' 'libmodplug' 'libmysofa' 'libomxil-bellagio' 'libplacebo'
@@ -32,31 +32,27 @@ 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='eb24a06ba4ee4948f219a3246b88439a8090bd37'
-_svt_vp9_ver='aaa8140c8cdf6c073eaa6aaa5d003d1535fd0059'
+_svt_hevc_ver='6cca5b932623d3a1953b165ae6b093ca1325ac44'
+_svt_vp9_ver='43ef8e5e96932421858762392adbbab57c84aebf'
 source=('git+https://git.ffmpeg.org/ffmpeg.git'
-        "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"
+        "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'
-            'b04d0707e14f43df1243a403d74cab434197ece9491d6590523a184e776496ba'
             'e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a'
-            'd8b91ea5f07d0208cbe0290567083808708014a1953fda322d13cb619349c9ee'
-            'd1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9'
-            '0d6b53940a81ebaf4e6b1a2208a178eb8a824d6a3d8e863bf9c4c7e0060d88ec'
+            'a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81'
+            '0433016c8523c7ce159523946a76c8fa06a926f33f94b70e8de7c2082d14178c'
+            '9b94b90a33dc8ac9693d72c825e9c444df914428fce7cca61117146ee8f8c07b'
+            '0e277c0d5e33612ca7a11025958133b17bfbe23168b0aee5bd07f674f6fd7440'
             '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
 
 prepare() {
     rm -f ffmpeg/libavcodec/libsvt_{hevc,vp9}.c
-    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}/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"
     patch -d ffmpeg -Np1 -i "${srcdir}/060-ffmpeg-fix-segfault-with-avisynthplus.patch"
@@ -115,6 +111,7 @@ build() {
         --enable-libflite \
         --enable-fontconfig \
         --enable-libfreetype \
+        --enable-libharfbuzz \
         --enable-libfribidi \
         --enable-libglslang \
         --enable-libgme \