diff options
| author | joerg <joerg> | 2016-12-17 23:24:31 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2016-12-17 23:24:31 +0000 |
| commit | 3a2acfb41224a696a447989ce81eab1e9ea3e28c (patch) | |
| tree | 7d54bd8207ee7c7cdd3314fa27eb4655ee7be716 /geography | |
| parent | ef43fc610191bbcb4922353870d48177303137d5 (diff) | |
| download | pkgsrc-3a2acfb41224a696a447989ce81eab1e9ea3e28c.tar.gz | |
Fix Jasper update fallout.
Diffstat (limited to 'geography')
| -rw-r--r-- | geography/gdal-lib/Makefile | 5 | ||||
| -rw-r--r-- | geography/gdal-lib/distinfo | 3 | ||||
| -rw-r--r-- | geography/gdal-lib/patches/patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp | 13 |
3 files changed, 19 insertions, 2 deletions
diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile index 693d148264f..4804b35c280 100644 --- a/geography/gdal-lib/Makefile +++ b/geography/gdal-lib/Makefile @@ -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" diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo index 05e6882b13c..5b2fb2cda4b 100644 --- a/geography/gdal-lib/distinfo +++ b/geography/gdal-lib/distinfo @@ -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) = 689b36a674fd5763a83e63f3a00460c44149a9447d31793d4e 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 diff --git a/geography/gdal-lib/patches/patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp b/geography/gdal-lib/patches/patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp new file mode 100644 index 00000000000..f4a38905620 --- /dev/null +++ b/geography/gdal-lib/patches/patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp @@ -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 {
|