<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/5cd900e1b7bd7d32a5092a2403809a9859133c7c">https://github.com/macports/macports-ports/commit/5cd900e1b7bd7d32a5092a2403809a9859133c7c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5cd900e1b7bd7d32a5092a2403809a9859133c7c
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Sep 12 08:01:15 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg-devel: update to git master as of 20170912
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ABI compatible with current ffmpeg.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> As of this snapshot, use of --enable-vda on 10.11+ causes a
</span><span style='display:block; white-space:pre;color:#404040;'> configuration error citing missing vda dependencies. Allowing
</span><span style='display:block; white-space:pre;color:#404040;'> ffmpeg to auto-configure in this situation allows the build
</span><span style='display:block; white-space:pre;color:#404040;'> to proceed but the effect on a previously cited bug is unverified.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Relevent test results and/or suggestions are welcome. For further
</span><span style='display:block; white-space:pre;color:#404040;'> details, see Portfile comments and https://github.com/mpv-player/mpv/issues/2299.
</span>---
multimedia/ffmpeg-devel/Portfile | 15 ++++++++++-----
.../files/patch-configure-no-static-libopenjpeg.diff | 2 +-
2 files changed, 11 insertions(+), 6 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 4256427..58331a5 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;'>@@ -7,10 +7,10 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup active_variants 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup FFmpeg FFmpeg bf8ab72ae95bb11f2c281d464594c2f6ba70326b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup FFmpeg FFmpeg 549ef6ef9a8168281640b9cd0240abe071cbbda3
</span> name ffmpeg-devel
conflicts ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20170729
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20170912
</span> license LGPL-2.1+
categories multimedia
maintainers {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,8 +49,8 @@ long_description FFmpeg is a complete solution to record, convert and \
</span> platforms darwin
homepage http://www.ffmpeg.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 afb5ba7eb354de24df8c3cf9403e7c696de76159 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e36c21d5d37e945be76355bbbc8bd6184defd44aaa818f128a7ceafb80136aa0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 74d111cb90417270bfeb01a86364e89ef7c423f9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fa05f46526b79e56bd45190b3cb85381df82a6bccabe368c102cf9e3038f5dde
</span>
depends_build port:pkgconfig \
port:gmake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,6 +66,7 @@ depends_lib port:lame \
</span> port:libvorbis \
port:libopus \
port:libogg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:librsvg \
</span> port:libtheora \
port:libmodplug \
port:libass \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,6 +108,7 @@ configure.args --enable-swscale \
</span> --enable-libmp3lame \
--enable-libvorbis \
--enable-libopus \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-librsvg \
</span> --enable-libtheora \
--enable-libopenjpeg \
--enable-libmodplug \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,7 +166,10 @@ platform darwin {
</span> # More information: https://github.com/mpv-player/mpv/issues/2299
if {${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)} {
configure.args-delete --disable-vda
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-vda
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configure now fails on 10.11+ if --enable-vda is forced citing missing vda dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ # this allows ffmpeg to configure and build, effect on the bug cited above not verified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configure.args-append --enable-vda
</span> }
# AudiotoolBox support requires CoreMedia Framework available on 10.7+
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-configure-no-static-libopenjpeg.diff b/multimedia/ffmpeg-devel/files/patch-configure-no-static-libopenjpeg.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8b3b50f..10c286c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/files/patch-configure-no-static-libopenjpeg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/files/patch-configure-no-static-libopenjpeg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.orig 2017-07-29 09:28:22.000000000 -0500
+++ configure 2017-08-18 03:16:33.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5871,10 +5871,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5908,10 +5908,10 @@
</span> require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
</pre><pre style='margin:0'>
</pre>