<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/4e144f4eefa1c4ceee48e7b7134e7a7e3b12c2ff">https://github.com/macports/macports-ports/commit/4e144f4eefa1c4ceee48e7b7134e7a7e3b12c2ff</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 4e144f4eefa ffmpeg ports: cleanup whitespace and line continuation - Also remove superfluous platform declaration
</span>4e144f4eefa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4e144f4eefa1c4ceee48e7b7134e7a7e3b12c2ff
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Jun 26 17:15:28 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg ports: cleanup whitespace and line continuation
</span><span style='display:block; white-space:pre;color:#404040;'> - Also remove superfluous platform declaration
</span>---
multimedia/ffmpeg-devel/Portfile | 11 +----------
multimedia/ffmpeg-upstream/Portfile | 11 +----------
multimedia/ffmpeg/Portfile | 11 +----------
3 files changed, 3 insertions(+), 30 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 1e2bf17d7f5..0af4673da0e 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;'>@@ -57,7 +57,6 @@ long_description FFmpeg is a complete solution to record, convert and \
</span> libavformat is a library containing parsers and \
generators for all common audio/video formats.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> homepage https://ffmpeg.org/
master_sites ${homepage}releases/
distname ${my_name}-${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,7 +111,6 @@ patchfiles-append patch-issue-9439-non-b-frame-encoding.diff
</span>
# enable auto configure of asm optimizations
# requires Xcode 3.1 or better on Leopard
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span> minimum_xcodeversions {9 3.1}
# requires a C11 compiler
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -273,8 +271,6 @@ platform powerpc {
</span> # "___atomic_fetch_sub_8", referenced from:
# _fifo_thread_dispatch_message.part.4 in fifo.o
configure.ldflags-append -latomic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
platform darwin 8 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,10 +308,9 @@ variant x11 {
</span> depends_lib-append port:xorg-libxcb \
port:xorg-libXext \
port:xorg-libXfixes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-delete --disable-libxcb \
--disable-libxcb-shm \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-libxcb-xfixes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libxcb-xfixes
</span> }
if {[variant_isset x11]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -337,7 +332,6 @@ variant libdc1394 description {Enable IIDC-1394 frame grabbing using libdc1394 (
</span>
variant librtmp description {Use librtmp (from rtmpdump) as rtmp[t][es]:// protocol handler} {
configure.args-append --enable-librtmp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:rtmpdump
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -373,7 +367,6 @@ variant gpl2 description {Enable GPL code, license will be GPL-2+} {
</span> depends_lib-append port:XviD \
port:x264 \
port:libvidstab
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> license GPL-2+
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -381,10 +374,8 @@ variant gpl3 requires gpl2 description {Enable GPL code, license will be GPL-3+}
</span> configure.args-append --enable-version3 \
--enable-libsmbclient \
--enable-libaribb24
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append path:lib/pkgconfig/smbclient.pc:samba3 \
port:libaribb24
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> license GPL-3+
}
<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 2b3fcdf2086..e1f4234b984 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;'>@@ -57,7 +57,6 @@ long_description FFmpeg is a complete solution to record, convert and \
</span> libavformat is a library containing parsers and \
generators for all common audio/video formats.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> homepage https://ffmpeg.org/
master_sites ${homepage}releases/
distname ${my_name}-${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,7 +155,6 @@ configure.args --enable-swscale \
</span> --enable-pthreads \
--cc=${configure.cc}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # zimg doesn't currently build on 10.7 and below, so only enable it on supported systems
if { ${os.platform} eq "darwin" && ${os.major} > 11 } {
configure.args-append --enable-libzimg
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,8 +259,6 @@ platform powerpc {
</span> # "___atomic_fetch_sub_8", referenced from:
# _fifo_thread_dispatch_message.part.4 in fifo.o
configure.ldflags-append -latomic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
platform darwin 8 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -300,10 +296,9 @@ variant x11 {
</span> depends_lib-append port:xorg-libxcb \
port:xorg-libXext \
port:xorg-libXfixes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-delete --disable-libxcb \
--disable-libxcb-shm \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-libxcb-xfixes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libxcb-xfixes
</span> }
if {[variant_isset x11]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -325,7 +320,6 @@ variant libdc1394 description {Enable IIDC-1394 frame grabbing using libdc1394 (
</span>
variant librtmp description {Use librtmp (from rtmpdump) as rtmp[t][es]:// protocol handler} {
configure.args-append --enable-librtmp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:rtmpdump
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -361,7 +355,6 @@ variant gpl2 description {Enable GPL code, license will be GPL-2+} {
</span> depends_lib-append port:XviD \
port:x264 \
port:libvidstab
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> license GPL-2+
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -369,10 +362,8 @@ variant gpl3 requires gpl2 description {Enable GPL code, license will be GPL-3+}
</span> configure.args-append --enable-version3 \
--enable-libsmbclient \
--enable-libaribb24
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append path:lib/pkgconfig/smbclient.pc:samba3 \
port:libaribb24
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> license GPL-3+
}
<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 af4981c6e30..c50f43649fc 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;'>@@ -57,7 +57,6 @@ long_description FFmpeg is a complete solution to record, convert and \
</span> libavformat is a library containing parsers and \
generators for all common audio/video formats.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> homepage https://ffmpeg.org/
master_sites ${homepage}releases/
distname ${my_name}-${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,7 +111,6 @@ patchfiles-append patch-issue-9439-non-b-frame-encoding.diff
</span>
# enable auto configure of asm optimizations
# requires Xcode 3.1 or better on Leopard
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span> minimum_xcodeversions {9 3.1}
# requires a C11 compiler
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -273,8 +271,6 @@ platform powerpc {
</span> # "___atomic_fetch_sub_8", referenced from:
# _fifo_thread_dispatch_message.part.4 in fifo.o
configure.ldflags-append -latomic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
platform darwin 8 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,10 +308,9 @@ variant x11 {
</span> depends_lib-append port:xorg-libxcb \
port:xorg-libXext \
port:xorg-libXfixes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-delete --disable-libxcb \
--disable-libxcb-shm \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-libxcb-xfixes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libxcb-xfixes
</span> }
if {[variant_isset x11]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -337,7 +332,6 @@ variant libdc1394 description {Enable IIDC-1394 frame grabbing using libdc1394 (
</span>
variant librtmp description {Use librtmp (from rtmpdump) as rtmp[t][es]:// protocol handler} {
configure.args-append --enable-librtmp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:rtmpdump
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -373,7 +367,6 @@ variant gpl2 description {Enable GPL code, license will be GPL-2+} {
</span> depends_lib-append port:XviD \
port:x264 \
port:libvidstab
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> license GPL-2+
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -381,10 +374,8 @@ variant gpl3 requires gpl2 description {Enable GPL code, license will be GPL-3+}
</span> configure.args-append --enable-version3 \
--enable-libsmbclient \
--enable-libaribb24
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append path:lib/pkgconfig/smbclient.pc:samba3 \
port:libaribb24
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> license GPL-3+
}
</pre><pre style='margin:0'>
</pre>