CVS commit: pkgsrc/geography/gdal-lib

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Sep  8 22:48:13 UTC 2021

Modified Files:
        pkgsrc/geography/gdal-lib: Makefile Makefile.common distinfo
        pkgsrc/geography/gdal-lib/patches: patch-port_cpl__conv.cpp
Added Files:
        pkgsrc/geography/gdal-lib/patches: patch-gcore_gdalopeninfo.cpp

Log Message:
geography/gdal*: Update to 3.3.2

Upstream changes are bugfixes.

One bugfix is applied locally and has been fixed differently upstream.

This version mostly passes gdal's tests on NetBSD 9 amd64, if one
rebuilds base sqlite3 with rtree.


To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 pkgsrc/geography/gdal-lib/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/geography/gdal-lib/Makefile.common
cvs rdiff -u -r1.47 -r1.48 pkgsrc/geography/gdal-lib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/gdal-lib/patches/patch-gcore_gdalopeninfo.cpp
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.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.139 pkgsrc/geography/gdal-lib/Makefile:1.140
--- pkgsrc/geography/gdal-lib/Makefile:1.139    Wed Jun 23 20:33:11 2021
+++ pkgsrc/geography/gdal-lib/Makefile  Wed Sep  8 22:48:13 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.139 2021/06/23 20:33:11 nia Exp $
+# $NetBSD: Makefile,v 1.140 2021/09/08 22:48:13 gdt Exp $
 
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=       ${DISTNAME:S/gdal/gdal-lib/}
-PKGREVISION=   2
+#PKGREVISION=  0
 
 COMMENT=       Translator library for raster geospatial data formats
 
@@ -32,6 +32,9 @@ CPPFLAGS+=    -D__STDC_LIMIT_MACROS
 # \todo: Support geopdf by including poppler, PoDoFo, or PDFium.
 # https://gdal.org/drivers/raster/pdf.html
 
+# Avoid NetBSD base sqlite3, which is deficient because it lacks rtree.
+# \todo Enhance pkgsrc to be able to declare that modules are needed.
+#BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.36.0
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"

Index: pkgsrc/geography/gdal-lib/Makefile.common
diff -u pkgsrc/geography/gdal-lib/Makefile.common:1.13 pkgsrc/geography/gdal-lib/Makefile.common:1.14
--- pkgsrc/geography/gdal-lib/Makefile.common:1.13      Mon Jul  5 17:25:29 2021
+++ pkgsrc/geography/gdal-lib/Makefile.common   Wed Sep  8 22:48:13 2021
@@ -1,22 +1,24 @@
-# $NetBSD: Makefile.common,v 1.13 2021/07/05 17:25:29 gdt Exp $
+# $NetBSD: Makefile.common,v 1.14 2021/09/08 22:48:13 gdt Exp $
 #
 # used by geography/gdal-lib/Makefile
 # used by geography/py-gdal/Makefile
 
 # Accomodate testing unreleased versions.
-VERSION_BASE=  3.3.1
+VERSION_BASE=  3.3.2
 #VERSION_RC=   rc1
 VERSION=       ${VERSION_BASE}${VERSION_RC}
 DISTNAME=      gdal-${VERSION}
 EXTRACT_SUFX=  .tar.xz
 CATEGORIES=    geography
-MASTER_SITES=  https://download.osgeo.org/gdal/${VERSION_BASE}/
+MASTER_SITES=  https://download.osgeo.org/gdal/${VERSION_BASE}${VERSION_RC}/
 
 MAINTAINER=    gdt%NetBSD.org@localhost
 #MAINTAINER+=  brook%nmsu.edu@localhost
 HOMEPAGE=      http://www.gdal.org/
 LICENSE=       mit
 
+WRKSRC=                ${WRKDIR}/gdal-${VERSION_BASE}
+
 PATCHDIR=      ${.CURDIR}/../../geography/gdal-lib/patches
 DISTINFO_FILE= ${.CURDIR}/../../geography/gdal-lib/distinfo
 

Index: pkgsrc/geography/gdal-lib/distinfo
diff -u pkgsrc/geography/gdal-lib/distinfo:1.47 pkgsrc/geography/gdal-lib/distinfo:1.48
--- pkgsrc/geography/gdal-lib/distinfo:1.47     Mon Jul  5 17:25:29 2021
+++ pkgsrc/geography/gdal-lib/distinfo  Wed Sep  8 22:48:13 2021
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.47 2021/07/05 17:25:29 gdt Exp $
+$NetBSD: distinfo,v 1.48 2021/09/08 22:48:13 gdt Exp $
 
