diff --git a/src/gdal-1-png.patch b/src/gdal-1-png.patch deleted file mode 100644 index 357e2dde..00000000 --- a/src/gdal-1-png.patch +++ /dev/null @@ -1,36 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -http://trac.osgeo.org/gdal/changeset/21526 -Index: /branches/1.8/gdal/frmts/png/pngdataset.cpp -=================================================================== ---- a/frmts/png/pngdataset.cpp (revision 21032) -+++ b/frmts/png/pngdataset.cpp (revision 21526) -@@ -1316,5 +1316,5 @@ - */ - check = (png_size_t)VSIFReadL(data, (png_size_t)1, length, -- (VSILFILE*)png_ptr->io_ptr); -+ (VSILFILE*)png_get_io_ptr(png_ptr)); - - if (check != length) -@@ -1331,5 +1331,5 @@ - png_uint_32 check; - -- check = VSIFWriteL(data, 1, length, (VSILFILE*)(png_ptr->io_ptr)); -+ check = VSIFWriteL(data, 1, length, (VSILFILE*)png_get_io_ptr(png_ptr)); - - if (check != length) -@@ -1342,5 +1342,5 @@ - static void png_vsi_flush(png_structp png_ptr) - { -- VSIFFlushL( (VSILFILE*)(png_ptr->io_ptr) ); -+ VSIFFlushL( (VSILFILE*)png_get_io_ptr(png_ptr) ); - } - -@@ -1358,5 +1358,5 @@ - // semantics. Ugg. - -- jmp_buf* psSetJmpContext = (jmp_buf*) png_ptr->error_ptr; -+ jmp_buf* psSetJmpContext = (jmp_buf*) png_get_error_ptr(png_ptr); - if (psSetJmpContext) - { diff --git a/src/gdal.mk b/src/gdal.mk index e4c4e3bc..cfae6787 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -4,8 +4,8 @@ # GDAL PKG := gdal $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.0 -$(PKG)_CHECKSUM := e5a2802933054050c6fb0b0a0e1f46b5dd195b0a +$(PKG)_VERSION := 1.8.1 +$(PKG)_CHECKSUM := b2f8b12ebdd00c05bc7f1ab7b761d9ac335c470c $(PKG)_SUBDIR := gdal-$($(PKG)_VERSION) $(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.gdal.org/