<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/01fbb958bdcbe25e03c15e549b49faf24749040a">https://github.com/macports/macports-ports/commit/01fbb958bdcbe25e03c15e549b49faf24749040a</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 01fbb95  ffmpeg: Fix +universal build with openjp2
</span>01fbb95 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 01fbb958bdcbe25e03c15e549b49faf24749040a
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Sun Feb 12 21:08:40 2017 -0800

<span style='display:block; white-space:pre;color:#404040;'>    ffmpeg: Fix +universal build with openjp2
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
 multimedia/ffmpeg/Portfile                                  |  3 ++-
 .../ffmpeg/files/patch-configure-no-static-libopenjpeg.diff | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

<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 e1366a1..ff9c675 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;'>@@ -92,7 +92,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/files/patch-configure-no-static-libopenjpeg.diff b/multimedia/ffmpeg/files/patch-configure-no-static-libopenjpeg.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c3df1b6
</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/files/patch-configure-no-static-libopenjpeg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-02-12 21:06:32.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure      2017-02-12 21:07:13.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5721,8 +5721,8 @@ enabled libopencv         && { check_hea
</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_lib2 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_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++enabled libopenjpeg       && { check_lib2 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                               { check_lib2 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_lib2 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_lib2 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_lib2 openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</span></pre><pre style='margin:0'>

</pre>