<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2beb79ded9d3d8d459501417aca5b8f50ef5897b">https://github.com/macports/macports-ports/commit/2beb79ded9d3d8d459501417aca5b8f50ef5897b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2beb79ded9d3d8d459501417aca5b8f50ef5897b
</span>Author: Veence <vince@macports.org>
AuthorDate: Thu May 18 20:30:48 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> gdal: bump to 2.2 (patches)
</span>---
.../files/patch-gdalwarpkernel_opencl_c_2.diff | 64 ----------------------
...c.diff => patch-gdalwarpkernel_opencl_cpp.diff} | 8 +--
gis/gdal/files/patch-nawk.diff | 2 +-
gis/gdal/files/patch-ogr_api_cpp.diff | 2 +-
gis/gdal/files/patch-uchar.diff | 23 ++++----
5 files changed, 18 insertions(+), 81 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-gdalwarpkernel_opencl_c_2.diff b/gis/gdal/files/patch-gdalwarpkernel_opencl_c_2.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0113c19..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-gdalwarpkernel_opencl_c_2.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,64 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alg/gdalwarpkernel_opencl.orig.c 2014-02-25 10:43:16.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alg/gdalwarpkernel_opencl.c 2014-02-25 11:32:50.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -535,6 +535,32 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *dVecf = "float";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *kernGenFuncs =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // ********************* General Funcs ********************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"void clampToDst(float fReal,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "__global outType *dstPtr,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "unsigned int iDstOffset,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "__constant float *fDstNoDataReal,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "int bandNum);\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"void setPixel(__global outType *dstReal,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "__global outType *dstImag,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "__global float *dstDensity,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "__global int *nDstValid,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "__constant float *fDstNoDataReal,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "const int bandNum,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "vecf fDensity, vecf fReal, vecf fImag);\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"int getPixel(__read_only image2d_t srcReal,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "__read_only image2d_t srcImag,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "__global float *fUnifiedSrcDensity,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "__global int *nUnifiedSrcValid,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "__constant char *useBandSrcValid,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "__global int *nBandSrcValid,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "const int2 iSrc,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "int bandNum,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "vecf *fDensity, vecf *fReal, vecf *fImag);\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"int isValid(__global float *fUnifiedSrcDensity,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "__global int *nUnifiedSrcValid,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "float2 fSrcCoords );\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"float2 getSrcCoords(__read_only image2d_t srcCoords);\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "#ifdef USE_CLAMP_TO_DST_FLOAT\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "void clampToDst(float fReal,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "__global outType *dstPtr,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -666,7 +692,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "int bHasValid = FALSE;\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Clamp the src offset values if needed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "if(useUnifiedSrcDensity || useUnifiedSrcValid || useUseBandSrcValid){\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "if(useUnifiedSrcDensity | useUnifiedSrcValid | useUseBandSrcValid){\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "int iSrcX = iSrc.x;\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "int iSrcY = iSrc.y;\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -903,6 +929,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *kernCubic =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // ************************ Cubic ************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "vecf cubicConvolution(float dist1, float dist2, float dist3,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "vecf f0, vecf f1, vecf f2, vecf f3);\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"vecf cubicConvolution(float dist1, float dist2, float dist3,\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "vecf f0, vecf f1, vecf f2, vecf f3)\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "{\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "return ( -f0 + f1 - f2 + f3) * dist3\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1023,6 +1052,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *kernResampler =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // ************************ LanczosSinc ************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"float lanczosSinc( float fX, float fR );\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"float bSpline( float x );\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "float lanczosSinc( float fX, float fR )\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "{\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "if ( fX > fR || fX < -fR)\n"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-gdalwarpkernel_opencl_c.diff b/gis/gdal/files/patch-gdalwarpkernel_opencl_cpp.diff
</span>similarity index 56%
rename from gis/gdal/files/patch-gdalwarpkernel_opencl_c.diff
rename to gis/gdal/files/patch-gdalwarpkernel_opencl_cpp.diff
<span style='display:block; white-space:pre;color:#808080;'>index 61f2d77..9ad2af5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-gdalwarpkernel_opencl_c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/files/patch-gdalwarpkernel_opencl_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- alg/gdalwarpkernel_opencl.c.orig 2011-01-28 12:19:27.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ alg/gdalwarpkernel_opencl.c 2011-01-28 12:20:32.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -212,9 +212,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- alg/gdalwarpkernel_opencl.cpp.orig 2017-05-18 20:06:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ alg/gdalwarpkernel_opencl.cpp 2017-05-18 20:10:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -213,9 +213,9 @@
</span> case CL_INVALID_MIP_LEVEL:
return("CL_INVALID_MIP_LEVEL");
break;
- case CL_INVALID_GLOBAL_WORK_SIZE:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* case CL_INVALID_GLOBAL_WORK_SIZE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* case CL_INVALID_GLOBAL_WORK_SIZE:
</span> return("CL_INVALID_GLOBAL_WORK_SIZE");
- break;
+ break; */
<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 b0ce63b..8c439d1 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;'>-@@ -7240,7 +7240,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9148,7 +9148,7 @@
</span>
<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 4a2e402..a1f58e2 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,6 +1,6 @@
</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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,6 +33,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,6 +38,8 @@
</span> #include "ogr_api.h"
#include "cpl_error.h"
<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><span style='display:block; white-space:pre;color:#808080;'>index c453d69..b5e6994 100644
</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;'>+++ b/gis/gdal/files/patch-uchar.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- frmts/jpeg2000/jpeg2000_vsil_io.cpp.orig 2016-10-24 04:00:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ frmts/jpeg2000/jpeg2000_vsil_io.cpp 2016-11-26 08:43:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -209,7 +209,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:#e0ffe0;'>+--- frmts/jpeg2000/jpeg2000_vsil_io.cpp.orig 2017-05-18 17:07:48.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ frmts/jpeg2000/jpeg2000_vsil_io.cpp 2017-05-18 17:09:32.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -207,7 +207,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* The buffer must be large enough to accommodate maximum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ putback. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert(bufsize > JAS_STREAM_MAXPUTBACK);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- stream->bufbase_ = JAS_CAST(uchar *, buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->bufbase_ = JAS_CAST(jas_uchar *, buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>