Attachment 214378 Details for Bug 246304 – gdal and py-gdal 3.1.0 fixed

[patch] gdal and py-gdal 3.1.0 fixed

gdal (text/plain), 14.04 KB, created by Loïc Bartoletti on 2020-05-11 14:32:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2020-05-11 14:32:52 UTC

Size: 14.04 KB

patch

obsolete

>Index: graphics/gdal/Makefile
>===================================================================
>--- graphics/gdal/Makefile	(rÃ©vision 534330)
>+++ graphics/gdal/Makefile	(copie de travail)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gdal
>-PORTVERSION=	3.0.4
>-PORTREVISION=	4
>+PORTVERSION=	3.1.0
> CATEGORIES=	graphics geography
> MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
> 		LOCAL/sunpoet
>@@ -21,19 +20,23 @@
> 		libjson-c.so:devel/json-c \
> 		libpng.so:graphics/png \
> 		libproj.so:graphics/proj \
>-		libtiff.so:graphics/tiff
>+		libtiff.so:graphics/tiff \
>+		libqhull.so:math/qhull
> 
>-OPTIONS_DEFINE=	ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GTA HDF5 JASPER \
>+USES=		compiler:c++11-lang gmake iconv jpeg localbase pkgconfig ssl tar:xz
>+
>+OPTIONS_DEFINE=	ARMADILLO BASH CFITSIO CURL ECW EXPAT FREEXL GEOS GTA HDF5 JASPER \
> 		KML LIBXML2 MYSQL NETCDF ODBC OPENJPEG PCRE PGSQL SFCGAL \
> 		SPATIALITE SQLITE WEBP XERCES ZSTD
>-OPTIONS_DEFAULT=JASPER
>+OPTIONS_DEFAULT=	CURL EXPAT FREEXL GEOS HDF5 JASPER \
>+			KML LIBXML2 NETCDF OPENJPEG PCRE PGSQL SFCGAL \
>+			SPATIALITE SQLITE WEBP XERCES ZSTD POPPLER
> OPTIONS_RADIO=	PDF
> OPTIONS_RADIO_PDF=	PODOFO POPPLER
> OPTIONS_SUB=	yes
>+BASH_DESC=	Install bash completion script
> PCRE_DESC=	Regular expression support for SQLite
> 
>-USES=		compiler:c++11-lang gmake iconv jpeg localbase pkgconfig ssl tar:xz
>-
> CFLAGS+=	-fPIC
> CONFIGURE_ARGS=	--datadir=${DATADIR} \
> 		--enable-static=yes \
>@@ -49,6 +52,7 @@
> 		--with-proj=yes \
> 		--with-threads=yes \
> 		--without-libtool \
>+		--with-qhull=yes \
> 		${ICONV_CONFIGURE_ARG}
> GNU_CONFIGURE=	yes
> LDFLAGS+=	${ICONV_LIB}
>@@ -79,6 +83,7 @@
> 
> ARMADILLO_CONFIGURE_WITH=	armadillo
> ARMADILLO_LIB_DEPENDS=	libarmadillo.so:math/armadillo
>+BASH_CONFIGURE_WITH=	bash-completion
> CFITSIO_CONFIGURE_WITH=	cfitsio
> CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
> CURL_CONFIGURE_OFF=	--with-curl=no
>@@ -102,7 +107,6 @@
> KML_CONFIGURE_WITH=	libkml
> KML_LIB_DEPENDS=	libkmlbase.so:science/libkml
> LIBXML2_CONFIGURE_OFF=	--with-xml2=no
>-LIBXML2_CONFIGURE_ON=	--with-xml2=${LOCALBASE}/bin/xml2-config
> LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
> MYSQL_CONFIGURE_OFF=	--with-mysql=no
> MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}/bin/mysql_config
>@@ -140,6 +144,7 @@
> 	@${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|; s| LICENSE.TXT||' ${WRKSRC}/GNUmakefile
> 	@${REINPLACE_CMD} -e 's|-lminizip|-lkmlminizip|' ${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e 's|getCString()|c_str()|' ${WRKSRC}/frmts/pdf/pdfdataset.cpp ${WRKSRC}/frmts/pdf/pdfobject.cpp
>+	@${REINPLACE_CMD} -e 's|$${sysconfdir}|${PREFIX}/etc/|' ${WRKSRC}/configure.ac # bash_completion
> # Clean up bundled libraries
> 	@${RM} -r ${WRKSRC}/frmts/gif/giflib/
> 	@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/
>@@ -155,6 +160,12 @@
> 	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
> 	${TOUCH} ${STAGEDIR}${PREFIX}/lib/gdalplugins/.keepme
> 	${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/
>+	${INSTALL_DATA} ${WRKSRC}/data/* ${STAGEDIR}${DATADIR}/
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so.${PORTVERSION}
>+.for p in 	gdaldem gdal_viewshed gdal_rasterize ogr2ogr ogrinfo gdal_grid gnmmanage gnmanalyse testepsg gdalmdiminfo ogrlineref \
>+		nearblack gdal_contour gdalmdimtranslate gdalsrsinfo gdalserver gdalmanage gdalbuildvrt gdalinfo gdaltindex gdaltransform \
>+		gdalwarp  ogrtindex gdaladdo gdallocationinfo gdalenhance gdal_translate
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${p}
>+.endfor
> 
> .include <bsd.port.mk>
>Index: graphics/gdal/distinfo
>===================================================================
>--- graphics/gdal/distinfo	(rÃ©vision 534330)
>+++ graphics/gdal/distinfo	(copie de travail)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1580562263
>-SHA256 (gdal-3.0.4.tar.xz) = 5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
>-SIZE (gdal-3.0.4.tar.xz) = 8696684
>+TIMESTAMP = 1588923980
>+SHA256 (gdal-3.1.0.tar.xz) = e754a22242ccbec731aacdb2333b567d4c95b9b02d3ba1ea12f70508d244fcda
>+SIZE (gdal-3.1.0.tar.xz) = 12076312
>Index: graphics/gdal/files/patch-apps_GNUmakefile
>===================================================================
>--- graphics/gdal/files/patch-apps_GNUmakefile	(rÃ©vision 534330)
>+++ graphics/gdal/files/patch-apps_GNUmakefile	(nonexistent)
>@@ -1,13 +0,0 @@
>---- apps/GNUmakefile.orig	2018-05-04 16:05:45 UTC
>-+++ apps/GNUmakefile
>-@@ -215,7 +215,7 @@ gdal-config-inst:	gdal-config.in ../GDAL
>- 
>- 
>- install: default
>--	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
>--	$(INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
>--	$(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
>-+	for f in $(BIN_LIST) ; do $(BSD_INSTALL_PROGRAM) $$f $(DESTDIR)$(INST_BIN) ; done
>-+	$(BSD_INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
>-+	$(BSD_INSTALL_SCRIPT) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
>- 
>
>Property changes on: graphics/gdal/files/patch-apps_GNUmakefile
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: graphics/gdal/files/patch-scripts-GNUmakefile
>===================================================================
>--- graphics/gdal/files/patch-scripts-GNUmakefile	(rÃ©vision 534330)
>+++ graphics/gdal/files/patch-scripts-GNUmakefile	(nonexistent)
>@@ -1,12 +0,0 @@
>---- scripts/GNUmakefile.orig	2017-01-20 08:20:46 UTC
>-+++ scripts/GNUmakefile
>-@@ -4,7 +4,5 @@ completion:
>- 	PATH=$(GDAL_ROOT)/swig/python/scripts:$(GDAL_ROOT)/apps:$(PATH) python completionFinder.py gdal-bash-completion.sh
>- 
>- install:
>--	if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
>--		$(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
>--		cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
>--	fi
>-+	$(INSTALL_DIR) $(DESTDIR)${prefix}/etc/bash_completion.d
>-+	$(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)${prefix}/etc/bash_completion.d
>
>Property changes on: graphics/gdal/files/patch-scripts-GNUmakefile
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: graphics/gdal/files/patch-scripts_GNUmakefile
>===================================================================
>--- graphics/gdal/files/patch-scripts_GNUmakefile	(nonexistent)
>+++ graphics/gdal/files/patch-scripts_GNUmakefile	(copie de travail)
>@@ -0,0 +1,12 @@
>+--- scripts/GNUmakefile.orig	2020-05-08 09:49:22 UTC
>++++ scripts/GNUmakefile
>+@@ -14,7 +14,7 @@ completion:
>+ 
>+ install:
>+ 	$(INSTALL_DIR) $(DESTDIR)$(INST_BASH_COMPLETION) ; \
>+-	$(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo; \
>++	$(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo; $(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)$(INST_BASH_COMPLETION)/; \
>+ 	for p in $(PROGRAMS); do \
>+-		ln -rs $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo $(DESTDIR)$(INST_BASH_COMPLETION)/$$p; \
>++		cd $(DESTDIR)$(INST_BASH_COMPLETION) ; ln -s gdalinfo $(DESTDIR)$(INST_BASH_COMPLETION)/$$p; \
>+ 	done
>
>Property changes on: graphics/gdal/files/patch-scripts_GNUmakefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/gdal/pkg-plist
>===================================================================
>--- graphics/gdal/pkg-plist	(rÃ©vision 534330)
>+++ graphics/gdal/pkg-plist	(copie de travail)
>@@ -15,6 +15,9 @@
> bin/gdaltindex
> bin/gdaltransform
> bin/gdalwarp
>+bin/gdal_viewshed
>+bin/gdalmdiminfo
>+bin/gdalmdimtranslate
> bin/gnmanalyse
> bin/gnmmanage
> bin/nearblack
>@@ -23,7 +26,44 @@
> bin/ogrlineref
> bin/ogrtindex
> bin/testepsg
>-etc/bash_completion.d/gdal-bash-completion.sh
>+%%BASH%%etc/bash_completion.d/gdal-bash-completion.sh
>+%%BASH%%etc/bash_completion.d/gdal-config
>+%%BASH%%etc/bash_completion.d/gdal2tiles.py
>+%%BASH%%etc/bash_completion.d/gdal2xyz.py
>+%%BASH%%etc/bash_completion.d/gdal_calc.py
>+%%BASH%%etc/bash_completion.d/gdal_contour
>+%%BASH%%etc/bash_completion.d/gdal_edit.py
>+%%BASH%%etc/bash_completion.d/gdal_fillnodata.py
>+%%BASH%%etc/bash_completion.d/gdal_grid
>+%%BASH%%etc/bash_completion.d/gdal_merge.py
>+%%BASH%%etc/bash_completion.d/gdal_polygonize.py
>+%%BASH%%etc/bash_completion.d/gdal_proximity.py
>+%%BASH%%etc/bash_completion.d/gdal_rasterize
>+%%BASH%%etc/bash_completion.d/gdal_retile.py
>+%%BASH%%etc/bash_completion.d/gdal_sieve.py
>+%%BASH%%etc/bash_completion.d/gdal_translate
>+%%BASH%%etc/bash_completion.d/gdaladdo
>+%%BASH%%etc/bash_completion.d/gdalbuildvrt
>+%%BASH%%etc/bash_completion.d/gdalchksum.py
>+%%BASH%%etc/bash_completion.d/gdalcompare.py
>+%%BASH%%etc/bash_completion.d/gdaldem
>+%%BASH%%etc/bash_completion.d/gdalenhance
>+%%BASH%%etc/bash_completion.d/gdalident.py
>+%%BASH%%etc/bash_completion.d/gdalimport.py
>+%%BASH%%etc/bash_completion.d/gdalinfo
>+%%BASH%%etc/bash_completion.d/gdallocationinfo
>+%%BASH%%etc/bash_completion.d/gdalmanage
>+%%BASH%%etc/bash_completion.d/gdalmove.py
>+%%BASH%%etc/bash_completion.d/gdalserver
>+%%BASH%%etc/bash_completion.d/gdalsrsinfo
>+%%BASH%%etc/bash_completion.d/gdaltindex
>+%%BASH%%etc/bash_completion.d/gdaltransform
>+%%BASH%%etc/bash_completion.d/gdalwarp
>+%%BASH%%etc/bash_completion.d/ogr2ogr
>+%%BASH%%etc/bash_completion.d/ogrinfo
>+%%BASH%%etc/bash_completion.d/ogrlineref
>+%%BASH%%etc/bash_completion.d/ogrmerge.py
>+%%BASH%%etc/bash_completion.d/ogrtindex
> include/cpl_atomic_ops.h
> include/cpl_auto_close.h
> include/cpl_aws.h
>@@ -100,6 +140,7 @@
> include/ogr_p.h
> include/ogr_spatialref.h
> include/ogr_srs_api.h
>+include/ogr_swq.h
> include/ogrsf_frmts.h
> include/rawdataset.h
> include/thinplatespline.h
>@@ -121,7 +162,85 @@
> %%DATADIR%%/eedaconf.json
> %%DATADIR%%/epsg.wkt
> %%DATADIR%%/esri_StatePlane_extra.wkt
>+%%DATADIR%%/gdal/GDALLogoBW.svg
>+%%DATADIR%%/gdal/GDALLogoColor.svg
>+%%DATADIR%%/gdal/GDALLogoGS.svg
>+%%DATADIR%%/gdal/bag_template.xml
>+%%DATADIR%%/gdal/cubewerx_extra.wkt
>+%%DATADIR%%/gdal/default.rsc
>+%%DATADIR%%/gdal/ecw_cs.wkt
>+%%DATADIR%%/gdal/eedaconf.json
>+%%DATADIR%%/gdal/epsg.wkt
>+%%DATADIR%%/gdal/esri_StatePlane_extra.wkt
>+%%DATADIR%%/gdal/gdalicon.png
>+%%DATADIR%%/gdal/gdalmdiminfo_output.schema.json
>+%%DATADIR%%/gdal/gdalvrt.xsd
>+%%DATADIR%%/gdal/gml_registry.xml
>+%%DATADIR%%/gdal/gmlasconf.xml
>+%%DATADIR%%/gdal/gmlasconf.xsd
>+%%DATADIR%%/gdal/gt_datum.csv
>+%%DATADIR%%/gdal/gt_ellips.csv
>+%%DATADIR%%/gdal/header.dxf
>+%%DATADIR%%/gdal/inspire_cp_BasicPropertyUnit.gfs
>+%%DATADIR%%/gdal/inspire_cp_CadastralBoundary.gfs
>+%%DATADIR%%/gdal/inspire_cp_CadastralParcel.gfs
>+%%DATADIR%%/gdal/inspire_cp_CadastralZoning.gfs
>+%%DATADIR%%/gdal/jpfgdgml_AdmArea.gfs
>+%%DATADIR%%/gdal/jpfgdgml_AdmBdry.gfs
>+%%DATADIR%%/gdal/jpfgdgml_AdmPt.gfs
>+%%DATADIR%%/gdal/jpfgdgml_BldA.gfs
>+%%DATADIR%%/gdal/jpfgdgml_BldL.gfs
>+%%DATADIR%%/gdal/jpfgdgml_Cntr.gfs
>+%%DATADIR%%/gdal/jpfgdgml_CommBdry.gfs
>+%%DATADIR%%/gdal/jpfgdgml_CommPt.gfs
>+%%DATADIR%%/gdal/jpfgdgml_Cstline.gfs
>+%%DATADIR%%/gdal/jpfgdgml_ElevPt.gfs
>+%%DATADIR%%/gdal/jpfgdgml_GCP.gfs
>+%%DATADIR%%/gdal/jpfgdgml_LeveeEdge.gfs
>+%%DATADIR%%/gdal/jpfgdgml_RailCL.gfs
>+%%DATADIR%%/gdal/jpfgdgml_RdASL.gfs
>+%%DATADIR%%/gdal/jpfgdgml_RdArea.gfs
>+%%DATADIR%%/gdal/jpfgdgml_RdCompt.gfs
>+%%DATADIR%%/gdal/jpfgdgml_RdEdg.gfs
>+%%DATADIR%%/gdal/jpfgdgml_RdMgtBdry.gfs
>+%%DATADIR%%/gdal/jpfgdgml_RdSgmtA.gfs
>+%%DATADIR%%/gdal/jpfgdgml_RvrMgtBdry.gfs
>+%%DATADIR%%/gdal/jpfgdgml_SBAPt.gfs
>+%%DATADIR%%/gdal/jpfgdgml_SBArea.gfs
>+%%DATADIR%%/gdal/jpfgdgml_SBBdry.gfs
>+%%DATADIR%%/gdal/jpfgdgml_WA.gfs
>+%%DATADIR%%/gdal/jpfgdgml_WL.gfs
>+%%DATADIR%%/gdal/jpfgdgml_WStrA.gfs
>+%%DATADIR%%/gdal/jpfgdgml_WStrL.gfs
>+%%DATADIR%%/gdal/netcdf_config.xsd
>+%%DATADIR%%/gdal/nitf_spec.xml
>+%%DATADIR%%/gdal/nitf_spec.xsd
>+%%DATADIR%%/gdal/ogrvrt.xsd
>+%%DATADIR%%/gdal/osmconf.ini
>+%%DATADIR%%/gdal/ozi_datum.csv
>+%%DATADIR%%/gdal/ozi_ellips.csv
>+%%DATADIR%%/gdal/pci_datum.txt
>+%%DATADIR%%/gdal/pci_ellips.txt
>+%%DATADIR%%/gdal/pdfcomposition.xsd
>+%%DATADIR%%/gdal/pds4_template.xml
>+%%DATADIR%%/gdal/plscenesconf.json
>+%%DATADIR%%/gdal/ruian_vf_ob_v1.gfs
>+%%DATADIR%%/gdal/ruian_vf_st_uvoh_v1.gfs
>+%%DATADIR%%/gdal/ruian_vf_st_v1.gfs
>+%%DATADIR%%/gdal/ruian_vf_v1.gfs
>+%%DATADIR%%/gdal/s57agencies.csv
>+%%DATADIR%%/gdal/s57attributes.csv
>+%%DATADIR%%/gdal/s57expectedinput.csv
>+%%DATADIR%%/gdal/s57objectclasses.csv
>+%%DATADIR%%/gdal/seed_2d.dgn
>+%%DATADIR%%/gdal/seed_3d.dgn
>+%%DATADIR%%/gdal/stateplane.csv
>+%%DATADIR%%/gdal/trailer.dxf
>+%%DATADIR%%/gdal/vdv452.xml
>+%%DATADIR%%/gdal/vdv452.xsd
>+%%DATADIR%%/gdal/vicar.json
> %%DATADIR%%/gdalicon.png
>+%%DATADIR%%/gdalmdiminfo_output.schema.json
> %%DATADIR%%/gdalvrt.xsd
> %%DATADIR%%/gml_registry.xml
> %%DATADIR%%/gmlasconf.xml
>@@ -186,3 +305,4 @@
> %%DATADIR%%/trailer.dxf
> %%DATADIR%%/vdv452.xml
> %%DATADIR%%/vdv452.xsd
>+%%DATADIR%%/vicar.json
>Index: graphics/py-gdal/Makefile
>===================================================================
>--- graphics/py-gdal/Makefile	(rÃ©vision 534330)
>+++ graphics/py-gdal/Makefile	(copie de travail)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gdal
>-PORTVERSION=	3.0.4
>+PORTVERSION=	3.1.0
> CATEGORIES=	graphics python
> MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
> 		LOCAL/sunpoet
>Index: graphics/py-gdal/distinfo
>===================================================================
>--- graphics/py-gdal/distinfo	(rÃ©vision 534330)
>+++ graphics/py-gdal/distinfo	(copie de travail)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1580562263
>-SHA256 (gdal-3.0.4.tar.xz) = 5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
>-SIZE (gdal-3.0.4.tar.xz) = 8696684
>+TIMESTAMP = 1588933945
>+SHA256 (gdal-3.1.0.tar.xz) = e754a22242ccbec731aacdb2333b567d4c95b9b02d3ba1ea12f70508d244fcda
>+SIZE (gdal-3.1.0.tar.xz) = 12076312

Actions: View | Diff

Attachments on bug 246304: 214270 | 214271 | 214378 | 214402