This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository gdal.
commit bd48bad9f60fffe4a94af6f966dd08da11666af8 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Nov 20 14:32:16 2017 +0100 Drop svn-r40330_Add-support-for-openjpeg-2.3.patch, included upstream. --- debian/changelog | 1 + debian/patches/series | 1 - debian/patches/spatialite | 6 +- .../svn-r40330_Add-support-for-openjpeg-2.3.patch | 262 --------------------- 4 files changed, 4 insertions(+), 266 deletions(-) diff --git a/debian/changelog b/debian/changelog index 445d91e..0c3117d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ gdal (2.2.3~rc1+dfsg-1) UNRELEASED; urgency=medium * New upstream release candidate. * Strip trailing whitespace from changelog. * Update watch file for 2.2.3 (pre-)releases. + * Drop svn-r40330_Add-support-for-openjpeg-2.3.patch, included upstream. -- Bas Couwenberg <sebas...@debian.org> Mon, 20 Nov 2017 14:19:51 +0100 diff --git a/debian/patches/series b/debian/patches/series index 7fb2d1c..9843ade 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,4 +9,3 @@ java.opt perl-vendor privacy-breach-logo.patch privacy-breach-generic.patch -svn-r40330_Add-support-for-openjpeg-2.3.patch diff --git a/debian/patches/spatialite b/debian/patches/spatialite index e0fb783..7974994 100644 --- a/debian/patches/spatialite +++ b/debian/patches/spatialite @@ -5,7 +5,7 @@ Forwarded: not-needed --- a/configure +++ b/configure -@@ -28912,7 +28912,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini +@@ -28977,7 +28977,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14,7 +14,7 @@ Forwarded: not-needed cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -28976,7 +28976,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini +@@ -29041,7 +29041,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23,7 +23,7 @@ Forwarded: not-needed cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -29366,7 +29366,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar +@@ -29431,7 +29431,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS diff --git a/debian/patches/svn-r40330_Add-support-for-openjpeg-2.3.patch b/debian/patches/svn-r40330_Add-support-for-openjpeg-2.3.patch deleted file mode 100644 index 21a6b92..0000000 --- a/debian/patches/svn-r40330_Add-support-for-openjpeg-2.3.patch +++ /dev/null @@ -1,262 +0,0 @@ -Description: Add support for openjpeg 2.3 (fixes #7074) -Author: Even Rouault <even.roua...@spatialys.com> -Origin: http://trac.osgeo.org/gdal/changeset/40330/ -Bug: http://trac.osgeo.org/gdal/ticket/7074 - ---- a/configure -+++ b/configure -@@ -25116,19 +25116,20 @@ $as_echo "$as_me: OpenJPEG (JPEG2000) su - - elif test "$with_openjpeg" = "yes" -o "$with_openjpeg" = "" ; then - -- for ac_header in openjpeg-2.2/openjpeg.h -+ -+ for ac_header in openjpeg-2.3/openjpeg.h - do : -- ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.2/openjpeg.h" "ac_cv_header_openjpeg_2_2_openjpeg_h" "$ac_includes_default" --if test "x$ac_cv_header_openjpeg_2_2_openjpeg_h" = xyes; then : -+ ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.3/openjpeg.h" "ac_cv_header_openjpeg_2_3_openjpeg_h" "$ac_includes_default" -+if test "x$ac_cv_header_openjpeg_2_3_openjpeg_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define HAVE_OPENJPEG_2_2_OPENJPEG_H 1 -+#define HAVE_OPENJPEG_2_3_OPENJPEG_H 1 - _ACEOF - - fi - - done - -- if test "$ac_cv_header_openjpeg_2_2_openjpeg_h" = "yes"; then -+ if test "$ac_cv_header_openjpeg_2_3_openjpeg_h" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_stream_set_user_data_length in -lopenjp2" >&5 - $as_echo_n "checking for opj_stream_set_user_data_length in -lopenjp2... " >&6; } - if ${ac_cv_lib_openjp2_opj_stream_set_user_data_length+:} false; then : -@@ -25172,23 +25173,23 @@ else - fi - - if test "$HAVE_OPENJPEG" = "yes"; then -- OPENJPEG_VERSION=20200 -+ OPENJPEG_VERSION=20300 - LIBS="-lopenjp2 $LIBS" - fi - else -- for ac_header in openjpeg-2.1/openjpeg.h -+ for ac_header in openjpeg-2.2/openjpeg.h - do : -- ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.1/openjpeg.h" "ac_cv_header_openjpeg_2_1_openjpeg_h" "$ac_includes_default" --if test "x$ac_cv_header_openjpeg_2_1_openjpeg_h" = xyes; then : -+ ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.2/openjpeg.h" "ac_cv_header_openjpeg_2_2_openjpeg_h" "$ac_includes_default" -+if test "x$ac_cv_header_openjpeg_2_2_openjpeg_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define HAVE_OPENJPEG_2_1_OPENJPEG_H 1 -+#define HAVE_OPENJPEG_2_2_OPENJPEG_H 1 - _ACEOF - - fi - - done - -- if test "$ac_cv_header_openjpeg_2_1_openjpeg_h" = "yes"; then -+ if test "$ac_cv_header_openjpeg_2_2_openjpeg_h" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_stream_set_user_data_length in -lopenjp2" >&5 - $as_echo_n "checking for opj_stream_set_user_data_length in -lopenjp2... " >&6; } - if ${ac_cv_lib_openjp2_opj_stream_set_user_data_length+:} false; then : -@@ -25232,23 +25233,23 @@ else - fi - - if test "$HAVE_OPENJPEG" = "yes"; then -- OPENJPEG_VERSION=20100 -+ OPENJPEG_VERSION=20200 - LIBS="-lopenjp2 $LIBS" - fi - else -- for ac_header in openjpeg-2.0/openjpeg.h -+ for ac_header in openjpeg-2.1/openjpeg.h - do : -- ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.0/openjpeg.h" "ac_cv_header_openjpeg_2_0_openjpeg_h" "$ac_includes_default" --if test "x$ac_cv_header_openjpeg_2_0_openjpeg_h" = xyes; then : -+ ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.1/openjpeg.h" "ac_cv_header_openjpeg_2_1_openjpeg_h" "$ac_includes_default" -+if test "x$ac_cv_header_openjpeg_2_1_openjpeg_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define HAVE_OPENJPEG_2_0_OPENJPEG_H 1 -+#define HAVE_OPENJPEG_2_1_OPENJPEG_H 1 - _ACEOF - - fi - - done - -- if test "$ac_cv_header_openjpeg_2_0_openjpeg_h" = "yes"; then -+ if test "$ac_cv_header_openjpeg_2_1_openjpeg_h" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_stream_set_user_data_length in -lopenjp2" >&5 - $as_echo_n "checking for opj_stream_set_user_data_length in -lopenjp2... " >&6; } - if ${ac_cv_lib_openjp2_opj_stream_set_user_data_length+:} false; then : -@@ -25292,8 +25293,69 @@ else - fi - - if test "$HAVE_OPENJPEG" = "yes"; then -+ OPENJPEG_VERSION=20100 - LIBS="-lopenjp2 $LIBS" - fi -+ else -+ for ac_header in openjpeg-2.0/openjpeg.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.0/openjpeg.h" "ac_cv_header_openjpeg_2_0_openjpeg_h" "$ac_includes_default" -+if test "x$ac_cv_header_openjpeg_2_0_openjpeg_h" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_OPENJPEG_2_0_OPENJPEG_H 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ if test "$ac_cv_header_openjpeg_2_0_openjpeg_h" = "yes"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_stream_set_user_data_length in -lopenjp2" >&5 -+$as_echo_n "checking for opj_stream_set_user_data_length in -lopenjp2... " >&6; } -+if ${ac_cv_lib_openjp2_opj_stream_set_user_data_length+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lopenjp2 $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char opj_stream_set_user_data_length (); -+int -+main () -+{ -+return opj_stream_set_user_data_length (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_openjp2_opj_stream_set_user_data_length=yes -+else -+ ac_cv_lib_openjp2_opj_stream_set_user_data_length=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openjp2_opj_stream_set_user_data_length" >&5 -+$as_echo "$ac_cv_lib_openjp2_opj_stream_set_user_data_length" >&6; } -+if test "x$ac_cv_lib_openjp2_opj_stream_set_user_data_length" = xyes; then : -+ HAVE_OPENJPEG=yes -+else -+ HAVE_OPENJPEG=no -+fi -+ -+ if test "$HAVE_OPENJPEG" = "yes"; then -+ LIBS="-lopenjp2 $LIBS" -+ fi -+ fi - fi - fi - fi -@@ -25308,8 +25370,11 @@ else - elif test -r $with_openjpeg/include/openjpeg-2.2/openjpeg.h ; then - OPENJPEG_VERSION=20200 - EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES" -+ elif test -r $with_openjpeg/include/openjpeg-2.3/openjpeg.h ; then -+ OPENJPEG_VERSION=20300 -+ EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES" - else -- as_fn_error $? "openjpeg.h not found in $with_openjpeg/include/openjpeg-2.0 or $with_openjpeg/include/openjpeg-2.1 or $with_openjpeg/include/openjpeg-2.2" "$LINENO" 5 -+ as_fn_error $? "openjpeg.h not found in $with_openjpeg/include/openjpeg-2.0 or $with_openjpeg/include/openjpeg-2.1 or $with_openjpeg/include/openjpeg-2.2 or $with_openjpeg/include/openjpeg-2.3" "$LINENO" 5 - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_stream_set_user_data_length in -lopenjp2" >&5 ---- a/configure.ac -+++ b/configure.ac -@@ -2539,28 +2539,38 @@ if test "$with_openjpeg" = "no" ; then - - elif test "$with_openjpeg" = "yes" -o "$with_openjpeg" = "" ; then - -- AC_CHECK_HEADERS([openjpeg-2.2/openjpeg.h]) -- if test "$ac_cv_header_openjpeg_2_2_openjpeg_h" = "yes"; then -+ -+ AC_CHECK_HEADERS([openjpeg-2.3/openjpeg.h]) -+ if test "$ac_cv_header_openjpeg_2_3_openjpeg_h" = "yes"; then - AC_CHECK_LIB(openjp2,opj_stream_set_user_data_length,HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,) - if test "$HAVE_OPENJPEG" = "yes"; then -- OPENJPEG_VERSION=20200 -+ OPENJPEG_VERSION=20300 - LIBS="-lopenjp2 $LIBS" - fi - else -- AC_CHECK_HEADERS([openjpeg-2.1/openjpeg.h]) -- if test "$ac_cv_header_openjpeg_2_1_openjpeg_h" = "yes"; then -+ AC_CHECK_HEADERS([openjpeg-2.2/openjpeg.h]) -+ if test "$ac_cv_header_openjpeg_2_2_openjpeg_h" = "yes"; then - AC_CHECK_LIB(openjp2,opj_stream_set_user_data_length,HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,) - if test "$HAVE_OPENJPEG" = "yes"; then -- OPENJPEG_VERSION=20100 -+ OPENJPEG_VERSION=20200 - LIBS="-lopenjp2 $LIBS" - fi - else -- AC_CHECK_HEADERS([openjpeg-2.0/openjpeg.h]) -- if test "$ac_cv_header_openjpeg_2_0_openjpeg_h" = "yes"; then -+ AC_CHECK_HEADERS([openjpeg-2.1/openjpeg.h]) -+ if test "$ac_cv_header_openjpeg_2_1_openjpeg_h" = "yes"; then - AC_CHECK_LIB(openjp2,opj_stream_set_user_data_length,HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,) - if test "$HAVE_OPENJPEG" = "yes"; then -+ OPENJPEG_VERSION=20100 - LIBS="-lopenjp2 $LIBS" - fi -+ else -+ AC_CHECK_HEADERS([openjpeg-2.0/openjpeg.h]) -+ if test "$ac_cv_header_openjpeg_2_0_openjpeg_h" = "yes"; then -+ AC_CHECK_LIB(openjp2,opj_stream_set_user_data_length,HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,) -+ if test "$HAVE_OPENJPEG" = "yes"; then -+ LIBS="-lopenjp2 $LIBS" -+ fi -+ fi - fi - fi - fi -@@ -2575,8 +2585,11 @@ else - elif test -r $with_openjpeg/include/openjpeg-2.2/openjpeg.h ; then - OPENJPEG_VERSION=20200 - EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES" -+ elif test -r $with_openjpeg/include/openjpeg-2.3/openjpeg.h ; then -+ OPENJPEG_VERSION=20300 -+ EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES" - else -- AC_MSG_ERROR([openjpeg.h not found in $with_openjpeg/include/openjpeg-2.0 or $with_openjpeg/include/openjpeg-2.1 or $with_openjpeg/include/openjpeg-2.2]) -+ AC_MSG_ERROR([openjpeg.h not found in $with_openjpeg/include/openjpeg-2.0 or $with_openjpeg/include/openjpeg-2.1 or $with_openjpeg/include/openjpeg-2.2 or $with_openjpeg/include/openjpeg-2.3]) - fi - - AC_CHECK_LIB(openjp2,opj_stream_set_user_data_length,HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,-L$with_openjpeg/lib) ---- a/frmts/openjpeg/openjpegdataset.cpp -+++ b/frmts/openjpeg/openjpegdataset.cpp -@@ -34,7 +34,9 @@ - #pragma clang diagnostic ignored "-Wdocumentation" - #endif - --#if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20200 -+#if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20300 -+#include <openjpeg-2.3/openjpeg.h> -+#elif defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20200 - #include <openjpeg-2.2/openjpeg.h> - #elif defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20100 - #include <openjpeg-2.1/openjpeg.h> ---- a/nmake.opt -+++ b/nmake.opt -@@ -611,6 +611,8 @@ OCI_INCLUDE = -I$(ORACLE_HOME)\oci\inclu - #OPENJPEG_VERSION = 20100 - # For OpenJpeg 2.2.x, uncomment - #OPENJPEG_VERSION = 20200 -+# For OpenJpeg 2.3.x, uncomment -+#OPENJPEG_VERSION = 20300 - - #if using an external zlib uncomment the following lines - #ZLIB_EXTERNAL_LIB = 1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel