<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/36a57c6622c70ce9ff2ac9e07c94d7f5c28302ac">https://github.com/macports/macports-ports/commit/36a57c6622c70ce9ff2ac9e07c94d7f5c28302ac</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 36a57c6622c70ce9ff2ac9e07c94d7f5c28302ac
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Aug 7 16:16:43 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    ffmpeg/ffmpeg-devel: enable zimg and x265 across-the-board
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/64675
</span>---
 multimedia/ffmpeg-devel/Portfile | 22 +++++-----------------
 multimedia/ffmpeg/Portfile       | 22 +++++-----------------
 2 files changed, 10 insertions(+), 34 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 7227d14990e..2d2c690a516 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;'>@@ -19,7 +19,7 @@ conflicts           ffmpeg ffmpeg-upstream
</span> 
 # Please increase the revision of mpv whenever ffmpeg's version is updated.
 version             4.4.2
<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               2
 
 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          patch-libavcodec-audiotoolboxenc.c.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,6 +143,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;'>@@ -167,12 +169,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;'>@@ -347,16 +343,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;'>@@ -374,10 +360,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+
 }
<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 02222f341e7..e7e624f9e24 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;'>@@ -19,7 +19,7 @@ conflicts           ffmpeg-devel ffmpeg-upstream
</span> 
 # Please increase the revision of mpv whenever ffmpeg's version is updated.
 version             4.4.2
<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               1
 
 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          patch-libavcodec-audiotoolboxenc.c.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,6 +143,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;'>@@ -167,12 +169,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;'>@@ -347,16 +343,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;'>@@ -374,10 +360,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>