Mon Nov 8 14:44:26 2021 UTC ()
geography/gdal: Update to 3.3.3

Upstream changes: bug fixes


(gdt)
diff -r1.142 -r1.143 pkgsrc/geography/gdal-lib/Makefile
diff -r1.14 -r1.15 pkgsrc/geography/gdal-lib/Makefile.common
diff -r1.50 -r1.51 pkgsrc/geography/gdal-lib/distinfo
diff -r1.1 -r0 pkgsrc/geography/gdal-lib/patches/patch-gcore_gdalopeninfo.cpp
diff -r1.38 -r1.39 pkgsrc/geography/py-gdal/Makefile
cvs diff -r1.142 -r1.143 pkgsrc/geography/gdal-lib/Makefile (switch to unified diff)

--- pkgsrc/geography/gdal-lib/Makefile 2021/10/21 00:28:05 1.142
+++ pkgsrc/geography/gdal-lib/Makefile 2021/11/08 14:44:26 1.143
@@ -1,54 +1,54 @@ @@ -1,54 +1,54 @@
1# $NetBSD: Makefile,v 1.142 2021/10/21 00:28:05 gdt Exp $ 1# $NetBSD: Makefile,v 1.143 2021/11/08 14:44:26 gdt Exp $
2 2
3.include "../../geography/gdal-lib/Makefile.common" 3.include "../../geography/gdal-lib/Makefile.common"
4PKGNAME= ${DISTNAME:S/gdal/gdal-lib/} 4PKGNAME= ${DISTNAME:S/gdal/gdal-lib/}
5PKGREVISION= 2 5#PKGREVISION= 0
6 6
7COMMENT= Translator library for raster geospatial data formats 7COMMENT= Translator library for raster geospatial data formats
8 8
9USE_LANGUAGES+= c99 c++11 9USE_LANGUAGES+= c99 c++11
10 10
11# This package intends to link against only libgeos_c, but ends up 11# This package intends to link against only libgeos_c, but ends up
12# also linking to the C++ library libgeos, apparently because of a 12# also linking to the C++ library libgeos, apparently because of a
13# libtool problem. 13# libtool problem.
14# Therefore this package needs revbumping on every geos update. 14# Therefore this package needs revbumping on every geos update.
15 15
16CONFIGURE_ARGS+= --without-python 16CONFIGURE_ARGS+= --without-python
17 17
18CONFIGURE_ARGS+= --with-proj 18CONFIGURE_ARGS+= --with-proj
19CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3} 19CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
20 20
21MAKE_FILE= GNUmakefile 21MAKE_FILE= GNUmakefile
22 22
23.include "options.mk" 23.include "options.mk"
24 24
25CHECK_PORTABILITY_SKIP+= mkbindist.sh 25CHECK_PORTABILITY_SKIP+= mkbindist.sh
26 26
27INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 share/gdal 27INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 share/gdal
28 28
29# jasper uses SIZE_MAX and friends in its headers. 29# jasper uses SIZE_MAX and friends in its headers.
30CPPFLAGS+= -D__STDC_LIMIT_MACROS 30CPPFLAGS+= -D__STDC_LIMIT_MACROS
31 31
32# \todo: Support geopdf by including poppler, PoDoFo, or PDFium. 32# \todo: Support geopdf by including poppler, PoDoFo, or PDFium.
33# https://gdal.org/drivers/raster/pdf.html 33# https://gdal.org/drivers/raster/pdf.html
34 34
35# Avoid NetBSD base sqlite3, which is deficient because it lacks rtree. 35# Avoid NetBSD base sqlite3, which is deficient because it lacks rtree.
36# \todo Enhance pkgsrc to be able to declare that modules are needed. 36# \todo Enhance pkgsrc to be able to declare that modules are needed.
37#BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.36.0 37#BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.36.0
38.include "../../databases/sqlite3/buildlink3.mk" 38.include "../../databases/sqlite3/buildlink3.mk"
39.include "../../devel/netcdf/buildlink3.mk" 39.include "../../devel/netcdf/buildlink3.mk"
40.include "../../devel/pcre/buildlink3.mk" 40.include "../../devel/pcre/buildlink3.mk"
41.include "../../devel/zlib/buildlink3.mk" 41.include "../../devel/zlib/buildlink3.mk"
42.include "../../geography/geos/buildlink3.mk" 42.include "../../geography/geos/buildlink3.mk"
43.include "../../geography/proj/buildlink3.mk" 43.include "../../geography/proj/buildlink3.mk"
44.include "../../geography/libgeotiff/buildlink3.mk" 44.include "../../geography/libgeotiff/buildlink3.mk"
45.include "../../math/qhull/buildlink3.mk" 45.include "../../math/qhull/buildlink3.mk"
46.include "../../graphics/giflib/buildlink3.mk" 46.include "../../graphics/giflib/buildlink3.mk"
47.include "../../graphics/libwebp/buildlink3.mk" 47.include "../../graphics/libwebp/buildlink3.mk"
48.include "../../graphics/openjpeg/buildlink3.mk" 48.include "../../graphics/openjpeg/buildlink3.mk"
49.include "../../graphics/png/buildlink3.mk" 49.include "../../graphics/png/buildlink3.mk"
50.include "../../graphics/tiff/buildlink3.mk" 50.include "../../graphics/tiff/buildlink3.mk"
51.include "../../textproc/libxml2/buildlink3.mk" 51.include "../../textproc/libxml2/buildlink3.mk"
52.include "../../textproc/xerces-c/buildlink3.mk" 52.include "../../textproc/xerces-c/buildlink3.mk"
53.include "../../www/curl/buildlink3.mk" 53.include "../../www/curl/buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/geography/gdal-lib/Makefile.common (switch to unified diff)

