<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/342e19a5a279ff77184962370898d14e39a77912">https://github.com/macports/macports-ports/commit/342e19a5a279ff77184962370898d14e39a77912</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 342e19a5a27 ffmpeg6: Update ffmpeg6 to version to 6.1
</span>342e19a5a27 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 342e19a5a279ff77184962370898d14e39a77912
</span>Author: Tobias Pyndt Steinmann <tps@iogates.com>
AuthorDate: Mon Nov 13 10:18:27 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg6: Update ffmpeg6 to version to 6.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Version 6.1 of ffmpeg introduces a fix for building on macOS 10.5 which
</span><span style='display:block; white-space:pre;color:#404040;'> breaks our audiotoolboxenc.c patch. As the macOS version check is
</span><span style='display:block; white-space:pre;color:#404040;'> different and our Portfile specifically mentions that AudioToolbox
</span><span style='display:block; white-space:pre;color:#404040;'> requires 10.7+, I have updated the patch to the new upstream source
</span><span style='display:block; white-space:pre;color:#404040;'> file.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream commit:
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/FFmpeg/FFmpeg/commit/35342dc390781f310daa53e6c850285863ab5829
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Trac Ticket regarding ffmpeg 6.x:
</span><span style='display:block; white-space:pre;color:#404040;'> https://trac.macports.org/ticket/65623
</span>---
multimedia/ffmpeg6/Portfile | 10 +++++-----
.../files/patch-libavcodec-audiotoolboxenc.c.diff | 16 +++++++---------
2 files changed, 12 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg6/Portfile b/multimedia/ffmpeg6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index faeab2364fb..6164e67ba81 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,8 +16,8 @@ PortGroup xcode_workaround 1.0
</span> name ffmpeg6
set my_name ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> epoch 0
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,9 +60,9 @@ distname ${my_name}-${version}
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 591511f1b96534dcd007875394913ba63e82a4a4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10234012
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5b9e3ee087e41aa61094530d01e29903f6048ed7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 488c76e57dd9b3bee901f71d5c95eaf1db4a5a31fe46a28654e837144207c270 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10455956
</span>
depends_build-append \
port:cctools \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg6/files/patch-libavcodec-audiotoolboxenc.c.diff b/multimedia/ffmpeg6/files/patch-libavcodec-audiotoolboxenc.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a592a07edc3..97351245ffe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg6/files/patch-libavcodec-audiotoolboxenc.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg6/files/patch-libavcodec-audiotoolboxenc.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libavcodec/audiotoolboxenc.c.orig 2016-05-18 05:07:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libavcodec/audiotoolboxenc.c 2016-05-18 05:09:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,8 +66,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/audiotoolboxenc.c.orig 2023-11-11 01:25:17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/audiotoolboxenc.c 2023-11-13 09:49:29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,7 +69,7 @@
</span> return kAudioFormatMPEG4AAC_HE_V2;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case FF_PROFILE_AAC_LD:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AV_PROFILE_AAC_LD:
</span> return kAudioFormatMPEG4AAC_LD;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span> +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case FF_PROFILE_AAC_ELD:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AV_PROFILE_AAC_ELD:
</span> return kAudioFormatMPEG4AAC_ELD;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case AV_CODEC_ID_ADPCM_IMA_QT:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return kAudioFormatAppleIMA4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>