<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/56dc8f427c8f15aec55de46d9febf1e5cccbe0be">https://github.com/macports/macports-ports/commit/56dc8f427c8f15aec55de46d9febf1e5cccbe0be</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 56dc8f427c8f15aec55de46d9febf1e5cccbe0be
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Oct 18 15:04:08 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg-devel: update to git master as of 20171018
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * upstream now handles configuration for openjpeg 2.3
</span><span style='display:block; white-space:pre;color:#404040;'> * ABI compatible with current ffmpeg
</span>---
multimedia/ffmpeg-devel/Portfile | 8 +++----
...h-configure-no-error-on-missing-prototypes.diff | 2 +-
.../patch-configure-no-static-libopenjpeg.diff | 26 +++++++++++-----------
3 files changed, 18 insertions(+), 18 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 58331a5..1a2b30e 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 549ef6ef9a8168281640b9cd0240abe071cbbda3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup FFmpeg FFmpeg f4090940bd3024e69d236257d327f11d1e496229
</span> name ffmpeg-devel
conflicts ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20170912
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20171018
</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 74d111cb90417270bfeb01a86364e89ef7c423f9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fa05f46526b79e56bd45190b3cb85381df82a6bccabe368c102cf9e3038f5dde
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ef3416826dff3f299d90af7f57a68cde35073d64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d97711f7ff9c62ebdee8c0fa37734808842a6d027375678404600e5f931a0f52
</span>
depends_build port:pkgconfig \
port:gmake \
<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 61a4335..f00e692 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;'>-@@ -5683,7 +5683,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6558,7 +6558,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><span style='display:block; white-space:pre;color:#808080;'>index 10c286c..643faa7 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,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-07-29 09:28:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-08-18 03:16:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5908,10 +5908,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 opencv opencv/cxcore.h cvCreateImageHeader; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--enabled libopenjpeg && { { 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.2/openjpeg.h opj_version -lopenjp2 ||
</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;'>-+enabled libopenjpeg && { check_lib libopenjpeg openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-10-18 12:52:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-10-18 14:32:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6034,10 +6034,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enabled libopenh264 && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-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:#e0ffe0;'>+- check_lib libopenjpeg openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { 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:#e0ffe0;'>++enabled libopenjpeg && { check_lib libopenjpeg openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { 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:#e0ffe0;'>+ check_lib libopenjpeg openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
</span> + { check_lib libopenjpeg openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ { check_lib libopenjpeg openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</span> check_lib libopenjpeg openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
<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> { check_lib libopenjpeg openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
<span style='display:block; white-space:pre;background:#ffe0e0;'>- { check_lib libopenjpeg openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { check_lib libopenjpeg openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</span></pre><pre style='margin:0'>
</pre>