diff options
author | gdt <gdt@pkgsrc.org> | 2021-03-01 19:07:51 +0000 |
---|---|---|
committer | gdt <gdt@pkgsrc.org> | 2021-03-01 19:07:51 +0000 |
commit | ab5550a210d3a8fc08121092fa64aa2e60fc278f (patch) | |
tree | 7b2931d3c1d30b3893f8b448883aa9935a3c714d /geography | |
parent | 74bc479cdf6ff50cc4e2723976b05758f7f62631 (diff) | |
download | pkgsrc-ab5550a210d3a8fc08121092fa64aa2e60fc278f.tar.gz |
geography/gdal-lib: Update to 3.2.1
This is a long overdue update which skips the 3.1 major release.
py-gdal is also udpated.
Besides what is noted in upstream NEWS, gdalserver has been withdrawn.
See NEWS in the source tarball; this pkgsrc update corresponds to 1452
lines.
= GDAL/OGR 3.2.0 Release Notes =
== In a nutshell... ==
* New GDAL drivers:
- ESRIC: ESRI bundle cache read-only driver (#2663)
- HEIF: read-only driver for HEIF/HEIC file. Requires libheif
- OGCAPI: tiles/maps/coverage raster/vector experimental driver
- TGA: read/only driver to read TGA image file format
* New OGR drivers:
- LVBAG: read-only support for Dutch LVBAG/Kadaster 2.0 vector format
* New utilities:
- gdal_create: to create/initialize a new raster file
* Other improvements:
- Multi-threaded overview computation (if GDAL_NUM_THREADS set)
- COG driver: TILING_SCHEME creation option
- OpenFileGDB driver: add support for using spatial indexes
- BAG driver: multiple improvements
- FITS driver: multiple improvements (MEF and binary table support)
- NITF driver: support for SNIP TREs
- OGRFieldDefn: support UNIQUE constraint
- OGRFieldDefn: support a AlternativeName (alias) property (#2729)
- Python bindings: move implementation of scripts (except gdal2tiles) in osgeo.utils package to be reusable
- Faster GTIFF Deflate compression/decompression through libdeflate (if using internal libtiff or libtiff > 4.1.0)
* Removed functionality:
- Python bindings: old-style "import gdal" is no longer available. Use "from osgeo import gdal" instead
- API_PROXY mechanism: likely never used for real usage.
- Removal of GDAL and OGR ArcSDE drivers
== Backward compatibility issues ==
See MIGRATION_GUIDE.txt
= GDAL/OGR 3.1.0 Release Notes =
== In a nutshell... ==
* Implement RFC 75: support for multidimensional arrays in MEM, VRT, netCDF, HDF4, HDF5 and GRIB drivers. Read/write for MEM and netCDF. Read/only for others. Add gdalmdiminfo and gdalmdimtranslate utilities.
* Implement RFC76: add capability of writing vector drivers in Python
* New GDAL drivers:
- COG: write-only, for Cloud Optimized GeoTIFF
- EXR: read/write driver, relying on OpenEXR library
- ISG: read-only, for geoid models of the International Service for the Geoid
- RDB: read-only, for RIEGL Database .mpx RDB 2 files (#1538) (needs proprietary SDK)
* New OGR drivers:
- FlatGeoBuf: read-support and creation (#1742)
- MapML: read/write driver for experimental web spec
* Improved drivers:
- OAPIF driver (renamed from WFS3): updated to OGC API - Features 1.0 core spec
- GTiff: improve performance of internal overview creation
- GTiff: GeoTIFF 1.1 support
- Shapefile driver: add read/creation/update support for .shz and .shp.zip
- netCDF vector: read/write support for CF-1.8 Encoded Geometries (#1287)
- VICAR: multiple improvements and write support (#1855)
- DDS: add read support
* Other improvements:
- gdalwarp: accept output drivers with only CreateCopy() capabilities
- gdal_viewshed: new utility for viewshed algorithm
* Remove GFT driver now that the online service no longer exists (#2050)
* New Sphinx-based documentation
* Multiple security related fixes (ossfuzz)
* Continued code linting (cppcheck, CoverityScan, etc.)
* Compatibility with GDAL 3.0:
- C and C++ API: backward compatible changes
- C ABI: backward compatible changes
- C++ ABI: modified
- Functional changes: see MIGRATION_GUIDE.TXT
Diffstat (limited to 'geography')
-rw-r--r-- | geography/gdal-lib/Makefile | 6 | ||||
-rw-r--r-- | geography/gdal-lib/Makefile.common | 6 | ||||
-rw-r--r-- | geography/gdal-lib/PLIST | 15 | ||||
-rw-r--r-- | geography/gdal-lib/distinfo | 12 | ||||
-rw-r--r-- | geography/gdal-lib/patches/patch-apps_gdalserver.cpp | 26 | ||||
-rw-r--r-- | geography/gdal-lib/patches/patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile | 19 | ||||
-rw-r--r-- | geography/py-gdal/Makefile | 5 | ||||
-rw-r--r-- | geography/py-gdal/PLIST | 63 |
8 files changed, 77 insertions, 75 deletions
diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile index c17559de724..ce65f8825e1 100644 --- a/geography/gdal-lib/Makefile +++ b/geography/gdal-lib/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.133 2021/02/11 13:56:24 gdt Exp $ +# $NetBSD: Makefile,v 1.134 2021/03/01 19:07:51 gdt Exp $ -PKGREVISION= 7 +#PKGREVISION= 0 .include "../../geography/gdal-lib/Makefile.common" PKGNAME= ${DISTNAME:S/gdal/gdal-lib/} -HOMEPAGE= http://www.gdal.org/ COMMENT= Translator library for raster geospatial data formats -LICENSE= mit USE_LANGUAGES+= c99 c++11 diff --git a/geography/gdal-lib/Makefile.common b/geography/gdal-lib/Makefile.common index 75347b31644..eff042993da 100644 --- a/geography/gdal-lib/Makefile.common +++ b/geography/gdal-lib/Makefile.common @@ -1,15 +1,17 @@ -# $NetBSD: Makefile.common,v 1.9 2020/04/28 23:50:03 gdt Exp $ +# $NetBSD: Makefile.common,v 1.10 2021/03/01 19:07:51 gdt Exp $ # # used by geography/gdal-lib/Makefile # used by geography/py-gdal/Makefile -VERSION= 3.0.4 +VERSION= 3.2.1 DISTNAME= gdal-${VERSION} CATEGORIES= geography MASTER_SITES= http://download.osgeo.org/gdal/${PKGVERSION_NOREV}/ MAINTAINER= gdt@NetBSD.org #MAINTAINER+= brook@nmsu.edu +HOMEPAGE= http://www.gdal.org/ +LICENSE= mit PATCHDIR= ${.CURDIR}/../../geography/gdal-lib/patches DISTINFO_FILE= ${.CURDIR}/../../geography/gdal-lib/distinfo diff --git a/geography/gdal-lib/PLIST b/geography/gdal-lib/PLIST index d9ab9d8caba..e517d7de4e0 100644 --- a/geography/gdal-lib/PLIST +++ b/geography/gdal-lib/PLIST @@ -1,10 +1,12 @@ -@comment $NetBSD: PLIST,v 1.18 2020/04/28 23:50:03 gdt Exp $ +@comment $NetBSD: PLIST,v 1.19 2021/03/01 19:07:51 gdt Exp $ @pkgdir lib/gdalplugins bin/gdal-config bin/gdal_contour +bin/gdal_create bin/gdal_grid bin/gdal_rasterize bin/gdal_translate +bin/gdal_viewshed bin/gdaladdo bin/gdalbuildvrt bin/gdaldem @@ -12,7 +14,8 @@ bin/gdalenhance bin/gdalinfo bin/gdallocationinfo bin/gdalmanage -bin/gdalserver +bin/gdalmdiminfo +bin/gdalmdimtranslate bin/gdalsrsinfo bin/gdaltindex bin/gdaltransform @@ -87,6 +90,7 @@ include/ogr_geometry.h include/ogr_p.h include/ogr_spatialref.h include/ogr_srs_api.h +include/ogr_swq.h include/ogrsf_frmts.h include/rawdataset.h include/vrtdataset.h @@ -104,6 +108,7 @@ share/gdal/eedaconf.json share/gdal/epsg.wkt share/gdal/esri_StatePlane_extra.wkt share/gdal/gdalicon.png +share/gdal/gdalmdiminfo_output.schema.json share/gdal/gdalvrt.xsd share/gdal/gml_registry.xml share/gdal/gmlasconf.xml @@ -165,6 +170,12 @@ share/gdal/s57objectclasses.csv share/gdal/seed_2d.dgn share/gdal/seed_3d.dgn share/gdal/stateplane.csv +share/gdal/template_tiles.mapml +share/gdal/tms_LINZAntarticaMapTileGrid.json +share/gdal/tms_MapML_APSTILE.json +share/gdal/tms_MapML_CBMTILE.json +share/gdal/tms_NZTM2000.json share/gdal/trailer.dxf share/gdal/vdv452.xml share/gdal/vdv452.xsd +share/gdal/vicar.json diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo index 8142b78f123..1fb1c0f2fd2 100644 --- a/geography/gdal-lib/distinfo +++ b/geography/gdal-lib/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.43 2020/04/28 23:50:03 gdt Exp $ +$NetBSD: distinfo,v 1.44 2021/03/01 19:07:51 gdt Exp $ -SHA1 (gdal-3.0.4.tar.gz) = 5362ecafb9d06fa9d86beb1ab07b974256b13542 -RMD160 (gdal-3.0.4.tar.gz) = a202e5c51d2abc768533912e6d9e736ea64986f5 -SHA512 (gdal-3.0.4.tar.gz) = bc5032a123a2cc90145fef8b467a4c9b78ddf7b4d850ceaae8350aacc3f6f23e13dd52219844a2b930b59d000854d3f2cce117643d62ead176b71939f4760ce9 -Size (gdal-3.0.4.tar.gz) = 14379480 bytes -SHA1 (patch-apps_gdalserver.cpp) = 4a2b8bac29582c8fc02920840ee498026d87acca +SHA1 (gdal-3.2.1.tar.gz) = ee6cb3af04a1d2995d374911e298b7a3893e111a +RMD160 (gdal-3.2.1.tar.gz) = 6a03f124f3c4c4259c29e335c00a4bc752b65e77 +SHA512 (gdal-3.2.1.tar.gz) = 152dd97464a8242ea1da7a3a215b1d3326bab5aa4b0884fcab6880da460577c80075f87ea7b9513d796e899e98b40701c0b6a63f1e5275607905480ec547e688 +Size (gdal-3.2.1.tar.gz) = 18953600 bytes SHA1 (patch-frmts_grib_degrib_degrib_myutil.c) = 0e046afa236d7e0d6186fe392cb2da05fa5b42c5 -SHA1 (patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile) = 6a5061b6dd8c3a4fa1ad7c10ddc0b815b41a637d SHA1 (patch-port_cpl__conv.cpp) = dd309911e85512d2a477d55f33f77f79e62482eb diff --git a/geography/gdal-lib/patches/patch-apps_gdalserver.cpp b/geography/gdal-lib/patches/patch-apps_gdalserver.cpp deleted file mode 100644 index 96a99eece54..00000000000 --- a/geography/gdal-lib/patches/patch-apps_gdalserver.cpp +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-apps_gdalserver.cpp,v 1.1 2019/03/09 01:54:59 gdt Exp $ - -Define _NETBSD_SOURCE on NetBSD to work around a mysterious problem -with <string>, where apparently too much is hidden because of the -XOPEN request. Probably this is not adequate, but I am choosing to -narrowly fix the case I can debug. - -\todo File upstream. - ---- apps/gdalserver.cpp.orig 2018-12-14 15:40:20.000000000 +0000 -+++ apps/gdalserver.cpp -@@ -29,6 +29,14 @@ - // So that __USE_XOPEN2K is defined to have getaddrinfo - #ifndef __sun__ - #define _XOPEN_SOURCE 600 -+#ifdef __NetBSD__ -+/* -+ * Defining _XOPEN_SOURCE causes other interfaces to be hidden. Something goes -+ * wrong with /usr/include/g++/string. -+ * \todo Address upstream. -+ */ -+#define _NETBSD_SOURCE 1 -+#endif - #endif - - #include "cpl_port.h" diff --git a/geography/gdal-lib/patches/patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile b/geography/gdal-lib/patches/patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile deleted file mode 100644 index 22468d9318d..00000000000 --- a/geography/gdal-lib/patches/patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile,v 1.3 2019/03/09 01:54:59 gdt Exp $ - -Raise _XOPEN_SOURCE to 600 (for SunOS). -\todo Explain why this is necessary/correct. -\todo File ticket and get this fixed upstream.es - ---- ogr/ogrsf_frmts/geojson/libjson/GNUmakefile.orig 2017-11-20 10:45:35.000000000 +0000 -+++ ogr/ogrsf_frmts/geojson/libjson/GNUmakefile -@@ -21,8 +21,8 @@ CPPFLAGS := $(CPPFLAGS) - - default: $(O_OBJ:.o=.$(OBJ_EXT)) - --# -D_XOPEN_SOURCE=500 to enable strdup() definition in C11 mode --CPPFLAGS := -D_XOPEN_SOURCE=500 $(CPPFLAGS) -+# -D_XOPEN_SOURCE=600 to enable strdup() definition in C11 mode -+CPPFLAGS := -D_XOPEN_SOURCE=600 $(CPPFLAGS) - - ../../o/%.$(OBJ_EXT): %.c - $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< diff --git a/geography/py-gdal/Makefile b/geography/py-gdal/Makefile index 0ebdda657a1..5969bf8b5b1 100644 --- a/geography/py-gdal/Makefile +++ b/geography/py-gdal/Makefile @@ -1,13 +1,10 @@ -# $NetBSD: Makefile,v 1.29 2021/02/11 13:56:24 gdt Exp $ +# $NetBSD: Makefile,v 1.30 2021/03/01 19:07:51 gdt Exp $ #PKGREVISION= 0 -PKGREVISION= 8 .include "../../geography/gdal-lib/Makefile.common" PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -HOMEPAGE= http://www.gdal.org/ COMMENT= Translator library for raster geospatial data formats, Python binding -LICENSE= mit BUILD_DIRS= swig/python diff --git a/geography/py-gdal/PLIST b/geography/py-gdal/PLIST index df86e562863..88156907922 100644 --- a/geography/py-gdal/PLIST +++ b/geography/py-gdal/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2019/03/09 17:39:01 gdt Exp $ +@comment $NetBSD: PLIST,v 1.3 2021/03/01 19:07:51 gdt Exp $ bin/epsg_tr.py bin/esri2wkt.py bin/gcps2vec.py @@ -28,15 +28,8 @@ ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe +${PYSITELIB}/${EGG_INFODIR}/requires.txt ${PYSITELIB}/${EGG_INFODIR}/top_level.txt -${PYSITELIB}/gdal.py -${PYSITELIB}/gdal.pyc -${PYSITELIB}/gdalconst.py -${PYSITELIB}/gdalconst.pyc -${PYSITELIB}/gdalnumeric.py -${PYSITELIB}/gdalnumeric.pyc -${PYSITELIB}/ogr.py -${PYSITELIB}/ogr.pyc ${PYSITELIB}/osgeo/__init__.py ${PYSITELIB}/osgeo/__init__.pyc ${PYSITELIB}/osgeo/_gdal.so @@ -59,5 +52,53 @@ ${PYSITELIB}/osgeo/ogr.py ${PYSITELIB}/osgeo/ogr.pyc ${PYSITELIB}/osgeo/osr.py ${PYSITELIB}/osgeo/osr.pyc -${PYSITELIB}/osr.py -${PYSITELIB}/osr.pyc +${PYSITELIB}/osgeo/utils/__init__.py +${PYSITELIB}/osgeo/utils/__init__.pyc +${PYSITELIB}/osgeo/utils/epsg_tr.py +${PYSITELIB}/osgeo/utils/epsg_tr.pyc +${PYSITELIB}/osgeo/utils/esri2wkt.py +${PYSITELIB}/osgeo/utils/esri2wkt.pyc +${PYSITELIB}/osgeo/utils/gcps2vec.py +${PYSITELIB}/osgeo/utils/gcps2vec.pyc +${PYSITELIB}/osgeo/utils/gcps2wld.py +${PYSITELIB}/osgeo/utils/gcps2wld.pyc +${PYSITELIB}/osgeo/utils/gdal2xyz.py +${PYSITELIB}/osgeo/utils/gdal2xyz.pyc +${PYSITELIB}/osgeo/utils/gdal_auth.py +${PYSITELIB}/osgeo/utils/gdal_auth.pyc +${PYSITELIB}/osgeo/utils/gdal_calc.py +${PYSITELIB}/osgeo/utils/gdal_calc.pyc +${PYSITELIB}/osgeo/utils/gdal_edit.py +${PYSITELIB}/osgeo/utils/gdal_edit.pyc +${PYSITELIB}/osgeo/utils/gdal_fillnodata.py +${PYSITELIB}/osgeo/utils/gdal_fillnodata.pyc +${PYSITELIB}/osgeo/utils/gdal_merge.py +${PYSITELIB}/osgeo/utils/gdal_merge.pyc +${PYSITELIB}/osgeo/utils/gdal_pansharpen.py +${PYSITELIB}/osgeo/utils/gdal_pansharpen.pyc +${PYSITELIB}/osgeo/utils/gdal_polygonize.py +${PYSITELIB}/osgeo/utils/gdal_polygonize.pyc +${PYSITELIB}/osgeo/utils/gdal_proximity.py +${PYSITELIB}/osgeo/utils/gdal_proximity.pyc +${PYSITELIB}/osgeo/utils/gdal_retile.py +${PYSITELIB}/osgeo/utils/gdal_retile.pyc +${PYSITELIB}/osgeo/utils/gdal_sieve.py +${PYSITELIB}/osgeo/utils/gdal_sieve.pyc +${PYSITELIB}/osgeo/utils/gdalchksum.py +${PYSITELIB}/osgeo/utils/gdalchksum.pyc +${PYSITELIB}/osgeo/utils/gdalcompare.py +${PYSITELIB}/osgeo/utils/gdalcompare.pyc +${PYSITELIB}/osgeo/utils/gdalident.py +${PYSITELIB}/osgeo/utils/gdalident.pyc +${PYSITELIB}/osgeo/utils/gdalimport.py +${PYSITELIB}/osgeo/utils/gdalimport.pyc +${PYSITELIB}/osgeo/utils/gdalmove.py +${PYSITELIB}/osgeo/utils/gdalmove.pyc +${PYSITELIB}/osgeo/utils/mkgraticule.py +${PYSITELIB}/osgeo/utils/mkgraticule.pyc +${PYSITELIB}/osgeo/utils/ogrmerge.py +${PYSITELIB}/osgeo/utils/ogrmerge.pyc +${PYSITELIB}/osgeo/utils/pct2rgb.py +${PYSITELIB}/osgeo/utils/pct2rgb.pyc +${PYSITELIB}/osgeo/utils/rgb2pct.py +${PYSITELIB}/osgeo/utils/rgb2pct.pyc |