--- pkgsrc/geography/gdal-lib/Makefile.common 2021/09/08 22:48:13 1.14
+++ pkgsrc/geography/gdal-lib/Makefile.common 2021/11/08 14:44:26 1.15
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1# $NetBSD: Makefile.common,v 1.14 2021/09/08 22:48:13 gdt Exp $ 1# $NetBSD: Makefile.common,v 1.15 2021/11/08 14:44:26 gdt Exp $
2# 2#
3# used by geography/gdal-lib/Makefile 3# used by geography/gdal-lib/Makefile
4# used by geography/py-gdal/Makefile 4# used by geography/py-gdal/Makefile
5 5
6# Accomodate testing unreleased versions. 6# Accomodate testing unreleased versions.
7VERSION_BASE= 3.3.2 7VERSION_BASE= 3.3.3
8#VERSION_RC= rc1 8#VERSION_RC= rc1
9VERSION= ${VERSION_BASE}${VERSION_RC} 9VERSION= ${VERSION_BASE}${VERSION_RC}
10DISTNAME= gdal-${VERSION} 10DISTNAME= gdal-${VERSION}
11EXTRACT_SUFX= .tar.xz 11EXTRACT_SUFX= .tar.xz
12CATEGORIES= geography 12CATEGORIES= geography
13MASTER_SITES= https://download.osgeo.org/gdal/${VERSION_BASE}${VERSION_RC}/ 13MASTER_SITES= https://download.osgeo.org/gdal/${VERSION_BASE}${VERSION_RC}/
14 14
15MAINTAINER= gdt@NetBSD.org 15MAINTAINER= gdt@NetBSD.org
16#MAINTAINER+= brook@nmsu.edu 16#MAINTAINER+= brook@nmsu.edu
17HOMEPAGE= http://www.gdal.org/ 17HOMEPAGE= http://www.gdal.org/
18LICENSE= mit 18LICENSE= mit
19 19
20WRKSRC= ${WRKDIR}/gdal-${VERSION_BASE} 20WRKSRC= ${WRKDIR}/gdal-${VERSION_BASE}
21 21
22PATCHDIR= ${.CURDIR}/../../geography/gdal-lib/patches 22PATCHDIR= ${.CURDIR}/../../geography/gdal-lib/patches
23DISTINFO_FILE= ${.CURDIR}/../../geography/gdal-lib/distinfo 23DISTINFO_FILE= ${.CURDIR}/../../geography/gdal-lib/distinfo
24 24
25CHECK_PORTABILITY_SKIP+= mkbindist.sh 25CHECK_PORTABILITY_SKIP+= mkbindist.sh
26 26
27USE_TOOLS+= gmake pkg-config 27USE_TOOLS+= gmake pkg-config
28USE_LANGUAGES= c99 c++ 28USE_LANGUAGES= c99 c++
29USE_LIBTOOL= yes 29USE_LIBTOOL= yes
30USE_PKGLOCALEDIR= yes 30USE_PKGLOCALEDIR= yes
31GNU_CONFIGURE= yes 31GNU_CONFIGURE= yes
32CONFIGURE_ARGS+= --with-geos 32CONFIGURE_ARGS+= --with-geos
33CONFIGURE_ARGS+= --with-libjson-c=internal 33CONFIGURE_ARGS+= --with-libjson-c=internal
34CONFIGURE_ARGS+= --with-libtiff=${BUILDLINK_PREFIX.tiff} 34CONFIGURE_ARGS+= --with-libtiff=${BUILDLINK_PREFIX.tiff}
35CONFIGURE_ARGS+= --with-libz=${BUILDLINK_PREFIX.zlib}/include 35CONFIGURE_ARGS+= --with-libz=${BUILDLINK_PREFIX.zlib}/include
36CONFIGURE_ARGS+= --with-netcdf=${BUILDLINK_PREFIX.netcdf} 36CONFIGURE_ARGS+= --with-netcdf=${BUILDLINK_PREFIX.netcdf}
37CONFIGURE_ARGS+= --with-webp=${BUILDLINK_PREFIX.libwebp} 37CONFIGURE_ARGS+= --with-webp=${BUILDLINK_PREFIX.libwebp}
38CONFIGURE_ARGS+= --with-xerces 38CONFIGURE_ARGS+= --with-xerces
39CONFIGURE_ARGS+= --with-xerces-inc=${BUILDLINK_PREFIX.xerces-c}/include 39CONFIGURE_ARGS+= --with-xerces-inc=${BUILDLINK_PREFIX.xerces-c}/include
40CONFIGURE_ARGS+= --with-xerces-lib=-L${BUILDLINK_PREFIX.xerces-c}/lib\ -lxerces-c 40CONFIGURE_ARGS+= --with-xerces-lib=-L${BUILDLINK_PREFIX.xerces-c}/lib\ -lxerces-c
41 41
42# force OpenJPEG for JPEG 2000 support 42# force OpenJPEG for JPEG 2000 support
43CONFIGURE_ARGS+= --without-jasper 43CONFIGURE_ARGS+= --without-jasper
44CONFIGURE_ARGS+= --with-openjpeg 44CONFIGURE_ARGS+= --with-openjpeg
cvs diff -r1.50 -r1.51 pkgsrc/geography/gdal-lib/distinfo (switch to unified diff)

