6.0

3 files changed, 20 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6bb9fbe6b0c3..5bc651966ad6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ffmpeg-jxl
 	pkgdesc = Complete solution to record, convert and stream audio and video (with JPEG XL support, supporting jxl screenshots in mpv)
-	pkgver = 5.1.2
-	pkgrel = 3
+	pkgver = 6.0
+	pkgrel = 1
 	url = https://ffmpeg.org/
 	arch = x86_64
 	license = GPL3
@@ -89,12 +89,8 @@ pkgbase = ffmpeg-jxl
 	provides = libswscale.so
 	provides = ffmpeg
 	conflicts = ffmpeg
-	source = https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.xz
+	source = https://ffmpeg.org/releases/ffmpeg-6.0.tar.xz
 	source = add-av_stream_get_first_dts-for-chromium.patch
-	source = ffmpeg-libjxl-primary.patch
-	source = vulkan-decode-defs.patch
-	b2sums = SKIP
-	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index dec9cb17efcb..32692e6a9a44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -37,8 +37,8 @@
 # This package flips on the JXL support that is readily available in ffmpeg, and by extension mpv.
 
 pkgname=ffmpeg-jxl
-pkgver=5.1.2
-pkgrel=3
+pkgver=6.0
+pkgrel=1
 pkgdesc='Complete solution to record, convert and stream audio and video (with JPEG XL support, supporting jxl screenshots in mpv)'
 arch=(x86_64)
 url=https://ffmpeg.org/
@@ -139,19 +139,13 @@ conflicts=('ffmpeg')
 source=(
   "https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"
   add-av_stream_get_first_dts-for-chromium.patch
-  ffmpeg-libjxl-primary.patch
-  vulkan-decode-defs.patch
 )
 b2sums=('SKIP'
-        'SKIP'
-        'SKIP'
         'SKIP')
 
 prepare() {
   cd "ffmpeg-${pkgver}"
   patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779
-  patch -Np1 -i ../ffmpeg-libjxl-primary.patch # https://github.com/mpv-player/mpv/issues/10349, https://github.com/FFmpeg/FFmpeg/commit/05d6157aab34bc49f23284645a8f34ece870f44d
-  patch -Np1 -i ../vulkan-decode-defs.patch # https://github.com/FFmpeg/FFmpeg/commit/eb0455d64690eed0068e5cb202f72ecdf899837c
 }
 
 build() {
diff --git a/add-av_stream_get_first_dts-for-chromium.patch b/add-av_stream_get_first_dts-for-chromium.patch
index 20ea725dabf4..e5afb937a9dd 100644
--- a/add-av_stream_get_first_dts-for-chromium.patch
+++ b/add-av_stream_get_first_dts-for-chromium.patch
@@ -1,31 +1,29 @@
-diff '--color=auto' -rupN ffmpeg.orig/libavformat/avformat.h ffmpeg/libavformat/avformat.h
---- ffmpeg.orig/libavformat/avformat.h	2022-08-19 17:42:47.323422603 +0200
-+++ ffmpeg/libavformat/avformat.h	2022-08-19 17:42:51.347130436 +0200
-@@ -1128,6 +1128,10 @@ struct AVCodecParserContext *av_stream_g
-  */
+--- a/libavformat/avformat.h
++++ b/libavformat/avformat.h
+@@ -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);
 +// Chromium: We use the internal field first_dts ^^^
 +
  #define AV_PROGRAM_RUNNING 1
- 
+
  /**
-diff '--color=auto' -rupN ffmpeg.orig/libavformat/mux_utils.c ffmpeg/libavformat/mux_utils.c
---- ffmpeg.orig/libavformat/mux_utils.c	2022-08-19 17:42:47.346758108 +0200
-+++ ffmpeg/libavformat/mux_utils.c	2022-08-19 17:47:28.549589002 +0200
-@@ -37,6 +37,13 @@ int64_t av_stream_get_end_pts(const AVSt
-         return AV_NOPTS_VALUE;
+--- a/libavformat/utils.c
++++ b/libavformat/utils.c
+@@ -55,6 +55,13 @@ int ff_unlock_avformat(void)
+     return ff_mutex_unlock(&avformat_mutex) ? -1 : 0;
  }
- 
+
 +// Chromium: We use the internal field first_dts vvv
 +int64_t av_stream_get_first_dts(const AVStream *st)
 +{
-+  return cffstream(st)->first_dts;
++  return ffstream(st)->first_dts;
 +}
 +// Chromium: We use the internal field first_dts ^^^
 +
- int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
-                          int std_compliance)
- {
+ /* an arbitrarily chosen "sane" max packet size -- 50M */
+ #define SANE_CHUNK_SIZE (50000000)
+