From dcd81c76d50db2a09e9d75e7f56b179a08575b35 Mon Sep 17 00:00:00 2001 From: landry Date: Wed, 28 Dec 2011 21:14:04 +0000 Subject: [PATCH] Bugfix update to gdal 1.8.1. See http://trac.osgeo.org/gdal/wiki/Release/1.8.1-News. --- geo/gdal/Makefile | 9 ++-- geo/gdal/distinfo | 10 ++--- geo/gdal/patches/patch-configure | 8 ++-- .../patches/patch-frmts_png_pngdataset_cpp | 43 ------------------- geo/gdal/pkg/PLIST-python | 5 ++- 5 files changed, 17 insertions(+), 58 deletions(-) delete mode 100644 geo/gdal/patches/patch-frmts_png_pngdataset_cpp diff --git a/geo/gdal/Makefile b/geo/gdal/Makefile index 0ad1fb3e70b..11e6d13665d 100644 --- a/geo/gdal/Makefile +++ b/geo/gdal/Makefile @@ -1,19 +1,17 @@ -# $OpenBSD: Makefile,v 1.20 2011/09/16 09:48:10 espie Exp $ +# $OpenBSD: Makefile,v 1.21 2011/12/28 21:14:04 landry Exp $ COMMENT-main = translator library for geospatial data formats COMMENT-python =python bindings and utilities for GDAL COMMENT-perl = perl bindings for GDAL -V = 1.8.0 +V = 1.8.1 DISTNAME = gdal-${V} PKGNAME-main = ${DISTNAME} PKGNAME-python =py-${DISTNAME} PKGNAME-perl = p5-Geo-GDAL-${V} -REVISION-main = 1 -REVISION-python = 1 -SHARED_LIBS = gdal 17.0 +SHARED_LIBS = gdal 18.0 #16.1 CATEGORIES = geo devel HOMEPAGE = http://www.gdal.org/ @@ -66,6 +64,7 @@ MAKE_FILE = GNUmakefile MAKE_FLAGS = LIBTOOL_FINISH=: USE_GMAKE = Yes USE_LIBTOOL = Yes +NO_REGRESS = Yes CONFIGURE_STYLE = gnu CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/libpng" \ diff --git a/geo/gdal/distinfo b/geo/gdal/distinfo index d246622cb35..09841bfe3fb 100644 --- a/geo/gdal/distinfo +++ b/geo/gdal/distinfo @@ -1,5 +1,5 @@ -MD5 (gdal-1.8.0.tar.gz) = x2LNqw9+UaZ3ukknioomPQ== -RMD160 (gdal-1.8.0.tar.gz) = DhFvQbI/9bRMaS9WRZ+sqzMsYgE= -SHA1 (gdal-1.8.0.tar.gz) = 5aKAKTMFQFDG+wsKDh9Gtd0ZWwo= -SHA256 (gdal-1.8.0.tar.gz) = UV8DFs0XKBoJoUeRS0eyi7xIVc24bUHRLLhxbRch5DU= -SIZE (gdal-1.8.0.tar.gz) = 8837824 +MD5 (gdal-1.8.1.tar.gz) = syJpiTr8ncns7UXnTkxrtA== +RMD160 (gdal-1.8.1.tar.gz) = SsHNWZeUZL03tNKqWICS7gw01Fw= +SHA1 (gdal-1.8.1.tar.gz) = svixLr3QDAW8fxq3t2HZrDNcRww= +SHA256 (gdal-1.8.1.tar.gz) = 1ddrhbSnoOKOrWySvg66nisjYaBtsKYO8PuF22Pnpd8= +SIZE (gdal-1.8.1.tar.gz) = 8852355 diff --git a/geo/gdal/patches/patch-configure b/geo/gdal/patches/patch-configure index 5c1415a91f3..4be57e3277a 100644 --- a/geo/gdal/patches/patch-configure +++ b/geo/gdal/patches/patch-configure @@ -1,8 +1,8 @@ -$OpenBSD: patch-configure,v 1.3 2011/06/22 12:53:12 landry Exp $ +$OpenBSD: patch-configure,v 1.4 2011/12/28 21:14:04 landry Exp $ ensure MODPY_BIN is picked to try detecting setuptools ---- configure.orig Fri Jan 14 06:19:06 2011 -+++ configure Mon Jun 20 22:18:34 2011 -@@ -24382,7 +24382,7 @@ $as_echo_n "checking for python setuptools... " >&6; } +--- configure.orig Sat Jul 9 18:33:34 2011 ++++ configure Tue Oct 4 14:42:10 2011 +@@ -24384,7 +24384,7 @@ $as_echo_n "checking for python setuptools... " >&6; } print 1 except ImportError: pass' diff --git a/geo/gdal/patches/patch-frmts_png_pngdataset_cpp b/geo/gdal/patches/patch-frmts_png_pngdataset_cpp deleted file mode 100644 index 593874f04e4..00000000000 --- a/geo/gdal/patches/patch-frmts_png_pngdataset_cpp +++ /dev/null @@ -1,43 +0,0 @@ -$OpenBSD: patch-frmts_png_pngdataset_cpp,v 1.1 2011/07/08 20:37:01 naddy Exp $ - -Fix build with png-1.5. -http://trac.osgeo.org/gdal/changeset/21525/trunk/gdal/frmts/png/pngdataset.cpp - ---- frmts/png/pngdataset.cpp.orig Thu Jan 13 22:19:04 2011 -+++ frmts/png/pngdataset.cpp Tue Jul 5 17:48:35 2011 -@@ -1315,7 +1315,7 @@ png_vsi_read_data(png_structp png_ptr, png_bytep data, - * instead of an int, which is what fread() actually returns. - */ - 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) - png_error(png_ptr, "Read Error"); -@@ -1330,7 +1330,7 @@ png_vsi_write_data(png_structp png_ptr, png_bytep data - { - 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) - png_error(png_ptr, "Write Error"); -@@ -1341,7 +1341,7 @@ png_vsi_write_data(png_structp png_ptr, png_bytep data - /************************************************************************/ - static void png_vsi_flush(png_structp png_ptr) - { -- VSIFFlushL( (VSILFILE*)(png_ptr->io_ptr) ); -+ VSIFFlushL( (VSILFILE*)png_get_io_ptr(png_ptr) ); - } - - /************************************************************************/ -@@ -1357,7 +1357,7 @@ static void png_gdal_error( png_structp png_ptr, const - // libpng is generally not built as C++ and so won't honour unwind - // semantics. Ugg. - -- jmp_buf* psSetJmpContext = (jmp_buf*) png_ptr->error_ptr; -+ jmp_buf* psSetJmpContext = (jmp_buf*) png_get_error_ptr(png_ptr); - if (psSetJmpContext) - { - longjmp( *psSetJmpContext, 1 ); diff --git a/geo/gdal/pkg/PLIST-python b/geo/gdal/pkg/PLIST-python index 8e2c9389b44..9f824d1b3b6 100644 --- a/geo/gdal/pkg/PLIST-python +++ b/geo/gdal/pkg/PLIST-python @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-python,v 1.3 2011/07/01 08:04:57 landry Exp $ +@comment $OpenBSD: PLIST-python,v 1.4 2011/12/28 21:14:05 landry Exp $ bin/epsg_tr.py bin/esri2wkt.py bin/gcps2vec.py @@ -30,12 +30,15 @@ lib/python${MODPY_VERSION}/site-packages/gdal.py lib/python${MODPY_VERSION}/site-packages/gdal.pyc lib/python${MODPY_VERSION}/site-packages/gdalconst.py lib/python${MODPY_VERSION}/site-packages/gdalconst.pyc +lib/python${MODPY_VERSION}/site-packages/gdalnumeric.py +lib/python${MODPY_VERSION}/site-packages/gdalnumeric.pyc lib/python${MODPY_VERSION}/site-packages/ogr.py lib/python${MODPY_VERSION}/site-packages/ogr.pyc lib/python${MODPY_VERSION}/site-packages/osgeo/ lib/python${MODPY_VERSION}/site-packages/osgeo/__init__.py lib/python${MODPY_VERSION}/site-packages/osgeo/__init__.pyc lib/python${MODPY_VERSION}/site-packages/osgeo/_gdal.so +lib/python${MODPY_VERSION}/site-packages/osgeo/_gdal_array.so lib/python${MODPY_VERSION}/site-packages/osgeo/_gdalconst.so lib/python${MODPY_VERSION}/site-packages/osgeo/_ogr.so lib/python${MODPY_VERSION}/site-packages/osgeo/_osr.so