CVS commit: pkgsrc/geography/proj

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Apr 27 00:23:07 UTC 2025

Modified Files:
        pkgsrc/geography/proj: Makefile PLIST distinfo
Added Files:
        pkgsrc/geography/proj/patches: patch-src_projections_robin.cpp

Log Message:
geography/proj: Update to 9.6.0

* `projinfo`: display whether an operation is time-dependent (#4255)

* Add CMake options `EMBED_RESOURCE_FILES` and `USE_ONLY_EMBEDDED_RESOURCE_FILES` for `proj.db` and `proj.ini` embedding (#4265, #4274)

* Database: ingest deprecated ESRI names to be able to better import old WKT ESRI (#4282)

* `proj_factors()`: enhance speed when called repeatedly on same compound or projected CRS (#4289)

* Add Airocean projection (formerly Dymaxion) (#4303)

* `createOperations()`: Optimization by avoiding database lookups for CRS (typically PROJ strings) using unknown datums (#4320)

* PROJJSON export: for a Projected CRS, add an explicit type=GeographicCRS/GeodeticCRS members to the base_crs member (#4331)

* `proj_trans_bounds()`: make it work when target CRS is a CompoundCRS (#4333)

* `createOperations()`: do Helmert transformation in 2D when one of source or target CRS is compound (#4337)

* Map EPSG method 'Vertical Offset by Grid Interpolation (asc)' to +proj=vgridshift (#4344)

* Add support for 'Coordinate Frame rotation full matrix (geocen)' and Coordinate Frame rotation full matrix (geog2D)' methods (#4348)

* Add a CMake `EMBED_RESOURCE_DIRECTORY` option to embed .tif/.json files in to libproj (#4349, #4373)

* Take into account new EPSG methods 'Cartesian Grid Offsets by TIN Interpolation (JSON)' and 'Vertical Offset by TIN Interpolation (JSON)' (#4353)

* Added an option `native_ca` to `proj.ini` and an environment variable `PROJ_NATIVE_CA` to be able to configure curl to use the operating system CA store. (#4356)

* Database: add an optional step_direction column to the concatenated_operation_step table (#4357)

* Database: replicate EGM2008 grid transformation record to WGS 84 realizations (#4363)

* Improve ETRFxxx to ETRFyyy, and WGS 84 (xxx) to WGS 84 (yyy) (#4364)

* Build: Update to C++17 version (#4366, #4369)

* Add bash completion script for projinfo (#4371)

* Dispatch content of `4D_api.cpp` into multiple .cpp files (#4393)

* Add `proj_trans_bounds_3D()` (#4394)

* Database: add a engineering_datum and engineering_crs tables; import few related EPSG records (#4396)

* NKG transformations: Add support for EUREF-FIN in Finish transformations (#4399)

* Add Spilhaus projection (#4401)

* Export ESRI:54099 `WGS_1984_Spilhaus_Ocean_Map_in_Square` as PROJ string (#4402)

* Database: update to EPSG v12.004 (#4413)

* `proj_download_file()`: invalidate in-memory caches related to downloaded file (for the current context) (#4414)


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/geography/proj/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/geography/proj/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/geography/proj/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/proj/patches/patch-src_projections_robin.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/proj/Makefile
diff -u pkgsrc/geography/proj/Makefile:1.49 pkgsrc/geography/proj/Makefile:1.50
--- pkgsrc/geography/proj/Makefile:1.49 Thu Apr 24 14:14:09 2025
+++ pkgsrc/geography/proj/Makefile      Sun Apr 27 00:23:07 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2025/04/24 14:14:09 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2025/04/27 00:23:07 gdt Exp $
 
-VERSION_BASE=  9.5.1
+VERSION_BASE=  9.6.0
 # Accommodate testing RCs (names like 9.0RC1, unpacking to 9.0).
 #VERSION_RC=   RC1
 VERSION=       ${VERSION_BASE}${VERSION_RC}

Index: pkgsrc/geography/proj/PLIST
diff -u pkgsrc/geography/proj/PLIST:1.14 pkgsrc/geography/proj/PLIST:1.15
--- pkgsrc/geography/proj/PLIST:1.14    Sun Dec  1 23:29:17 2024
+++ pkgsrc/geography/proj/PLIST Sun Apr 27 00:23:07 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2024/12/01 23:29:17 gdt Exp $
+@comment $NetBSD: PLIST,v 1.15 2025/04/27 00:23:07 gdt Exp $
 bin/cct
 bin/cs2cs
 bin/geod
@@ -37,7 +37,7 @@ lib/cmake/proj4/proj4-targets-release.cm
 lib/cmake/proj4/proj4-targets.cmake
 lib/libproj.so
 lib/libproj.so.25
-lib/libproj.so.25.9.5.1
+lib/libproj.so.25.${PKGVERSION}
 lib/pkgconfig/proj.pc
 man/man1/cct.1
 man/man1/cs2cs.1
@@ -46,6 +46,7 @@ man/man1/gie.1
 man/man1/proj.1
 man/man1/projinfo.1
 man/man1/projsync.1
+share/bash-completion/completions/projinfo
 share/doc/proj/AUTHORS.md
 share/doc/proj/COPYING
 share/doc/proj/NEWS.md

Index: pkgsrc/geography/proj/distinfo
diff -u pkgsrc/geography/proj/distinfo:1.25 pkgsrc/geography/proj/distinfo:1.26
--- pkgsrc/geography/proj/distinfo:1.25 Sun Dec  1 23:29:17 2024
+++ pkgsrc/geography/proj/distinfo      Sun Apr 27 00:23:07 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.25 2024/12/01 23:29:17 gdt Exp $
+$NetBSD: distinfo,v 1.26 2025/04/27 00:23:07 gdt Exp $
 
-BLAKE2s (proj-9.5.1.tar.gz) = 23a3e511a9496dc39ebbf0a8d6e821b64930aea5d5017fafc76d646e85edd1f6
-SHA512 (proj-9.5.1.tar.gz) = 1b2a874f3b2e1343d2cbfff1e81c269cccac6c4a227b159f2d4063ebc4400bc968ed0c5bf66fe4d297b313e917087c8bfd1aa33345a5131ed53254b7130c9e86
-Size (proj-9.5.1.tar.gz) = 5702286 bytes
+BLAKE2s (proj-9.6.0.tar.gz) = 525865aa36ebcf758875ec37b27f5b6a053eef4f0c189eed2e9ae67d0993efa4
+SHA512 (proj-9.6.0.tar.gz) = c152fc0400f073fe6c980aca00905421f65e8b515adea173c56103279c1af232968781479010e1609ad826f087a5448f7a7b37de8a7a2c7ea671b04c63578988
+Size (proj-9.6.0.tar.gz) = 5830688 bytes
+SHA1 (patch-src_projections_robin.cpp) = 42e91b7ae6e5ce3ba83d7f135c64135ef97df76d

Added files:

Index: pkgsrc/geography/proj/patches/patch-src_projections_robin.cpp
diff -u /dev/null pkgsrc/geography/proj/patches/patch-src_projections_robin.cpp:1.1
--- /dev/null   Sun Apr 27 00:23:07 2025
+++ pkgsrc/geography/proj/patches/patch-src_projections_robin.cpp       Sun Apr 27 00:23:07 2025
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_projections_robin.cpp,v 1.1 2025/04/27 00:23:07 gdt Exp $
+
+Fix bare isnan and math includes.   Cherry-picked from pending upstream PR.
+
+https://github.com/OSGeo/PROJ/pull/4471
+
+--- src/projections/robin.cpp.orig     2025-04-27 00:09:12.308976595 +0000
++++ src/projections/robin.cpp
+@@ -1,7 +1,7 @@
+ 
+ #include "proj.h"
+ #include "proj_internal.h"
+-#include <math.h>
++#include <cmath>
+ 
+ PROJ_HEAD(robin, "Robinson") "\n\tPCyl, Sph";
+ 
+@@ -82,7 +82,7 @@ static PJ_XY robin_s_forward(PJ_LP lp, P
+     (void)P;
+ 
+     dphi = fabs(lp.phi);
+-    i = isnan(lp.phi) ? -1 : lround(floor(dphi * C1 + 1e-15));
++    i = std::isnan(lp.phi) ? -1 : lround(floor(dphi * C1 + 1e-15));
+     if (i < 0) {
+         proj_errno_set(P, PROJ_ERR_COORD_TRANSFM_OUTSIDE_PROJECTION_DOMAIN);
+         return xy;
+@@ -116,7 +116,7 @@ static PJ_LP robin_s_inverse(PJ_XY xy, P
+         }
+     } else { /* general problem */
+         /* in Y space, reduce to table interval */
+-        long i = isnan(lp.phi) ? -1 : lround(floor(lp.phi * NODES));
++        long i = std::isnan(lp.phi) ? -1 : lround(floor(lp.phi * NODES));
+         if (i < 0 || i >= NODES) {
+             proj_errno_set(P, PROJ_ERR_COORD_TRANSFM_OUTSIDE_PROJECTION_DOMAIN);
+             return lp;