<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/8801597f1cd9d80644ec42c763805c0c527c2488">https://github.com/macports/macports-ports/commit/8801597f1cd9d80644ec42c763805c0c527c2488</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 8801597 ffmpeg: Fix build failure with openjpeg 2.2
</span>8801597 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8801597f1cd9d80644ec42c763805c0c527c2488
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Aug 18 03:35:33 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg: Fix build failure with openjpeg 2.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54613
</span>---
multimedia/ffmpeg/Portfile | 2 +
.../patch-configure-no-static-libopenjpeg.diff | 15 ++--
multimedia/ffmpeg/files/patch-openjpeg-2.2.diff | 93 ++++++++++++++++++++++
3 files changed, 104 insertions(+), 6 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 cba02df..97f4b06 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;'>@@ -10,6 +10,7 @@ name ffmpeg
</span> conflicts ffmpeg-devel
epoch 1
version 3.3.3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license LGPL-2.1+
categories multimedia
maintainers {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,6 +93,7 @@ depends_lib port:lame \
</span> port:zlib
patchfiles patch-libavcodec-audiotoolboxenc.c.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-openjpeg-2.2.diff \
</span> patch-configure-no-static-libopenjpeg.diff
#
<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><span style='display:block; white-space:pre;color:#808080;'>index eca40e9..7437f00 100644
</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;'>+++ b/multimedia/ffmpeg/files/patch-configure-no-static-libopenjpeg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-06-06 19:04:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-06-15 05:11:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5805,8 +5805,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-08-18 03:27:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-08-18 03:27:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5806,10 +5806,10 @@
</span> require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
<span style='display:block; white-space:pre;background:#ffe0e0;'>--enabled libopenjpeg && { { check_lib 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 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-enabled libopenjpeg && { { check_lib 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 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { check_lib 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 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { check_lib 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 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
</span> + { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
{ check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
{ check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/files/patch-openjpeg-2.2.diff b/multimedia/ffmpeg/files/patch-openjpeg-2.2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..59b7953
</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-openjpeg-2.2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,93 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/FFmpeg/FFmpeg/commit/078322f33ced4b2db6ac3e5002f98233d6fbf643
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-07-29 12:49:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-08-18 02:42:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1875,6 +1875,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ machine_ioctl_meteor_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ malloc_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opencv2_core_core_c_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ openjpeg_2_2_openjpeg_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openjpeg_2_1_openjpeg_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openjpeg_2_0_openjpeg_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openjpeg_1_5_openjpeg_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5805,7 +5806,9 @@
</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 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 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 openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { check_lib 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 openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { check_lib 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 openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/libopenjpegdec.c.orig 2017-07-29 12:49:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/libopenjpegdec.c 2017-08-18 02:43:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "internal.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "thread.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_OPENJPEG_2_2_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <openjpeg-2.2/openjpeg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <openjpeg-2.1/openjpeg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <openjpeg-2.0/openjpeg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +46,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <openjpeg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define OPENJPEG_MAJOR_VERSION 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define OPJ(x) OPJ_##x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -429,7 +431,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opj_stream_set_read_function(stream, stream_read);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opj_stream_set_skip_function(stream, stream_skip);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opj_stream_set_seek_function(stream, stream_seek);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opj_stream_set_user_data(stream, &reader, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opj_stream_set_user_data(stream, &reader);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/libopenjpegenc.c.orig 2017-07-29 12:49:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/libopenjpegenc.c 2017-08-18 02:43:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +32,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "avcodec.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "internal.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_OPENJPEG_2_2_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <openjpeg-2.2/openjpeg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <openjpeg-2.1/openjpeg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <openjpeg-2.0/openjpeg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <openjpeg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define OPENJPEG_MAJOR_VERSION 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define OPJ(x) OPJ_##x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -305,7 +307,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opj_set_default_encoder_parameters(&ctx->enc_params);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (ctx->cinema_mode) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case OPJ_CINEMA2K_24:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -769,7 +771,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opj_stream_set_write_function(stream, stream_write);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opj_stream_set_skip_function(stream, stream_skip);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opj_stream_set_seek_function(stream, stream_seek);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opj_stream_set_user_data(stream, &writer, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opj_stream_set_user_data(stream, &writer);
</span></pre><pre style='margin:0'>
</pre>