<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/8eb840f09516c100d84e58c4973b8fa1325822fb">https://github.com/macports/macports-ports/commit/8eb840f09516c100d84e58c4973b8fa1325822fb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8eb840f09516c100d84e58c4973b8fa1325822fb
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Aug 21 07:40:03 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg*: cleanup
</span>---
multimedia/ffmpeg-devel/Portfile | 19 +++++++++++--------
multimedia/ffmpeg-upstream/Portfile | 13 +++++++++----
multimedia/ffmpeg/Portfile | 19 +++++++++++--------
3 files changed, 31 insertions(+), 20 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 736aae45875..35c3e876d8c 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;'>@@ -67,12 +67,14 @@ checksums rmd160 22a690edfad74f25de0d24557f8edf4b2366b1a0 \
</span> sha256 af419a7f88adbc56c758ab19b4c708afbcae15ef09606b82b855291f6a6faa93 \
size 9562968
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span> port:gmake \
port:cctools \
port:texinfo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:lame \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lame \
</span> port:libiconv \
port:libvorbis \
port:libopus \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,18 +98,16 @@ depends_lib port:lame \
</span> port:zimg \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-libavcodec-audiotoolboxenc.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-libavcodec-audiotoolboxenc.c.diff
</span>
# Fix an upstream bug that overrides the max_b_frames setting
# https://trac.ffmpeg.org/ticket/9231
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This bug is fixed upstream in commit 55d9d6767967794edcdd6e1bbd8840fc6f4e9315
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and should therefore be available in the next release version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fixed via upstream commit: 55d9d6767967794edcdd6e1bbd8840fc6f4e9315
</span> patchfiles-append patch-libavcodec-videotoolboxenc.c.diff
# Patch for upstream bug related to non-B-frame encoding
# https://trac.ffmpeg.org/ticket/9439
# Fixed via upstream commit: b786bc7433dfe082441a57c1ba9ae9ea47904b78
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Will be available in the next release version
</span> patchfiles-append patch-issue-9439-non-b-frame-encoding.diff
# enable auto configure of asm optimizations
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,8 +127,11 @@ compiler.blacklist-append {clang < 800}
</span> # Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
default_variants-append +gpl2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-swscale \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DHAVE_LRINTF ${configure.cppflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-swscale \
</span> --enable-avfilter \
--enable-avresample \
--enable-libmp3lame \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-upstream/Portfile b/multimedia/ffmpeg-upstream/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 71098f2703e..215c061384f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-upstream/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-upstream/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,12 +67,14 @@ checksums rmd160 36c440d17f9f5584d6780e38daa7d0f465ba03ce \
</span> sha256 55eb6aab5ee235550fa54a33eaf8bf1b4ec66c01453182b12f6a993d75698b03 \
size 10001864
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span> port:gmake \
port:cctools \
port:texinfo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:lame \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lame \
</span> port:libiconv \
port:libvorbis \
port:libopus \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,8 +122,11 @@ compiler.blacklist-append {clang < 800}
</span> # Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
default_variants-append +gpl2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-swscale \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DHAVE_LRINTF ${configure.cppflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-swscale \
</span> --enable-avfilter \
--enable-libmp3lame \
--enable-libvorbis \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/Portfile b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 42a0e346412..c0e37c2d205 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,12 +67,14 @@ checksums rmd160 22a690edfad74f25de0d24557f8edf4b2366b1a0 \
</span> sha256 af419a7f88adbc56c758ab19b4c708afbcae15ef09606b82b855291f6a6faa93 \
size 9562968
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span> port:gmake \
port:cctools \
port:texinfo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:lame \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lame \
</span> port:libiconv \
port:libvorbis \
port:libopus \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,18 +98,16 @@ depends_lib port:lame \
</span> port:zimg \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-libavcodec-audiotoolboxenc.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-libavcodec-audiotoolboxenc.c.diff
</span>
# Fix an upstream bug that overrides the max_b_frames setting
# https://trac.ffmpeg.org/ticket/9231
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This bug is fixed upstream in commit 55d9d6767967794edcdd6e1bbd8840fc6f4e9315
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and should therefore be available in the next release version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fixed via upstream commit: 55d9d6767967794edcdd6e1bbd8840fc6f4e9315
</span> patchfiles-append patch-libavcodec-videotoolboxenc.c.diff
# Patch for upstream bug related to non-B-frame encoding
# https://trac.ffmpeg.org/ticket/9439
# Fixed via upstream commit: b786bc7433dfe082441a57c1ba9ae9ea47904b78
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Will be available in the next release version
</span> patchfiles-append patch-issue-9439-non-b-frame-encoding.diff
# enable auto configure of asm optimizations
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,8 +127,11 @@ compiler.blacklist-append {clang < 800}
</span> # Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
default_variants-append +gpl2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-swscale \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DHAVE_LRINTF ${configure.cppflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-swscale \
</span> --enable-avfilter \
--enable-avresample \
--enable-libmp3lame \
</pre><pre style='margin:0'>
</pre>