<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9ff3625e4ec87a39c1bd5eb0c6ca9bee219f2796">https://github.com/macports/macports-ports/commit/9ff3625e4ec87a39c1bd5eb0c6ca9bee219f2796</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9ff3625e4ec ffmpeg-devel: update to 5.0
</span>9ff3625e4ec is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9ff3625e4ec87a39c1bd5eb0c6ca9bee219f2796
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Jan 19 10:34:37 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg-devel: update to 5.0
</span>---
multimedia/ffmpeg-devel/Portfile | 23 +++++-----------------
.../files/patch-issue-9231-max_b_frames.diff | 10 ----------
.../patch-issue-9439-non-b-frame-encoding.diff | 18 -----------------
3 files changed, 5 insertions(+), 46 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/Portfile b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8eed75920d9..dab343dbca0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,8 +18,8 @@ set my_name ffmpeg
</span> conflicts ffmpeg
# Please increase the revision of mpv whenever ffmpeg's version is updated.
epoch 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.4.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license LGPL-2.1+
categories multimedia
maintainers {devans @dbevans} {jeremyhu @jeremyhu} {mascguy @mascguy} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,9 +62,9 @@ distname ${my_name}-${version}
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ebb1f042b2ba4f13be86339d30522cd73eb6da3e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9557516
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 181f07234e028a65677b3201373dc7c2354c34b7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 51e919f7d205062c0fd4fae6243a84850391115104ccf1efc451733bc0ac7298 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9811480
</span>
depends_build port:pkgconfig \
port:gmake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,18 +96,6 @@ depends_lib port:lame \
</span>
patchfiles-append patch-libavcodec-audiotoolboxenc.c.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch for upstream bug related to max_b_frames setting
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.ffmpeg.org/ticket/9231
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fixed via upstream commit: 55d9d6767967794edcdd6e1bbd8840fc6f4e9315
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Will be available in the next release version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-issue-9231-max_b_frames.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch for upstream bug related to non-B-frame encoding
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.ffmpeg.org/ticket/9439
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fixed via upstream commit: b786bc7433dfe082441a57c1ba9ae9ea47904b78
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Will be available in the next release version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-issue-9439-non-b-frame-encoding.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # enable auto configure of asm optimizations
# requires Xcode 3.1 or better on Leopard
minimum_xcodeversions {9 3.1}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +116,6 @@ default_variants-append +gpl2
</span> configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
configure.args --enable-swscale \
--enable-avfilter \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-avresample \
</span> --enable-libmp3lame \
--enable-libvorbis \
--enable-libopus \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-issue-9231-max_b_frames.diff b/multimedia/ffmpeg-devel/files/patch-issue-9231-max_b_frames.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7b907bdd5e8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/files/patch-issue-9231-max_b_frames.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libavcodec/videotoolboxenc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libavcodec/videotoolboxenc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1398,7 +1398,6 @@ static int vtenc_configure_encoder(AVCodecContext *avctx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vtctx->codec_id = avctx->codec_id;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- avctx->max_b_frames = 16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vtctx->codec_id == AV_CODEC_ID_H264) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vtctx->get_param_set_func = CMVideoFormatDescriptionGetH264ParameterSetAtIndex;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-issue-9439-non-b-frame-encoding.diff b/multimedia/ffmpeg-devel/files/patch-issue-9439-non-b-frame-encoding.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 25fa01d79ae..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/files/patch-issue-9439-non-b-frame-encoding.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libavcodec/videotoolboxenc.c.orig 2021-12-11 09:44:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libavcodec/videotoolboxenc.c 2021-12-11 09:42:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-avcodec/videotoolboxenc: Fix non-B-Frame encoding
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Sets vtctx->has_b_frames to 0 if the VideoToolbox compression session will not emit B-frames (and, in consequence, no valid DTSs).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Required for the handling of invalid DTSs in 'vtenc_cm_to_avpacket' (line 2018ff) to work correctly and not abort encoding with "DTS is invalid" when no B-frames are generated.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* See: https://trac.ffmpeg.org/ticket/9439
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1516,7 +1516,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!status && has_b_frames_cfbool) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //Some devices don't output B-frames for main profile, even if requested.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // HEVC has b-pyramid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vtctx->has_b_frames = (CFBooleanGetValue(has_b_frames_cfbool) && avctx->codec_id == AV_CODEC_ID_HEVC) ? 2 : 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (CFBooleanGetValue(has_b_frames_cfbool))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vtctx->has_b_frames = avctx->codec_id == AV_CODEC_ID_HEVC ? 2 : 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vtctx->has_b_frames = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFRelease(has_b_frames_cfbool);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- avctx->has_b_frames = vtctx->has_b_frames;
</span></pre><pre style='margin:0'>
</pre>