commit 8f29942644e15a1d001c42e1bf5c5d9175b065be Author: Tim Biermann <tbier@posteo.de> Date: Sat Sep 10 12:29:51 2022 +0200 ffmpeg: 5.1 -> 5.1.1 diff --git a/ffmpeg/.signature b/ffmpeg/.signature index f4d4baa99..783ba051b 100644 --- a/ffmpeg/.signature +++ b/ffmpeg/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ddRHeKk3uc3xwFbncKYptN+RNi7OT+TQD1fut6aVk84PHpUDKhUucT9sfnG1MfjyIrNM6vZ7024n3UnRTkY9gs= -SHA256 (Pkgfile) = 5d92f0e4bcd0885b46592fe864e3cd028a67a2ee7b5b244dee6210ba27a213b2 +RWSE3ohX2g5d/dsEEAEGzgBDogN9TIVjCjOYC0BNZ62v24VikooZr8sFAuPXI0DekpCcCqaFSAG1Fogp/byzd5oTIPmBuz6zyQ0= +SHA256 (Pkgfile) = 46cafd7d1f1b4e28ef9bea55f4e50fe5a798121820143bef7c79ff6e8722afa7 SHA256 (.footprint) = 93cc038b2af60596e07f1c67e86a45e941602cd888ae555943762c56cfd0a114 -SHA256 (ffmpeg-5.1.tar.bz2) = 32b56fb01ce90d452958ae25e91c9564abf49ed5453c127bec23c63e530aa8fa +SHA256 (ffmpeg-5.1.1.tar.bz2) = cd0e16f903421266d5ccddedf7b83b9e5754aef4b9f7a7f06ce9e4c802f0545b +SHA256 (add-av_stream_get_first_dts-for-chromium.patch) = 57e26caced5a1382cb639235f9555fc50e45e7bf8333f7c9ae3d49b3241d3f77 SHA256 (ffmpeg-x264-10bit.sh) = dde9627c41800235fbcfe0f74d2181be96239a82cd2d0d277715dddb57eb9cb3 diff --git a/ffmpeg/Pkgfile b/ffmpeg/Pkgfile index 9c4f30629..086f6414b 100644 --- a/ffmpeg/Pkgfile +++ b/ffmpeg/Pkgfile @@ -5,9 +5,10 @@ # Optional: alsa-lib cuda dav1d fdk-aac nv-codec-headers gnutls gsm jack jack-audio-connection-kit lame libass libsdl2 libtheora libva libvdpau libvorbis libvpx libwebp opus pulseaudio x264 x265 name=ffmpeg -version=5.1 +version=5.1.1 release=1 source=(https://ffmpeg.org/releases/$name-$version.tar.bz2 + add-av_stream_get_first_dts-for-chromium.patch ffmpeg-x264-10bit.sh) build() { @@ -42,6 +43,8 @@ build() { PKGMK_FFMPEG+=' --enable-openssl --enable-nonfree' fi + patch -Np1 -i $SRC/add-av_stream_get_first_dts-for-chromium.patch + ./configure ${PKGMK_FFMPEG} \ --prefix=/usr \ --disable-debug \ diff --git a/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch b/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch index fb5589800..20ea725da 100644 --- a/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch +++ b/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch @@ -1,19 +1,7 @@ -From 95aab0fd83619408995720ce53d7a74790580220 Mon Sep 17 00:00:00 2001 -From: "liberato@chromium.org" <liberato@chromium.org> -Date: Wed, 7 Jul 2021 19:01:22 -0700 -Subject: [PATCH] Add av_stream_get_first_dts for Chromium - -[foutrelis: adjust for new FFStream struct replacing AVStreamInternal] ---- - libavformat/avformat.h | 4 ++++ - libavformat/utils.c | 7 +++++++ - 2 files changed, 11 insertions(+) - -diff --git a/libavformat/avformat.h b/libavformat/avformat.h -index cd7b0d941c..b4a6dce885 100644 ---- a/libavformat/avformat.h -+++ b/libavformat/avformat.h -@@ -1010,6 +1010,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); +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 */ int64_t av_stream_get_end_pts(const AVStream *st); @@ -24,11 +12,10 @@ index cd7b0d941c..b4a6dce885 100644 #define AV_PROGRAM_RUNNING 1 /** -diff --git a/libavformat/utils.c b/libavformat/utils.c -index de7580c32d..0ef0fe530e 100644 ---- a/libavformat/utils.c -+++ b/libavformat/utils.c -@@ -121,6 +121,13 @@ int64_t av_stream_get_end_pts(const AVStream *st) +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; } @@ -39,6 +26,6 @@ index de7580c32d..0ef0fe530e 100644 +} +// Chromium: We use the internal field first_dts ^^^ + - struct AVCodecParserContext *av_stream_get_parser(const AVStream *st) + int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id, + int std_compliance) { - return st->internal->parser;