From 1fefb2a949fee5ac0aca07769a9efca85aa570f8 Mon Sep 17 00:00:00 2001 From: wen Date: Fri, 10 Oct 2014 01:13:57 +0000 Subject: Update to 1.11.1 Upstream changes please visit: http://trac.osgeo.org/gdal/wiki/Release/1.11.1-News Reviewed by: wiz@ --- geography/gdal-lib/patches/patch-configure | 13 +++ .../patches/patch-frmts_gif_biggifdataset.cpp | 45 ---------- .../patches/patch-frmts_gif_gifabstractdataset.cpp | 19 ----- .../patches/patch-frmts_gif_gifdataset.cpp | 95 ---------------------- 4 files changed, 13 insertions(+), 159 deletions(-) create mode 100644 geography/gdal-lib/patches/patch-configure delete mode 100644 geography/gdal-lib/patches/patch-frmts_gif_biggifdataset.cpp delete mode 100644 geography/gdal-lib/patches/patch-frmts_gif_gifabstractdataset.cpp delete mode 100644 geography/gdal-lib/patches/patch-frmts_gif_gifdataset.cpp (limited to 'geography/gdal-lib/patches') 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) -- cgit v1.2.3