diff options
author | wen <wen@pkgsrc.org> | 2014-10-10 01:13:57 +0000 |
---|---|---|
committer | wen <wen@pkgsrc.org> | 2014-10-10 01:13:57 +0000 |
commit | ab6741c6d03aa7b6d42db39adce2f6ce30e5b8cf (patch) | |
tree | 4d09fff9dcbfd0d44a4cb727f8799afa6607a177 | |
parent | 4de9058e5af41aac30e24784a130a199af5cebfc (diff) | |
download | pkgsrc-ab6741c6d03aa7b6d42db39adce2f6ce30e5b8cf.tar.gz |
Update to 1.11.1
Upstream changes please visit:
http://trac.osgeo.org/gdal/wiki/Release/1.11.1-News
Reviewed by: wiz@
-rw-r--r-- | geography/gdal-lib/Makefile | 7 | ||||
-rw-r--r-- | geography/gdal-lib/PLIST | 28 | ||||
-rw-r--r-- | geography/gdal-lib/distinfo | 12 | ||||
-rw-r--r-- | geography/gdal-lib/patches/patch-configure | 13 | ||||
-rw-r--r-- | geography/gdal-lib/patches/patch-frmts_gif_biggifdataset.cpp | 45 | ||||
-rw-r--r-- | geography/gdal-lib/patches/patch-frmts_gif_gifabstractdataset.cpp | 19 | ||||
-rw-r--r-- | geography/gdal-lib/patches/patch-frmts_gif_gifdataset.cpp | 95 |
7 files changed, 48 insertions, 171 deletions
diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile index f233f0e1863..6f154a2dd29 100644 --- a/geography/gdal-lib/Makefile +++ b/geography/gdal-lib/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.70 2014/10/07 16:47:25 adam Exp $ +# $NetBSD: Makefile,v 1.71 2014/10/10 01:13:57 wen Exp $ -VERSION= 1.9.2 +VERSION= 1.11.1 DISTNAME= gdal-${VERSION} PKGNAME= gdal-lib-${VERSION} -PKGREVISION= 12 CATEGORIES= geography -MASTER_SITES= http://download.osgeo.org/gdal/ +MASTER_SITES= http://download.osgeo.org/gdal/${VERSION}/ MAINTAINER= brook@nmsu.edu HOMEPAGE= http://www.gdal.org/ diff --git a/geography/gdal-lib/PLIST b/geography/gdal-lib/PLIST index 5fa17275c0a..0381baebd16 100644 --- a/geography/gdal-lib/PLIST +++ b/geography/gdal-lib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2012/03/07 16:17:05 adam Exp $ +@comment $NetBSD: PLIST,v 1.11 2014/10/10 01:13:57 wen Exp $ bin/gdal-config bin/gdal_contour bin/gdal_grid @@ -11,6 +11,7 @@ bin/gdalenhance bin/gdalinfo bin/gdallocationinfo bin/gdalmanage +bin/gdalserver bin/gdalsrsinfo bin/gdaltindex bin/gdaltransform @@ -18,6 +19,7 @@ bin/gdalwarp bin/nearblack bin/ogr2ogr bin/ogrinfo +bin/ogrlineref bin/ogrtindex bin/testepsg include/cpl_atomic_ops.h @@ -36,11 +38,15 @@ include/cpl_minizip_zip.h include/cpl_multiproc.h include/cpl_odbc.h include/cpl_port.h +include/cpl_progress.h include/cpl_quad_tree.h +include/cpl_spawn.h include/cpl_string.h include/cpl_time.h +include/cpl_virtualmem.h include/cpl_vsi.h include/cpl_vsi_virtual.h +include/cpl_vsil_curl_priv.h include/cpl_win32ce_api.h include/cpl_wince.h include/cplkeywordparser.h @@ -53,9 +59,14 @@ include/gdal_pam.h include/gdal_priv.h include/gdal_proxy.h include/gdal_rat.h +include/gdal_simplesurf.h include/gdal_version.h include/gdal_vrt.h +include/gdalexif.h +include/gdalgeorefpamdataset.h include/gdalgrid.h +include/gdalgrid_priv.h +include/gdaljp2abstractdataset.h include/gdaljp2metadata.h include/gdalwarper.h include/gdalwarpkernel_opencl.h @@ -65,6 +76,7 @@ include/ogr_api.h include/ogr_core.h include/ogr_feature.h include/ogr_featurestyle.h +include/ogr_geocoding.h include/ogr_geometry.h include/ogr_p.h include/ogr_spatialref.h @@ -74,6 +86,7 @@ include/rawdataset.h include/thinplatespline.h include/vrtdataset.h lib/libgdal.la +lib/pkgconfig/gdal.pc share/gdal/GDALLogoBW.svg share/gdal/GDALLogoColor.svg share/gdal/GDALLogoGS.svg @@ -93,17 +106,29 @@ share/gdal/gcs.override.csv share/gdal/gdal_datum.csv share/gdal/gdalicon.png share/gdal/geoccs.csv +share/gdal/gml_registry.xml share/gdal/gt_datum.csv share/gdal/gt_ellips.csv share/gdal/header.dxf +share/gdal/inspire_cp_BasicPropertyUnit.gfs +share/gdal/inspire_cp_CadastralBoundary.gfs +share/gdal/inspire_cp_CadastralParcel.gfs +share/gdal/inspire_cp_CadastralZoning.gfs share/gdal/nitf_spec.xml share/gdal/nitf_spec.xsd +share/gdal/ogrvrt.xsd +share/gdal/osmconf.ini +share/gdal/ozi_datum.csv +share/gdal/ozi_ellips.csv share/gdal/pci_datum.txt share/gdal/pci_ellips.txt share/gdal/pcs.csv 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_v1.gfs +share/gdal/ruian_vf_v1.gfs share/gdal/s57agencies.csv share/gdal/s57attributes.csv share/gdal/s57attributes_aml.csv @@ -119,3 +144,4 @@ share/gdal/trailer.dxf share/gdal/unit_of_measure.csv share/gdal/vertcs.csv share/gdal/vertcs.override.csv +@pkgdir lib/gdalplugins diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo index ff53120c8ac..1742756950a 100644 --- a/geography/gdal-lib/distinfo +++ b/geography/gdal-lib/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.23 2014/09/15 16:48:21 jperkin Exp $ +$NetBSD: distinfo,v 1.24 2014/10/10 01:13:57 wen Exp $ -SHA1 (gdal-1.9.2.tar.gz) = 7eda6a4d735b8d6903740e0acdd702b43515e351 -RMD160 (gdal-1.9.2.tar.gz) = 1ab34a85946bae4313cbd925cdbbf728d23d7b57 -Size (gdal-1.9.2.tar.gz) = 9495381 bytes +SHA1 (gdal-1.11.1.tar.gz) = e2c67481932ec9fb6ec3c0faadc004f715c4eef4 +RMD160 (gdal-1.11.1.tar.gz) = 9ebfbebeaff99a533bb4f4cf33b3f747e1ced9b4 +Size (gdal-1.11.1.tar.gz) = 10731242 bytes SHA1 (patch-GDALmake.opt.in) = 6bae7f2bfea619d6b96bb0709f31e84a2eb764a5 -SHA1 (patch-frmts_gif_biggifdataset.cpp) = ec591ad57fdc96e04713ef769f93df6b8e101e0d -SHA1 (patch-frmts_gif_gifabstractdataset.cpp) = a36bfacd0c1c329d221af8554fa8d236033b970d -SHA1 (patch-frmts_gif_gifdataset.cpp) = 7d307e0530bad5f5364e08c157e45c39b20b5026 +SHA1 (patch-configure) = 8cb8b26365933780cded7069722fa3e35d0c4b33 diff --git a/geography/gdal-lib/patches/patch-configure b/geography/gdal-lib/patches/patch-configure new file mode 100644 index 00000000000..516a007a3b0 --- /dev/null +++ b/geography/gdal-lib/patches/patch-configure @@ -0,0 +1,13 @@ +$NetBSD: patch-configure,v 1.3 2014/10/10 01:13:58 wen Exp $ + +--- configure.orig 2014-10-09 09:28:47.000000000 +0000 ++++ configure +@@ -22498,7 +22498,7 @@ $as_echo "found libecwj2 in $with_ecw/li + + # ECW SDK 5.0 style + elif test -r $with_ecw/lib/x64/release/libNCSEcw.so ; then +- if test `arch` == "x86_64" ; then ++ if test `arch` = "x86_64" ; then + ECW_LIBDIR=$with_ecw/lib/x64/release + else + ECW_LIBDIR=$with_ecw/lib/x86/release diff --git a/geography/gdal-lib/patches/patch-frmts_gif_biggifdataset.cpp b/geography/gdal-lib/patches/patch-frmts_gif_biggifdataset.cpp deleted file mode 100644 index 912e75d6e22..00000000000 --- a/geography/gdal-lib/patches/patch-frmts_gif_biggifdataset.cpp +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-frmts_gif_biggifdataset.cpp,v 1.1 2014/05/23 13:04:10 obache Exp $ - -* giflib>=5.1 API change - ---- frmts/gif/biggifdataset.cpp.orig 2012-10-09 00:58:25.000000000 +0000 -+++ frmts/gif/biggifdataset.cpp -@@ -337,7 +337,12 @@ CPLErr BIGGIFDataset::ReOpen() - /* If the file is already open, close it so we can restart. */ - /* -------------------------------------------------------------------- */ - if( hGifFile != NULL ) -+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \ -+ (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5) -+ DGifCloseFile( hGifFile, NULL ); -+#else - DGifCloseFile( hGifFile ); -+#endif - - /* -------------------------------------------------------------------- */ - /* If we are actually reopening, then we assume that access to */ -@@ -411,7 +416,12 @@ CPLErr BIGGIFDataset::ReOpen() - - if( RecordType != IMAGE_DESC_RECORD_TYPE ) - { -+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \ -+ (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5) -+ DGifCloseFile( hGifFile, NULL ); -+#else - DGifCloseFile( hGifFile ); -+#endif - hGifFile = NULL; - - CPLError( CE_Failure, CPLE_OpenFailed, -@@ -421,7 +431,12 @@ CPLErr BIGGIFDataset::ReOpen() - - if (DGifGetImageDesc(hGifFile) == GIF_ERROR) - { -+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \ -+ (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5) -+ DGifCloseFile( hGifFile, NULL ); -+#else - DGifCloseFile( hGifFile ); -+#endif - hGifFile = NULL; - - CPLError( CE_Failure, CPLE_OpenFailed, diff --git a/geography/gdal-lib/patches/patch-frmts_gif_gifabstractdataset.cpp b/geography/gdal-lib/patches/patch-frmts_gif_gifabstractdataset.cpp deleted file mode 100644 index 441cc4b49ae..00000000000 --- a/geography/gdal-lib/patches/patch-frmts_gif_gifabstractdataset.cpp +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-frmts_gif_gifabstractdataset.cpp,v 1.1 2014/05/23 13:04:10 obache Exp $ - -* giflib>=5.1 API change - ---- frmts/gif/gifabstractdataset.cpp.orig 2012-10-09 00:58:25.000000000 +0000 -+++ frmts/gif/gifabstractdataset.cpp -@@ -82,7 +82,12 @@ GIFAbstractDataset::~GIFAbstractDataset( - } - - if( hGifFile ) -+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \ -+ (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5) -+ DGifCloseFile( hGifFile, NULL ); -+#else - DGifCloseFile( hGifFile ); -+#endif - - if( fp != NULL ) - VSIFCloseL( fp ); diff --git a/geography/gdal-lib/patches/patch-frmts_gif_gifdataset.cpp b/geography/gdal-lib/patches/patch-frmts_gif_gifdataset.cpp deleted file mode 100644 index c8f7e4b421a..00000000000 --- a/geography/gdal-lib/patches/patch-frmts_gif_gifdataset.cpp +++ /dev/null @@ -1,95 +0,0 @@ -$NetBSD: patch-frmts_gif_gifdataset.cpp,v 1.1 2014/05/23 13:04:10 obache Exp $ - -* giflib>=5.1 API change - ---- frmts/gif/gifdataset.cpp.orig 2012-10-09 00:58:25.000000000 +0000 -+++ frmts/gif/gifdataset.cpp -@@ -385,13 +385,23 @@ GDALDataset *GIFDataset::Open( GDALOpenI - CPLDebug( "GIF", - "Due to limitations of the GDAL GIF driver we deliberately avoid\n" - "opening large GIF files (larger than 100 megapixels)."); -+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \ -+ (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5) -+ DGifCloseFile( hGifFile, NULL ); -+#else - DGifCloseFile( hGifFile ); -+#endif - VSIFCloseL( fp ); - return NULL; - } - } - -+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \ -+ (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5) -+ DGifCloseFile( hGifFile, NULL ); -+#else - DGifCloseFile( hGifFile ); -+#endif - - VSIFSeekL( fp, 0, SEEK_SET); - -@@ -416,7 +426,12 @@ GDALDataset *GIFDataset::Open( GDALOpenI - if( nGifErr != GIF_OK || hGifFile->SavedImages == NULL ) - { - VSIFCloseL( fp ); -+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \ -+ (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5) -+ DGifCloseFile(hGifFile, NULL); -+#else - DGifCloseFile(hGifFile); -+#endif - - if( nGifErr == D_GIF_ERR_DATA_TOO_BIG ) - { -@@ -648,7 +663,12 @@ GIFDataset::CreateCopy( const char * psz - { - GifFreeMapObject(psGifCT); - GDALPrintGifError(hGifFile, "Error writing gif file."); -+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \ -+ (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5) -+ EGifCloseFile(hGifFile, NULL); -+#else - EGifCloseFile(hGifFile); -+#endif - VSIFCloseL( fp ); - return NULL; - } -@@ -672,7 +692,12 @@ GIFDataset::CreateCopy( const char * psz - if (EGifPutImageDesc(hGifFile, 0, 0, nXSize, nYSize, bInterlace, NULL) == GIF_ERROR ) - { - GDALPrintGifError(hGifFile, "Error writing gif file."); -+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \ -+ (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5) -+ EGifCloseFile(hGifFile, NULL); -+#else - EGifCloseFile(hGifFile); -+#endif - VSIFCloseL( fp ); - return NULL; - } -@@ -755,7 +780,12 @@ GIFDataset::CreateCopy( const char * psz - /* -------------------------------------------------------------------- */ - /* cleanup */ - /* -------------------------------------------------------------------- */ -+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \ -+ (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5) -+ if (EGifCloseFile(hGifFile, NULL) == GIF_ERROR) -+#else - if (EGifCloseFile(hGifFile) == GIF_ERROR) -+#endif - { - CPLError( CE_Failure, CPLE_AppDefined, - "EGifCloseFile() failed.\n" ); -@@ -806,7 +836,12 @@ GIFDataset::CreateCopy( const char * psz - - error: - if (hGifFile) -+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \ -+ (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5) -+ EGifCloseFile(hGifFile, NULL); -+#else - EGifCloseFile(hGifFile); -+#endif - if (fp) - VSIFCloseL( fp ); - if (pabyScanline) |