CVS commit: pkgsrc/geography/gdal-lib

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Dec 17 23:24:32 UTC 2016

Modified Files:
        pkgsrc/geography/gdal-lib: Makefile distinfo
Added Files:
        pkgsrc/geography/gdal-lib/patches:
            patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp

Log Message:
Fix Jasper update fallout.


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/geography/gdal-lib/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/geography/gdal-lib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/gdal-lib/patches/patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/gdal-lib/Makefile
diff -u pkgsrc/geography/gdal-lib/Makefile:1.84 pkgsrc/geography/gdal-lib/Makefile:1.85
--- pkgsrc/geography/gdal-lib/Makefile:1.84     Sun Dec  4 05:17:28 2016
+++ pkgsrc/geography/gdal-lib/Makefile  Sat Dec 17 23:24:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2016/12/04 05:17:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.85 2016/12/17 23:24:31 joerg Exp $
 
 DISTNAME=      gdal-1.11.3
 PKGNAME=       ${DISTNAME:S/gdal/gdal-lib/}
@@ -39,6 +39,9 @@ CHECK_PORTABILITY_SKIP+=      mkbindist.sh
 
 INSTALLATION_DIRS=     bin include lib ${PKGMANDIR}/man1 share/gdal
 
+# jasper uses SIZE_MAX and friends in its headers.
+CPPFLAGS+=     -D__STDC_LIMIT_MACROS
+
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/geography/gdal-lib/distinfo
diff -u pkgsrc/geography/gdal-lib/distinfo:1.28 pkgsrc/geography/gdal-lib/distinfo:1.29
--- pkgsrc/geography/gdal-lib/distinfo:1.28     Sat Dec 12 15:27:50 2015
+++ pkgsrc/geography/gdal-lib/distinfo  Sat Dec 17 23:24:31 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2015/12/12 15:27:50 wiedi Exp $
+$NetBSD: distinfo,v 1.29 2016/12/17 23:24:31 joerg Exp $
 
 SHA1 (gdal-1.11.3.tar.gz) = f0cfa13f62a2ad0f545327897cb90f0f0e08bc63
 RMD160 (gdal-1.11.3.tar.gz) = 8373d8d83d4614cb4086d4048531a4845c588649
@@ -6,3 +6,4 @@ SHA512 (gdal-1.11.3.tar.gz) = 689b36a674
 Size (gdal-1.11.3.tar.gz) = 10758778 bytes
 SHA1 (patch-GDALmake.opt.in) = f8096596d1b808d0c0a02e95ad5d0664b1c895eb
 SHA1 (patch-frmts_grib_degrib18_degrib_myutil.c) = 6179ba75d77607cefa6f2413c50443054308cdd3
+SHA1 (patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp) = 89d5d3d8e1604c76cc22ed931a170dfe61ad6880

Added files:

Index: pkgsrc/geography/gdal-lib/patches/patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp
diff -u /dev/null pkgsrc/geography/gdal-lib/patches/patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp:1.1
--- /dev/null   Sat Dec 17 23:24:32 2016
+++ pkgsrc/geography/gdal-lib/patches/patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp       Sat Dec 17 23:24:31 2016
@@ -0,0 +1,13 @@
+$NetBSD: patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp,v 1.1 2016/12/17 23:24:31 joerg Exp $
+
+--- frmts/jpeg2000/jpeg2000_vsil_io.cpp.orig   2016-12-17 20:05:26.504722084 +0000
++++ frmts/jpeg2000/jpeg2000_vsil_io.cpp
+@@ -206,7 +206,7 @@ static void JPEG2000_VSIL_jas_stream_ini
+                       /* The buffer must be large enough to accommodate maximum
+                         putback. */
+                       assert(bufsize > JAS_STREAM_MAXPUTBACK);
+-                      stream->bufbase_ = JAS_CAST(uchar *, buf);
++                      stream->bufbase_ = JAS_CAST(unsigned char *, buf);
+                       stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
+               }
+       } else {