CVS commit: pkgsrc/geography/gdal-lib

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Aug 16 11:58:38 UTC 2024

Modified Files:
        pkgsrc/geography/gdal-lib: Makefile Makefile.common distinfo

Log Message:
geography/gdal-lib: Update to 3.9.2 (also py-gdal)

Drop sqlite3 accomodations, now that using sqlite3 results in a
fully-functional sqlite3 implementation.

Upstream NEWS: bugfixes and minor improvements

(rc2 tested with qgis)


To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 pkgsrc/geography/gdal-lib/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/geography/gdal-lib/Makefile.common
cvs rdiff -u -r1.66 -r1.67 pkgsrc/geography/gdal-lib/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/gdal-lib/Makefile
diff -u pkgsrc/geography/gdal-lib/Makefile:1.175 pkgsrc/geography/gdal-lib/Makefile:1.176
--- pkgsrc/geography/gdal-lib/Makefile:1.175    Thu Jun 27 23:32:31 2024
+++ pkgsrc/geography/gdal-lib/Makefile  Fri Aug 16 11:58:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.175 2024/06/27 23:32:31 gdt Exp $
+# $NetBSD: Makefile,v 1.176 2024/08/16 11:58:38 gdt Exp $
 
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=       ${DISTNAME:S/gdal/gdal-lib/}
@@ -76,19 +76,6 @@ CMAKE_CONFIGURE_ARGS+=       -DNetCDF_DIR=${BU
 #CMAKE_CONFIGURE_ARGS+=        -Dxerces-inc=${BUILDLINK_PREFIX.xerces-c}/include
 #CMAKE_CONFIGURE_ARGS+=        -Dxerces-lib=-L${BUILDLINK_PREFIX.xerces-c}/lib\ -lxerces-c
 
-# gdal wants to use rtree, which is technically optional in sqlite3.
-# While it is present in pkgsrc and NetBSD 10, it is missing in NetBSD
-# 9.  This is messy because base sqlite3 is linked via heimdal and
-# python links with base by default.  Resolving this is hard; it
-# basically amounts to declaring that NetBSD 9 sqlite3 is not
-# acceptable in pkgsrc, and then avoiding base sqlite3 via base
-# heimdal.  It seems likely consensus would form around "gdal is
-# deficient on NetBSD 9" rather than upheaval.
-
-# Don't try to force new/rtree sqlite3, and accept lack of rtree.
-#BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.36.0
-CMAKE_CONFIGURE_ARGS+= -DACCEPT_MISSING_SQLITE3_RTREE:BOOL=ON
-
 .include "options.mk"
 
 CHECK_PORTABILITY_SKIP+=       mkbindist.sh
@@ -98,10 +85,6 @@ INSTALLATION_DIRS=   bin include lib ${PKG
 # \todo: Support geopdf by including poppler, PoDoFo, or PDFium.
 # https://gdal.org/drivers/raster/pdf.html
 
-# NB: spatialite requires sqlite3, so there is the spectre of base/pkg confusion.
-# Therefore, include it first in the baseless hope that helps.
-.include "../../geography/libspatialite/buildlink3.mk"
-
 # \todo Enable zstd
 # .include "../../archivers/zstd/buildlink3.mk"
 
@@ -113,6 +96,7 @@ INSTALLATION_DIRS=   bin include lib ${PKG
 .include "../../geography/geos/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
 .include "../../geography/libgeotiff/buildlink3.mk"
+.include "../../geography/libspatialite/buildlink3.mk"
 .include "../../math/qhull/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"

Index: pkgsrc/geography/gdal-lib/Makefile.common
diff -u pkgsrc/geography/gdal-lib/Makefile.common:1.28 pkgsrc/geography/gdal-lib/Makefile.common:1.29
--- pkgsrc/geography/gdal-lib/Makefile.common:1.28      Thu Jun 27 23:32:31 2024
+++ pkgsrc/geography/gdal-lib/Makefile.common   Fri Aug 16 11:58:38 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.28 2024/06/27 23:32:31 gdt Exp $
+# $NetBSD: Makefile.common,v 1.29 2024/08/16 11:58:38 gdt Exp $
 #
 # used by geography/gdal-lib/Makefile
 # used by geography/py-gdal/Makefile
 
-VERSION_BASE=  3.9.1
+VERSION_BASE=  3.9.2
 PLIST_SUBST+=  VERSION_BASE=${VERSION_BASE}
 # Accomodate testing unreleased versions.
 #VERSION_RC=   rc2

Index: pkgsrc/geography/gdal-lib/distinfo
diff -u pkgsrc/geography/gdal-lib/distinfo:1.66 pkgsrc/geography/gdal-lib/distinfo:1.67
--- pkgsrc/geography/gdal-lib/distinfo:1.66     Thu Jun 27 23:32:31 2024
+++ pkgsrc/geography/gdal-lib/distinfo  Fri Aug 16 11:58:38 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.66 2024/06/27 23:32:31 gdt Exp $
+$NetBSD: distinfo,v 1.67 2024/08/16 11:58:38 gdt Exp $
 
-BLAKE2s (gdal-3.9.1.tar.xz) = b7b4b6ef563e99f73b2e8bff228d924665cab086ecbe67a1dc2abc5c83088723
-SHA512 (gdal-3.9.1.tar.xz) = 5f4edc65ffb1eb187fa83259a25f4a078fbc75e21b39d21b17660a8ccf3322ca13de263ff91531cdf7a2e2871d1dd4275b88af37c122080fc16bef2436e1edb6
-Size (gdal-3.9.1.tar.xz) = 9098844 bytes
+BLAKE2s (gdal-3.9.2.tar.xz) = 38fdc24359f3439818ad3ca69eb95ca7767b8e6a1a232eedbb926680d314d599
+SHA512 (gdal-3.9.2.tar.xz) = b918c6cdd0c14c40ac4ca021cc19439300d34d3d2c3dffce04631ae2d77584bd5c73d16ba2dd54e5771bdb58efb7345356d2c7a8cec912fe774c6a89bb251269
+Size (gdal-3.9.2.tar.xz) = 9102740 bytes
 SHA1 (patch-frmts_grib_degrib_degrib_myutil.c) = 0e046afa236d7e0d6186fe392cb2da05fa5b42c5
 SHA1 (patch-port_cpl__port.h) = 1a8e90085b4390edb4ec2b40b68f83093fbe164d