cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gdal 2.1.0.

Browse Source 
see http://trac.osgeo.org/gdal/wiki/Release/2.1.0-News for details.
enable support for Geographical networks, see
https://trac.osgeo.org/gdal/wiki/rfc48_geographical_networks_support

tested in a bulk build by ajacoutot@, thanks!
This commit is contained in:
landry 2016-05-15 12:18:26 +00:00
parent bfad938c68
commit e460383b2d
10 changed files with 54 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
geo/gdal/Makefile
View File

@ -1,17 +1,17 @@
# $OpenBSD: Makefile,v 1.45 2016/03/20 15:58:26 naddy Exp $
# $OpenBSD: Makefile,v 1.46 2016/05/15 12:18:26 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.0.2
V = 2.1.0
DISTNAME = gdal-${V}
PKGNAME-main = ${DISTNAME}
PKGNAME-python =py-${DISTNAME}
PKGNAME-perl = p5-Geo-GDAL-${V}
SHARED_LIBS = gdal 24.0 #20.2
SHARED_LIBS = gdal 25.0 #21.0
CATEGORIES = geo devel
HOMEPAGE = http://www.gdal.org/
@ -46,17 +46,14 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
WANTLIB-main = ${WANTLIB} c expat m stdc++ z tiff openjp2 ssl crypto \
curl pq geos geos_c idn png gif jpeg jasper json-c geotiff \
perl proj pthread freexl pcre spatialite sqlite3 xml2 lzma nghttp2
proj pthread freexl pcre spatialite sqlite3 xml2 lzma nghttp2
LIB_DEPENDS-python = ${PKGNAME}:${BASE_PKGPATH},-main
WANTLIB-python = ${MODPY_WANTLIB} gdal m pthread stdc++
LIB_DEPENDS-perl = ${PKGNAME}:${BASE_PKGPATH},-main
WANTLIB-perl = gdal crypto curl expat geos_c geotiff gif idn \
jasper jpeg openjp2 m png pq ssl tiff z pthread \
json-c freexl pcre spatialite sqlite3 xml2 \
nghttp2 ${MODGETTEXT_WANTLIB}
WANTLIB-perl = gdal
RUN_DEPENDS += math/py-numpy
BUILD_DEPENDS += ${RUN_DEPENDS} devel/swig
@ -91,6 +88,7 @@ CONFIGURE_ARGS =--without-hdf5 \
--with-python \
--with-perl \
--with-geos \
--with-gnm \
--with-freexl=${LOCALBASE} \
--with-spatialite=${LOCALBASE} \
--with-png=${LOCALBASE} \
@ -102,10 +100,6 @@ CONFIGURE_ARGS =--without-hdf5 \
--with-libjson-c=${LOCALBASE} \
--with-jasper=${LOCALBASE}
post-build:
# fix manpages doubled .TH lines/sections, http://trac.osgeo.org/gdal/ticket/6048
sed -i -e '2,5d' ${WRKSRC}/man/man1/*.1
post-install:
rm ${PREFIX}/man/man1/_home_rouault_dist_wrk_gdal_apps_.1

4
geo/gdal/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gdal-2.0.2.tar.gz) = 23ciyvjZ3XmOwYASucrPQKUYkYRmEmqIuf0ne9fUDMQ=
SIZE (gdal-2.0.2.tar.gz) = 11643726
SHA256 (gdal-2.1.0.tar.gz) = 60mbGOXFJiqAO7dTCuVulcMpO+eybHS8rfZ0iSA78s0=
SIZE (gdal-2.1.0.tar.gz) = 12819400

10
geo/gdal/patches/patch-apps_gdalserver_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-apps_gdalserver_c,v 1.1 2015/09/25 08:19:21 landry Exp $
$OpenBSD: patch-apps_gdalserver_c,v 1.2 2016/05/15 12:18:26 landry Exp $
Needed for fd_set/select
--- apps/gdalserver.c.orig Fri Sep 25 09:48:31 2015
+++ apps/gdalserver.c Fri Sep 25 09:49:07 2015
@@ -46,6 +46,7 @@
#else
--- apps/gdalserver.c.orig Mon Apr 25 19:35:51 2016
+++ apps/gdalserver.c Fri May 13 09:46:27 2016
@@ -53,6 +53,7 @@
#include <sys/select.h>
#include <sys/time.h>
#include <sys/types.h>
+ #include <sys/select.h>

10
geo/gdal/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.11 2016/02/07 12:28:28 landry Exp $
--- configure.orig Tue Jan 26 16:21:45 2016
+++ configure Sun Feb 7 10:05:51 2016
@@ -22606,9 +22606,9 @@ fi
$OpenBSD: patch-configure,v 1.12 2016/05/15 12:18:26 landry Exp $
--- configure.orig Mon Apr 25 19:35:51 2016
+++ configure Fri May 13 09:46:29 2016
@@ -23677,9 +23677,9 @@ fi
LIBS="-lopenjp2 $LIBS"
fi
else
@ -13,7 +13,7 @@ $OpenBSD: patch-configure,v 1.11 2016/02/07 12:28:28 landry Exp $
if test "x$ac_cv_header_openjpeg_2_1_openjpeg_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENJPEG_2_1_OPENJPEG_H 1
@@ -22672,7 +22672,7 @@ else
@@ -23743,7 +23743,7 @@ else
HAVE_OPENJPEG=yes
if test -r $with_openjpeg/include/openjpeg-2.0/openjpeg.h ; then
EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"

8
geo/gdal/patches/patch-swig_perl_GNUmakefile
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-swig_perl_GNUmakefile,v 1.2 2014/05/04 20:17:35 landry Exp $
$OpenBSD: patch-swig_perl_GNUmakefile,v 1.3 2016/05/15 12:18:26 landry Exp $
INST_PREFIX is wrong
--- swig/perl/GNUmakefile.orig Wed Apr 16 22:04:49 2014
+++ swig/perl/GNUmakefile Wed Apr 30 22:15:37 2014
@@ -26,7 +26,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL
--- swig/perl/GNUmakefile.orig Mon Apr 25 19:35:57 2016
+++ swig/perl/GNUmakefile Fri May 13 09:46:29 2016
@@ -28,7 +28,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL
gdal_wrap.cc: generate
Makefile_Geo__GDAL:

20
geo/gdal/patches/patch-swig_python_GNUmakefile
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-swig_python_GNUmakefile,v 1.4 2012/10/18 07:09:29 landry Exp $
tweak to build egg-info files during build stage
--- swig/python/GNUmakefile.orig Thu May 17 05:30:56 2012
+++ swig/python/GNUmakefile Mon Oct 1 11:16:00 2012
@@ -61,14 +61,12 @@ generate: ${WRAPPERS} gdal_array_wrap.cpp
build:
$(PYTHON) setup.py build
-
-egg:
$(PYTHON) setup.py bdist_egg
install:
ifeq ($(PY_HAVE_SETUPTOOLS),1)
- $(PYTHON) setup.py install
+ $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) --root=/ --single-version-externally-managed
else
$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
endif

8
geo/gdal/patches/patch-swig_python_setup_py
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-swig_python_setup_py,v 1.5 2015/06/27 06:55:38 landry Exp $
--- swig/python/setup.py.orig Sun Jun 14 21:06:33 2015
+++ swig/python/setup.py Thu Jun 25 22:59:28 2015
@@ -198,7 +198,7 @@ class gdal_ext(build_ext):
$OpenBSD: patch-swig_python_setup_py,v 1.6 2016/05/15 12:18:26 landry Exp $
--- swig/python/setup.py.orig Mon Apr 25 19:35:56 2016
+++ swig/python/setup.py Fri May 13 09:46:30 2016
@@ -197,7 +197,7 @@ class gdal_ext(build_ext):
self.include_dirs.append(os.path.join(self.gdaldir,'include'))

19
geo/gdal/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.13 2015/07/20 14:45:37 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.14 2016/05/15 12:18:26 landry Exp $
@conflict gdal-<=1.8.0
@pkgpath geo/gdal
bin/gdal-config
@ -18,6 +18,8 @@ bin/gdal-config
@bin bin/gdaltindex
@bin bin/gdaltransform
@bin bin/gdalwarp
@bin bin/gnmanalyse
@bin bin/gnmmanage
@bin bin/nearblack
@bin bin/ogr2ogr
@bin bin/ogrinfo
@ -25,6 +27,7 @@ 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
@ -42,15 +45,16 @@ include/cpl_odbc.h
include/cpl_port.h
include/cpl_progress.h
include/cpl_quad_tree.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_win32ce_api.h
include/cpl_wince.h
include/cpl_worker_thread_pool.h
include/cplkeywordparser.h
include/gdal.h
include/gdal_alg.h
@ -63,6 +67,7 @@ include/gdal_priv.h
include/gdal_proxy.h
include/gdal_rat.h
include/gdal_simplesurf.h
include/gdal_utils.h
include/gdal_version.h
include/gdal_vrt.h
include/gdalexif.h
@ -72,10 +77,12 @@ 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/gvgcpfit.h
include/internal_qhull_headers.h
include/memdataset.h
include/ogr_api.h
include/ogr_core.h
@ -112,6 +119,9 @@ lib/pkgconfig/gdal.pc
@man man/man1/gdaltindex.1
@man man/man1/gdaltransform.1
@man man/man1/gdalwarp.1
@man man/man1/gnm_utilities.1
@man man/man1/gnmanalyse.1
@man man/man1/gnmmanage.1
@man man/man1/nearblack.1
@man man/man1/ogr2ogr.1
@man man/man1/ogr_utilities.1
@ -147,6 +157,7 @@ share/gdal/inspire_cp_BasicPropertyUnit.gfs
share/gdal/inspire_cp_CadastralBoundary.gfs
share/gdal/inspire_cp_CadastralParcel.gfs
share/gdal/inspire_cp_CadastralZoning.gfs
share/gdal/netcdf_config.xsd
share/gdal/nitf_spec.xml
share/gdal/nitf_spec.xsd
share/gdal/ogrvrt.xsd
@ -176,5 +187,7 @@ share/gdal/seed_3d.dgn
share/gdal/stateplane.csv
share/gdal/trailer.dxf
share/gdal/unit_of_measure.csv
share/gdal/vdv452.xml
share/gdal/vdv452.xsd
share/gdal/vertcs.csv
share/gdal/vertcs.override.csv

5
geo/gdal/pkg/PLIST-perl
View File

@ -1,9 +1,10 @@
@comment $OpenBSD: PLIST-perl,v 1.6 2015/09/25 08:19:21 landry Exp $
@comment $OpenBSD: PLIST-perl,v 1.7 2016/05/15 12:18:26 landry Exp $
${P5ARCH}/
${P5ARCH}/Geo/
${P5ARCH}/Geo/GDAL/
${P5ARCH}/Geo/GDAL.pm
${P5ARCH}/Geo/GDAL/Const.pm
${P5ARCH}/Geo/GNM.pm
${P5ARCH}/Geo/OGR.pm
${P5ARCH}/Geo/OSR.pm
${P5ARCH}/auto/
@ -12,6 +13,8 @@ ${P5ARCH}/auto/Geo/GDAL/
${P5ARCH}/auto/Geo/GDAL/Const/
${P5ARCH}/auto/Geo/GDAL/Const/Const.so
${P5ARCH}/auto/Geo/GDAL/GDAL.so
${P5ARCH}/auto/Geo/GNM/
${P5ARCH}/auto/Geo/GNM/GNM.so
${P5ARCH}/auto/Geo/OGR/
${P5ARCH}/auto/Geo/OGR/OGR.so
${P5ARCH}/auto/Geo/OSR/

9
geo/gdal/pkg/PLIST-python
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-python,v 1.7 2015/07/20 14:45:37 landry Exp $
@comment $OpenBSD: PLIST-python,v 1.8 2016/05/15 12:18:26 landry Exp $
bin/epsg_tr.py
bin/esri2wkt.py
bin/gcps2vec.py
@ -13,6 +13,7 @@ bin/gdal_edit.py
bin/gdal_fillnodata.dox
bin/gdal_fillnodata.py
bin/gdal_merge.py
bin/gdal_pansharpen.py
bin/gdal_polygonize.dox
bin/gdal_polygonize.py
bin/gdal_proximity.dox
@ -42,6 +43,8 @@ lib/python${MODPY_VERSION}/site-packages/gdalconst.py
lib/python${MODPY_VERSION}/site-packages/gdalconst.pyc
lib/python${MODPY_VERSION}/site-packages/gdalnumeric.py
lib/python${MODPY_VERSION}/site-packages/gdalnumeric.pyc
lib/python${MODPY_VERSION}/site-packages/gnm.py
lib/python${MODPY_VERSION}/site-packages/gnm.pyc
lib/python${MODPY_VERSION}/site-packages/ogr.py
lib/python${MODPY_VERSION}/site-packages/ogr.pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/
@ -50,6 +53,7 @@ lib/python${MODPY_VERSION}/site-packages/osgeo/__init__.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
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
@ -60,6 +64,8 @@ lib/python${MODPY_VERSION}/site-packages/osgeo/gdalconst.py
lib/python${MODPY_VERSION}/site-packages/osgeo/gdalconst.pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/gdalnumeric.py
lib/python${MODPY_VERSION}/site-packages/osgeo/gdalnumeric.pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/gnm.py
lib/python${MODPY_VERSION}/site-packages/osgeo/gnm.pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/ogr.py
lib/python${MODPY_VERSION}/site-packages/osgeo/ogr.pyc
lib/python${MODPY_VERSION}/site-packages/osgeo/osr.py
@ -70,6 +76,7 @@ lib/python${MODPY_VERSION}/site-packages/osr.pyc
@man man/man1/gdal_calc.1
@man man/man1/gdal_edit.1
@man man/man1/gdal_fillnodata.1
@man man/man1/gdal_pansharpen.1
@man man/man1/gdal_polygonize.1
@man man/man1/gdal_proximity.1
@man man/man1/gdal_retile.1