<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/c8768115cf1428332078f917e6b65fb84420632d">https://github.com/macports/macports-ports/commit/c8768115cf1428332078f917e6b65fb84420632d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c8768115cf1428332078f917e6b65fb84420632d
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Oct 24 15:37:49 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg-devel: update to git master as of 20171024
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * now configures openjpeg using pkgconfig and links with shared lib by default
</span><span style='display:block; white-space:pre;color:#404040;'> * breaks ABI with current ffmpeg
</span>---
multimedia/ffmpeg-devel/Portfile | 11 +++++------
.../patch-configure-no-error-on-missing-prototypes.diff | 2 +-
.../files/patch-configure-no-static-libopenjpeg.diff | 16 ----------------
3 files changed, 6 insertions(+), 23 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 4c5ec7d..8ef9f02 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 f4090940bd3024e69d236257d327f11d1e496229
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup FFmpeg FFmpeg 6e1654768585692e327343059b35695b6123444a
</span> name ffmpeg-devel
conflicts ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20171018
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20171024
</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 ef3416826dff3f299d90af7f57a68cde35073d64 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d97711f7ff9c62ebdee8c0fa37734808842a6d027375678404600e5f931a0f52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 106c025aab98a4768a93af1a7196bd4ca9f9d74f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3d2212b976e30106e1f39622eef40bd5a1fb12d6587400dcfdb6b094d5c4d2ca
</span>
depends_build port:pkgconfig \
port:gmake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,8 +82,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;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-configure-no-error-on-missing-prototypes.diff b/multimedia/ffmpeg-devel/files/patch-configure-no-error-on-missing-prototypes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f00e692..bc40a05 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/files/patch-configure-no-error-on-missing-prototypes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/files/patch-configure-no-error-on-missing-prototypes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.old 2015-09-27 18:43:30.000000000 +0200
+++ configure 2015-09-27 18:44:18.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6558,7 +6558,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6520,7 +6520,6 @@
</span> check_optflags -fno-tree-vectorize
check_cflags -Werror=format-security
check_cflags -Werror=implicit-function-declaration
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 643faa7..0000000
</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;'>+++ /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-10-18 12:52:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-10-18 14:32:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6034,10 +6034,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require libopencv 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></pre><pre style='margin:0'>
</pre>