CVS commit: pkgsrc/geography/gdal-lib

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Mar 22 14:00:49 UTC 2019

Modified Files:
        pkgsrc/geography/gdal-lib: Makefile.common distinfo
Added Files:
        pkgsrc/geography/gdal-lib/patches: patch-ogr_ogrlinestring.cpp

Log Message:
geography/gdal-lib: Update to 2.4.1

pkgsrc changes: add patch to fix or work around std::fabs

upstream changes: bug fixes


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/geography/gdal-lib/Makefile.common
cvs rdiff -u -r1.37 -r1.38 pkgsrc/geography/gdal-lib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/gdal-lib/patches/patch-ogr_ogrlinestring.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/gdal-lib/Makefile.common
diff -u pkgsrc/geography/gdal-lib/Makefile.common:1.4 pkgsrc/geography/gdal-lib/Makefile.common:1.5
--- pkgsrc/geography/gdal-lib/Makefile.common:1.4       Sat Mar  9 17:39:01 2019
+++ pkgsrc/geography/gdal-lib/Makefile.common   Fri Mar 22 14:00:49 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.4 2019/03/09 17:39:01 gdt Exp $
+# $NetBSD: Makefile.common,v 1.5 2019/03/22 14:00:49 gdt Exp $
 #
 # used by geography/gdal-lib/Makefile
 # used by geography/py-gdal/Makefile
 
-VERSION=       2.4.0
+VERSION=       2.4.1
 DISTNAME=      gdal-${VERSION}
 CATEGORIES=    geography
 MASTER_SITES=  http://download.osgeo.org/gdal/${PKGVERSION_NOREV}/

Index: pkgsrc/geography/gdal-lib/distinfo
diff -u pkgsrc/geography/gdal-lib/distinfo:1.37 pkgsrc/geography/gdal-lib/distinfo:1.38
--- pkgsrc/geography/gdal-lib/distinfo:1.37     Sat Mar  9 17:39:01 2019
+++ pkgsrc/geography/gdal-lib/distinfo  Fri Mar 22 14:00:49 2019
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.37 2019/03/09 17:39:01 gdt Exp $
+$NetBSD: distinfo,v 1.38 2019/03/22 14:00:49 gdt Exp $
 
-SHA1 (gdal-2.4.0.tar.gz) = 3420ae8a9644ce652339ecbad18f9024279cd2ba
-RMD160 (gdal-2.4.0.tar.gz) = 7e16bb8fa0e35bec6b76a5b55f221f024ef2cf5d
-SHA512 (gdal-2.4.0.tar.gz) = 9517b23009621ed2622a460dc813b30de726d293531c6f107fb308a31e45a143e67e71aa3af3d1faed554ad516a35924973d714c63ee41445ac8d3b2da61dd10
-Size (gdal-2.4.0.tar.gz) = 14533664 bytes
+SHA1 (gdal-2.4.1.tar.gz) = cb5dec7fe1a6b6cae44f520724ef3e8ac290d8bd
+RMD160 (gdal-2.4.1.tar.gz) = cb46f21e808f67110f3198cb827822342b94a50c
+SHA512 (gdal-2.4.1.tar.gz) = b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
+Size (gdal-2.4.1.tar.gz) = 14546610 bytes
 SHA1 (patch-apps_gdalserver.cpp) = 4a2b8bac29582c8fc02920840ee498026d87acca
 SHA1 (patch-frmts_grib_degrib_degrib_myutil.c) = 0e046afa236d7e0d6186fe392cb2da05fa5b42c5
+SHA1 (patch-ogr_ogrlinestring.cpp) = 3fc6dc50d963c995cc0d56e19a569cd97f257551
 SHA1 (patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile) = 6a5061b6dd8c3a4fa1ad7c10ddc0b815b41a637d
 SHA1 (patch-port_cpl__conv.cpp) = e0c9d2dac25bc6f69f0af13a2c86ab5f0f521445

Added files:

Index: pkgsrc/geography/gdal-lib/patches/patch-ogr_ogrlinestring.cpp
diff -u /dev/null pkgsrc/geography/gdal-lib/patches/patch-ogr_ogrlinestring.cpp:1.1
--- /dev/null   Fri Mar 22 14:00:49 2019
+++ pkgsrc/geography/gdal-lib/patches/patch-ogr_ogrlinestring.cpp       Fri Mar 22 14:00:49 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-ogr_ogrlinestring.cpp,v 1.1 2019/03/22 14:00:49 gdt Exp $
+
+fabs is not in std.   Sent upstream via mail
+
+--- ogr/ogrlinestring.cpp.orig 2019-03-15 12:35:19.000000000 +0000
++++ ogr/ogrlinestring.cpp
+@@ -2551,7 +2551,7 @@ void OGRSimpleCurve::segmentize( double 
+         const double dfX = paoPoints[i+1].x - paoPoints[i].x;
+         const double dfY = paoPoints[i+1].y - paoPoints[i].y;
+         const double dfSquareDist = dfX * dfX + dfY * dfY;
+-        if( std::fabs(dfSquareDist - dfSquareMaxLength) > 1e-5 * dfSquareMaxLength )
++        if( fabs(dfSquareDist - dfSquareMaxLength) > 1e-5 * dfSquareMaxLength )
+         {
+             const double dfIntermediatePoints =
+                 floor(sqrt(dfSquareDist / dfSquareMaxLength) - 1e-2);