CVS commit: pkgsrc/geography/gdal-lib

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Mar 22 15:31:12 UTC 2019

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

Log Message:
geography/gdal-lib: Replace std::fabs workaround with fix from upstream


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 pkgsrc/geography/gdal-lib/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/geography/gdal-lib/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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
diff -u pkgsrc/geography/gdal-lib/Makefile:1.111 pkgsrc/geography/gdal-lib/Makefile:1.112
--- pkgsrc/geography/gdal-lib/Makefile:1.111    Sat Mar  9 17:39:01 2019
+++ pkgsrc/geography/gdal-lib/Makefile  Fri Mar 22 15:31:11 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.111 2019/03/09 17:39:01 gdt Exp $
+# $NetBSD: Makefile,v 1.112 2019/03/22 15:31:11 gdt Exp $
 
-#PKGREVISION=  0
+PKGREVISION=   1
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=       ${DISTNAME:S/gdal/gdal-lib/}
 

Index: pkgsrc/geography/gdal-lib/distinfo
diff -u pkgsrc/geography/gdal-lib/distinfo:1.38 pkgsrc/geography/gdal-lib/distinfo:1.39
--- pkgsrc/geography/gdal-lib/distinfo:1.38     Fri Mar 22 14:00:49 2019
+++ pkgsrc/geography/gdal-lib/distinfo  Fri Mar 22 15:31:11 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2019/03/22 14:00:49 gdt Exp $
+$NetBSD: distinfo,v 1.39 2019/03/22 15:31:11 gdt Exp $
 
 SHA1 (gdal-2.4.1.tar.gz) = cb5dec7fe1a6b6cae44f520724ef3e8ac290d8bd
 RMD160 (gdal-2.4.1.tar.gz) = cb46f21e808f67110f3198cb827822342b94a50c
@@ -6,6 +6,6 @@ SHA512 (gdal-2.4.1.tar.gz) = b25e49f3439
 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_ogrlinestring.cpp) = f42faff9f40bcc554a6a8ffdab7d1ad79a03680a
 SHA1 (patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile) = 6a5061b6dd8c3a4fa1ad7c10ddc0b815b41a637d
 SHA1 (patch-port_cpl__conv.cpp) = e0c9d2dac25bc6f69f0af13a2c86ab5f0f521445

Index: pkgsrc/geography/gdal-lib/patches/patch-ogr_ogrlinestring.cpp
diff -u pkgsrc/geography/gdal-lib/patches/patch-ogr_ogrlinestring.cpp:1.1 pkgsrc/geography/gdal-lib/patches/patch-ogr_ogrlinestring.cpp:1.2
--- pkgsrc/geography/gdal-lib/patches/patch-ogr_ogrlinestring.cpp:1.1   Fri Mar 22 14:00:49 2019
+++ pkgsrc/geography/gdal-lib/patches/patch-ogr_ogrlinestring.cpp       Fri Mar 22 15:31:11 2019
@@ -1,15 +1,14 @@
-$NetBSD: patch-ogr_ogrlinestring.cpp,v 1.1 2019/03/22 14:00:49 gdt Exp $
+$NetBSD: patch-ogr_ogrlinestring.cpp,v 1.2 2019/03/22 15:31:11 gdt Exp $
 
-fabs is not in std.   Sent upstream via mail
+Include required header for std::fabs.  From upstream.
 
 --- 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);
+@@ -31,6 +31,7 @@
+ #include "ogr_geos.h"
+ #include "ogr_p.h"
+ 
++#include <cmath>
+ #include <cstdlib>
+ #include <algorithm>
+ #include <limits>