<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/179dffd2d5693091b57a3eec851f8c0113a2b9d4">https://github.com/macports/macports-ports/commit/179dffd2d5693091b57a3eec851f8c0113a2b9d4</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 179dffd ffmpeg: sync build fixes with ffmpeg-devel
</span>179dffd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 179dffd2d5693091b57a3eec851f8c0113a2b9d4
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Apr 29 17:45:07 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg: sync build fixes with ffmpeg-devel
</span>---
multimedia/ffmpeg/Portfile | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
<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 cee3d3b..8f7b285 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;'>@@ -55,13 +55,6 @@ checksums rmd160 905285cf32e1b00d320c51c0a94cbd670fab6649 \
</span> sha256 ed945daf40b124e77a685893cc025d086f638bc703183460aff49508edb3a43f \
size 8656948
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# root directory of extracted tarball is owned by root and has permissions 700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# set to 755 to facilitate maintenance
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${worksrcpath} -permissions 0755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:pkgconfig \
port:gmake \
port:texinfo
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,6 +106,11 @@ platform darwin powerpc {
</span> universal_variant no
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# _Nullable not available with clang < 700.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${xcodeversion} 7.0] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-libavcodec-videotoolboxenc.c-drop-Nullable.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # The old ffmpeg port was GPL-2+ as base and had a no_gpl variant, so this keeps us consistent
# 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:#e0e0e0;'>@@ -147,7 +145,6 @@ configure.args --enable-swscale \
</span> --disable-indev=jack \
--disable-opencl \
--disable-outdev=xv \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-vda \
</span> --disable-audiotoolbox \
--disable-videotoolbox \
--disable-sdl2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,18 +175,6 @@ platform darwin {
</span> --disable-filter=coreimagesrc
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # VDA (video hardware acceleration, mostly H264) is only supported on 10.6.3+ up to (excluding) 10.11.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if {(${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)) && (${os.major} < 15)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Due to a bug in ffmpeg(?), we have to enable VDA on 10.11 as well, even though it shouldn't be supported.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # More information: https://github.com/mpv-player/mpv/issues/2299
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-vda
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # configure now fails on 10.11+ if --enable-vda is forced citing missing vda dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if we just remove --disable-vda, ffmpeg will auto configure vda if the required dependencies are available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this allows ffmpeg to configure and build, effect on the bug cited above not verified
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # configure.args-append --enable-vda
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # AudioToolbox support requires CoreMedia Framework available on 10.7+
# libsdl2 requires minimum Xcode 10.7 SDK to build successfully
if {${os.major} > 10} {
</pre><pre style='margin:0'>
</pre>