geo/gdal: update to 3.6.0.
see https://github.com/OSGeo/gdal/blob/v3.6.0/NEWS.md
This commit is contained in:
parent
61a222ba09
commit
97da73cb69
@ -1,8 +1,7 @@
|
||||
COMMENT-main = translator library for geospatial data formats
|
||||
COMMENT-python =python bindings and utilities for GDAL
|
||||
|
||||
V = 3.5.3
|
||||
REVISION-python = 0
|
||||
V = 3.6.0
|
||||
DISTNAME = gdal-${V}
|
||||
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
|
||||
gdalautotest-${V}${EXTRACT_SUFX}
|
||||
@ -12,7 +11,7 @@ FULLPKGPATH-main = geo/gdal,-main
|
||||
FULLPKGNAME-python = py3-${DISTNAME}
|
||||
FULLPKGPATH-python = geo/gdal,-python${FLAVOR_EXT:S/-/,/g}
|
||||
|
||||
SHARED_LIBS = gdal 43.2 # 30.1
|
||||
SHARED_LIBS = gdal 44.0 # 30.1
|
||||
CATEGORIES = geo devel
|
||||
|
||||
HOMEPAGE = https://gdal.org/
|
||||
|
@ -1,4 +1,4 @@
|
||||
SHA256 (gdal-3.5.3.tar.gz) = qeoDANF+Nbq3HfTxbmK7L7gIHK+ZSrPuBQLOTPDU5ZM=
|
||||
SHA256 (gdalautotest-3.5.3.tar.gz) = Zp6USAh/d4j/6dZwSMn+RdiX+Ku6uz7t2iedfOdJrk4=
|
||||
SIZE (gdal-3.5.3.tar.gz) = 14504091
|
||||
SIZE (gdalautotest-3.5.3.tar.gz) = 12374523
|
||||
SHA256 (gdal-3.6.0.tar.gz) = DWp57sDGr7l8cXLkKewFydFdOReYetaGqRSyksg1Mds=
|
||||
SHA256 (gdalautotest-3.6.0.tar.gz) = tIIdS+jDS63ToBaFu6ervRgpnKYdXtEf/xIBX+e6jr8=
|
||||
SIZE (gdal-3.6.0.tar.gz) = 13932581
|
||||
SIZE (gdalautotest-3.6.0.tar.gz) = 12568383
|
||||
|
@ -1,16 +0,0 @@
|
||||
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
|
||||
@@ -113,7 +113,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\")")
|
@ -1,12 +0,0 @@
|
||||
Index: swig/python/setup.py
|
||||
--- swig/python/setup.py.orig
|
||||
+++ swig/python/setup.py
|
||||
@@ -270,7 +270,7 @@ class gdal_ext(build_ext):
|
||||
return build_ext.build_extension(self, ext)
|
||||
|
||||
|
||||
-extra_link_args = []
|
||||
+extra_link_args = ['-fPIC']
|
||||
extra_compile_args = []
|
||||
|
||||
gdal_module = Extension('osgeo._gdal',
|
@ -88,6 +88,7 @@ include/ogr_featurestyle.h
|
||||
include/ogr_geocoding.h
|
||||
include/ogr_geometry.h
|
||||
include/ogr_p.h
|
||||
include/ogr_recordbatch.h
|
||||
include/ogr_spatialref.h
|
||||
include/ogr_srs_api.h
|
||||
include/ogr_swq.h
|
||||
|
@ -14,6 +14,7 @@ bin/gdal_sieve.py
|
||||
bin/gdalattachpct.py
|
||||
bin/gdalcompare.py
|
||||
bin/gdalmove.py
|
||||
bin/ogr_layer_algebra.py
|
||||
bin/ogrmerge.py
|
||||
bin/pct2rgb.py
|
||||
bin/rgb2pct.py
|
||||
@ -36,7 +37,6 @@ lib/python${MODPY_VERSION}/site-packages/osgeo/${MODPY_PYCACHE}gnm.${MODPY_PYC_M
|
||||
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.${MODPY_PYC_MAGIC_TAG}so
|
||||
@so lib/python${MODPY_VERSION}/site-packages/osgeo/_gdal_array.${MODPY_PYC_MAGIC_TAG}so
|
||||
@so lib/python${MODPY_VERSION}/site-packages/osgeo/_gdalconst.${MODPY_PYC_MAGIC_TAG}so
|
||||
@so lib/python${MODPY_VERSION}/site-packages/osgeo/_gnm.${MODPY_PYC_MAGIC_TAG}so
|
||||
@so lib/python${MODPY_VERSION}/site-packages/osgeo/_ogr.${MODPY_PYC_MAGIC_TAG}so
|
||||
@ -66,6 +66,7 @@ lib/python${MODPY_VERSION}/site-packages/osgeo_utils/${MODPY_PYCACHE}gdal_sieve.
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/${MODPY_PYCACHE}gdalattachpct.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/${MODPY_PYCACHE}gdalcompare.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/${MODPY_PYCACHE}gdalmove.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/${MODPY_PYCACHE}ogr_layer_algebra.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/${MODPY_PYCACHE}ogrmerge.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/${MODPY_PYCACHE}pct2rgb.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/${MODPY_PYCACHE}rgb2pct.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
@ -113,6 +114,7 @@ lib/python${MODPY_VERSION}/site-packages/osgeo_utils/gdal_sieve.py
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/gdalattachpct.py
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/gdalcompare.py
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/gdalmove.py
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/ogr_layer_algebra.py
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/ogrmerge.py
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/pct2rgb.py
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/rgb2pct.py
|
||||
@ -165,7 +167,6 @@ lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/${MODPY_PYCACHE}ogr
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/${MODPY_PYCACHE}ogr2vrt.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/${MODPY_PYCACHE}ogr_build_junction_table.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/${MODPY_PYCACHE}ogr_dispatch.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/${MODPY_PYCACHE}ogr_layer_algebra.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/${MODPY_PYCACHE}ogrinfo.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/${MODPY_PYCACHE}ogrupdate.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/${MODPY_PYCACHE}rel.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
@ -224,7 +225,6 @@ lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/ogr2ogr.py
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/ogr2vrt.py
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/ogr_build_junction_table.py
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/ogr_dispatch.py
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/ogr_layer_algebra.py
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/ogrinfo.py
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/ogrupdate.py
|
||||
lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/rel.py
|
||||
@ -249,6 +249,7 @@ lib/python${MODPY_VERSION}/site-packages/osgeo_utils/samples/wcs_virtds_params.p
|
||||
@man man/man1/gdal_sieve.1
|
||||
@man man/man1/gdalcompare.1
|
||||
@man man/man1/gdalmove.1
|
||||
@man man/man1/ogr_layer_algebra.1
|
||||
@man man/man1/ogrmerge.1
|
||||
@man man/man1/pct2rgb.1
|
||||
@man man/man1/rgb2pct.1
|
||||
@ -299,7 +300,6 @@ share/examples/${MODPY_PY_PREFIX}gdal/ogr2ogr.py
|
||||
share/examples/${MODPY_PY_PREFIX}gdal/ogr2vrt.py
|
||||
share/examples/${MODPY_PY_PREFIX}gdal/ogr_build_junction_table.py
|
||||
share/examples/${MODPY_PY_PREFIX}gdal/ogr_dispatch.py
|
||||
share/examples/${MODPY_PY_PREFIX}gdal/ogr_layer_algebra.py
|
||||
share/examples/${MODPY_PY_PREFIX}gdal/ogrinfo.py
|
||||
share/examples/${MODPY_PY_PREFIX}gdal/ogrupdate.py
|
||||
share/examples/${MODPY_PY_PREFIX}gdal/rel.py
|
||||
|
Loading…
Reference in New Issue
Block a user