From 36edfeade82777c85a19b6c4267bc1b0878988c2 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 26 Nov 2015 13:37:30 +0000 Subject: The 1.11.3 release is a bug fix release. == Build (Unix) == * Support custom buildflags in GRASS plugin (5850) * GRASS 7.0.0 support (5852) * fix detection of ECW SDK 5.1 on Mac (5867, 5390) * Add support for Poppler >= 0.31.0 (6118) == Port == * /vsitar/: remove useless validation test that prevents from opening valid .tar files (5864) == Algorithms == * gdal_grid: fix crash in optimized mode with GCC 4.4 on 64bit (5987) * Fix failure in GDALSuggestedWarpOut2() when computing output image size in case the top-left and bottom-right corners tranform to the same point (5980) * Rasterize: add check to avoid burning negative x values (5641) == GDAL core == * GMLJP2 reader: add compatibility with OGC CRS URL as found in GMLJP2v2 (5940) * GMLJP2: on reading, don't do axis inversation if there's an explicit axisName requesting easting, northing order (5960) * GMLJP2: add missing rangeParameters element to validate against GMLJP2 schema (5707) == Utilities == * gdalbuildvrt: fix potential crash when using -b switch (6095) * gdalserver: fix compilation with recent GNU libc (such as in Arch Linux) (6073) * gdalwarp: emit error message if file specified with -cutline cannot be opened (5921) * gdalwarp: fix 1.11.2 regression when invoking several times gdalwarp with several input files on the same target file, and when the input files have a nodata setting: only the last input file was warped onto the target dataset (5909) * ogr2ogr: fix crash with -clipdst when a reprojection fails before (5973) * ogr_layer_algebra.py: for Update, Clip and Erase, only creates attribute of input layer by default --- geography/gdal-lib/Makefile | 18 ++++++++++-------- geography/gdal-lib/PLIST | 3 ++- geography/gdal-lib/buildlink3.mk | 5 ++++- geography/gdal-lib/distinfo | 14 ++++++-------- geography/gdal-lib/patches/patch-GDALmake.opt.in | 6 ++---- geography/gdal-lib/patches/patch-apps_gdalserver.c | 15 --------------- 6 files changed, 24 insertions(+), 37 deletions(-) delete mode 100644 geography/gdal-lib/patches/patch-apps_gdalserver.c diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile index 5511e6c9049..f152f33aaa2 100644 --- a/geography/gdal-lib/Makefile +++ b/geography/gdal-lib/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.75 2015/10/10 01:58:08 ryoon Exp $ +# $NetBSD: Makefile,v 1.76 2015/11/26 13:37:30 adam Exp $ -VERSION= 1.11.1 -DISTNAME= gdal-${VERSION} -PKGNAME= gdal-lib-${VERSION} -PKGREVISION= 3 +DISTNAME= gdal-1.11.3 +PKGNAME= ${DISTNAME:S/gdal/gdal-lib/} CATEGORIES= geography -MASTER_SITES= http://download.osgeo.org/gdal/${VERSION}/ +MASTER_SITES= http://download.osgeo.org/gdal/${PKGVERSION_NOREV}/ MAINTAINER= brook@nmsu.edu HOMEPAGE= http://www.gdal.org/ @@ -16,20 +14,21 @@ LICENSE= mit # as a bug and changes the C++ shlib version every release. Therefore # this package needs revbumping on every geos update. -USE_LANGUAGES= c c++ fortran77 +USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-geos +CONFIGURE_ARGS+= --with-libjson-c=internal CONFIGURE_ARGS+= --with-libtiff=${BUILDLINK_PREFIX.tiff} CONFIGURE_ARGS+= --with-libz=${BUILDLINK_PREFIX.zlib}/include CONFIGURE_ARGS+= --with-netcdf=${BUILDLINK_PREFIX.netcdf} +CONFIGURE_ARGS+= --with-webp=${BUILDLINK_PREFIX.libwebp} CONFIGURE_ARGS+= --with-xerces CONFIGURE_ARGS+= --with-xerces-inc=${BUILDLINK_PREFIX.xerces-c}/include CONFIGURE_ARGS+= --with-xerces-lib=-L${BUILDLINK_PREFIX.xerces-c}/lib\ -lxerces-c CONFIGURE_ARGS+= --without-python -CONFIGURE_ARGS+= --with-libjson-c=internal MAKE_FILE= GNUmakefile @@ -40,11 +39,14 @@ CHECK_PORTABILITY_SKIP+= mkbindist.sh INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 share/gdal .include "../../devel/netcdf/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../geography/geos/buildlink3.mk" .include "../../geography/proj/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/giflib/buildlink3.mk" +.include "../../graphics/libwebp/buildlink3.mk" +.include "../../graphics/openjpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/geography/gdal-lib/PLIST b/geography/gdal-lib/PLIST index 0381baebd16..780b49ed3d0 100644 --- a/geography/gdal-lib/PLIST +++ b/geography/gdal-lib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2014/10/10 01:13:57 wen Exp $ +@comment $NetBSD: PLIST,v 1.12 2015/11/26 13:37:30 adam Exp $ bin/gdal-config bin/gdal_contour bin/gdal_grid @@ -127,6 +127,7 @@ share/gdal/pcs.override.csv share/gdal/prime_meridian.csv share/gdal/projop_wparm.csv share/gdal/ruian_vf_ob_v1.gfs +share/gdal/ruian_vf_st_uvoh_v1.gfs share/gdal/ruian_vf_st_v1.gfs share/gdal/ruian_vf_v1.gfs share/gdal/s57agencies.csv diff --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk index 97050e5d707..0140aa4692f 100644 --- a/geography/gdal-lib/buildlink3.mk +++ b/geography/gdal-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.37 2015/03/14 18:44:08 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.38 2015/11/26 13:37:30 adam Exp $ BUILDLINK_TREE+= gdal-lib @@ -21,11 +21,14 @@ pkgbase := gdal-lib .endif .include "../../devel/netcdf/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../geography/geos/buildlink3.mk" .include "../../geography/proj/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/giflib/buildlink3.mk" +.include "../../graphics/libwebp/buildlink3.mk" +.include "../../graphics/openjpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../textproc/xerces-c/buildlink3.mk" diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo index c4a74035f65..b706d9f8f48 100644 --- a/geography/gdal-lib/distinfo +++ b/geography/gdal-lib/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.26 2015/11/03 00:08:42 agc Exp $ +$NetBSD: distinfo,v 1.27 2015/11/26 13:37:30 adam Exp $ -SHA1 (gdal-1.11.1.tar.gz) = e2c67481932ec9fb6ec3c0faadc004f715c4eef4 -RMD160 (gdal-1.11.1.tar.gz) = 9ebfbebeaff99a533bb4f4cf33b3f747e1ced9b4 -SHA512 (gdal-1.11.1.tar.gz) = 17214ae17a5199d73477d17cf8680396aee8a28d4333cf55818bdd869548dc6a4d7535d7e05949696db31a7be4a511c5ca73199af3dda48d9a40d5640618e9c3 -Size (gdal-1.11.1.tar.gz) = 10731242 bytes -SHA1 (patch-GDALmake.opt.in) = 6bae7f2bfea619d6b96bb0709f31e84a2eb764a5 -SHA1 (patch-apps_gdalserver.c) = 95d9902c1c5cb08400c45742808b18241b794060 -SHA1 (patch-configure) = 8cb8b26365933780cded7069722fa3e35d0c4b33 +SHA1 (gdal-1.11.3.tar.gz) = f0cfa13f62a2ad0f545327897cb90f0f0e08bc63 +RMD160 (gdal-1.11.3.tar.gz) = 8373d8d83d4614cb4086d4048531a4845c588649 +SHA512 (gdal-1.11.3.tar.gz) = 689b36a674fd5763a83e63f3a00460c44149a9447d31793d4e4dc2700c862775d565d5915bf3ac9594f0777ae89cf34c90b82820537d0f4d4d5c2c6a5d78d033 +Size (gdal-1.11.3.tar.gz) = 10758778 bytes +SHA1 (patch-GDALmake.opt.in) = f8096596d1b808d0c0a02e95ad5d0664b1c895eb diff --git a/geography/gdal-lib/patches/patch-GDALmake.opt.in b/geography/gdal-lib/patches/patch-GDALmake.opt.in index 84144a51251..3fc589add18 100644 --- a/geography/gdal-lib/patches/patch-GDALmake.opt.in +++ b/geography/gdal-lib/patches/patch-GDALmake.opt.in @@ -1,9 +1,7 @@ -$NetBSD: patch-GDALmake.opt.in,v 1.1 2014/09/15 16:48:21 jperkin Exp $ - -Fix occasional paralle build failure: +$NetBSD: patch-GDALmake.opt.in,v 1.2 2015/11/26 13:37:30 adam Exp $ +Fix occasional paralell build failure: ogr/ogr_core.h:34:26: fatal error: gdal_version.h: No such file or directory - by ensuring we have the correct includes. --- GDALmake.opt.in.orig 2012-10-09 00:58:28.000000000 +0000 diff --git a/geography/gdal-lib/patches/patch-apps_gdalserver.c b/geography/gdal-lib/patches/patch-apps_gdalserver.c deleted file mode 100644 index 700a5d0a19a..00000000000 --- a/geography/gdal-lib/patches/patch-apps_gdalserver.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-apps_gdalserver.c,v 1.1 2014/10/13 20:52:44 joerg Exp $ - ---- apps/gdalserver.c.orig 2014-10-13 10:16:23.000000000 +0000 -+++ apps/gdalserver.c -@@ -27,10 +27,6 @@ - * DEALINGS IN THE SOFTWARE. - ****************************************************************************/ - --#if defined(__STDC_VERSION__) --#define _XOPEN_SOURCE --#endif -- - #include "cpl_port.h" - - #ifdef WIN32 -- cgit v1.2.3