<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/835b713994d8b47c5b1ec922001afacc7cc17d39">https://github.com/macports/macports-ports/commit/835b713994d8b47c5b1ec922001afacc7cc17d39</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 835b713994d8b47c5b1ec922001afacc7cc17d39
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Apr 23 16:52:12 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg: update to version 4.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Breaks both API/ABI with previous version.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> At a minimum all binary dependents (those that link with
</span><span style='display:block; white-space:pre;color:#404040;'> one of ffmpeg's libraries) need to be rebuilt with ffmpeg 4.0
</span><span style='display:block; white-space:pre;color:#404040;'> due to library version changes.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> If your port does not rebuild cleanly, see ${prefix)/share/doc/ffmpeg/APIchanges
</span><span style='display:block; white-space:pre;color:#404040;'> for detailed API changes.
</span>---
multimedia/ffmpeg/Portfile | 15 +++++++--------
.../files/patch-configure-no-static-libopenjpeg.diff | 16 ----------------
.../ffmpeg/files/patch-libavcodec-audiotoolboxenc.c.diff | 2 +-
3 files changed, 8 insertions(+), 25 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 cfdc140..cee3d3b 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;'>@@ -9,7 +9,7 @@ PortGroup active_variants 1.1
</span> name ffmpeg
conflicts ffmpeg-devel
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.0
</span> license LGPL-2.1+
categories multimedia
maintainers {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,9 +51,9 @@ master_sites http://www.ffmpeg.org/releases/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 97751ae03808242ced7cc9495f999a3b1760325c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8478376
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 905285cf32e1b00d320c51c0a94cbd670fab6649 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ed945daf40b124e77a685893cc025d086f638bc703183460aff49508edb3a43f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8656948
</span>
# root directory of extracted tarball is owned by root and has permissions 700
# set to 755 to facilitate maintenance
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,8 +91,7 @@ depends_lib port:lame \
</span> port:xz \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-libavcodec-audiotoolboxenc.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure-no-static-libopenjpeg.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-libavcodec-audiotoolboxenc.c.diff
</span>
#
# enable auto configure of asm optimizations
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,7 +138,7 @@ configure.args --enable-swscale \
</span> --enable-fontconfig \
--enable-libfreetype \
--enable-libfribidi \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-jack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libjack \
</span> --disable-libopencore-amrnb \
--disable-libopencore-amrwb \
--disable-libxcb \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -332,7 +331,7 @@ if {[variant_isset high10]} {
</span> variant jack description {Enable jack library and indev support} {
# jack will autoconfigure if not disabled
depends_lib-append port:jack
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-jack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-libjack \
</span> --disable-indev=jack
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/files/patch-configure-no-static-libopenjpeg.diff b/multimedia/ffmpeg/files/patch-configure-no-static-libopenjpeg.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b5e8ee6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/files/patch-configure-no-static-libopenjpeg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-12-10 21:35:18.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-12-11 14:32:27.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5956,10 +5956,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enabled libopenh264 && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--enabled libopenjpeg && { { check_lib libopenjpeg openjpeg-2.3/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- check_lib libopenjpeg openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { check_lib libopenjpeg openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+enabled libopenjpeg && { check_lib libopenjpeg openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { check_lib libopenjpeg openjpeg-2.3/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_lib libopenjpeg openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { check_lib libopenjpeg openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { check_lib libopenjpeg openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_lib libopenjpeg openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { check_lib libopenjpeg openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/files/patch-libavcodec-audiotoolboxenc.c.diff b/multimedia/ffmpeg/files/patch-libavcodec-audiotoolboxenc.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c0b406a..a592a07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/files/patch-libavcodec-audiotoolboxenc.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/files/patch-libavcodec-audiotoolboxenc.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- libavcodec/audiotoolboxenc.c.orig 2016-05-18 05:07:43.000000000 -0700
+++ libavcodec/audiotoolboxenc.c 2016-05-18 05:09:16.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,8 +64,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,8 +66,10 @@
</span> return kAudioFormatMPEG4AAC_HE_V2;
case FF_PROFILE_AAC_LD:
return kAudioFormatMPEG4AAC_LD;
</pre><pre style='margin:0'>
</pre>