aboutsummaryrefslogtreecommitdiff
path: root/graphics/gstreamer1-plugins-openjpeg/files
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2017-10-10 17:45:57 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2017-10-10 17:45:57 +0000
commitd263cacb215208f14d5910b1b8c15d3fcf420154 (patch)
treee126d4230754cba870576d34ad3eaf1a3aec60f1 /graphics/gstreamer1-plugins-openjpeg/files
parent79ad3516744ba2cdbd58eb466f0cdd3603ccb2fb (diff)
Update graphics/openjpeg to 2.3.0
Notes
Notes: svn path=/head/; revision=451711
Diffstat (limited to 'graphics/gstreamer1-plugins-openjpeg/files')
-rw-r--r--graphics/gstreamer1-plugins-openjpeg/files/patch-openjpeg23163
1 files changed, 163 insertions, 0 deletions
diff --git a/graphics/gstreamer1-plugins-openjpeg/files/patch-openjpeg23 b/graphics/gstreamer1-plugins-openjpeg/files/patch-openjpeg23
new file mode 100644
index 000000000000..12579a1c796b
--- /dev/null
+++ b/graphics/gstreamer1-plugins-openjpeg/files/patch-openjpeg23
@@ -0,0 +1,163 @@
+--- config.h.in.orig 2017-09-18 11:34:31 UTC
++++ config.h.in
+@@ -459,6 +459,9 @@
+ /* Define if OpenJPEG 2.2 is used */
+ #undef HAVE_OPENJPEG_2_2
+
++/* Define if OpenJPEG 2.3 is used */
++#undef HAVE_OPENJPEG_2_3
++
+ /* Define to enable openni2 library (used by openni2). */
+ #undef HAVE_OPENNI2
+
+--- configure.orig 2017-09-18 11:34:30 UTC
++++ configure
+@@ -771,6 +771,8 @@
+ USE_OPENJPEG_FALSE
+ USE_OPENJPEG_TRUE
+ HAVE_OPENJPEG
++OPENJPEG_2_3_LIBS
++OPENJPEG_2_3_CFLAGS
+ OPENJPEG_2_2_LIBS
+ OPENJPEG_2_2_CFLAGS
+ OPENJPEG_2_1_LIBS
+@@ -2043,6 +2045,8 @@
+ OPENJPEG_2_1_LIBS
+ OPENJPEG_2_2_CFLAGS
+ OPENJPEG_2_2_LIBS
++OPENJPEG_2_3_CFLAGS
++OPENJPEG_2_3_LIBS
+ OPENNI2_CFLAGS
+ OPENNI2_LIBS
+ OPUS_CFLAGS
+@@ -3281,6 +3285,10 @@
+ C compiler flags for OPENJPEG_2_2, overriding pkg-config
+ OPENJPEG_2_2_LIBS
+ linker flags for OPENJPEG_2_2, overriding pkg-config
++ OPENJPEG_2_3_CFLAGS
++ C compiler flags for OPENJPEG_2_3, overriding pkg-config
++ OPENJPEG_2_3_LIBS
++ linker flags for OPENJPEG_2_3, overriding pkg-config
+ OPENNI2_CFLAGS
+ C compiler flags for OPENNI2, overriding pkg-config
+ OPENNI2_LIBS
+@@ -48938,6 +48946,106 @@
+
+ $as_echo "#define HAVE_OPENJPEG_2_2 1" >>confdefs.h
+
++
++ which="libopenjp2 >= 2.3"
++ required="no"
++
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENJPEG_2_3" >&5
++$as_echo_n "checking for OPENJPEG_2_3... " >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$OPENJPEG_2_3_CFLAGS"; then
++ pkg_cv_OPENJPEG_2_3_CFLAGS="$OPENJPEG_2_3_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$which\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "$which") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_OPENJPEG_2_3_CFLAGS=`$PKG_CONFIG --cflags "$which" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$OPENJPEG_2_3_LIBS"; then
++ pkg_cv_OPENJPEG_2_3_LIBS="$OPENJPEG_2_3_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$which\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "$which") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_OPENJPEG_2_3_LIBS=`$PKG_CONFIG --libs "$which" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ OPENJPEG_2_3_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$which"`
++ else
++ OPENJPEG_2_3_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$which"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$OPENJPEG_2_3_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++ HAVE_OPENJPEG_2_3="no"
++ if test "x$required" = "xyes"; then
++ as_fn_error $? "$OPENJPEG_2_3_PKG_ERRORS" "$LINENO" 5
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: $OPENJPEG_2_3_PKG_ERRORS" >&5
++$as_echo "$as_me: $OPENJPEG_2_3_PKG_ERRORS" >&6;}
++ fi
++
++elif test $pkg_failed = untried; then
++
++ HAVE_OPENJPEG_2_3="no"
++ if test "x$required" = "xyes"; then
++ as_fn_error $? "$OPENJPEG_2_3_PKG_ERRORS" "$LINENO" 5
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: $OPENJPEG_2_3_PKG_ERRORS" >&5
++$as_echo "$as_me: $OPENJPEG_2_3_PKG_ERRORS" >&6;}
++ fi
++
++else
++ OPENJPEG_2_3_CFLAGS=$pkg_cv_OPENJPEG_2_3_CFLAGS
++ OPENJPEG_2_3_LIBS=$pkg_cv_OPENJPEG_2_3_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++ HAVE_OPENJPEG_2_3="yes"
++
++fi
++
++
++ if test x"$HAVE_OPENJPEG_2_3" = x"yes"; then
++
++$as_echo "#define HAVE_OPENJPEG_2_3 1" >>confdefs.h
++
++ fi
+ fi
+ fi
+ else
+--- ext/openjpeg/gstopenjpeg.h.orig 2017-08-17 10:39:18 UTC
++++ ext/openjpeg/gstopenjpeg.h
+@@ -38,7 +38,9 @@
+ #define OPJ_CPRL CPRL
+ #else
+ #include <stdio.h>
+-# if defined(HAVE_OPENJPEG_2_2)
++# if defined(HAVE_OPENJPEG_2_3)
++# include <openjpeg-2.3/openjpeg.h>
++# elif defined(HAVE_OPENJPEG_2_2)
+ # include <openjpeg-2.2/openjpeg.h>
+ # elif defined(HAVE_OPENJPEG_2_1)
+ # include <openjpeg-2.1/openjpeg.h>