Update to version 6.0

4 files changed, 37 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f27818ee8cd..c62f51fcfcab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ffmpeg-decklink
 	pkgdesc = Complete solution to record, convert and stream audio and video (decklink enabled)
-	pkgver = 5.1.2
+	pkgver = 6.0
 	pkgrel = 1
 	epoch = 1
 	url = https://www.ffmpeg.org/
@@ -10,9 +10,11 @@ pkgbase = ffmpeg-decklink
 	makedepends = avisynthplus
 	makedepends = clang
 	makedepends = ffnvcodec-headers
-	makedepends = git
 	makedepends = ladspa
+	makedepends = mesa
 	makedepends = nasm
+	makedepends = opencl-headers
+	makedepends = vulkan-headers
 	makedepends = decklink-sdk
 	depends = alsa-lib
 	depends = aom
@@ -27,12 +29,16 @@ pkgbase = ffmpeg-decklink
 	depends = libass.so
 	depends = libavc1394
 	depends = libbluray.so
+	depends = libbs2b.so
 	depends = libdav1d.so
 	depends = libdrm
 	depends = libfreetype.so
+	depends = libgl
 	depends = libiec61883
+	depends = libjxl.so
 	depends = libmfx
 	depends = libmodplug
+	depends = libopenmpt.so
 	depends = libpulse
 	depends = librav1e.so
 	depends = libraw1394
@@ -48,6 +54,7 @@ pkgbase = ffmpeg-decklink
 	depends = libvorbisenc.so
 	depends = libvorbis.so
 	depends = libvpx.so
+	depends = libvulkan.so
 	depends = libwebp
 	depends = libx11
 	depends = libx264.so
@@ -58,6 +65,7 @@ pkgbase = ffmpeg-decklink
 	depends = libxv
 	depends = libxvidcore.so
 	depends = libzimg.so
+	depends = ocl-icd
 	depends = opencore-amr
 	depends = openjpeg2
 	depends = opus
@@ -83,18 +91,16 @@ pkgbase = ffmpeg-decklink
 	provides = libswscale.so
 	provides = ffmpeg
 	conflicts = ffmpeg
-	source = https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.xz
-	source = https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.xz.asc
+	source = https://ffmpeg.org/releases/ffmpeg-6.0.tar.xz
+	source = https://ffmpeg.org/releases/ffmpeg-6.0.tar.xz.asc
 	source = 040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
 	source = 060-ffmpeg-fix-segfault-with-avisynthplus.patch
-	source = 070-ffmpeg-fix-v4l2-memory-leak.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/30aa0c3f4873a92c5e3da8ba8cf030de56bf4cf7
 	source = LICENSE
 	validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
-	sha256sums = 619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc
+	sha256sums = 57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082
 	sha256sums = SKIP
-	sha256sums = 2df82046908015bf26bc1303275cf52ba01fa380029a54ea6415373e389e423c
-	sha256sums = b1d68f626168f2409a4b0987acf5b208e7ced2ddab49b11990a10f458d377e9a
-	sha256sums = 9e4e290378028cd4474c36d3e3a25f77d4f40424dbd3115632e20c5734b50979
+	sha256sums = d1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9
+	sha256sums = bf563193f450ece58a93db6840c0db33875df945fa81477b9b02fb209d3bf57a
 	sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
 
 pkgname = ffmpeg-decklink
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/060-ffmpeg-fix-segfault-with-avisynthplus.patch b/060-ffmpeg-fix-segfault-with-avisynthplus.patch
index 2404112a4236..dd58e840eec1 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
-@@ -127,7 +127,7 @@ static av_cold void avisynth_atexit_handler(void);
+@@ -141,7 +141,7 @@ static av_cold void avisynth_atexit_handler(void);
  
  static av_cold int avisynth_load_library(void)
  {
diff --git a/PKGBUILD b/PKGBUILD
index 4f7954e17228..1d36f46bbc04 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Jan Koppe <post@jankoppe.de>
 
 pkgname=ffmpeg-decklink
-pkgver=5.1.2
+pkgver=6.0
 pkgrel=1
 epoch=1
 pkgdesc='Complete solution to record, convert and stream audio and video (decklink enabled)'
@@ -23,12 +23,16 @@ depends=(
   libass.so
   libavc1394
   libbluray.so
+  libbs2b.so
   libdav1d.so
   libdrm
   libfreetype.so
+  libgl
   libiec61883
+  libjxl.so
   libmfx
   libmodplug
+  libopenmpt.so
   libpulse
   librav1e.so
   libraw1394
@@ -44,6 +48,7 @@ depends=(
   libvorbisenc.so
   libvorbis.so
   libvpx.so
+  libvulkan.so
   libwebp
   libx11
   libx264.so
@@ -54,6 +59,7 @@ depends=(
   libxv
   libxvidcore.so
   libzimg.so
+  ocl-icd
   opencore-amr
   openjpeg2
   opus
@@ -71,9 +77,11 @@ makedepends=(
   avisynthplus
   clang
   ffnvcodec-headers
-  git
   ladspa
+  mesa
   nasm
+  opencl-headers
+  vulkan-headers
   decklink-sdk
 )
 optdepends=('avisynthplus: for AviSynthPlus support'
@@ -87,20 +95,17 @@ conflicts=('ffmpeg')
 source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
         '040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch'
         '060-ffmpeg-fix-segfault-with-avisynthplus.patch'
-        '070-ffmpeg-fix-v4l2-memory-leak.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/30aa0c3f4873a92c5e3da8ba8cf030de56bf4cf7'
         'LICENSE')
-sha256sums=('619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc'
+sha256sums=('57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082'
             'SKIP'
-            '2df82046908015bf26bc1303275cf52ba01fa380029a54ea6415373e389e423c'
-            'b1d68f626168f2409a4b0987acf5b208e7ced2ddab49b11990a10f458d377e9a'
-            '9e4e290378028cd4474c36d3e3a25f77d4f40424dbd3115632e20c5734b50979'
+            'd1ad786df86354d218a70b306a50961736c0a6e2d2716bf8de3db31d79957df9'
+            'bf563193f450ece58a93db6840c0db33875df945fa81477b9b02fb209d3bf57a'
             '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
 
 prepare() {
     patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch"
     patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/060-ffmpeg-fix-segfault-with-avisynthplus.patch"
-    patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/070-ffmpeg-fix-v4l2-memory-leak.patch"
 }
 
 build() {
@@ -124,6 +129,7 @@ build() {
         --enable-libaom \
         --enable-libass \
         --enable-libbluray \
+        --enable-libbs2b \
         --enable-libdav1d \
         --enable-libdrm \
         --enable-libfreetype \
@@ -131,12 +137,14 @@ build() {
         --enable-libgsm \
         --enable-libiec61883 \
         --enable-libjack \
+        --enable-libjxl \
         --enable-libmfx \
         --enable-libmodplug \
         --enable-libmp3lame \
         --enable-libopencore_amrnb \
         --enable-libopencore_amrwb \
         --enable-libopenjpeg \
+        --enable-libopenmpt \
         --enable-libopus \
         --enable-libpulse \
         --enable-librav1e \
@@ -161,9 +169,11 @@ build() {
         --enable-libzimg \
         --enable-nvdec \
         --enable-nvenc \
+        --enable-opencl \
+        --enable-opengl \
         --enable-shared \
         --enable-version3 \
-        --enable-nonfree \
+        --enable-vulkan \
         --enable-decklink
     make
     make tools/qt-faststart