<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f6f39602d1594f4a2c0c558d6ddf0df9f52739e9">https://github.com/macports/macports-ports/commit/f6f39602d1594f4a2c0c558d6ddf0df9f52739e9</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 f6f3960 ffmpeg: change patch to build against openjpeg 2.3
</span>f6f3960 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f6f39602d1594f4a2c0c558d6ddf0df9f52739e9
</span>Author: kencu <ken.cunningham.webuse@gmail.com>
AuthorDate: Mon Oct 9 15:25:52 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg: change patch to build against openjpeg 2.3
</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/55023
</span>---
multimedia/ffmpeg/Portfile | 3 ++-
.../patch-configure-no-static-libopenjpeg.diff | 8 ++++----
...h-openjpeg-2.2.diff => patch-openjpeg-2.3.diff} | 24 +++++++++++-----------
3 files changed, 18 insertions(+), 17 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 19cd5bb..aa4476c 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.4
<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,7 +93,7 @@ depends_lib port:lame \
</span> port:zlib
patchfiles patch-libavcodec-audiotoolboxenc.c.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-openjpeg-2.2.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-openjpeg-2.3.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 7437f00..2b6cfcc 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;'>@@ -4,11 +4,11 @@
</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.2/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.2/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-enabled libopenjpeg && { { check_lib 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 openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
</span> - { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+enabled libopenjpeg && { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { 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;'>++enabled libopenjpeg && { check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</span> check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
+ { 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; } ||
<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.3.diff
</span>similarity index 85%
rename from multimedia/ffmpeg/files/patch-openjpeg-2.2.diff
rename to multimedia/ffmpeg/files/patch-openjpeg-2.3.diff
<span style='display:block; white-space:pre;color:#808080;'>index 59b7953..60fca3a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/files/patch-openjpeg-2.2.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/files/patch-openjpeg-2.3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ https://github.com/FFmpeg/FFmpeg/commit/078322f33ced4b2db6ac3e5002f98233d6fbf643
</span> machine_ioctl_meteor_h
malloc_h
opencv2_core_core_c_h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ openjpeg_2_2_openjpeg_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ openjpeg_2_3_openjpeg_h
</span> openjpeg_2_1_openjpeg_h
openjpeg_2_0_openjpeg_h
openjpeg_1_5_openjpeg_h
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,8 +14,8 @@ https://github.com/FFmpeg/FFmpeg/commit/078322f33ced4b2db6ac3e5002f98233d6fbf643
</span> require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
-enabled libopenjpeg && { { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+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:#ffe0e0;'>-+ check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++enabled libopenjpeg && { { check_lib 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 openjpeg-2.3/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.1/openjpeg.h opj_version -lopenjp2 ||
{ check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,8 +27,8 @@ https://github.com/FFmpeg/FFmpeg/commit/078322f33ced4b2db6ac3e5002f98233d6fbf643
</span> #include "thread.h"
-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <openjpeg-2.2/openjpeg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_OPENJPEG_2_3_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <openjpeg-2.3/openjpeg.h>
</span> +#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
# include <openjpeg-2.1/openjpeg.h>
#elif HAVE_OPENJPEG_2_0_OPENJPEG_H
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ https://github.com/FFmpeg/FFmpeg/commit/078322f33ced4b2db6ac3e5002f98233d6fbf643
</span> #endif
-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#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;'>++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
</span> # define OPENJPEG_MAJOR_VERSION 2
# define OPJ(x) OPJ_##x
#else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@ https://github.com/FFmpeg/FFmpeg/commit/078322f33ced4b2db6ac3e5002f98233d6fbf643
</span> opj_stream_set_skip_function(stream, stream_skip);
opj_stream_set_seek_function(stream, stream_seek);
-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
</span> opj_stream_set_user_data(stream, &reader, NULL);
#elif HAVE_OPENJPEG_2_0_OPENJPEG_H
opj_stream_set_user_data(stream, &reader);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,8 +58,8 @@ https://github.com/FFmpeg/FFmpeg/commit/078322f33ced4b2db6ac3e5002f98233d6fbf643
</span> #include "internal.h"
-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <openjpeg-2.2/openjpeg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_OPENJPEG_2_3_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <openjpeg-2.3/openjpeg.h>
</span> +#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
# include <openjpeg-2.1/openjpeg.h>
#elif HAVE_OPENJPEG_2_0_OPENJPEG_H
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@ https://github.com/FFmpeg/FFmpeg/commit/078322f33ced4b2db6ac3e5002f98233d6fbf643
</span> #endif
-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#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;'>++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
</span> # define OPENJPEG_MAJOR_VERSION 2
# define OPJ(x) OPJ_##x
#else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,7 @@ https://github.com/FFmpeg/FFmpeg/commit/078322f33ced4b2db6ac3e5002f98233d6fbf643
</span> opj_set_default_encoder_parameters(&ctx->enc_params);
-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
</span> switch (ctx->cinema_mode) {
case OPJ_CINEMA2K_24:
ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,7 +87,7 @@ https://github.com/FFmpeg/FFmpeg/commit/078322f33ced4b2db6ac3e5002f98233d6fbf643
</span> opj_stream_set_skip_function(stream, stream_skip);
opj_stream_set_seek_function(stream, stream_seek);
-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
</span> opj_stream_set_user_data(stream, &writer, NULL);
#elif HAVE_OPENJPEG_2_0_OPENJPEG_H
opj_stream_set_user_data(stream, &writer);
</pre><pre style='margin:0'>
</pre>