CVS commit: pkgsrc/geography

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/geography
From: "Greg Troxel" <gdt%netbsd.org@localhost>
Date: Sat, 9 Mar 2019 01:54:59 +0000

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Mar  9 01:54:59 UTC 2019

Modified Files:
        pkgsrc/geography/gdal-lib: Makefile Makefile.common PLIST distinfo
        pkgsrc/geography/gdal-lib/patches:
            patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile
            patch-port_cpl__conv.cpp
        pkgsrc/geography/py-gdal: Makefile
Added Files:
        pkgsrc/geography/gdal-lib/patches: patch-apps_gdalserver.cpp
            patch-frmts_grib_degrib_degrib_myutil.c
Removed Files:
        pkgsrc/geography/gdal-lib/patches: patch-apps_GNUmakefile
            patch-frmts_grib_degrib18_degrib_myutil.c

Log Message:
geography/gdal-lib: Update to 2.3.3

2.3.3: bug fixes and minor improvements
2.3.2: bug fixes and minor improvements
2.3.1: bug fixes and minor improvements

= GDAL/OGR 2.3.0 Release Notes =

Note: due to the change of SCM during the development, #XXXX still refers to
Trac tickets. GitHub tickets are explicitly indicated with github #XXXX

== In a nutshell... ==

 * New GDAL drivers:
   - PDS4: read/write
   - RDA: DigitalGlobe Raster Data Access (read-only)
 * New OGR drivers:
   - MVT: add read/write driver for Mapbox Vector Tile standalone files or tilesets
   - ESRIJson and TopoJSON: read-only, splitted from existing code of the GeoJSON driver
   - WFS3: *experimental* read-only driver
 * RFC 68: Make C++11 a build requirement
    https://trac.osgeo.org/gdal/wiki/rfc68_cplusplus11
 * RFC 70: Guess output format from extension of output filename, if no explicit format passed to C++ or Python utilities
    https://trac.osgeo.org/gdal/wiki/rfc70_output_format_guess
 * RFC 71: Move to GitHub for source code repository and issue tracker.
    https://trac.osgeo.org/gdal/wiki/rfc71_github_migration
 * Significantly improved drivers:
    - MBTiles (vector tiles support)
    - DXF
    - GRIB (GRIB2 write support)
    - WCS (support WCS 2.0)
 * Improvements in network-based /vsi handlers: /vsicurl, /vsis3, /vsigs. Add:
     - /vsiaz for Microsoft Azure Blobs
     - /vsioss for Alibaba Cloud Object Storage Service
     - /vsiswift/ for OpenStack Swift object storage
 * Command line utilities: use Unicode main on Windows to avoid issues with non-ASCII characters (#7065)
 * Update to EPSG v9.2 (#7125)
 * Update data/esri_extra.wkt and add data/esri_epsg.wkt, taken from https://github.com/Esri/projection-engine-db-doc (Apache v2 license) (#2163)
 * Add support for PROJ.5 new API (requires proj 5.0.1 or later). PROJ 4.X is still supported.
 * More than 1000 fixes for issues/vulnerabilities found by OSS-Fuzz
 * Remove raster OGDI driver (vector OGDI driver still there) (#7087)

== New installed files ==

 * data/pds4_template.xml
 * data/esri_epsg.wkt

== Backward compatibility issues ==

See MIGRATION_GUIDE.TXT

Note that changes are extensive; see NEWS in the distfile.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 pkgsrc/geography/gdal-lib/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/geography/gdal-lib/Makefile.common
cvs rdiff -u -r1.14 -r1.15 pkgsrc/geography/gdal-lib/PLIST
cvs rdiff -u -r1.35 -r1.36 pkgsrc/geography/gdal-lib/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/geography/gdal-lib/patches/patch-apps_GNUmakefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/gdal-lib/patches/patch-apps_gdalserver.cpp \
    pkgsrc/geography/gdal-lib/patches/patch-frmts_grib_degrib_degrib_myutil.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/geography/gdal-lib/patches/patch-frmts_grib_degrib18_degrib_myutil.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/geography/gdal-lib/patches/patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp
cvs rdiff -u -r1.9 -r1.10 pkgsrc/geography/py-gdal/Makefile

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.109 pkgsrc/geography/gdal-lib/Makefile:1.110
--- pkgsrc/geography/gdal-lib/Makefile:1.109    Fri Mar  8 20:23:23 2019
+++ pkgsrc/geography/gdal-lib/Makefile  Sat Mar  9 01:54:59 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.109 2019/03/08 20:23:23 gdt Exp $
+# $NetBSD: Makefile,v 1.110 2019/03/09 01:54:59 gdt Exp $
 
-PKGREVISION=   9
+#PKGREVISION=  0
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=       ${DISTNAME:S/gdal/gdal-lib/}
 
@@ -10,6 +10,8 @@ HOMEPAGE=     http://www.gdal.org/
 COMMENT=       Translator library for raster geospatial data formats
 LICENSE=       mit
 
+USE_LANGUAGES+=        c99 c++11
+
 # This package intends to link against only libgeos_c, but ends up
 # also linking to the C++ library libgeos, apparently because of a
 # libtool problem.
@@ -17,7 +19,7 @@ LICENSE=      mit
 
 CONFIGURE_ARGS+=       --without-python
 
-CONFIGURE_ARGS+=       --with-static-proj4
+CONFIGURE_ARGS+=       --with-proj
 
 MAKE_FILE=             GNUmakefile
 

Index: pkgsrc/geography/gdal-lib/Makefile.common
diff -u pkgsrc/geography/gdal-lib/Makefile.common:1.2 pkgsrc/geography/gdal-lib/Makefile.common:1.3
--- pkgsrc/geography/gdal-lib/Makefile.common:1.2       Wed Mar 21 23:20:12 2018
+++ pkgsrc/geography/gdal-lib/Makefile.common   Sat Mar  9 01:54:59 2019
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.2 2018/03/21 23:20:12 gdt Exp $
+# $NetBSD: Makefile.common,v 1.3 2019/03/09 01:54:59 gdt Exp $
 #
 # used by geography/gdal-lib/Makefile
 # used by geography/py-gdal/Makefile
 
-DISTNAME=      gdal-2.2.4
+VERSION=       2.3.3
+DISTNAME=      gdal-${VERSION}
 CATEGORIES=    geography
 MASTER_SITES=  http://download.osgeo.org/gdal/${PKGVERSION_NOREV}/
 

Index: pkgsrc/geography/gdal-lib/PLIST
diff -u pkgsrc/geography/gdal-lib/PLIST:1.14 pkgsrc/geography/gdal-lib/PLIST:1.15
--- pkgsrc/geography/gdal-lib/PLIST:1.14        Mon Feb 19 12:05:17 2018
+++ pkgsrc/geography/gdal-lib/PLIST     Sat Mar  9 01:54:59 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2018/02/19 12:05:17 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.15 2019/03/09 01:54:59 gdt Exp $
 bin/gdal-config
 bin/gdal_contour
 bin/gdal_grid
@@ -25,16 +25,14 @@ bin/ogrlineref
 bin/ogrtindex
 bin/testepsg
 include/cpl_atomic_ops.h
-include/cpl_aws.h
 include/cpl_config.h
 include/cpl_config_extras.h
 include/cpl_conv.h
-include/cpl_cpu_features.h
 include/cpl_csv.h
 include/cpl_error.h
-include/cpl_google_cloud.h
 include/cpl_hash_set.h
 include/cpl_http.h
+include/cpl_json.h
 include/cpl_list.h
 include/cpl_minixml.h
 include/cpl_minizip_ioapi.h
@@ -45,8 +43,6 @@ include/cpl_odbc.h
 include/cpl_port.h
 include/cpl_progress.h
 include/cpl_quad_tree.h
-include/cpl_sha1.h
-include/cpl_sha256.h
 include/cpl_spawn.h
 include/cpl_string.h
 include/cpl_time.h
@@ -54,8 +50,6 @@ include/cpl_virtualmem.h
 include/cpl_vsi.h
 include/cpl_vsi_error.h
 include/cpl_vsi_virtual.h
-include/cpl_vsil_curl_priv.h
-include/cpl_worker_thread_pool.h
 include/cplkeywordparser.h
 include/gdal.h
 include/gdal_alg.h
@@ -71,22 +65,16 @@ include/gdal_simplesurf.h
 include/gdal_utils.h
 include/gdal_version.h
 include/gdal_vrt.h
-include/gdalexif.h
 include/gdalgeorefpamdataset.h
 include/gdalgrid.h
 include/gdalgrid_priv.h
 include/gdaljp2abstractdataset.h
 include/gdaljp2metadata.h
-include/gdaljp2metadatagenerator.h
 include/gdalpansharpen.h
-include/gdalsse_priv.h
 include/gdalwarper.h
-include/gdalwarpkernel_opencl.h
 include/gnm.h
 include/gnm_api.h
 include/gnmgraph.h
-include/gvgcpfit.h
-include/internal_qhull_headers.h
 include/memdataset.h
 include/ogr_api.h
 include/ogr_core.h
@@ -99,7 +87,6 @@ include/ogr_spatialref.h
 include/ogr_srs_api.h
 include/ogrsf_frmts.h
 include/rawdataset.h
-include/thinplatespline.h
 include/vrtdataset.h
 lib/libgdal.la
 lib/pkgconfig/gdal.pc
@@ -117,6 +104,7 @@ share/gdal/ellipsoid.csv
 share/gdal/epsg.wkt
 share/gdal/esri_StatePlane_extra.wkt
 share/gdal/esri_Wisconsin_extra.wkt
+share/gdal/esri_epsg.wkt
 share/gdal/esri_extra.wkt
 share/gdal/gcs.csv
 share/gdal/gcs.override.csv
@@ -172,6 +160,7 @@ share/gdal/pci_datum.txt
 share/gdal/pci_ellips.txt
 share/gdal/pcs.csv
 share/gdal/pcs.override.csv
+share/gdal/pds4_template.xml
 share/gdal/plscenesconf.json
 share/gdal/prime_meridian.csv
 share/gdal/projop_wparm.csv
@@ -192,3 +181,4 @@ share/gdal/vdv452.xml
 share/gdal/vdv452.xsd
 share/gdal/vertcs.csv
 share/gdal/vertcs.override.csv
+@pkgdir lib/gdalplugins

Index: pkgsrc/geography/gdal-lib/distinfo
diff -u pkgsrc/geography/gdal-lib/distinfo:1.35 pkgsrc/geography/gdal-lib/distinfo:1.36
--- pkgsrc/geography/gdal-lib/distinfo:1.35     Wed Mar 21 23:20:12 2018
+++ pkgsrc/geography/gdal-lib/distinfo  Sat Mar  9 01:54:59 2019
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.35 2018/03/21 23:20:12 gdt Exp $
+$NetBSD: distinfo,v 1.36 2019/03/09 01:54:59 gdt Exp $
 
-SHA1 (gdal-2.2.4.tar.gz) = 39c7d8e7c3d2345491d26acaa8bfed89dd56fd7d
-RMD160 (gdal-2.2.4.tar.gz) = c2a0fbaca8e8895fd8443b535ded768943afa5c8
-SHA512 (gdal-2.2.4.tar.gz) = 82085c4e0aa112fa04c8e2631f6836bd18c396b8a83d1fe87cdd7ed801c9f1f82238e542d22493cfa75eca75e65a805277748229d4a25996c80a87131ffef7e1
-Size (gdal-2.2.4.tar.gz) = 13774304 bytes
-SHA1 (patch-apps_GNUmakefile) = 8e5de1b5bb9eab76a4f50b4ba2bd47573c5b08e2
-SHA1 (patch-frmts_grib_degrib18_degrib_myutil.c) = 584e2e3e73df2001bd377094c28eea4b6a0c31cd
-SHA1 (patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile) = 214d51e0065d5fe3c6a2af5c84f365f22ad39fda
-SHA1 (patch-port_cpl__conv.cpp) = 8a52b21f85b381e70e2a2b3424f072cc5c1d8b3a
+SHA1 (gdal-2.3.3.tar.gz) = 99cd1f4565c38561bd8409ade95209566e9b7f47
+RMD160 (gdal-2.3.3.tar.gz) = 6eb0a04c2144bd0ed9bf3e0838ee73c2e28fbaaa
+SHA512 (gdal-2.3.3.tar.gz) = 23c7fe500f7470a6120b8c30f928808c275376996c07e7491c0fe84b6bc26c72a3f92c4f75f965ee3cfb5e86cbf0fcbb82836dae515c5d5d3ffdf74888ff780b
+Size (gdal-2.3.3.tar.gz) = 14468306 bytes
+SHA1 (patch-apps_gdalserver.cpp) = 4a2b8bac29582c8fc02920840ee498026d87acca
+SHA1 (patch-frmts_grib_degrib_degrib_myutil.c) = 0e046afa236d7e0d6186fe392cb2da05fa5b42c5
+SHA1 (patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile) = 6a5061b6dd8c3a4fa1ad7c10ddc0b815b41a637d
+SHA1 (patch-port_cpl__conv.cpp) = e0c9d2dac25bc6f69f0af13a2c86ab5f0f521445

Index: pkgsrc/geography/gdal-lib/patches/patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile
diff -u pkgsrc/geography/gdal-lib/patches/patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile:1.2 pkgsrc/geography/gdal-lib/patches/patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile:1.3
--- pkgsrc/geography/gdal-lib/patches/patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile:1.2    Mon Feb 19 12:05:17 2018
+++ pkgsrc/geography/gdal-lib/patches/patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile        Sat Mar  9 01:54:59 2019
@@ -1,6 +1,8 @@
-$NetBSD: patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile,v 1.2 2018/02/19 12:05:17 ryoon Exp $
+$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

Index: pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp
diff -u pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp:1.1 pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp:1.2
--- pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp:1.1      Mon Feb 19 12:05:17 2018
+++ pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp  Sat Mar  9 01:54:59 2019
@@ -1,6 +1,8 @@
-$NetBSD: patch-port_cpl__conv.cpp,v 1.1 2018/02/19 12:05:17 ryoon Exp $
+$NetBSD: patch-port_cpl__conv.cpp,v 1.2 2019/03/09 01:54:59 gdt Exp $
 
-* Fix build under NetBSD
+Fix build under NetBSD
+\todo Explain what is wrong.
+\todo File ticket and get this fixed upstream.
 
 --- port/cpl_conv.cpp.orig     2017-11-20 10:45:32.000000000 +0000
 +++ port/cpl_conv.cpp

Index: pkgsrc/geography/py-gdal/Makefile
diff -u pkgsrc/geography/py-gdal/Makefile:1.9 pkgsrc/geography/py-gdal/Makefile:1.10
--- pkgsrc/geography/py-gdal/Makefile:1.9       Thu Dec 13 19:51:58 2018
+++ pkgsrc/geography/py-gdal/Makefile   Sat Mar  9 01:54:59 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2018/12/13 19:51:58 adam Exp $
+# $NetBSD: Makefile,v 1.10 2019/03/09 01:54:59 gdt Exp $
 
-PKGREVISION=   5
+#PKGREVISION=  0
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 
@@ -19,7 +19,7 @@ INSTALLATION_DIRS=    bin
 
 .include "../../mk/bsd.prefs.mk"
 
-EGG_NAME?=             GDAL-2.2.4
+EGG_NAME?=             GDAL-${VERSION}
 EGG_INFODIR?=          ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
 PLIST_SUBST+=          PYSITELIB=${PYSITELIB}
 PLIST_SUBST+=          EGG_NAME=${EGG_NAME}-py${PYVERSSUFFIX}

Added files:

Index: pkgsrc/geography/gdal-lib/patches/patch-apps_gdalserver.cpp
diff -u /dev/null pkgsrc/geography/gdal-lib/patches/patch-apps_gdalserver.cpp:1.1
--- /dev/null   Sat Mar  9 01:54:59 2019
+++ pkgsrc/geography/gdal-lib/patches/patch-apps_gdalserver.cpp Sat Mar  9 01:54:59 2019
@@ -0,0 +1,26 @@
+$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"
Index: pkgsrc/geography/gdal-lib/patches/patch-frmts_grib_degrib_degrib_myutil.c
diff -u /dev/null pkgsrc/geography/gdal-lib/patches/patch-frmts_grib_degrib_degrib_myutil.c:1.1
--- /dev/null   Sat Mar  9 01:54:59 2019
+++ pkgsrc/geography/gdal-lib/patches/patch-frmts_grib_degrib_degrib_myutil.c   Sat Mar  9 01:54:59 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-frmts_grib_degrib_degrib_myutil.c,v 1.1 2019/03/09 01:54:59 gdt Exp $
+
+fix build on SunOS
+\todo Explain what's wrong.
+\todo File a ticket and get this fixed upstream.
+
+--- frmts/grib/degrib/degrib/myutil.c.orig     2017-11-20 10:45:40.000000000 +0000
++++ frmts/grib/degrib/degrib/myutil.c
+@@ -23,7 +23,7 @@
+ #ifdef _XOPEN_SOURCE
+ #undef _XOPEN_SOURCE
+ #endif
+-#define _XOPEN_SOURCE 500
++#define _XOPEN_SOURCE 600
+ #endif
+ 
+ #include <stdlib.h>

Prev by Date: CVS commit: pkgsrc/meta-pkgs/mate
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/meta-pkgs/mate
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index