-SHA1 (gdal-3.3.1.tar.xz) = 43ae8ce8255d0bc60c59331cecde9574780aed3a
-RMD160 (gdal-3.3.1.tar.xz) = 7d2e737733248346201cad75987f258e065dc14d
-SHA512 (gdal-3.3.1.tar.xz) = 54d726d2ca5a2d11ece4ea5aef7d9c71ac4f8fb3a91b489a5f7bc9b16405e0ec82ee9220381f8566a555b6ef05f3241e05b36a5a78eb4f726afb945ba8cbcbcb
-Size (gdal-3.3.1.tar.xz) = 12933888 bytes
+SHA1 (gdal-3.3.2.tar.xz) = 61bdc71dd611e02137400f7dbbc8f219fa21cf3d
+RMD160 (gdal-3.3.2.tar.xz) = 812d7a48b7bdb200ec6a87e6537bd8f2fbd39c2b
+SHA512 (gdal-3.3.2.tar.xz) = 24599095a9185b3ca5170609cbcf682756c9d5f4c43343034f89c1cbb237bc943702c167731c926eaacfb0d5385dede21e5c5c4c27bc6c3b3b8ee18d9e8ceee5
+Size (gdal-3.3.2.tar.xz) = 12940900 bytes
 SHA1 (patch-frmts_grib_degrib_degrib_myutil.c) = 0e046afa236d7e0d6186fe392cb2da05fa5b42c5
-SHA1 (patch-port_cpl__conv.cpp) = dd309911e85512d2a477d55f33f77f79e62482eb
+SHA1 (patch-gcore_gdalopeninfo.cpp) = 1650dd183a97e8b14004349974e08be136363c03
+SHA1 (patch-port_cpl__conv.cpp) = bd77ae1b4cf1bed41be4b8189391156fdc68f57d

Index: pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp
diff -u pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp:1.3 pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp:1.4
--- pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp:1.3      Tue Apr 28 00:24:48 2020
+++ pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp  Wed Sep  8 22:48:13 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-port_cpl__conv.cpp,v 1.3 2020/04/28 00:24:48 gdt Exp $
+$NetBSD: patch-port_cpl__conv.cpp,v 1.4 2021/09/08 22:48:13 gdt Exp $
 
 Avoid visibility define that masks usage that is apparently beyond XOPEN or C99.
 
-Not yet net upstream; waiting until we are caught up.
+Not yet sent upstream.
 
 --- port/cpl_conv.cpp.orig     2020-01-08 11:49:05.000000000 +0000
 +++ port/cpl_conv.cpp

Added files:

Index: pkgsrc/geography/gdal-lib/patches/patch-gcore_gdalopeninfo.cpp
diff -u /dev/null pkgsrc/geography/gdal-lib/patches/patch-gcore_gdalopeninfo.cpp:1.1
--- /dev/null   Wed Sep  8 22:48:13 2021
+++ pkgsrc/geography/gdal-lib/patches/patch-gcore_gdalopeninfo.cpp      Wed Sep  8 22:48:13 2021
@@ -0,0 +1,23 @@
+$NetBSD: patch-gcore_gdalopeninfo.cpp,v 1.1 2021/09/08 22:48:13 gdt Exp $
+
+Upstream code assumes that fopen(dir, 'r') will fail, when POSIX requires
+it to succeed.  Extend the "only on FreeBSD" conditional to all systems.
+
+Fixed differently upstream post 3.3.2 after discussion.
+
+--- gcore/gdalopeninfo.cpp.orig        2021-09-01 09:48:45.000000000 +0000
++++ gcore/gdalopeninfo.cpp
+@@ -213,12 +213,8 @@ retry:  // TODO(schwehr): Stop using got
+ 
+ #endif  // HAVE_READLINK
+ 
+-#ifdef __FreeBSD__
+-    /* FreeBSD 8 oddity: fopen(a_directory, "rb") returns non NULL */
++    /* fopen(dir, "r") is required to succeed, per POSIX */
+     bool bPotentialDirectory = (eAccess == GA_ReadOnly);
+-#else
+-    bool bPotentialDirectory = false;
+-#endif  // __FreeBDS__
+ 
+     /* Check if the filename might be a directory of a special virtual file system */
+     if( STARTS_WITH(pszFilename, "/vsizip/") ||