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

Update to gdal 3.1.1.

Browse Source 
See https://github.com/OSGeo/gdal/blob/v3.1.1/gdal/NEWS
switch to python3 only, all the py-gdal consumers (qgis, mapproxy, fiona
and rasterio) exclusively use python3 since a while.
This commit is contained in:
landry 2020-06-30 06:02:38 +00:00
parent a7902b1446
commit cd186a1d20
5 changed files with 69 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
geo/gdal/Makefile
View File

@ -1,22 +1,22 @@
# $OpenBSD: Makefile,v 1.85 2020/05/14 11:28:33 landry Exp $
# $OpenBSD: Makefile,v 1.86 2020/06/30 06:02:38 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 = 3.1.0
V = 3.1.1
DISTNAME = gdal-${V}
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
gdalautotest-${V}${EXTRACT_SUFX}
FULLPKGNAME-main = ${DISTNAME}
FULLPKGPATH-main = geo/gdal,-main
FULLPKGNAME-python = py-${DISTNAME}
FULLPKGNAME-python = py3-${DISTNAME}
FULLPKGPATH-python = geo/gdal,-python${FLAVOR_EXT:S/-/,/g}
FULLPKGNAME-perl = p5-Geo-GDAL-${V}
FULLPKGPATH-perl = geo/gdal,-perl
SHARED_LIBS = gdal 39.0 #27.0
SHARED_LIBS = gdal 39.1 #27.1
CATEGORIES = geo devel
HOMEPAGE = http://www.gdal.org/
@ -30,11 +30,7 @@ MASTER_SITES = http://download.osgeo.org/gdal/${V}/
MODULES = perl lang/python
FLAVORS = python3
FLAVOR ?=
.if ${FLAVOR:Mpython3}
FULLPKGNAME-python = py3-${DISTNAME}
.endif
FLAVOR = python3
COMPILER = base-clang ports-gcc
@ -133,20 +129,7 @@ CONFIGURE_ARGS =--without-cfitsio \
post-extract:
ln -sf ${WRKDIR}/gdalautotest-${V} ${WRKSRC}/autotest
PYBINS = epsg_tr esri2wkt gcps2vec gcps2wld gdal2xyz gdal_auth gdal_merge \
gdalchksum gdalident gdalimport mkgraticule
PYBINSWITHMAN = gdal2tiles gdal_calc gdal_edit gdal_fillnodata gdal_pansharpen \
gdal_polygonize gdal_proximity gdal_retile gdal_sieve gdalcompare \
gdalmove ogrmerge pct2rgb rgb2pct
post-install:
.for b in ${PYBINSWITHMAN}
mv -f ${PREFIX}/bin/$b.py ${PREFIX}/bin/$b${MODPY_BIN_SUFFIX}.py
mv -f ${PREFIX}/man/man1/$b.1 ${PREFIX}/man/man1/$b${MODPY_BIN_SUFFIX}.1
.endfor
.for b in ${PYBINS}
mv -f ${PREFIX}/bin/$b.py ${PREFIX}/bin/$b${MODPY_BIN_SUFFIX}.py
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${MODPY_PY_PREFIX}gdal
cp ${WRKSRC}/swig/python/samples/*.py ${PREFIX}/share/examples/${MODPY_PY_PREFIX}gdal

8
geo/gdal/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (gdal-3.1.0.tar.gz) = Z5PdsrHKBCSU2TisgscdBrkSW7sAybuUFKfF46cHxjk=
SHA256 (gdalautotest-3.1.0.tar.gz) = qRng2331Ypb5Gt2LCQspvQzV1GMUKekngwFKs3SrtFg=
SIZE (gdal-3.1.0.tar.gz) = 18796401
SIZE (gdalautotest-3.1.0.tar.gz) = 34816000
SHA256 (gdal-3.1.1.tar.gz) = WvI0KdbUgaztrYu/xOUPNGJBNmJly6qrxTdjwOpdjw4=
SHA256 (gdalautotest-3.1.1.tar.gz) = m2Vxve+/tfgyYhTMfK4EOZwd2urM2yS6d/kc+Cgr2aE=
SIZE (gdal-3.1.1.tar.gz) = 18806693
SIZE (gdalautotest-3.1.1.tar.gz) = 34887680

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

@ -1,9 +1,9 @@
$OpenBSD: patch-swig_python_setup_py,v 1.14 2020/05/14 11:28:33 landry Exp $
$OpenBSD: patch-swig_python_setup_py,v 1.15 2020/06/30 06:02:38 landry Exp $
Index: swig/python/setup.py
--- swig/python/setup.py.orig
+++ swig/python/setup.py
@@ -350,7 +350,7 @@ if sys.version_info < (3,):
@@ -351,7 +351,7 @@ if sys.version_info < (3,):
except:
pass

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.21 2020/05/14 11:28:34 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.22 2020/06/30 06:02:38 landry Exp $
@conflict gdal-<=1.8.0
@pkgpath geo/gdal
bin/gdal-config
@ -106,12 +106,15 @@ lib/pkgconfig/gdal.pc
@man man/man1/gdal_merge.1
@man man/man1/gdal_rasterize.1
@man man/man1/gdal_translate.1
@man man/man1/gdal_viewshed.1
@man man/man1/gdaladdo.1
@man man/man1/gdalbuildvrt.1
@man man/man1/gdaldem.1
@man man/man1/gdalinfo.1
@man man/man1/gdallocationinfo.1
@man man/man1/gdalmanage.1
@man man/man1/gdalmdiminfo.1
@man man/man1/gdalmdimtranslate.1
@man man/man1/gdalsrsinfo.1
@man man/man1/gdaltindex.1
@man man/man1/gdaltransform.1

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

@ -1,29 +1,31 @@
@comment $OpenBSD: PLIST-python,v 1.20 2020/05/14 11:28:34 landry Exp $
bin/epsg_tr${MODPY_BIN_SUFFIX}.py
bin/esri2wkt${MODPY_BIN_SUFFIX}.py
bin/gcps2vec${MODPY_BIN_SUFFIX}.py
bin/gcps2wld${MODPY_BIN_SUFFIX}.py
bin/gdal2tiles${MODPY_BIN_SUFFIX}.py
bin/gdal2xyz${MODPY_BIN_SUFFIX}.py
bin/gdal_auth${MODPY_BIN_SUFFIX}.py
bin/gdal_calc${MODPY_BIN_SUFFIX}.py
bin/gdal_edit${MODPY_BIN_SUFFIX}.py
bin/gdal_fillnodata${MODPY_BIN_SUFFIX}.py
bin/gdal_merge${MODPY_BIN_SUFFIX}.py
bin/gdal_pansharpen${MODPY_BIN_SUFFIX}.py
bin/gdal_polygonize${MODPY_BIN_SUFFIX}.py
bin/gdal_proximity${MODPY_BIN_SUFFIX}.py
bin/gdal_retile${MODPY_BIN_SUFFIX}.py
bin/gdal_sieve${MODPY_BIN_SUFFIX}.py
bin/gdalchksum${MODPY_BIN_SUFFIX}.py
bin/gdalcompare${MODPY_BIN_SUFFIX}.py
bin/gdalident${MODPY_BIN_SUFFIX}.py
bin/gdalimport${MODPY_BIN_SUFFIX}.py
bin/gdalmove${MODPY_BIN_SUFFIX}.py
bin/mkgraticule${MODPY_BIN_SUFFIX}.py
bin/ogrmerge${MODPY_BIN_SUFFIX}.py
bin/pct2rgb${MODPY_BIN_SUFFIX}.py
bin/rgb2pct${MODPY_BIN_SUFFIX}.py
@comment $OpenBSD: PLIST-python,v 1.21 2020/06/30 06:02:38 landry Exp $
@conflict py-gdal-<3.1.1
@pkgpath geo/gdal,-python
bin/epsg_tr.py
bin/esri2wkt.py
bin/gcps2vec.py
bin/gcps2wld.py
bin/gdal2tiles.py
bin/gdal2xyz.py
bin/gdal_auth.py
bin/gdal_calc.py
bin/gdal_edit.py
bin/gdal_fillnodata.py
bin/gdal_merge.py
bin/gdal_pansharpen.py
bin/gdal_polygonize.py
bin/gdal_proximity.py
bin/gdal_retile.py
bin/gdal_sieve.py
bin/gdalchksum.py
bin/gdalcompare.py
bin/gdalident.py
bin/gdalimport.py
bin/gdalmove.py
bin/mkgraticule.py
bin/ogrmerge.py
bin/pct2rgb.py
bin/rgb2pct.py
lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@ -31,18 +33,26 @@ 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/not-zip-safe
lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/GDAL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
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/ogr.py
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/gdalconst.py
lib/python${MODPY_VERSION}/site-packages/gdalnumeric.py
lib/python${MODPY_VERSION}/site-packages/ogr.py
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
@so lib/python${MODPY_VERSION}/site-packages/osgeo/_gdal.so
@so lib/python${MODPY_VERSION}/site-packages/osgeo/_gdal_array.so
@so lib/python${MODPY_VERSION}/site-packages/osgeo/_gdalconst.so
@ -50,35 +60,27 @@ lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}__init__.${MODPY_
@so lib/python${MODPY_VERSION}/site-packages/osgeo/_ogr.so
@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
@man man/man1/gdal_fillnodata${MODPY_BIN_SUFFIX}.1
@man man/man1/gdal_pansharpen${MODPY_BIN_SUFFIX}.1
@man man/man1/gdal_polygonize${MODPY_BIN_SUFFIX}.1
@man man/man1/gdal_proximity${MODPY_BIN_SUFFIX}.1
@man man/man1/gdal_retile${MODPY_BIN_SUFFIX}.1
@man man/man1/gdal_sieve${MODPY_BIN_SUFFIX}.1
@man man/man1/gdalcompare${MODPY_BIN_SUFFIX}.1
@man man/man1/gdalmove${MODPY_BIN_SUFFIX}.1
@man man/man1/ogrmerge${MODPY_BIN_SUFFIX}.1
@man man/man1/pct2rgb${MODPY_BIN_SUFFIX}.1
@man man/man1/rgb2pct${MODPY_BIN_SUFFIX}.1
@man man/man1/gdal2tiles.1
@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
@man man/man1/gdal_sieve.1
@man man/man1/gdalcompare.1
@man man/man1/gdalmove.1
@man man/man1/ogrmerge.1
@man man/man1/pct2rgb.1
@man man/man1/rgb2pct.1
share/examples/${MODPY_PY_PREFIX}gdal/
share/examples/${MODPY_PY_PREFIX}gdal/assemblepoly.py
share/examples/${MODPY_PY_PREFIX}gdal/attachpct.py