geogrpahy/geos: Update to 3.9.0

Upstream NEWS:

Changes in 3.9.0beta1
2020-11-27

- New things:
  - MaximumInscribedCircle and LargestEmptyCircle (JTS-530, Paul Ramsey)
  - CAPI: Fixed precision overlay operations (Sandro Santilli, Paul Ramsey)
  - CAPI: GEOSPreparedNearestPoints (#1007, Sandro Santilli)
  - CAPI: GEOSPreparedDistance (#1066, Sandro Santilli)
  - SimpleSTRTree spatial index implementation (Paul Ramsey)
  - Add support for pkg-config for GEOS C API (#1073, Mike Taves)

- Improvements:
  - Stack allocate segments in OverlapUnion (Paul Ramsey)
  - Improve performance of GEOSisValid (Dan Baston)
  - Update geos-config tool for consistency
    and escape paths (https://git.osgeo.org/gitea/geos/geos/pulls/99)
    changes mostly affect CMake MSVC builds (#1015, Mike Taves)
  - Testing on Rasberry Pi 32-bit (berrie) (#1017, Bruce Rindahl, Regina Obe)
  - Replace ttmath with JTS DD double-double implementation (Paul Ramsey)
  - Fix bug in DistanceOp for geometries with empty components (#1026, Paul Ramsey)
  - Remove undefined behaviour in CAPI (#1021, Greg Troxel)
  - Fix buffering issue (#1022, JTS-525, Paul Ramsey)
  - MinimumBoundingCircle.getMaximumDiameter fix (JTS-533, Paul Ramsey)

- Changes:
  - Drop SWIG bindings, including for Ruby and Python (#1076, Mike Taves)

2 files changed, 7 insertions, 57 deletions

diff --git a/geography/geos/patches/patch-ae b/geography/geos/patches/patch-ae
index f1ac95e34d9..278e6c4d792 100644
--- a/geography/geos/patches/patch-ae
+++ b/geography/geos/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.7 2020/03/11 12:52:07 gdt Exp $
+$NetBSD: patch-ae,v 1.8 2021/01/03 01:27:29 gdt Exp $
 
 TODO: explain what's in LDFLAGS.
 TODO: explain why --libs has -L in the first place (vs --ldflags).
 TODO: report upstream.
 
---- tools/geos-config.in.orig	2019-10-03 17:32:04.000000000 +0000
+--- tools/geos-config.in.orig	2020-07-21 18:07:17.000000000 +0000
 +++ tools/geos-config.in
-@@ -58,7 +58,7 @@ case $1 in
-       echo -L@libdir@ -lgeos -lm
+@@ -67,7 +67,7 @@ while test $# -gt 0; do
+       echo -I${prefix}/include
        ;;
      --ldflags)
--      echo -L@libdir@
-+      echo -L@libdir@ @LDFLAGS@
+-      echo -L${libdir}
++      echo -L${libdir} @LDFLAGS@
        ;;
      --includes)
-       echo @prefix@/include
+       echo ${prefix}/include
diff --git a/geography/geos/patches/patch-capi_geos__ts__c.cpp b/geography/geos/patches/patch-capi_geos__ts__c.cpp
deleted file mode 100644
index 9b257e9a6a6..00000000000
--- a/geography/geos/patches/patch-capi_geos__ts__c.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-capi_geos__ts__c.cpp,v 1.6 2020/03/11 23:09:09 gdt Exp $
-
-The geos code passes an object of type std::string to variadic functions
-NOTICE_MESSAGE and ERROR_MESSAGE, which then pass them to va_start.
-Use of non-POD types with varargs is "conditionally supported", which
-without a fixed compiler becomes UB.
-
-To avoid this, change the functions to take const char * rather than
-std::string (and adjust the use of the variables in the functions).
-
-https://trac.osgeo.org/geos/ticket/1021
-
---- capi/geos_ts_c.cpp.orig	2020-03-10 17:19:40.000000000 +0000
-+++ capi/geos_ts_c.cpp
-@@ -233,7 +233,7 @@ typedef struct GEOSContextHandle_HS {
-     }
- 
-     void
--    NOTICE_MESSAGE(string fmt, ...)
-+    NOTICE_MESSAGE(const char *fmt, ...)
-     {
-         if(NULL == noticeMessageOld && NULL == noticeMessageNew) {
-             return;
-@@ -241,7 +241,7 @@ typedef struct GEOSContextHandle_HS {
- 
-         va_list args;
-         va_start(args, fmt);
--        int result = vsnprintf(msgBuffer, sizeof(msgBuffer) - 1, fmt.c_str(), args);
-+        int result = vsnprintf(msgBuffer, sizeof(msgBuffer) - 1, fmt, args);
-         va_end(args);
- 
-         if(result > 0) {
-@@ -255,7 +255,7 @@ typedef struct GEOSContextHandle_HS {
-     }
- 
-     void
--    ERROR_MESSAGE(string fmt, ...)
-+    ERROR_MESSAGE(const char *fmt, ...)
-     {
-         if(NULL == errorMessageOld && NULL == errorMessageNew) {
-             return;
-@@ -263,7 +263,7 @@ typedef struct GEOSContextHandle_HS {
- 
-         va_list args;
-         va_start(args, fmt);
--        int result = vsnprintf(msgBuffer, sizeof(msgBuffer) - 1, fmt.c_str(), args);
-+        int result = vsnprintf(msgBuffer, sizeof(msgBuffer) - 1, fmt, args);
-         va_end(args);
- 
-         if(result > 0) {