Update to gdal 2.3.0.

See http://trac.osgeo.org/gdal/wiki/Release/2.3.0-News
This commit is contained in:
landry 2018-05-13 06:26:35 +00:00
parent 68d4b4aad7
commit 3aca59f212
9 changed files with 54 additions and 100 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.67 2018/03/29 19:48:18 landry Exp $
# $OpenBSD: Makefile,v 1.68 2018/05/13 06:26:35 landry Exp $
COMMENT-main = translator library for geospatial data formats
COMMENT-python =python bindings and utilities for GDAL
COMMENT-perl = perl bindings for GDAL
V = 2.2.4
V = 2.3.0
DISTNAME = gdal-${V}
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
gdalautotest-${V}${EXTRACT_SUFX}
@ -16,7 +16,7 @@ FULLPKGPATH-python = geo/gdal,-python${FLAVOR_EXT:S/-/,/g}
FULLPKGNAME-perl = p5-Geo-GDAL-${V}
FULLPKGPATH-perl = geo/gdal,-perl
SHARED_LIBS = gdal 31.0 #23.3
SHARED_LIBS = gdal 32.0 #23.3
CATEGORIES = geo devel
HOMEPAGE = http://www.gdal.org/
@ -26,7 +26,7 @@ MAINTAINER = Landry Breuil <landry@openbsd.org>
# MIT/X
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES = http://download.osgeo.org/gdal/${V}/
MASTER_SITES = http://download.osgeo.org/gdal/${V:S/beta1//}/
MODULES = perl lang/python
FLAVORS = python3
@ -36,10 +36,13 @@ FLAVOR ?=
FULLPKGNAME-python = py3-${DISTNAME}
.endif
COMPILER = base-clang ports-gcc
MULTI_PACKAGES = -main -python -perl
MODPY_RUNDEP = No
LIB_DEPENDS-main = databases/sqlite3 \
archivers/zstd \
graphics/tiff \
net/curl \
math/qhull \
@ -60,7 +63,7 @@ LIB_DEPENDS-main = databases/sqlite3 \
WANTLIB-main = c crypto curl expat freexl geos geos_c geotiff gif \
iconv jasper jpeg json-c lzma m nghttp2 openjp2 \
pcre png pq proj pthread qhull spatialite sqlite3 \
ssl tiff xml2 webp z ${COMPILER_LIBCXX}
ssl tiff xml2 webp z zstd ${COMPILER_LIBCXX}
RUN_DEPENDS-python = ${MODPY_RUN_DEPENDS} \
math/py-numpy${MODPY_FLAVOR}
@ -73,7 +76,7 @@ LIB_DEPENDS-perl = ${FULLPKGNAME-main}:${FULLPKGPATH-main}
WANTLIB-perl = perl gdal # uses perl ABI
WANTLIB-perl += c crypto curl expat freexl geos_c geotiff gif iconv
WANTLIB-perl += jasper jpeg json-c lzma m nghttp2 openjp2 pcre png
WANTLIB-perl += pq pthread qhull spatialite sqlite3 ssl tiff xml2 webp z
WANTLIB-perl += pq pthread qhull spatialite sqlite3 ssl tiff xml2 webp z zstd
BUILD_DEPENDS += ${RUN_DEPENDS} math/py-numpy${MODPY_FLAVOR} devel/swig
@ -81,7 +84,7 @@ TEST_DEPENDS += ${FULLPKGNAME-python}:${FULLPKGPATH-python}
TEST_ENV = GDAL_DOWNLOAD_TEST_DATA=1 GDAL_RUN_SLOW_TESTS=yes
MODPY_SETUPTOOLS = Yes
MODPY_EGG_VERSION = ${V}
MODPY_EGG_VERSION = ${V:C/beta.//}
MODPY_ADJ_FILES = swig/python/scripts/*.py
MAKE_FILE = GNUmakefile
@ -118,6 +121,7 @@ CONFIGURE_ARGS =--without-hdf5 \
--with-curl=${LOCALBASE} \
--with-gif=${LOCALBASE} \
--with-jpeg=${LOCALBASE} \
--with-zstd=${LOCALBASE} \
--with-libjson-c=${LOCALBASE} \
--with-jasper=${LOCALBASE}

View File

@ -1,4 +1,4 @@
SHA256 (gdal-2.2.4.tar.gz) = udWnI3h/MAaoLLJ22xccchGHsEi4ZsDiDm30ZNZxoaQ=
SHA256 (gdalautotest-2.2.4.tar.gz) = DTuxNi+GUHslXY4gALWIJLMulgKviTE13lSSYoM71qo=
SIZE (gdal-2.2.4.tar.gz) = 13774304
SIZE (gdalautotest-2.2.4.tar.gz) = 6778713
SHA256 (gdal-2.3.0.tar.gz) = KUS7/uAJvxygknFuT9VHy0rioeiBYYYjYRDCLxHH4ek=
SHA256 (gdalautotest-2.3.0.tar.gz) = lt8qMg+iUgv/38CvZj95PQoKjWDPt0thUWTrJ7VSuq8=
SIZE (gdal-2.3.0.tar.gz) = 14423820
SIZE (gdalautotest-2.3.0.tar.gz) = 30371840

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-apps_gdalserver_c,v 1.3 2017/05/19 09:19:48 landry Exp $
Needed for fd_set/select
Index: apps/gdalserver.c
--- apps/gdalserver.c.orig
+++ apps/gdalserver.c
@@ -52,6 +52,7 @@
#include <sys/select.h>
#include <sys/time.h>
#include <sys/types.h>
+ #include <sys/select.h>
#include <sys/wait.h>
#include <sys/socket.h>
#include <sys/un.h>

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-configure,v 1.18 2017/11/24 19:18:07 landry Exp $
chunk 1&2: adapt paths for our openjp2 install
Index: configure
--- configure.orig
+++ configure
@@ -25117,9 +25117,9 @@ $as_echo "$as_me: OpenJPEG (JPEG2000) support disabled
elif test "$with_openjpeg" = "yes" -o "$with_openjpeg" = "" ; then
- for ac_header in openjpeg-2.3/openjpeg.h
+ for ac_header in openjp2/openjpeg.h
do :
- ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.3/openjpeg.h" "ac_cv_header_openjpeg_2_3_openjpeg_h" "$ac_includes_default"
+ ac_fn_c_check_header_mongrel "$LINENO" "openjp2/openjpeg.h" "ac_cv_header_openjpeg_2_3_openjpeg_h" "$ac_includes_default"
if test "x$ac_cv_header_openjpeg_2_3_openjpeg_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENJPEG_2_3_OPENJPEG_H 1
@@ -25370,7 +25370,7 @@ else
elif test -r $with_openjpeg/include/openjpeg-2.2/openjpeg.h ; then
OPENJPEG_VERSION=20200
EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
- elif test -r $with_openjpeg/include/openjpeg-2.3/openjpeg.h ; then
+ elif test -r $with_openjpeg/include/openjp2/openjpeg.h ; then
OPENJPEG_VERSION=20300
EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
else

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-frmts_openjpeg_openjpegdataset_cpp,v 1.8 2017/11/24 19:18:07 landry Exp $
Index: frmts/openjpeg/openjpegdataset.cpp
--- frmts/openjpeg/openjpegdataset.cpp.orig
+++ frmts/openjpeg/openjpegdataset.cpp
@@ -35,7 +35,7 @@
#endif
#if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20300
-#include <openjpeg-2.3/openjpeg.h>
+#include <openjp2/openjpeg.h>
#elif defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20200
#include <openjpeg-2.2/openjpeg.h>
#elif defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20100

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-swig_python_GNUmakefile,v 1.6 2018/05/13 06:26:35 landry Exp $
cf https://github.com/OSGeo/gdal/commit/8cae2eb06969b85725acd7094e9481e32ab23b5b &
https://github.com/OSGeo/gdal/commit/975c95853a5630dbd82bf6ea5b0b4083792cee5d
fix python prefix install, otherwise ends up adding fake twice
Index: swig/python/GNUmakefile
--- swig/python/GNUmakefile.orig
+++ swig/python/GNUmakefile
@@ -83,7 +83,7 @@ ifdef DESTDIR
endif
ifdef PREFIX
- setup_opts+=--prefix=$(PREFIX)
+ setup_opts+=--prefix=$(prefix)
else ifdef prefix
ifeq ($(shell uname),Darwin)
STD_UNIX_LAYOUT=$(shell $(PYTHON) -c "from __future__ import print_function;import sys;print(\"FALSE\" if \"framework\" in sys.prefix.lower() else \"TRUE\")")

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-swig_python_setup_py,v 1.10 2018/03/29 19:48:18 landry Exp $
$OpenBSD: patch-swig_python_setup_py,v 1.11 2018/05/13 06:26:35 landry Exp $
Index: swig/python/setup.py
--- swig/python/setup.py.orig
+++ swig/python/setup.py
@@ -219,7 +219,7 @@ class gdal_ext(build_ext):
self.include_dirs.append(os.path.join(self.gdaldir,'include'))
@@ -303,7 +303,7 @@ class gdal_ext(build_ext):
return build_ext.build_extension(self, ext)
-extra_link_args = []

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.15 2017/05/19 09:19:48 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.16 2018/05/13 06:26:35 landry Exp $
@conflict gdal-<=1.8.0
@pkgpath geo/gdal
bin/gdal-config
@ -27,16 +27,14 @@ bin/gdal-config
@bin bin/ogrtindex
@bin 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
@ -47,17 +45,12 @@ 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
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
@ -73,22 +66,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
@ -101,7 +88,6 @@ include/ogr_spatialref.h
include/ogr_srs_api.h
include/ogrsf_frmts.h
include/rawdataset.h
include/thinplatespline.h
include/vrtdataset.h
lib/gdalplugins/
lib/libgdal.a
@ -149,6 +135,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
@ -204,6 +191,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

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-python,v 1.10 2017/11/01 16:47:17 landry Exp $
@comment $OpenBSD: PLIST-python,v 1.11 2018/05/13 06:26:35 landry Exp $
bin/epsg_tr${MODPY_BIN_SUFFIX}.py
bin/esri2wkt${MODPY_BIN_SUFFIX}.py
bin/gcps2vec${MODPY_BIN_SUFFIX}.py
@ -30,28 +30,20 @@ lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VER
lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}gdal.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}gdalconst.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}gdalnumeric.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}gnm.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ogr.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}osr.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gdal.py
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}gdal.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gdalconst.py
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}gdalconst.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gdalnumeric.py
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}gdalnumeric.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gnm.py
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}gnm.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ogr.py
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ogr.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/
lib/python${MODPY_VERSION}/site-packages/osgeo/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gdal.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gdal_array.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gdalconst.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gdalnumeric.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gnm.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}ogr.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}osr.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/_gdal.so
lib/python${MODPY_VERSION}/site-packages/osgeo/_gdal_array.so
lib/python${MODPY_VERSION}/site-packages/osgeo/_gdalconst.so
@ -59,13 +51,21 @@ lib/python${MODPY_VERSION}/site-packages/osgeo/_gnm.so
lib/python${MODPY_VERSION}/site-packages/osgeo/_ogr.so
lib/python${MODPY_VERSION}/site-packages/osgeo/_osr.so
lib/python${MODPY_VERSION}/site-packages/osgeo/gdal.py
lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gdal.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/gdal_array.py
lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gdal_array.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/gdalconst.py
lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gdalconst.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/gdalnumeric.py
lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gdalnumeric.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/gnm.py
lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gnm.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/ogr.py
lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}ogr.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/osr.py
lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}osr.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/osr.py
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}osr.${MODPY_PYC_MAGIC_TAG}pyc
@man man/man1/gdal2tiles${MODPY_BIN_SUFFIX}.1
@man man/man1/gdal_calc${MODPY_BIN_SUFFIX}.1
@man man/man1/gdal_edit${MODPY_BIN_SUFFIX}.1