<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4bbee7a6f4c1422d72774a0a3408e58629f27900">https://github.com/macports/macports-ports/commit/4bbee7a6f4c1422d72774a0a3408e58629f27900</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 4bbee7a  ffmpeg-devel: Fix +universal build with openjp2
</span>4bbee7a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4bbee7a6f4c1422d72774a0a3408e58629f27900
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Aug 18 03:24:12 2017 -0500

<span style='display:block; white-space:pre;color:#404040;'>    ffmpeg-devel: Fix +universal build with openjp2
</span>---
 multimedia/ffmpeg-devel/Portfile                         |  3 ++-
 .../files/patch-configure-no-static-libopenjpeg.diff     | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

<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 3638dd4..4256427 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;'>@@ -81,7 +81,8 @@ 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:#e0ffe0;'>+patchfiles          patch-libavcodec-audiotoolboxenc.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-configure-no-static-libopenjpeg.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-static-libopenjpeg.diff b/multimedia/ffmpeg-devel/files/patch-configure-no-static-libopenjpeg.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8b3b50f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-07-29 09:28:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure      2017-08-18 03:16:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5871,10 +5871,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                  require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-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:#e0ffe0;'>+-                               check_lib libopenjpeg openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>++enabled libopenjpeg       && { check_lib libopenjpeg openjpeg-2.2/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;'>+                                check_lib libopenjpeg openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                { 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;background:#e0ffe0;'>+                                { 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:#e0ffe0;'>+                                { check_lib libopenjpeg openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</span></pre><pre style='margin:0'>

</pre>