<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/021f2739c79736c394a00bf29d620a650a6f6a47">https://github.com/macports/macports-ports/commit/021f2739c79736c394a00bf29d620a650a6f6a47</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 021f2739c79736c394a00bf29d620a650a6f6a47
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Aug 7 16:14:46 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg-upstream: enable zimg and x265 across-the-board
</span><span style='display:block; white-space:pre;color:#404040;'> - Also add new av1 codecs, already present in ffmpeg/ffmpeg-devel
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/64675
</span>---
multimedia/ffmpeg-upstream/Portfile | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
<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 ec5c5360020..36309a3832e 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;'>@@ -19,7 +19,7 @@ conflicts ffmpeg ffmpeg-devel
</span>
# Please increase the revision of mpv whenever ffmpeg's version is updated.
version 5.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> epoch 0
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,6 +93,7 @@ depends_lib port:lame \
</span> port:soxr \
port:bzip2 \
port:xz \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zimg \
</span> port:zlib
patchfiles-append patch-libavcodec-audiotoolboxenc.c.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,6 +135,7 @@ configure.args --enable-swscale \
</span> --enable-libspeex \
--enable-libass \
--enable-libbluray \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-libzimg \
</span> --enable-libzvbi \
--enable-lzma \
--enable-gnutls \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,12 +161,6 @@ configure.args --enable-swscale \
</span> --enable-pthreads \
--cc=${configure.cc}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# zimg doesn't currently build on 10.7 and below, so only enable it on supported systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" && ${os.major} > 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-libzimg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:zimg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform darwin {
# disable asm on Tiger
# libblueray doesn't build on Tiger so disable for now (#39442)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,6 +223,18 @@ platform darwin {
</span> if {${os.major} < 12} {
configure.args-append --disable-indev=avfoundation
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # av1 codecs, available on 10.7+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-libaom \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-librav1e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-libsvtav1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:aom \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:rav1e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:svt-av1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
build.cmd ${prefix}/bin/gmake
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -327,16 +335,6 @@ variant librtmp description {Use librtmp (from rtmpdump) as rtmp[t][es]:// proto
</span> depends_lib-append port:rtmpdump
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# x265 currently does not support OS X < 10.6 (#48336, #48338)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# only enable libx265 support on 10.6 or greater
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} > 9 && [variant_isset gpl2]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-libx265
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:x265
</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;'>-
</span> variant jack description {Enable jack library and indev support} {
# jack will autoconfigure if not disabled
depends_lib-append port:jack
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -354,10 +352,12 @@ variant gpl2 description {Enable GPL code, license will be GPL-2+} {
</span> configure.args-append --enable-gpl \
--enable-postproc \
--enable-libx264 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-libx265 \
</span> --enable-libxvid \
--enable-libvidstab
depends_lib-append port:XviD \
port:x264 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:x265 \
</span> port:libvidstab
license GPL-2+
}
</pre><pre style='margin:0'>
</pre>