<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/254240ecc5150f283fd91420e13dd06459eb9a3a">https://github.com/macports/macports-ports/commit/254240ecc5150f283fd91420e13dd06459eb9a3a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 254240ecc5150f283fd91420e13dd06459eb9a3a
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Nov 29 09:54:34 2016 -0800
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg-devel: update to upstream git master as of 20161129
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Enable libx265 support. Disable libvpx support on Leopard and earlier.
</span><span style='display:block; white-space:pre;color:#404040;'> ABI compatible with current ffmpeg.
</span>---
multimedia/ffmpeg-devel/Portfile | 20 ++++++++++++++------
multimedia/ffmpeg-devel/patch.diff | 18 ------------------
2 files changed, 14 insertions(+), 24 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 8674cae..9c87a43 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,11 +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 85d23e5cbc9ad6835eef870a5b4247de78febe56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup FFmpeg FFmpeg c9dcd25288e3502eb0e6d45a8533a4e3a80d3060
</span> name ffmpeg-devel
conflicts ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20161024
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20161129
</span> license LGPL-2.1+
categories multimedia
maintainers devans jeremyhu openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,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 4f82065f34a43fb381e6fa2d0b3523c00b23867e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 98bd06d24ae17e567ef37633aaec2147bcef90e05b355b9b1e29ff90dc784e5f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cfc629695154e44a9da06bb2986d9a3fd419ac1d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 565ecd64a602b456ab7b9e14ca96dae064c1bbaf7f0818adb898846f16ef265a
</span>
depends_build port:pkgconfig \
port:gmake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,6 +145,13 @@ platform darwin {
</span> configure.args-append --disable-asm
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # as of 1.6.0 libvpx only supports darwin 10 or later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-delete port:libvpx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --enable-libvpx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-libvpx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # filters coreimage and coreimagesrc don't build on 10.6
# and earlier due to use of bridged casts in Objective C (#51823)
if {${os.major} < 11} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -304,9 +310,11 @@ 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
depends_lib-append port:XviD \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:x264
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:x264 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:x265
</span>
license GPL-2+
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/patch.diff b/multimedia/ffmpeg-devel/patch.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2a643fa..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/patch.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../ffmpeg-devel/Portfile 2016-11-14 10:53:00.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Portfile 2016-11-14 11:24:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -162,11 +171,11 @@
</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;'>- # AudiotoolBox support requires CoreMedia Framework available on 10.7+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # libsdl2 requires Xcode 10.7 SDK to build successfully
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # libsdl2 requires minimum Xcode 10.7 SDK to build successfully
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} > 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- configure.args-delete --disable-audiotoolbox --disable-sdl2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- configure.args-append --enable-audiotoolbox --enable-sdl2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- depends_lib-append port:libsdl2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ configure.args-replace --disable-audiotoolbox --enable-audiotoolbox
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ configure.args-replace --disable-sdl2 --enable-sdl2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ depends_lib-append port:libsdl2
</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;'>- # VideotoolBox, a new hardware acceleration framework, is supported on 10.8+ and "here to stay".
</span></pre><pre style='margin:0'>
</pre>