--- pkgsrc/geography/gdal-lib/distinfo 2021/10/26 10:45:09 1.50
+++ pkgsrc/geography/gdal-lib/distinfo 2021/11/08 14:44:26 1.51
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.50 2021/10/26 10:45:09 nia Exp $ 1$NetBSD: distinfo,v 1.51 2021/11/08 14:44:26 gdt Exp $
2 2
3BLAKE2s (gdal-3.3.2.tar.xz) = adab576231bb50cd95ab7d801236f32513cd08de051de3fccea029679b031892 3BLAKE2s (gdal-3.3.3.tar.xz) = 550ab58c940e43d2e7c6703359fe8394b56657e0fcd4f7852ef03fe0d290bbe5
4SHA512 (gdal-3.3.2.tar.xz) = 24599095a9185b3ca5170609cbcf682756c9d5f4c43343034f89c1cbb237bc943702c167731c926eaacfb0d5385dede21e5c5c4c27bc6c3b3b8ee18d9e8ceee5 4SHA512 (gdal-3.3.3.tar.xz) = ef67df029a6051f05872cec58d6f5822a64fa5b130de65acf5c5544856eb92e074574abb840ac540cc8473998e80038fd5e760e3737167e4f507fd3a1df30031
5Size (gdal-3.3.2.tar.xz) = 12940900 bytes 5Size (gdal-3.3.3.tar.xz) = 12946356 bytes
6SHA1 (patch-frmts_grib_degrib_degrib_myutil.c) = 0e046afa236d7e0d6186fe392cb2da05fa5b42c5 6SHA1 (patch-frmts_grib_degrib_degrib_myutil.c) = 0e046afa236d7e0d6186fe392cb2da05fa5b42c5
7SHA1 (patch-gcore_gdalopeninfo.cpp) = 1650dd183a97e8b14004349974e08be136363c03 
8SHA1 (patch-port_cpl__conv.cpp) = bd77ae1b4cf1bed41be4b8189391156fdc68f57d 7SHA1 (patch-port_cpl__conv.cpp) = bd77ae1b4cf1bed41be4b8189391156fdc68f57d
File Deleted: pkgsrc/geography/gdal-lib/patches/Attic/patch-gcore_gdalopeninfo.cpp
cvs diff -r1.38 -r1.39 pkgsrc/geography/py-gdal/Makefile (switch to unified diff)

