<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1b9e02f535311169fd671b0ef6b9ce2b0b4ec6b3">https://github.com/macports/macports-ports/commit/1b9e02f535311169fd671b0ef6b9ce2b0b4ec6b3</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 1b9e02f gdal: update version 2.2.1->2.2.3
</span>1b9e02f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1b9e02f535311169fd671b0ef6b9ce2b0b4ec6b3
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Nov 24 11:41:49 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> gdal: update version 2.2.1->2.2.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/54647
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/55083
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/54433
</span>---
gis/gdal/Portfile | 19 +-
gis/gdal/files/patch-configure-ecw-libcxx.diff | 2 +-
gis/gdal/files/patch-configure-ecw-libstdcxx.diff | 2 +-
gis/gdal/files/patch-gdalwarpkernel_opencl_h.diff | 4 +-
gis/gdal/files/patch-nawk.diff | 2 +-
gis/gdal/files/patch-netcdfdataset_cpp.diff | 2 +-
gis/gdal/files/patch-ogr_api_cpp.diff | 4 +-
gis/gdal/files/patch-openjpeg.diff | 207 ----------------------
gis/gdal/files/patch-port-cpl_config.h.in.patch | 9 -
gis/gdal/files/patch-port-cpl_port.h.diff | 16 --
gis/gdal/files/patch-uchar.diff | 12 --
11 files changed, 13 insertions(+), 266 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ba61f4..fb13ea2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup mpi 1.0
</span> PortGroup muniversal 1.0
name gdal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.2.3
</span> categories gis
license MIT BSD
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,8 +25,8 @@ long_description GDAL is a translator library for raster geospatial \
</span> homepage http://www.gdal.org/
master_sites http://download.osgeo.org/gdal/${version}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e12e1c0efe35a0a018cd7313a5ce48a0c2555d51 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 61837706abfa3e493f3550236efc2c14bd6b24650232f9107db50a944abf8b2f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4fe078373c85e1f269e1821d3420a147dd29a909 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 52f01bda8968643633016769607e6082a8ba1c746fadc2c1abe12cf7dc8f61dd
</span>
compilers.choose cc cxx
mpi.setup
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +47,8 @@ depends_lib-append port:zlib \
</span> set PYINST ""
set OPENCLBASE "/System/Library/Frameworks/OpenCL.framework/"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
--with-local=${prefix} \
--with-libz=${prefix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +86,6 @@ configure.args-append \
</span> --without-curl \
--without-sqlite3 \
--without-spatialite \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-dwgdirect \
</span> --without-idb \
--without-sde \
--without-geos \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +93,6 @@ configure.args-append \
</span> --without-pam \
--without-perl \
--without-php \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-ruby \
</span> --without-python \
--without-expat \
--without-poppler \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,13 +109,6 @@ patchfiles patch-gdalwarpkernel_opencl_h.diff \
</span> patch-nawk.diff \
patch-scripts-GNUmakefile.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# uchar is undeclared, and stream->bufbase_ is of type jas_uchar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://github.com/mdadams/jasper/commit/d42b2388f7f8e0332c846675133acea151fc557a#diff-c9eea58015962f20fc7ba09e1388c3da
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-uchar.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/54840
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-openjpeg.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # for all platforms without C++11 support
# this is just a suboptimal approximation (doesn't hold for gcc)
if {${configure.cxx_stdlib} != "libc++"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,8 +116,6 @@ if {${configure.cxx_stdlib} != "libc++"} {
</span> --without-cpp11
# backported from master and could be applied everywhere
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-port-cpl_config.h.in.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-port-cpl_port.h.diff \
</span> patch-netcdfdataset_cpp.diff
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-configure-ecw-libcxx.diff b/gis/gdal/files/patch-configure-ecw-libcxx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ad02c7a..1f8e44e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-configure-ecw-libcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/files/patch-configure-ecw-libcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.old 2015-07-19 11:54:14.000000000 +0200
+++ configure 2015-07-19 11:56:22.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22951,7 +22951,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25705,7 +25705,7 @@
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $with_ecw/lib." >&5
$as_echo "found in $with_ecw/lib." >&6; }
elif test -r $with_ecw/bin/libNCSEcw.so -o -r $with_ecw/bin/libNCSEcw.dylib ; then
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-configure-ecw-libstdcxx.diff b/gis/gdal/files/patch-configure-ecw-libstdcxx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 13bc025..df54419 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-configure-ecw-libstdcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/files/patch-configure-ecw-libstdcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.old 2015-07-19 11:54:14.000000000 +0200
+++ configure 2015-07-19 11:56:22.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22951,7 +22951,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25705,7 +25705,7 @@
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $with_ecw/lib." >&5
$as_echo "found in $with_ecw/lib." >&6; }
elif test -r $with_ecw/bin/libNCSEcw.so -o -r $with_ecw/bin/libNCSEcw.dylib ; then
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-gdalwarpkernel_opencl_h.diff b/gis/gdal/files/patch-gdalwarpkernel_opencl_h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a620c17..be5a74f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-gdalwarpkernel_opencl_h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/files/patch-gdalwarpkernel_opencl_h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> --- alg/gdalwarpkernel_opencl.h.orig 2012-04-18 14:34:27.000000000 +0200
+++ alg/gdalwarpkernel_opencl.h 2012-04-18 14:35:25.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CL_USE_DEPRECATED_OPENCL_1_0_APIS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span>
#ifdef __APPLE__
-#include <OpenCL/OpenCL.h>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-nawk.diff b/gis/gdal/files/patch-nawk.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c439d1..2268183 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-nawk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/files/patch-nawk.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.orig 2015-06-14 14:06:33.000000000 -0500
+++ configure 2015-11-16 10:48:16.000000000 -0600
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9148,7 +9148,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9149,7 +9149,7 @@
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-netcdfdataset_cpp.diff b/gis/gdal/files/patch-netcdfdataset_cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 64d5936..72421c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-netcdfdataset_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/files/patch-netcdfdataset_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- frmts/netcdf/netcdfdataset.cpp.orig 2017-08-01 17:04:53.000000000 +0200
+++ frmts/netcdf/netcdfdataset.cpp 2017-08-01 17:06:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4582,7 +4582,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4642,7 +4642,7 @@
</span> /* rint() */
/************************************************************************/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-ogr_api_cpp.diff b/gis/gdal/files/patch-ogr_api_cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a1f58e2..3c52d22 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-ogr_api_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/files/patch-ogr_api_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> --- ogr/ogr_api.cpp.old 2016-05-05 11:40:13.000000000 +0200
+++ ogr/ogr_api.cpp 2016-05-05 11:40:37.000000000 +0200
@@ -38,6 +38,8 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "ogr_api.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "cpl_error.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPL_CVSID("$Id: ogr_api.cpp 36963 2016-12-19 15:38:17Z rouault $");
</span>
+#define OGR_ENABLED
+
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-openjpeg.diff b/gis/gdal/files/patch-openjpeg.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9adb8ad..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-openjpeg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,207 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0d623ab8bf95eff5a9d9010ebe6aeed908b7062c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Even Rouault <even.rouault@mines-paris.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 15 Aug 2017 18:54:51 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Add support for building against OpenJPEG 2.2 (fixes #7002)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-git-svn-id: https://svn.osgeo.org/gdal/trunk@39821 f0d54148-0727-0410-94bb-9a71ac55c965
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdal/configure | 76 ++++++++++++++++++++++++++++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdal/configure.ac | 18 ++++++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdal/frmts/openjpeg/openjpegdataset.cpp | 4 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdal/nmake.opt | 4 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4 files changed, 91 insertions(+), 11 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdal/configure b/gdal/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8455e21f92a..a34fc73bc91 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25115,19 +25115,19 @@ $as_echo "$as_me: OpenJPEG (JPEG2000) support disabled." >&6;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif test "$with_openjpeg" = "yes" -o "$with_openjpeg" = "" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ac_header in openjpeg-2.0/openjpeg.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for ac_header in openjpeg-2.2/openjpeg.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.0/openjpeg.h" "ac_cv_header_openjpeg_2_0_openjpeg_h" "$ac_includes_default"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "x$ac_cv_header_openjpeg_2_0_openjpeg_h" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.2/openjpeg.h" "ac_cv_header_openjpeg_2_2_openjpeg_h" "$ac_includes_default"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$ac_cv_header_openjpeg_2_2_openjpeg_h" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define HAVE_OPENJPEG_2_0_OPENJPEG_H 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HAVE_OPENJPEG_2_2_OPENJPEG_H 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$ac_cv_header_openjpeg_2_0_openjpeg_h" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$ac_cv_header_openjpeg_2_2_openjpeg_h" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_stream_set_user_data_length in -lopenjp2" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "checking for opj_stream_set_user_data_length in -lopenjp2... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ${ac_cv_lib_openjp2_opj_stream_set_user_data_length+:} false; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25171,6 +25171,7 @@ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$HAVE_OPENJPEG" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENJPEG_VERSION=20200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="-lopenjp2 $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25233,6 +25234,66 @@ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENJPEG_VERSION=20100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="-lopenjp2 $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for ac_header in openjpeg-2.0/openjpeg.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+do :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.0/openjpeg.h" "ac_cv_header_openjpeg_2_0_openjpeg_h" "$ac_includes_default"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$ac_cv_header_openjpeg_2_0_openjpeg_h" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HAVE_OPENJPEG_2_0_OPENJPEG_H 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$ac_cv_header_openjpeg_2_0_openjpeg_h" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_stream_set_user_data_length in -lopenjp2" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo_n "checking for opj_stream_set_user_data_length in -lopenjp2... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if ${ac_cv_lib_openjp2_opj_stream_set_user_data_length+:} false; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS="-lopenjp2 $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Override any GCC internal prototype to avoid an error.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Use char because int might match the return type of a GCC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ builtin and then its argument prototype would still apply. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern "C"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+char opj_stream_set_user_data_length ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+main ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+return opj_stream_set_user_data_length ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if ac_fn_c_try_link "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_cv_lib_openjp2_opj_stream_set_user_data_length=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_cv_lib_openjp2_opj_stream_set_user_data_length=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS=$ac_check_lib_save_LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openjp2_opj_stream_set_user_data_length" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo "$ac_cv_lib_openjp2_opj_stream_set_user_data_length" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$ac_cv_lib_openjp2_opj_stream_set_user_data_length" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HAVE_OPENJPEG=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HAVE_OPENJPEG=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$HAVE_OPENJPEG" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS="-lopenjp2 $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25243,8 +25304,11 @@ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif test -r $with_openjpeg/include/openjpeg-2.1/openjpeg.h ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENJPEG_VERSION=20100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elif test -r $with_openjpeg/include/openjpeg-2.2/openjpeg.h ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENJPEG_VERSION=20200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- as_fn_error $? "openjpeg.h not found in $with_openjpeg/include/openjpeg-2.0 or $with_openjpeg/include/openjpeg-2.1" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_stream_set_user_data_length in -lopenjp2" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdal/configure.ac b/gdal/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index caf72c02b33..d771808d1a8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2539,10 +2539,11 @@ if test "$with_openjpeg" = "no" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif test "$with_openjpeg" = "yes" -o "$with_openjpeg" = "" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CHECK_HEADERS([openjpeg-2.0/openjpeg.h])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$ac_cv_header_openjpeg_2_0_openjpeg_h" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_HEADERS([openjpeg-2.2/openjpeg.h])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$ac_cv_header_openjpeg_2_2_openjpeg_h" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_LIB(openjp2,opj_stream_set_user_data_length,HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$HAVE_OPENJPEG" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENJPEG_VERSION=20200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="-lopenjp2 $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2553,6 +2554,14 @@ elif test "$with_openjpeg" = "yes" -o "$with_openjpeg" = "" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENJPEG_VERSION=20100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="-lopenjp2 $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_HEADERS([openjpeg-2.0/openjpeg.h])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$ac_cv_header_openjpeg_2_0_openjpeg_h" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_LIB(openjp2,opj_stream_set_user_data_length,HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "$HAVE_OPENJPEG" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS="-lopenjp2 $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2563,8 +2572,11 @@ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif test -r $with_openjpeg/include/openjpeg-2.1/openjpeg.h ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENJPEG_VERSION=20100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elif test -r $with_openjpeg/include/openjpeg-2.2/openjpeg.h ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENJPEG_VERSION=20200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_ERROR([openjpeg.h not found in $with_openjpeg/include/openjpeg-2.0 or $with_openjpeg/include/openjpeg-2.1])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_LIB(openjp2,opj_stream_set_user_data_length,HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,-L$with_openjpeg/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdal/frmts/openjpeg/openjpegdataset.cpp b/gdal/frmts/openjpeg/openjpegdataset.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2e07f7899c8..81b8e4fc2db 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- frmts/openjpeg/openjpegdataset.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ frmts/openjpeg/openjpegdataset.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic ignored "-Wdocumentation"
</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 defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20200
</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:#ffe0e0;'>-+#elif defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20100
</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;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h> /* openjpeg.h needs FILE* */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdal/nmake.opt b/gdal/nmake.opt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d5ec99f13f3..8bfd930530b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nmake.opt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nmake.opt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -607,8 +607,10 @@ OCI_INCLUDE = -I$(ORACLE_HOME)\oci\include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #OPENJPEG_ENABLED = YES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #OPENJPEG_CFLAGS = -IC:\openjpeg\include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #OPENJPEG_LIB = C:\openjpeg\lib\openjp2.lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# For OpenJpeg >= 2.1, uncomment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# For OpenJpeg 2.1.x, uncomment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #OPENJPEG_VERSION = 20100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# For OpenJpeg 2.2.x, uncomment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#OPENJPEG_VERSION = 20200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if using an external zlib uncomment the following lines
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ZLIB_EXTERNAL_LIB = 1
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-port-cpl_config.h.in.patch b/gis/gdal/files/patch-port-cpl_config.h.in.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7baeec8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-port-cpl_config.h.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- port/cpl_config.h.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ port/cpl_config.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -258,3 +258,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define to 1 if you have the `uselocale' function. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_USELOCALE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Define to 1 if you have the `std::isnan' function. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef HAVE_STD_IS_NAN
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-port-cpl_port.h.diff b/gis/gdal/files/patch-port-cpl_port.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b80b5f4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-port-cpl_port.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- port/cpl_port.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ port/cpl_port.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -653,10 +653,11 @@ static inline char* CPL_afl_friendly_strstr(const char* haystack, const char* ne
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define CPLIsNan(x) _isnan(x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define CPLIsInf(x) (!_isnan(x) && !_finite(x))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define CPLIsFinite(x) _finite(x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__cplusplus) && defined(__MINGW32__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* Hack for compatibility with ancient i586-mingw32msvc toolchain */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__cplusplus) && defined(HAVE_STD_IS_NAN) && HAVE_STD_IS_NAN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C++" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef DOXYGEN_SKIP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cmath>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static inline int CPLIsNan(float f) { return std::isnan(f); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static inline int CPLIsNan(double f) { return std::isnan(f); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static inline int CPLIsInf(float f) { return std::isinf(f); }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-uchar.diff b/gis/gdal/files/patch-uchar.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b5e6994..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-uchar.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- frmts/jpeg2000/jpeg2000_vsil_io.cpp.orig 2017-05-18 17:07:48.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ frmts/jpeg2000/jpeg2000_vsil_io.cpp 2017-05-18 17:09:32.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -207,7 +207,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* The buffer must be large enough to accommodate maximum
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- putback. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(bufsize > JAS_STREAM_MAXPUTBACK);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- stream->bufbase_ = JAS_CAST(uchar *, buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ stream->bufbase_ = JAS_CAST(jas_uchar *, buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>