upgpkg: mingw-w64-ffmpeg 1:6.0-1

3 files changed, 21 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37f8fdc6ce7e..b7fcade37227 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-ffmpeg
 	pkgdesc = Complete solution to record, convert and stream audio and video (mingw-w64)
-	pkgver = 5.1.2
+	pkgver = 6.0
 	pkgrel = 1
 	epoch = 1
 	url = https://ffmpeg.org/
@@ -9,7 +9,6 @@ pkgbase = mingw-w64-ffmpeg
 	makedepends = mingw-w64-amf-headers
 	makedepends = mingw-w64-avisynthplus
 	makedepends = mingw-w64-gcc
-	makedepends = mingw-w64-opencl-headers
 	makedepends = mingw-w64-pkg-config
 	makedepends = mingw-w64-vulkan-headers
 	makedepends = git
@@ -22,13 +21,14 @@ pkgbase = mingw-w64-ffmpeg
 	depends = mingw-w64-gmp
 	depends = mingw-w64-gnutls
 	depends = mingw-w64-gsm
-	depends = mingw-w64-opencl-icd
+	depends = mingw-w64-libjxl
 	depends = mingw-w64-lame
 	depends = mingw-w64-libass
 	depends = mingw-w64-libbluray
 	depends = mingw-w64-libbs2b
 	depends = mingw-w64-dav1d
 	depends = mingw-w64-libmodplug
+	depends = mingw-w64-libopenmpt
 	depends = mingw-w64-libsoxr
 	depends = mingw-w64-libtheora
 	depends = mingw-w64-vid.stab
@@ -54,12 +54,12 @@ pkgbase = mingw-w64-ffmpeg
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=1326fe9d4c85cca1ee774b072ef4fa337694f2e7
+	source = git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=3949db4d261748a9f34358a388ee255ad1a7f0c0
 	source = add-av_stream_get_first_dts-for-chromium.patch
 	source = configure.patch
 	validpgpkeys = DD1EC9E8DE085C629B3E1846B18E8928B3948D64
 	b2sums = SKIP
 	b2sums = 555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de
-	b2sums = 600ce3b6c87378f6d0827ba837484c859a84595f63f6ffdc8d6f5d989ebab4b661b3d15810bdd1192b983119e131fec7421f18fb0ed642b965554d2f9e5efc64
+	b2sums = 7171cf5055c4356f9aeb42a5bb550b3380cad20fff8dc4e9114d4fbb17e95bfe40c1057c3b7188641a1d7b9d026105e3eb0175789d7af30c5999793dfddf97fb
 
 pkgname = mingw-w64-ffmpeg
diff --git a/PKGBUILD b/PKGBUILD
index 29fa122a087e..842c455f2177 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer : Karl-Felix Glatzer <karl[dot]glatzer[at]gmx[dot]de>
 
 pkgname=mingw-w64-ffmpeg
-pkgver=5.1.2
+pkgver=6.0
 pkgrel=1
 epoch=1
 pkgdesc="Complete solution to record, convert and stream audio and video (mingw-w64)"
