<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/d29cf89b54354dec54e7d6bd1e0322078a9580e4">https://github.com/macports/macports-ports/commit/d29cf89b54354dec54e7d6bd1e0322078a9580e4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d29cf89b54354dec54e7d6bd1e0322078a9580e4
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Oct 18 14:53:38 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg: update to version 3.4, dependencies, configuration
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * support added for librsvg
</span><span style='display:block; white-space:pre;color:#404040;'> * support removed for schoedinger
</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;'> * configure can now auto configure vda support if available
</span><span style='display:block; white-space:pre;color:#404040;'> * --enable-yasm is now --enable-x86asm
</span><span style='display:block; white-space:pre;color:#404040;'> * ABI compatible with previous version
</span>---
multimedia/ffmpeg/Portfile | 23 +++---
...h-configure-no-error-on-missing-prototypes.diff | 2 +-
.../patch-configure-no-static-libopenjpeg.diff | 30 +++----
multimedia/ffmpeg/files/patch-openjpeg-2.3.diff | 93 ----------------------
4 files changed, 28 insertions(+), 120 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 aa4476c..bdc0919 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;'>@@ -9,8 +9,7 @@ PortGroup active_variants 1.1
</span> name ffmpeg
conflicts ffmpeg-devel
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4
</span> license LGPL-2.1+
categories multimedia
maintainers {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,8 +51,8 @@ master_sites http://www.ffmpeg.org/releases/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d206ec78c62f0d9377d3a2a36e6b576e4ab2a444 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e554cb80356779de57b24c97d0ccb485a0b144eb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 aeee06e4d8b18d852c61ebbfe5e1bb7014b1e118e8728c1c2115f91e51bffbef
</span>
# root directory of extracted tarball is owned by root and has permissions 700
# set to 755 to facilitate maintenance
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,9 +75,9 @@ depends_lib port:lame \
</span> port:libvorbis \
port:libopus \
port:libogg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:librsvg \
</span> port:libtheora \
port:libmodplug \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:schroedinger \
</span> port:libass \
port:libbluray \
port:gnutls \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +92,6 @@ 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.3.diff \
</span> patch-configure-no-static-libopenjpeg.diff
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,8 +117,8 @@ configure.args --enable-swscale \
</span> --enable-libmp3lame \
--enable-libvorbis \
--enable-libopus \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-librsvg \
</span> --enable-libtheora \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-libschroedinger \
</span> --enable-libopenjpeg \
--enable-libmodplug \
--enable-libvpx \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,7 +175,10 @@ platform darwin {
</span> # More information: https://github.com/mpv-player/mpv/issues/2299
if {${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)} {
configure.args-delete --disable-vda
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-vda
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configure now fails on 10.11+ if --enable-vda is forced citing missing vda dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if we just remove --disable-vda, ffmpeg will auto configure vda if the required dependencies are available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this allows ffmpeg to configure and build, effect on the bug cited above not verified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configure.args-append --enable-vda
</span> }
# AudiotoolBox support requires CoreMedia Framework available on 10.7+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -249,14 +250,14 @@ if {[variant_isset universal]} {
</span> if {[string match "*86*" ${configure.universal_archs}]} {
depends_build-append port:yasm
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(i386) --enable-yasm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(x86_64) --enable-yasm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(i386) --enable-x86asm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(x86_64) --enable-x86asm
</span> } else {
configure.args-append --arch=${configure.build_arch}
configure.env-append ASFLAGS='[get_canonical_archflags]'
if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
depends_build-append port:yasm
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-yasm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-x86asm
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/files/patch-configure-no-error-on-missing-prototypes.diff b/multimedia/ffmpeg/files/patch-configure-no-error-on-missing-prototypes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6928ea5..c6ee549 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/files/patch-configure-no-error-on-missing-prototypes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/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;'>-@@ -5672,7 +5672,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6480,7 +6480,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/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 2b6cfcc..670e813 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,16 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-08-18 03:27:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-08-18 03:27:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5806,10 +5806,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-10-15 08:59:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-10-18 13:31:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5955,10 +5955,10 @@
</span> require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
<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 openjpeg-2.3/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.3/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { 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;'>-+enabled libopenjpeg && { check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { 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:#ffe0e0;'>- check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { 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.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { 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:#ffe0e0;'>- { check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</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><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 -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.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/files/patch-openjpeg-2.3.diff b/multimedia/ffmpeg/files/patch-openjpeg-2.3.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 60fca3a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/files/patch-openjpeg-2.3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,93 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/FFmpeg/FFmpeg/commit/078322f33ced4b2db6ac3e5002f98233d6fbf643
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-07-29 12:49:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-08-18 02:42:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1875,6 +1875,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- machine_ioctl_meteor_h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- malloc_h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opencv2_core_core_c_h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ openjpeg_2_3_openjpeg_h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openjpeg_2_1_openjpeg_h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openjpeg_2_0_openjpeg_h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openjpeg_1_5_openjpeg_h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5805,7 +5806,9 @@
</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 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 openjpeg-2.3/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.3/openjpeg.h opj_version -lopenjp2 ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { 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;'>- { 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:#ffe0e0;'>- { 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:#ffe0e0;'>---- libavcodec/libopenjpegdec.c.orig 2017-07-29 12:49:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libavcodec/libopenjpegdec.c 2017-08-18 02:43:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "internal.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "thread.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <openjpeg-2.3/openjpeg.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <openjpeg-2.1/openjpeg.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <openjpeg-2.0/openjpeg.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,7 +46,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <openjpeg.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define OPENJPEG_MAJOR_VERSION 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define OPJ(x) OPJ_##x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -429,7 +431,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opj_stream_set_read_function(stream, stream_read);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opj_stream_set_skip_function(stream, stream_skip);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opj_stream_set_seek_function(stream, stream_seek);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opj_stream_set_user_data(stream, &reader, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opj_stream_set_user_data(stream, &reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libavcodec/libopenjpegenc.c.orig 2017-07-29 12:49:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libavcodec/libopenjpegenc.c 2017-08-18 02:43:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,7 +32,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "avcodec.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "internal.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <openjpeg-2.3/openjpeg.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <openjpeg-2.1/openjpeg.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <openjpeg-2.0/openjpeg.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <openjpeg.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define OPENJPEG_MAJOR_VERSION 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define OPJ(x) OPJ_##x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -305,7 +307,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opj_set_default_encoder_parameters(&ctx->enc_params);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (ctx->cinema_mode) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case OPJ_CINEMA2K_24:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -769,7 +771,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opj_stream_set_write_function(stream, stream_write);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opj_stream_set_skip_function(stream, stream_skip);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opj_stream_set_seek_function(stream, stream_seek);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opj_stream_set_user_data(stream, &writer, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opj_stream_set_user_data(stream, &writer);
</span></pre><pre style='margin:0'>
</pre>