This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository librasterlite2.
commit 57a025d1755772cce7ea102d9ad36a3f8355e24c Author: Bas Couwenberg <[email protected]> Date: Wed Oct 18 16:44:52 2017 +0200 Add patch to fix FTBFS with OpenJPEG 2.3. --- debian/changelog | 6 +++ debian/patches/openjp-2.3.patch | 112 ++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 119 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9e00ca7..7742bee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +librasterlite2 (1.0.0~rc0+devel1-6) UNRELEASED; urgency=medium + + * Add patch to fix FTBFS with OpenJPEG 2.3. + + -- Bas Couwenberg <[email protected]> Wed, 18 Oct 2017 16:44:38 +0200 + librasterlite2 (1.0.0~rc0+devel1-5) unstable; urgency=medium * Change priority from extra to optional. diff --git a/debian/patches/openjp-2.3.patch b/debian/patches/openjp-2.3.patch new file mode 100644 index 0000000..8ac206f --- /dev/null +++ b/debian/patches/openjp-2.3.patch @@ -0,0 +1,112 @@ +Description: Add support for OpenJPEG 2.3. +Author: Bas Couwennberg <[email protected]> +Bug: https://www.gaia-gis.it/fossil/librasterlite2/info/f3f2e7d32bf737e7 +Forwarded: https://www.gaia-gis.it/fossil/librasterlite2/info/f3f2e7d32bf737e7 + +--- a/config.h.in ++++ b/config.h.in +@@ -73,6 +73,9 @@ + /* Define to 1 if you have the <openjpeg-2.2/openjpeg.h> header file. */ + #undef HAVE_OPENJPEG_2_2_OPENJPEG_H + ++/* Define to 1 if you have the <openjpeg-2.3/openjpeg.h> header file. */ ++#undef HAVE_OPENJPEG_2_3_OPENJPEG_H ++ + /* Define to 1 if you have the <png.h> header file. */ + #undef HAVE_PNG_H + +@@ -160,6 +163,9 @@ + /* testing for OpenJpeg 2.2 */ + #undef OPENJPEG_2_2 + ++/* testing for OpenJpeg 2.3 */ ++#undef OPENJPEG_2_3 ++ + /* Name of package */ + #undef PACKAGE + +--- a/configure.ac ++++ b/configure.ac +@@ -32,6 +32,8 @@ AH_TEMPLATE([OPENJPEG_2_1], + [testing for OpenJpeg 2.1]) + AH_TEMPLATE([OPENJPEG_2_2], + [testing for OpenJpeg 2.2]) ++AH_TEMPLATE([OPENJPEG_2_3], ++ [testing for OpenJpeg 2.3]) + + # config depending options + AH_TEMPLATE([OMIT_LZMA], +@@ -152,13 +154,16 @@ AC_ARG_ENABLE(openjpeg, [AS_HELP_STRING( + # they could be either on -/include/openjpeg-2.0 + # or on -/include/openjpeg-2.1 + # or on -/include/openjpeg-2.2 ++ # or on -/include/openjpeg-2.3 + # + AC_CHECK_HEADERS(openjpeg-2.0/openjpeg.h) + AC_CHECK_HEADERS(openjpeg-2.1/openjpeg.h) + AC_CHECK_HEADERS(openjpeg-2.2/openjpeg.h) ++ AC_CHECK_HEADERS(openjpeg-2.3/openjpeg.h) + if test x"$ac_cv_header_openjpeg_2_0_openjpeg_h" != x"yes" && + test x"$ac_cv_header_openjpeg_2_1_openjpeg_h" != x"yes" && +- test x"$ac_cv_header_openjpeg_2_2_openjpeg_h" != x"yes"; ++ test x"$ac_cv_header_openjpeg_2_2_openjpeg_h" != x"yes" && ++ test x"$ac_cv_header_openjpeg_2_3_openjpeg_h" != x"yes"; + then + AC_MSG_ERROR(['OpenJpeg-2' is required but the header (openjpeg.h) doesn't seem to be installed on this system]) + fi +--- a/src/rl2openjpeg.c ++++ b/src/rl2openjpeg.c +@@ -63,6 +63,9 @@ the terms of any one of the MPL, the GPL + #ifdef HAVE_OPENJPEG_2_2_OPENJPEG_H + #include <openjpeg-2.2/openjpeg.h> + #else ++#ifdef HAVE_OPENJPEG_2_3_OPENJPEG_H ++#include <openjpeg-2.3/openjpeg.h> ++#else + #ifdef __ANDROID__ /* Android specific */ + #include <openjpeg.h> + #else +@@ -70,6 +73,7 @@ the terms of any one of the MPL, the GPL + #endif + #endif + #endif ++#endif + + struct jp2_memfile + { +@@ -404,7 +408,7 @@ compress_jpeg2000 (rl2RasterPtr ptr, uns + opj_stream_set_write_function (stream, write_callback); + opj_stream_set_seek_function (stream, seek_callback); + opj_stream_set_skip_function (stream, skip_callback); +-#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H) ++#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_3_OPENJPEG_H) + opj_stream_set_user_data (stream, &clientdata, NULL); + #else + opj_stream_set_user_data (stream, &clientdata); +@@ -764,7 +768,7 @@ rl2_decode_jpeg2000_scaled (int scale, c + clientdata.size = jpeg2000_sz; + clientdata.eof = jpeg2000_sz; + clientdata.current = 0; +-#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H) ++#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_3_OPENJPEG_H) + opj_stream_set_user_data (stream, &clientdata, NULL); + #else + opj_stream_set_user_data (stream, &clientdata); +@@ -1336,7 +1340,7 @@ rl2_get_jpeg2000_infos (const char *path + clientdata.size = jpeg2000_sz; + clientdata.eof = jpeg2000_sz; + clientdata.current = 0; +-#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H) ++#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_3_OPENJPEG_H) + opj_stream_set_user_data (stream, &clientdata, NULL); + #else + opj_stream_set_user_data (stream, &clientdata); +@@ -1437,7 +1441,7 @@ rl2_get_jpeg2000_blob_type (const unsign + clientdata.size = jpeg2000_sz; + clientdata.eof = jpeg2000_sz; + clientdata.current = 0; +-#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H) ++#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_3_OPENJPEG_H) + opj_stream_set_user_data (stream, &clientdata, NULL); + #else + opj_stream_set_user_data (stream, &clientdata); diff --git a/debian/patches/series b/debian/patches/series index e6d048f..9f75f85 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ openjp-2.2.patch +openjp-2.3.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/librasterlite2.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