@@ -17,13 +17,14 @@ depends=(
   'mingw-w64-gmp'
   'mingw-w64-gnutls'
   'mingw-w64-gsm'
-  'mingw-w64-opencl-icd'
+  'mingw-w64-libjxl'
   'mingw-w64-lame'
   'mingw-w64-libass'
   'mingw-w64-libbluray'
   'mingw-w64-libbs2b'
   'mingw-w64-dav1d'
   'mingw-w64-libmodplug'
+  'mingw-w64-libopenmpt'
   'mingw-w64-libsoxr'
   'mingw-w64-libtheora'
   'mingw-w64-vid.stab'
@@ -47,18 +48,20 @@ depends=(
   'mingw-w64-zlib'
   'mingw-w64-x265'
 )
+# 'mingw-w64-opencl-icd'
 # 'mingw-w64-vmaf' (see comment below)
 #'mingw-w64-svt-av1' (only 64 bit support)
 options=(!strip !buildflags staticlibs)
-makedepends=('mingw-w64-amf-headers' 'mingw-w64-avisynthplus' 'mingw-w64-gcc' 'mingw-w64-opencl-headers' 'mingw-w64-pkg-config' 'mingw-w64-vulkan-headers' 'git' 'yasm')
-_tag=1326fe9d4c85cca1ee774b072ef4fa337694f2e7
+makedepends=('mingw-w64-amf-headers' 'mingw-w64-avisynthplus' 'mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-vulkan-headers' 'git' 'yasm')
+# 'mingw-w64-opencl-headers'
+_tag=3949db4d261748a9f34358a388ee255ad1a7f0c0
 #source=("git+https://git.ffmpeg.org/ffmpeg.git#tag=n${pkgver}"
 source=(git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=${_tag}
         add-av_stream_get_first_dts-for-chromium.patch
         configure.patch)
 b2sums=('SKIP'
         '555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de'
-        '600ce3b6c87378f6d0827ba837484c859a84595f63f6ffdc8d6f5d989ebab4b661b3d15810bdd1192b983119e131fec7421f18fb0ed642b965554d2f9e5efc64')
+        '7171cf5055c4356f9aeb42a5bb550b3380cad20fff8dc4e9114d4fbb17e95bfe40c1057c3b7188641a1d7b9d026105e3eb0175789d7af30c5999793dfddf97fb')
 validpgpkeys=(DD1EC9E8DE085C629B3E1846B18E8928B3948D64) # Michael Niedermayer <michael@niedermayer.cc>
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@@ -108,11 +111,13 @@ build() {
       --enable-libfreetype \
       --enable-libfribidi \
       --enable-libgsm \
+      --enable-libjxl \
       --enable-libmodplug \
       --enable-libmp3lame \
       --enable-libopencore_amrnb \
       --enable-libopencore_amrwb \
       --enable-libopenjpeg \
+      --enable-libopenmpt \
       --enable-libopus \
       --enable-librav1e \
       --enable-librsvg \
@@ -130,7 +135,6 @@ build() {
       --enable-libxml2 \
       --enable-libxvid \
       --enable-libzimg \
-      --enable-opencl \
       --enable-opengl \
       --enable-zlib \
       --enable-shared \
@@ -139,6 +143,8 @@ build() {
       --disable-doc \
       --x86asmexe=yasm
 
+# Enable opencl if mingw-w64-opencl-icd works
+#      --enable-opencl \
 # VMAF disabled again due to 64 bit binary crashing with
 #
 # Mingw-w64 runtime failure:
diff --git a/configure.patch b/configure.patch
index 33fa63d9089e..1782dba99047 100644
--- a/configure.patch
+++ b/configure.patch
@@ -1,7 +1,6 @@
-diff -ruN ffmpeg-4.0/configure patched/configure
---- ffmpeg-4.0/configure	2018-04-20 12:02:55.000000000 +0200
-+++ patched/configure	2018-05-13 10:55:23.199869611 +0200
-@@ -5101,10 +5101,10 @@
+--- ffmpeg/configure	2023-03-03 16:09:27.129999842 +0100
++++ patched/configure	2023-03-03 16:11:44.793333176 +0100
+@@ -5583,10 +5583,10 @@
          elif enabled aarch64; then
              LIBTARGET="arm64"
          fi
@@ -12,6 +11,6 @@ diff -ruN ffmpeg-4.0/configure patched/configure
 -        fi
 +        #    disable static
 +        #fi
-         enabled shared && ! enabled small && test_cmd $windres --version && enable gnu_windres
+         ! enabled small && test_cmd $windres --version && enable gnu_windres
          enabled x86_32 && check_ldflags -Wl,--large-address-aware
          shlibdir_default="$bindir_default"