summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhans <hans@pkgsrc.org>2012-05-04 13:27:23 +0000
committerhans <hans@pkgsrc.org>2012-05-04 13:27:23 +0000
commit07102bf573a2615563af5ed1cab2657223d9bb15 (patch)
tree223a47f54f955c3c1d599f8bc3071c14cda00a03
parentb9d89e824395195d1280c1d90ea4fcdd914f7bb3 (diff)
downloadpkgsrc-07102bf573a2615563af5ed1cab2657223d9bb15.tar.gz
Fix build with gcc 4.6
-rw-r--r--geography/gdal-lib/distinfo3
-rw-r--r--geography/gdal-lib/patches/patch-frmts_netcdf_netcdfdataset.cpp13
2 files changed, 15 insertions, 1 deletions
diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo
index 50b1350267f..959aed005af 100644
--- a/geography/gdal-lib/distinfo
+++ b/geography/gdal-lib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.18 2012/03/07 16:17:05 adam Exp $
+$NetBSD: distinfo,v 1.19 2012/05/04 13:27:23 hans Exp $
SHA1 (gdal-1.9.0.tar.gz) = e2eaaf0fba39137b40c0d3069ac41dfb6f3c76db
RMD160 (gdal-1.9.0.tar.gz) = 76957dd3f9dfd3b86281250f3be691f38ec4d762
Size (gdal-1.9.0.tar.gz) = 9435584 bytes
SHA1 (patch-configure) = 2da57c3b45b82b49d3c08217557c304f794e81ce
+SHA1 (patch-frmts_netcdf_netcdfdataset.cpp) = e7d67936e13177284aa07ac12e534477a1cc26d9
diff --git a/geography/gdal-lib/patches/patch-frmts_netcdf_netcdfdataset.cpp b/geography/gdal-lib/patches/patch-frmts_netcdf_netcdfdataset.cpp
new file mode 100644
index 00000000000..20d79da7831
--- /dev/null
+++ b/geography/gdal-lib/patches/patch-frmts_netcdf_netcdfdataset.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-frmts_netcdf_netcdfdataset.cpp,v 1.1 2012/05/04 13:27:23 hans Exp $
+
+--- frmts/netcdf/netcdfdataset.cpp.orig 2012-01-04 08:03:37.000000000 +0100
++++ frmts/netcdf/netcdfdataset.cpp 2012-05-04 15:08:15.080833521 +0200
+@@ -962,7 +962,7 @@ void netCDFRasterBand::CheckValidData (
+ /* check for nodata and nan */
+ if ( CPLIsEqual( (double) ((T *)pImage)[i], dfNoDataValue ) )
+ continue;
+- if( bCheckIsNan && CPLIsNan( ( (T *) pImage)[i] ) ) {
++ if( bCheckIsNan && CPLIsNan( (double) ( (T *) pImage)[i] ) ) {
+ ( (T *)pImage )[i] = (T)dfNoDataValue;
+ continue;
+ }