<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/6c718927264bb5a14cc5600003a382ab421e6e6c">https://github.com/macports/macports-ports/commit/6c718927264bb5a14cc5600003a382ab421e6e6c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6c718927264bb5a14cc5600003a382ab421e6e6c
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Dec 12 00:38:34 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg-devel: update to git master as of 20171210
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * VDA (Video Decode Acceleration) support removed, use VideoToolbox instead
</span><span style='display:block; white-space:pre;color:#404040;'> * OpenCL 1.2 support enabled if available
</span><span style='display:block; white-space:pre;color:#404040;'> * Optional OpenCL support for filters deshake and unsharp removed
</span><span style='display:block; white-space:pre;color:#404040;'> * Additional filters overlay_opencl and unsharp_opencl added
</span>---
multimedia/ffmpeg-devel/Portfile | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 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 d874e1f..ca50c27 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 6e1654768585692e327343059b35695b6123444a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup FFmpeg FFmpeg c7a5e80f569d312c9d2f0dc534e07630eecd5a34
</span> name ffmpeg-devel
conflicts ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20171024
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20171210
</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 106c025aab98a4768a93af1a7196bd4ca9f9d74f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3d2212b976e30106e1f39622eef40bd5a1fb12d6587400dcfdb6b094d5c4d2ca
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d87b4d883f3546c5ffc37e53548b2e5c6c3da79e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 13a497f5525a212633234551c063b3bc67f0cee04d548386d91c629af27a2e18
</span>
depends_build port:pkgconfig \
port:gmake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,8 +133,8 @@ configure.args --enable-swscale \
</span> --disable-libxcb-shm \
--disable-libxcb-xfixes \
--disable-indev=jack \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-opencl \
</span> --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;'>@@ -165,18 +165,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} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,6 +179,11 @@ platform darwin {
</span> configure.args-replace --disable-videotoolbox --enable-videotoolbox
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OpenCL support requires version 1.2 available 10.8+
</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-replace --disable-opencl --enable-opencl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Apple GCC has problems with SIMD intrinsics and -Werror=no-missing-prototypes.
if {${os.major} < 11} {
patchfiles-append patch-configure-no-error-on-missing-prototypes.diff
</pre><pre style='margin:0'>
</pre>