tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
geography/gdal-lib
I would like to update the geography/gdal-lib package to 1.8.0. Here
is a brief description of the changes (see
http://trac.osgeo.org/gdal/wiki/Release/1.8.0-News).
In a nutshell:
* New GDAL drivers : GTX, HF2, JPEGLS, JP2OpenJPEG, JPIPKAK,
KMLSUPEROVERLAY, LOS/LAS, MG4Lidar, NTv2, OZI, PDF, RASDAMAN,
XYZ
* New OGR drivers : AeronavFAA, ArcObjects, GPSBabel, HTF, LIBKML,
MSSQLSpatial, NAS, OpenAir, PDS, PGDump, SOSI, SUA, WFS
* Significantly improved OGR drivers : DXF, GML
* New implemented RFCs:
o RFC 7: Use VSILFILE for VSI*L Functions
o RFC 24: Progressive data support in GDAL
o RFC 28: OGR SQL Generalized Expressions
o RFC 29: OGR Set Ignored Fields
o RFC 30: Unicode Filenames
o RFC 33: GTIFF - Corrected !PixelIsPoint Interpretation
* New utility : gdallocationinfo
Backward compatibility issues:
* MITAB driver: use "," for the OGR Feature Style id: parameter
delimiter, not "." as per the spec. Known impacted application:
MapServer?
* RFC 33 changes the way PixelIsPoint? is handled for GeoTIFF
* GML driver: write valid <gml:MultiGeometry> element instead of
the non-conformant <gml:GeometryCollection>. For backward
compatibility, recognize both syntax for the reading part
Please see the patch below for the changes I intend.
Before I commit this, however, I have a couple of questions. First,
this version of gdal makes use of an internal TIFF function,
TIFFUnsetField, that apparently does not exist in tiff v3.9.4, which
is the latest stable release. As a result, I have switched to using
the internally supplied version of tiff rather than the one in pkgsrc.
Comments?
Second, I will switch the patch file over to the new naming
convention. Is that desired or should the old convention be
maintained for existing packages?
Finally, I assume that BUILDLINK_ABI_DEPENDS should be updated, but
I'm not really certain about that. I'm also not entirely certain
about how, in general, to manage the BUILDLINK_API_DEPENDS and
BUILDLINK_ABI_DEPENDS variables. Help is welcome.
Thanks alot for your input.
Cheers,
Brook
===========================================================================
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/geography/gdal-lib/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- Makefile 18 Jan 2011 09:01:29 -0000 1.34
+++ Makefile 6 Feb 2011 22:03:39 -0000
@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.34 2011/01/18 09:01:29 wiz Exp $
-DISTNAME= gdal-1.7.3
-PKGNAME= gdal-lib-1.7.3
-PKGREVISION= 2
+DISTNAME= gdal-1.8.0
+PKGNAME= gdal-lib-1.8.0
CATEGORIES= geography
MASTER_SITES= http://download.osgeo.org/gdal/
@@ -19,6 +18,7 @@
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-geos
+CONFIGURE_ARGS+= --with-libtiff=internal
CONFIGURE_ARGS+= --with-libz=${BUILDLINK_PREFIX.zlib}/include
CONFIGURE_ARGS+= --with-xerces
CONFIGURE_ARGS+= --with-xerces-inc=${BUILDLINK_PREFIX.xerces-c}/include
@@ -39,7 +39,6 @@
.include "../../graphics/jasper/buildlink3.mk"
.include "../../graphics/libungif/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
.include "../../textproc/xerces-c/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/geography/gdal-lib/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- PLIST 10 Mar 2010 11:45:26 -0000 1.8
+++ PLIST 6 Feb 2011 22:03:39 -0000
@@ -9,6 +9,7 @@
bin/gdaldem
bin/gdalenhance
bin/gdalinfo
+bin/gdallocationinfo
bin/gdalmanage
bin/gdaltindex
bin/gdaltransform
@@ -19,6 +20,7 @@
bin/ogrtindex
bin/testepsg
include/cpl_atomic_ops.h
+include/cpl_base64.h
include/cpl_config.h
include/cpl_config_extras.h
include/cpl_conv.h
@@ -30,6 +32,7 @@
include/cpl_minixml.h
include/cpl_minizip_ioapi.h
include/cpl_minizip_unzip.h
+include/cpl_minizip_zip.h
include/cpl_multiproc.h
include/cpl_odbc.h
include/cpl_port.h
@@ -44,6 +47,7 @@
include/gdal.h
include/gdal_alg.h
include/gdal_alg_priv.h
+include/gdal_csv.h
include/gdal_frmts.h
include/gdal_pam.h
include/gdal_priv.h
@@ -54,6 +58,7 @@
include/gdalgrid.h
include/gdaljp2metadata.h
include/gdalwarper.h
+include/gdalwarpkernel_opencl.h
include/gvgcpfit.h
include/memdataset.h
include/ogr_api.h
@@ -73,8 +78,10 @@
share/gdal/GDALLogoColor.svg
share/gdal/GDALLogoGS.svg
share/gdal/LICENSE.TXT
+share/gdal/compdcs.csv
share/gdal/coordinate_axis.csv
share/gdal/cubewerx_extra.wkt
+share/gdal/datum_shift.csv
share/gdal/ecw_cs.wkt
share/gdal/ellipsoid.csv
share/gdal/epsg.wkt
@@ -86,6 +93,8 @@
share/gdal/gt_datum.csv
share/gdal/gt_ellips.csv
share/gdal/header.dxf
+share/gdal/pci_datum.txt
+share/gdal/pci_ellips.txt
share/gdal/pcs.csv
share/gdal/pcs.override.csv
share/gdal/prime_meridian.csv
@@ -103,3 +112,5 @@
share/gdal/stateplane.csv
share/gdal/trailer.dxf
share/gdal/unit_of_measure.csv
+share/gdal/vertcs.csv
+share/gdal/vertcs.override.csv
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/geography/gdal-lib/buildlink3.mk,v
retrieving revision 1.19
diff -u -r1.19 buildlink3.mk
--- buildlink3.mk 13 Jan 2011 13:36:08 -0000 1.19
+++ buildlink3.mk 6 Feb 2011 22:03:39 -0000
@@ -6,7 +6,7 @@
GDAL_LIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gdal-lib+= gdal-lib>=1.6.1
-BUILDLINK_ABI_DEPENDS.gdal-lib+= gdal-lib>=1.7.3nb1
+BUILDLINK_ABI_DEPENDS.gdal-lib+= gdal-lib>=1.8.0
BUILDLINK_PKGSRCDIR.gdal-lib?= ../../geography/gdal-lib
pkgbase := gdal-lib
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/geography/gdal-lib/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 24 Jan 2011 16:26:16 -0000 1.13
+++ distinfo 6 Feb 2011 22:03:39 -0000
@@ -1,7 +1,6 @@
$NetBSD: distinfo,v 1.13 2011/01/24 16:26:16 wiz Exp $
-SHA1 (gdal-1.7.3.tar.gz) = 58d4355fe792ad618bb74605dc1a084a0aeb7cb1
-RMD160 (gdal-1.7.3.tar.gz) = ce84a12d48c85a58c56a17381aee1c4f2ba08b57
-Size (gdal-1.7.3.tar.gz) = 7757684 bytes
-SHA1 (patch-aa) = 2c017bda45d4ed4fb10f7e70d33b707ca33149d1
-SHA1 (patch-ab) = d551e277108c4dbbde595a7797b3c3ceaa39a058
+SHA1 (gdal-1.8.0.tar.gz) = e5a2802933054050c6fb0b0a0e1f46b5dd195b0a
+RMD160 (gdal-1.8.0.tar.gz) = 0e116f41b23ff5b44c692f56459facab332c6201
+Size (gdal-1.8.0.tar.gz) = 8837824 bytes
+SHA1 (frmts_png_pngdataset.cpp) = 2d13b396a79883d41751148762ad10839e6e18dc
Notice above that a new patch file will be created following the new
naming convention. Essentially, this is a renamed and updated version
of the previous patch-ab file. The diffs that would have been applied
to patch-ab had the name not been changed are below.
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/geography/gdal-lib/patches/patch-ab,v
retrieving revision 1.8
diff -u -r1.8 patch-ab
--- patches/patch-ab 24 Jan 2011 16:26:16 -0000 1.8
+++ patches/patch-ab 6 Feb 2011 22:08:42 -0000
@@ -3,36 +3,36 @@
Fix build with png-1.5.
http://trac.osgeo.org/gdal/ticket/3914
---- frmts/png/pngdataset.cpp.orig 2010-11-07 18:28:47.000000000 +0000
-+++ frmts/png/pngdataset.cpp
-@@ -1296,7 +1296,7 @@ png_vsi_read_data(png_structp png_ptr, p
+--- frmts/png/pngdataset.cpp.orig 2011-01-13 22:19:04.000000000 -0700
++++ frmts/png/pngdataset.cpp 2011-02-06 12:43:09.000000000 -0700
+@@ -1315,7 +1315,7 @@
* instead of an int, which is what fread() actually returns.
*/
check = (png_size_t)VSIFReadL(data, (png_size_t)1, length,
-- (png_FILE_p)png_ptr->io_ptr);
-+ (png_FILE_p)png_get_io_ptr(png_ptr));
+- (VSILFILE*)png_ptr->io_ptr);
++ (VSILFILE*)png_get_io_ptr(png_ptr));
if (check != length)
png_error(png_ptr, "Read Error");
-@@ -1311,7 +1311,7 @@ png_vsi_write_data(png_structp png_ptr,
+@@ -1330,7 +1330,7 @@
{
png_uint_32 check;
-- check = VSIFWriteL(data, 1, length, (png_FILE_p)(png_ptr->io_ptr));
-+ check = VSIFWriteL(data, 1, length, (png_FILE_p)(png_get_io_ptr(png_ptr)));
+- 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");
-@@ -1322,7 +1322,7 @@ png_vsi_write_data(png_structp png_ptr,
+@@ -1341,7 +1341,7 @@
/************************************************************************/
static void png_vsi_flush(png_structp png_ptr)
{
-- VSIFFlushL( (png_FILE_p)(png_ptr->io_ptr) );
-+ VSIFFlushL( (png_FILE_p)(png_get_io_ptr(png_ptr)) );
+- VSIFFlushL( (VSILFILE*)(png_ptr->io_ptr) );
++ VSIFFlushL( (VSILFILE*)(png_get_io_ptr(png_ptr)) );
}
/************************************************************************/
-@@ -1338,10 +1338,10 @@ static void png_gdal_error( png_structp
+@@ -1357,7 +1357,7 @@
// libpng is generally not built as C++ and so won't honour unwind
// semantics. Ugg.
@@ -41,6 +41,3 @@
if (psSetJmpContext)
{
longjmp( *psSetJmpContext, 1 );
- }
- }
-
Home |
Main Index |
Thread Index |
Old Index