--- pkgsrc/geography/py-gdal/Makefile 2021/10/21 00:28:05 1.38
+++ pkgsrc/geography/py-gdal/Makefile 2021/11/08 14:44:26 1.39
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile,v 1.38 2021/10/21 00:28:05 gdt Exp $ 1# $NetBSD: Makefile,v 1.39 2021/11/08 14:44:26 gdt Exp $
2 2
3.include "../../geography/gdal-lib/Makefile.common" 3.include "../../geography/gdal-lib/Makefile.common"
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5PKGREVISION= 2 5#PKGREVISION= 0
6 6
7COMMENT= Translator library for raster geospatial data formats, Python binding 7COMMENT= Translator library for raster geospatial data formats, Python binding
8 8
9BUILD_DIRS= swig/python 9BUILD_DIRS= swig/python
10 10
11MAKE_FILE= GNUmakefile 11MAKE_FILE= GNUmakefile
12 12
13PYTHON_VERSIONS_INCOMPATIBLE= 27 13PYTHON_VERSIONS_INCOMPATIBLE= 27
14PYTHON_VERSIONS_INCOMPATIBLE+= 36 # py-numpy 14PYTHON_VERSIONS_INCOMPATIBLE+= 36 # py-numpy
15 15
16REPLACE_PYTHON+= swig/python/scripts/*py 16REPLACE_PYTHON+= swig/python/scripts/*py
17 17
18INSTALLATION_DIRS= bin 18INSTALLATION_DIRS= bin
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22EGG_NAME?= GDAL-${VERSION_BASE} 22EGG_NAME?= GDAL-${VERSION_BASE}
23EGG_INFODIR?= ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info 23EGG_INFODIR?= ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
24PLIST_SUBST+= PYSITELIB=${PYSITELIB} 24PLIST_SUBST+= PYSITELIB=${PYSITELIB}
25PLIST_SUBST+= EGG_NAME=${EGG_NAME}-py${PYVERSSUFFIX} 25PLIST_SUBST+= EGG_NAME=${EGG_NAME}-py${PYVERSSUFFIX}
26PLIST_SUBST+= EGG_INFODIR=${EGG_INFODIR} 26PLIST_SUBST+= EGG_INFODIR=${EGG_INFODIR}
27PRINT_PLIST_AWK+= { gsub(/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/, \ 27PRINT_PLIST_AWK+= { gsub(/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/, \
28 "$${EGG_INFODIR}") } 28 "$${EGG_INFODIR}") }
29 29
30.include "../../geography/gdal-lib/buildlink3.mk" 30.include "../../geography/gdal-lib/buildlink3.mk"
31.include "../../lang/python/tool.mk" 31.include "../../lang/python/tool.mk"
32.include "../../lang/python/application.mk" 32.include "../../lang/python/application.mk"
33.include "../../lang/python/extension.mk" 33.include "../../lang/python/extension.mk"
34.include "../../math/py-numpy/buildlink3.mk" 34.include "../../math/py-numpy/buildlink3.mk"
35.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"