CVS commit: pkgsrc/geography/proj

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Sep  1 13:33:50 UTC 2024

Modified Files:
        pkgsrc/geography/proj: Makefile PLIST buildlink3.mk distinfo

Log Message:
geography/proj: Update to 9.4.1

I judge this update (8.2.1 to 9.4.1) safe because there have been no
API withdrawals, and I've been using it for a while, building and
mapserver.

packaging changes:
  - switch to cmake because upstream withdrew autoconf :-(
  - add nlohmann-json dependency (undocumented)
  - add google-test dependency (undocumented)

Upstream NEWS, less normal updates (e.g. EPSG database) and other
housekeeping, bugfixes, minor improvements follows.

9.4.1 Release Notes
-------------------

 Updates
 -------

 o Database: update to EPSG v11.006 (#4086)

 o Database: update ESRI dataset to ArcGIS Pro 3.3 (#4143)

9.4.0 Release Notes
-------------------

 Updates
 -------

 o Add support for transformations involving coordinate epoch changes
   (PointMotionOperation), specifically for Canadian NAD83(CSRS)(#3884)

 o SSL_OPTIONS: set SSL options on Curl library (#3936)

 o Add support for unity builds (#3962)

 o Added ability to install *.tif if present in data (#3970)

 o createOperationsCompoundToGeog(): tune selection logic
   when --grid-check known_available is specified (#3990)

 o Increase CMake minimum version from 3.9 to 3.16 (#3997)

 o CMake: use FetchContent to get googletest-1.12.1 (#4006)

 o CMake: Replace custom FindSqlite3 with FindSQLite3 built-in (#4007)

 o tpeqd: use numerically stable formula for computing the central angle
   from (phi_1, lam_1) to (phi_2, lam_2) (#4009)

 o Move content of proj_experimental.h to proj.h (#4019)

 o Add +proj=mod_krovak projection method for Modified Krovak that
   applies to S-JTSK/05 in the Czech Republic (#4021)

 o PROJString formatter optimizer: simplify pipelines doing
   [Modified]Krovak (South West) <--> [Modified]Krovak (East North)
   by just doing an axis swap (#4034)

 o +proj=gridshift: enhance to support grids referenced in projected CRS,
   and with easting_offset/northing_offset corrections (#4038)

 o Tune concatenated operation instanciation, reference CR2005 geoid for
   Czechia and add (disabled by default) records for Czechia S-JTSK/05 based
   transformations (#4044)

 o Database: update to EPSG v11.004 (#4062)

9.3.1 Release Notes
-------------------

 Updates
 -------

 o Update to EPSG 10.098 (#3968)

 o Update ESRI objects to v3.2.0 (#3944)

9.3.0 Release Notes
-------------------

 Updates
 -------

 o Add C++ API to transform coordinate (#3705)

 o CMake: add PROJ_DB_CACHE_DIR (#3711)

 o Implement EPSG:1026 Mercator (Spherical) method (#3741)

 o CMake: remove useless cross-compiling related checks (#3747)

 o Add mapping of Equidistant Conic to new EPSG:1119 method (#3812)

 o Implement proposal001 from Planetary DWG from OGC (#3816)

 o Add option in proj CLI to use a CRS (#3825)

 o proj_factors(): make it work with projected CRS with non-metre unit and/or
   northing/easting axis order (#3826)

 o PROJ_DEBUG: make ON an alias of 2, and OFF of 1 (#3835)

 o Database: update to EPSG 10.094 (#3847)

9.2.1 Release Notes
-------------------

 Database updates
 ----------------

 o Add alias for old ESRI datum/CRS names of EPSG:8353
   S_JTSK_JTSK03_Krovak_East_North (#3678)

 o Pseudo Mercator now supported with IAU CRS's (#3645)

 o Updated to EPSG 10.088 (#3731)

9.2.0 Release Notes
-------------------

 Updates
 --------

 + Database

    o EPSG updated to EPSG 10.082 (#3609)

    o ESRI objects updated to v3.1.0 (#3575)

    o Added Slovenian geoid model SLO-VRP2016/Koper (#3610)

 + Projections

   o Added generic Space Oblique Mercator (#3338)

   o Inverse eck4: Add checks for projection domain (#3625)

 + Transformations

   o Added support for NADCON5 grids and transformation method (#3510)

   o Added option ONLY_BEST=YES (#3535)

     When enabled only use the best possible transformation between two CRS's can be
     instantiated. If the best possible transfomations can't be instantiated it will
     fail instead of opting for the next best transformation.

     With ONLY_BEST=YES a transformation will fail if a needed grid is unavailable.

     The option can be toggled in proj.ini and with --only-best in cs2cs.

    o Implement 'Similarity transformation' (EPSG:9621) and import related
      tranformations from EPSG (#3578)

    o Optimise transformations between GDA94, GDA2020 and WGS84 (#3621)

 + Performance improvements

   o Pass PJ_COORD by reference for fwd4d and inv4d callbacks (#3503)

   o Improved of inverse meridian length calculations (#3516)

   o Avoid very poor performance on a geographic CRS whose datum name is the alias
     of an official one (#3624)

 + Well-Known Text improvements

   o Support WKT:2019 COORDINATEMETADATA[] construct (#2711)

   o implement alterCSLinearUnit for CompoundCRS (#3325)

   o Implement alterCSLinearUnit for BoundCRS (#3327)

   o Added PJ_TYPE_DERIVED_PROJECTED_CRS (#3488)

   o Added support for ISO19111 CoordinateMetadata class (#3562)

   o Update WKT import to support WKT2 corrigendum (#3573)

   o WKT import: Make axis direction and range meaning enumeration case
     insensitive as mandated by spec (#3577)

   o Implement AffineCS and handle it in WKT (#3579)

   o WKT1 parser: Support inf as inverse flattening value (#3626)

 + PROJJSON

   o Version number changed to 0.6

   o Added an additional optional source_crs property in abridged_transformation (#3454)

   o Added support for ISO19111 CoordinateMetadata class (#3562)

   o Implement AffineCS and handle it in PROJJSON (#3579)

 + C/C++ API

   o C API: add proj_get_domain_count(), proj_get_area_of_use_ex() and proj_get_scope_ex() (#3588)

   DEPRECATIONS

   The following functions have been deprecated and will be removed in a future version.

   o C API function proj_rtodms. Use proj_rtodms2 instead (#3431)

   o C experimental API function proj_create_conversion_tunisia_mapping_grid().
     Use proj_create_conversion_tunisia_mining_grid() instead (#3559)

   o C++ API function createTunisiaMapingGrid(). Use createTunisiaMiningGrid() instead (#3559)

   o Added explicit NaN handling to proj_trans and gie (#3603)

9.1.1 Release Notes
-------------------

 Updates
 --------

 o Database: register at_bev_AT_GIS_GRID_2021_09_28 grid (#3442)

9.1.0 Release Notes
-------------------

 Updates
 --------

 + Database

  o Database: update to EPSG v10.074 (#3273)

  o Update ESRI objects to version 3.0.0 (#3257)

  o Generate null transformation between geodetic/vertical datum ensemble and
    its members (#3266)

  o Add fk delete cascade to database tables for improved customizability
    of the database (#3237)

  o Add Svalbard geoid grid no_kv_arcgp-2006-sk to grid alternatives (#3292)

  o Added French grid fr_ign_RAF20 to grid alternatives (#3228)

 + WKT & PROJJSON

  o WKT2 parser: allow unit-less PARAMETER for coordinate operations (#3271)

  o WKT and PROJJSON adjustments (#3234)

  o Bump PROJJSON to v0.5 (#3216)

  o Change order of horizontal and vertical operations when dealing with
    WKT1 / PROJ4 compound CRS (#3127)

 + Coordinate Operations

  o Implement Vertical Offset and slope transformation method (#3200)

  o Add Interrupted Mollweide (land and ocean view) projections (#3139)

  o Add invertible Horner polynomials (#3133)

 + Optimizations

  o NTv2 and GTX grid readers: add a cache of lines to speed-up (#3241)

  o IComparable::isEquivalentTo() optimizations (#3233)

 + Various Updates

  o createOperations() / proj_trans(): better take into account area of
    interest name / do not only keep first returned coordinate operation (#3282)

  o createOperations(): take into account axis unit and inversion of target
    DerivedProjectedCRS (#3281)

  o Allow a Compound CRS with derived projected (#3283)

  o Make "Vertical Offset and Slope" method usable as a deriving conversion of
    a DerivedVerticalCRS (#3270)

  o PROJ pipeline generator: recognize opposite Helmert transformations using
    a different convention (#3265)

  o createOperations(): prefer simpler pipelines / affects WGS 84 to
    GDA94/GDA2020 (#3248)

  o Make it possible to determine which grid files were actually used during a
    transformation (#3180)

  o Transformation: no longer do vertical trasnformation when doing compound CRS
    to 2D CRS / add --3d to cs2cs (#3119)

  o Deprecate PROJ4 CMake name (#3094)

  o Use GNUInstallDirs for CMake install locations (#3100)

  o Introduce PROJ_DATA environment variable to deprecate PROJ_LIB (#3253)

9.0.1 Release Notes
-------------------

 Database updates
 -------

 o Update to EPSG 10.064 (#3208)

 o Add OGC:CRS84h (WGS 84 longitude-latitude-height) (#3155)

9.0.0 Release Notes
-------------------

 Breaking Changes
 ----------------

 o Support for the autotools build system has been removed (#3027)
   See RFC7 for details: https://proj.org/community/rfc/rfc-7.html

 Updates
 --------

 o Database updates:

  + ESRI projection engine db to version 12.9 (#2943)

  + EPSG v10.054 (#3051)

  + Vertical grid files for PL-geoid-2011, Polish geoid model (#2960)

  + Belgian geoid model hBG18 to grid alternatives (#3044)

 o Add new option to proj_create_crs_to_crs_from_pj method to force +over on
   transformation operations (#2914)

 o Specify CMAKE_INSTALL_RPATH for macOS; use -rpath LDFLAGS for tests (#3009)

 o Implement Geographic3D to Depth/Geog2D+Depth as used by ETRS89 to CD Norway
   depth (#3010)

 o Allow PROJ_LIB paths wrapped with double quotes (#3031)

 o Use external gtest by default when possible (#3035)

 o CMake: make BUILD_SHARED_LIBS=ON the default even on Windows (#3042)

 o proj.ini: add a 'ca_bundle_path' variable (#3049)


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/geography/proj/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/geography/proj/PLIST
cvs rdiff -u -r1.22 -r1.23 pkgsrc/geography/proj/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/geography/proj/distinfo

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.40 pkgsrc/geography/proj/Makefile:1.41
--- pkgsrc/geography/proj/Makefile:1.40 Wed May 29 16:32:48 2024
+++ pkgsrc/geography/proj/Makefile      Sun Sep  1 13:33:50 2024
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.40 2024/05/29 16:32:48 adam Exp $
+# $NetBSD: Makefile,v 1.41 2024/09/01 13:33:50 gdt Exp $
 
-# An update to 9 is on hold until I can assess if it causes trouble.
-VERSION_BASE=  8.2.1
-# Accomodate testing RCs, whcih have names like 9.0RC1 and unpack to
-# 9.0.
+VERSION_BASE=  9.4.1
+# Accommodate testing RCs (names like 9.0RC1, unpacking to 9.0).
 VERSION_RC=
 VERSION=       ${VERSION_BASE}${VERSION_RC}
 WRKFINAL=      proj-${VERSION_BASE}
 WRKSRC=                ${WRKDIR}/${WRKFINAL}
 DISTNAME=      proj-${VERSION}
-PKGREVISION=   1
 CATEGORIES=    geography
 MASTER_SITES=  https://download.osgeo.org/proj/
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
@@ -29,7 +26,12 @@ USE_CXX_FEATURES=    c++11
 
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config
-GNU_CONFIGURE=         yes
+
+TOOL_DEPENDS+=         sqlite3>=3.10.0:../../databases/sqlite3
+
+CMAKE_CONFIGURE_ARGS+= -DRUN_NETWORK_DEPENDENT_TESTS=OFF
+
+.include "../../devel/cmake/build.mk"
 
 # \todo GC this after resolving test issues.
 #.if ${OPSYS} == "NetBSD"
@@ -40,10 +42,19 @@ GNU_CONFIGURE=              yes
 CXXFLAGS.SunOS+=       -fpermissive
 
 # \todo Debug geodtest failure, after we are up to date.
-TEST_TARGET=           check
+TEST_TARGET=           test
 
+# Dependencies documented by upstream
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+
+# Dependencies not documented by upstream
+#  reported 20240527
+.include "../../devel/googletest/buildlink3.mk"
+#  reported 20240527
+.include "../../textproc/nlohmann-json/buildlink3.mk"
+#  not yet reported
 .include "../../mk/pthread.buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/geography/proj/PLIST
diff -u pkgsrc/geography/proj/PLIST:1.11 pkgsrc/geography/proj/PLIST:1.12
--- pkgsrc/geography/proj/PLIST:1.11    Thu May 23 13:35:58 2024
+++ pkgsrc/geography/proj/PLIST Sun Sep  1 13:33:50 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2024/05/23 13:35:58 gdt Exp $
+@comment $NetBSD: PLIST,v 1.12 2024/09/01 13:33:50 gdt Exp $
 bin/cct
 bin/cs2cs
 bin/geod
@@ -12,6 +12,7 @@ include/geodesic.h
 include/proj.h
 include/proj/common.hpp
 include/proj/coordinateoperation.hpp
+include/proj/coordinates.hpp
 include/proj/coordinatesystem.hpp
 include/proj/crs.hpp
 include/proj/datum.hpp
@@ -22,7 +23,21 @@ include/proj/util.hpp
 include/proj_constants.h
 include/proj_experimental.h
 include/proj_symbol_rename.h
-lib/libproj.la
+lib/cmake/proj/proj-config-version.cmake
+lib/cmake/proj/proj-config.cmake
+lib/cmake/proj/proj-targets-release.cmake
+lib/cmake/proj/proj-targets.cmake
+lib/cmake/proj/proj4-targets-release.cmake
+lib/cmake/proj/proj4-targets.cmake
+lib/cmake/proj4/proj-targets-release.cmake
+lib/cmake/proj4/proj-targets.cmake
+lib/cmake/proj4/proj4-config-version.cmake
+lib/cmake/proj4/proj4-config.cmake
+lib/cmake/proj4/proj4-targets-release.cmake
+lib/cmake/proj4/proj4-targets.cmake
+lib/libproj.so
+lib/libproj.so.25
+lib/libproj.so.25.9.4.1
 lib/pkgconfig/proj.pc
 man/man1/cct.1
 man/man1/cs2cs.1

Index: pkgsrc/geography/proj/buildlink3.mk
diff -u pkgsrc/geography/proj/buildlink3.mk:1.22 pkgsrc/geography/proj/buildlink3.mk:1.23
--- pkgsrc/geography/proj/buildlink3.mk:1.22    Mon Jun 10 09:44:04 2024
+++ pkgsrc/geography/proj/buildlink3.mk Sun Sep  1 13:33:50 2024
@@ -1,16 +1,20 @@
-# $NetBSD: buildlink3.mk,v 1.22 2024/06/10 09:44:04 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2024/09/01 13:33:50 gdt Exp $
 
 BUILDLINK_TREE+=       proj
 
 .if !defined(PROJ_BUILDLINK3_MK)
+
 PROJ_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.proj+=   proj>=5.0.0
-BUILDLINK_ABI_DEPENDS.proj+=   proj>=8.2.1
-BUILDLINK_PKGSRCDIR.proj?=     ../../geography/proj
+# Proj withdrew the old API with 8.0.0.
+BUILDLINK_API_DEPENDS.proj+=   proj>=8.0.0
+BUILDLINK_ABI_DEPENDS.proj+=   proj>=9.4.0
+BUILDLINK_PKGSRCDIR.proj?=     ../../wip/proj
+
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+
 .endif # PROJ_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -proj

Index: pkgsrc/geography/proj/distinfo
diff -u pkgsrc/geography/proj/distinfo:1.21 pkgsrc/geography/proj/distinfo:1.22
--- pkgsrc/geography/proj/distinfo:1.21 Mon Jun 10 09:41:52 2024
+++ pkgsrc/geography/proj/distinfo      Sun Sep  1 13:33:50 2024
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.21 2024/06/10 09:41:52 jperkin Exp $
+$NetBSD: distinfo,v 1.22 2024/09/01 13:33:50 gdt Exp $
 
-BLAKE2s (proj-8.2.1.tar.gz) = 2d7629837ac2cdf2d7a60e9c3717dc2dda5506d81326f78f24b3fb5ee6847ab1
-SHA512 (proj-8.2.1.tar.gz) = c6164771fd492be5aa91d8dd2f2794a19b47431078f148356aa70dee96a4589ec5decbab9d8dd756a7bcb322ad94935750c22e0e7fb16e21c8f59ca474e7137e
-Size (proj-8.2.1.tar.gz) = 5882136 bytes
-SHA1 (patch-src_proj__json__streaming__writer.hpp) = a74be3b825a3967d8575cb3644bdaac5c080fb8b
-SHA1 (patch-src_projections_s2.cpp) = 0afc66d0cc71a8e7ce92527f4538c741775f00f3
+BLAKE2s (proj-9.4.1.tar.gz) = 6a283bfcc15e0da5b41abfbc23a5d5346ad1cdd4cc8d6781143d12bf502313f8
+SHA512 (proj-9.4.1.tar.gz) = e9e4a80125a9481709fa7a16c8ceed7c5480c1d9152fe0c16ff69cd976081b9f41e23783459ee2a50771ec7f6210f46167de5af9ee943ff274bd27a1de4b6305
+Size (proj-9.4.1.tar.gz) = 5665272 bytes