[99753] trunk/dports/gis/gdal

[vince at macports.org]

Revision: 99753
          https://trac.macports.org/changeset/99753
Author:   vince at macports.org
Date:     2012-11-16 03:49:45 -0800 (Fri, 16 Nov 2012)
Log Message:
-----------
Bump to 1.9.2 and remove obsoleted patch

Modified Paths:
--------------
    trunk/dports/gis/gdal/Portfile

Removed Paths:
-------------
    trunk/dports/gis/gdal/files/patch-frmts_gif_gifdataset.cpp.diff

Modified: trunk/dports/gis/gdal/Portfile
===================================================================
--- trunk/dports/gis/gdal/Portfile	2012-11-16 11:28:53 UTC (rev 99752)
+++ trunk/dports/gis/gdal/Portfile	2012-11-16 11:49:45 UTC (rev 99753)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                gdal
-version             1.9.1
-revision            1
+version             1.9.2
 categories          gis
 license             MIT BSD
 platforms           darwin
@@ -26,8 +25,8 @@
 master_sites        http://www.gdal.org/dl/ \
                     http://download.osgeo.org/gdal/
 
-checksums           rmd160  c4d77975b753fae75c634662e5e572fc2308456e \
-                    sha256  5b829e91c5d6c6c9af23fe6322e51bae9339e8805d52724cb0ad0b741aef7fa9
+checksums           rmd160  1ab34a85946bae4313cbd925cdbbf728d23d7b57 \
+                    sha256  9f3b9ae968eaa8d06ee5448e5b65e7bfa940e2e345282a29d95275421f36c688
 
 depends_lib-append  port:zlib \
                     port:libpng \
@@ -95,7 +94,6 @@
 # Patch to ensure that the python installation respects DESTDIR
 patchfiles          patch-swig_python_GNUmakefile \
                     patch-gdalwarpkernel_opencl_c.diff \
-                    patch-frmts_gif_gifdataset.cpp.diff \
                     patch-gdalwarpkernel_opencl_h.diff
 
 # Patches for universal build

Deleted: trunk/dports/gis/gdal/files/patch-frmts_gif_gifdataset.cpp.diff
===================================================================
--- trunk/dports/gis/gdal/files/patch-frmts_gif_gifdataset.cpp.diff	2012-11-16 11:28:53 UTC (rev 99752)
+++ trunk/dports/gis/gdal/files/patch-frmts_gif_gifdataset.cpp.diff	2012-11-16 11:49:45 UTC (rev 99753)
@@ -1,53 +0,0 @@
---- frmts/gif/gifdataset.cpp.orig	2012-05-22 17:29:20.000000000 +0400
-+++ frmts/gif/gifdataset.cpp	2012-05-22 17:29:28.000000000 +0400
-@@ -470,6 +470,28 @@
- }
- 
- /************************************************************************/
-+/*                        GDALPrintGifError()                           */
-+/************************************************************************/
-+
-+static void GDALPrintGifError(const char* pszMsg)
-+{
-+/* GIFLIB_MAJOR is only defined in libgif >= 4.2.0 */
-+/* libgif 4.2.0 has retired PrintGifError() and added GifErrorString() */
-+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \
-+        ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4)
-+    /* Static string actually, hence the const char* cast */
-+    const char* pszGIFLIBError = (const char*) GifErrorString();
-+    if (pszGIFLIBError == NULL)
-+        pszGIFLIBError = "Unknown error";
-+    CPLError( CE_Failure, CPLE_AppDefined,
-+              "%s. GIFLib Error : %s", pszMsg, pszGIFLIBError );
-+#else
-+    PrintGifError();
-+    CPLError( CE_Failure, CPLE_AppDefined, "%s", pszMsg );
-+#endif
-+}
-+
-+/************************************************************************/
- /*                             CreateCopy()                             */
- /************************************************************************/
- 
-@@ -596,9 +618,7 @@
-                           psGifCT->ColorCount, 255, psGifCT) == GIF_ERROR)
-     {
-         FreeMapObject(psGifCT);
--        PrintGifError();
--        CPLError( CE_Failure, CPLE_AppDefined, 
--                  "Error writing gif file." );
-+        GDALPrintGifError("Error writing gif file.");
-         EGifCloseFile(hGifFile);
-         VSIFCloseL( fp );
-         return NULL;
-@@ -622,9 +642,7 @@
- 
-     if (EGifPutImageDesc(hGifFile, 0, 0, nXSize, nYSize, bInterlace, NULL) == GIF_ERROR )
-     {
--        PrintGifError();
--        CPLError( CE_Failure, CPLE_AppDefined, 
--                  "Error writing gif file." );
-+        GDALPrintGifError("Error writing gif file.");
-         EGifCloseFile(hGifFile);
-         VSIFCloseL( fp );
-         return NULL;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121116/0dd6a09d/attachment.html>