Date: Thu, 9 Jul 2015 16:05:07 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391657 - in head: astro/merkaartor astro/osmium astro/qlandkartegt databases/grass graphics/R-cran-rgdal graphics/gdal graphics/gdal-grass graphics/gdal-grass/files graphics/gmt graphi... Message-ID: <201507091605.t69G5748030677@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Thu Jul 9 16:05:06 2015 New Revision: 391657 URL: https://svnweb.freebsd.org/changeset/ports/391657 Log: - Update to 2.0.0 - Bump PORTREVISION for graphics/gdal shlib change - Mark astro/merkaartor as BROKEN Changes: http://trac.osgeo.org/gdal/wiki/Release/2.0.0-News Added: head/graphics/gdal-grass/files/patch-ogrgrass.h (contents, props changed) head/graphics/gdal-grass/files/patch-ogrgrasslayer.cpp (contents, props changed) head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_datasource.cpp (contents, props changed) head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_datasource.hpp (contents, props changed) head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_layer_ptr.hpp (contents, props changed) Modified: head/astro/merkaartor/Makefile head/astro/osmium/Makefile head/astro/qlandkartegt/Makefile head/databases/grass/Makefile head/graphics/R-cran-rgdal/Makefile head/graphics/gdal-grass/Makefile head/graphics/gdal/Makefile head/graphics/gdal/distinfo head/graphics/gdal/pkg-plist head/graphics/gmt/Makefile head/graphics/mapnik/Makefile head/graphics/mapserver/Makefile head/graphics/osgearth/Makefile head/graphics/qgis/Makefile head/math/pdal/Makefile head/math/saga/Makefile Modified: head/astro/merkaartor/Makefile ============================================================================== --- head/astro/merkaartor/Makefile Thu Jul 9 15:59:11 2015 (r391656) +++ head/astro/merkaartor/Makefile Thu Jul 9 16:05:06 2015 (r391657) @@ -16,6 +16,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal \ libproj.so:${PORTSDIR}/graphics/proj +BROKEN= does not build with GDAL 2.0 + USES= qmake tar:bzip2 USE_LDCONFIG= yes Modified: head/astro/osmium/Makefile ============================================================================== --- head/astro/osmium/Makefile Thu Jul 9 15:59:11 2015 (r391656) +++ head/astro/osmium/Makefile Thu Jul 9 16:05:06 2015 (r391657) @@ -3,7 +3,7 @@ PORTNAME= osmium PORTVERSION= git20130522 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= astro geography devel MAINTAINER= amdmi3@FreeBSD.org Modified: head/astro/qlandkartegt/Makefile ============================================================================== --- head/astro/qlandkartegt/Makefile Thu Jul 9 15:59:11 2015 (r391656) +++ head/astro/qlandkartegt/Makefile Thu Jul 9 16:05:06 2015 (r391657) @@ -3,7 +3,7 @@ PORTNAME= qlandkartegt PORTVERSION= 1.7.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/QLandkarte%20GT%20${PORTVERSION} Modified: head/databases/grass/Makefile ============================================================================== --- head/databases/grass/Makefile Thu Jul 9 15:59:11 2015 (r391656) +++ head/databases/grass/Makefile Thu Jul 9 16:05:06 2015 (r391657) @@ -3,7 +3,7 @@ PORTNAME= grass PORTVERSION= 6.4.4 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 2 CATEGORIES= databases geography MASTER_SITES= http://grass.osgeo.org/%SUBDIR%/ \ Modified: head/graphics/R-cran-rgdal/Makefile ============================================================================== --- head/graphics/R-cran-rgdal/Makefile Thu Jul 9 15:59:11 2015 (r391656) +++ head/graphics/R-cran-rgdal/Makefile Thu Jul 9 16:05:06 2015 (r391657) @@ -3,6 +3,7 @@ PORTNAME= rgdal DISTVERSION= 1.0-4 +PORTREVISION= 1 CATEGORIES= graphics DISTNAME= ${PORTNAME}_${DISTVERSION} Modified: head/graphics/gdal-grass/Makefile ============================================================================== --- head/graphics/gdal-grass/Makefile Thu Jul 9 15:59:11 2015 (r391656) +++ head/graphics/gdal-grass/Makefile Thu Jul 9 16:05:06 2015 (r391657) @@ -3,6 +3,7 @@ PORTNAME= gdal-grass PORTVERSION= 1.11.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://download.osgeo.org/gdal/ Added: head/graphics/gdal-grass/files/patch-ogrgrass.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gdal-grass/files/patch-ogrgrass.h Thu Jul 9 16:05:06 2015 (r391657) @@ -0,0 +1,11 @@ +--- ogrgrass.h.orig 2015-02-06 15:30:50 UTC ++++ ogrgrass.h +@@ -55,7 +55,7 @@ class OGRGRASSLayer : public OGRLayer + + // Layer info + OGRFeatureDefn * GetLayerDefn() { return poFeatureDefn; } +- int GetFeatureCount( int ); ++ GIntBig GetFeatureCount( int ); + OGRErr GetExtent(OGREnvelope *psExtent, int bForce); + virtual OGRSpatialReference *GetSpatialRef(); + int TestCapability( const char * ); Added: head/graphics/gdal-grass/files/patch-ogrgrasslayer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gdal-grass/files/patch-ogrgrasslayer.cpp Thu Jul 9 16:05:06 2015 (r391657) @@ -0,0 +1,11 @@ +--- ogrgrasslayer.cpp.orig 2015-02-06 15:30:50 UTC ++++ ogrgrasslayer.cpp +@@ -1013,7 +1013,7 @@ OGRErr OGRGRASSLayer::CreateFeature( OGR + /* Eventually we should consider implementing a more efficient */ + /* way of counting features matching a spatial query. */ + /************************************************************************/ +-int OGRGRASSLayer::GetFeatureCount( int bForce ) ++GIntBig OGRGRASSLayer::GetFeatureCount( int bForce ) + { + if( m_poFilterGeom != NULL || m_poAttrQuery != NULL ) + return OGRLayer::GetFeatureCount( bForce ); Modified: head/graphics/gdal/Makefile ============================================================================== --- head/graphics/gdal/Makefile Thu Jul 9 15:59:11 2015 (r391656) +++ head/graphics/gdal/Makefile Thu Jul 9 16:05:06 2015 (r391657) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gdal -PORTVERSION= 1.11.2 -PORTREVISION= 3 +PORTVERSION= 2.0.0 CATEGORIES= graphics geography MASTER_SITES= http://download.osgeo.org/gdal/${PORTVERSION}/ \ ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \ @@ -47,7 +46,7 @@ MAKEFILE= GNUmakefile USE_LDCONFIG= yes USES= gmake jpeg tar:xz -PLIST_SUB= PORTVERSION=${PORTVERSION} +PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} PORTVERSION=${PORTVERSION} PORTDATA= * SLAVEDIRS= graphics/p5-Geo-GDAL graphics/php-gdal graphics/py-gdal graphics/ruby-gdal Modified: head/graphics/gdal/distinfo ============================================================================== --- head/graphics/gdal/distinfo Thu Jul 9 15:59:11 2015 (r391656) +++ head/graphics/gdal/distinfo Thu Jul 9 16:05:06 2015 (r391657) @@ -1,2 +1,2 @@ -SHA256 (gdal-1.11.2.tar.xz) = b7a18956dde45d636330d558a3a804684565f9356b517ddec223462f2430075f -SIZE (gdal-1.11.2.tar.xz) = 6473004 +SHA256 (gdal-2.0.0.tar.xz) = 91704fafeea2349c5e268dc1e2d03921b3aae64b05ee01d59fdfc1a6b0ffc061 +SIZE (gdal-2.0.0.tar.xz) = 6967656 Modified: head/graphics/gdal/pkg-plist ============================================================================== --- head/graphics/gdal/pkg-plist Thu Jul 9 15:59:11 2015 (r391656) +++ head/graphics/gdal/pkg-plist Thu Jul 9 16:05:06 2015 (r391657) @@ -54,6 +54,7 @@ include/gdal_alg.h include/gdal_alg_priv.h include/gdal_csv.h include/gdal_frmts.h +include/gdal_mdreader.h include/gdal_pam.h include/gdal_priv.h include/gdal_proxy.h @@ -67,6 +68,8 @@ include/gdalgrid.h include/gdalgrid_priv.h include/gdaljp2abstractdataset.h include/gdaljp2metadata.h +include/gdaljp2metadatagenerator.h +include/gdalsse_priv.h include/gdalwarper.h include/gdalwarpkernel_opencl.h include/gvgcpfit.h @@ -87,6 +90,6 @@ include/vrtdataset.h lib/gdalplugins/.keepme lib/libgdal.a lib/libgdal.so -lib/libgdal.so.1 +lib/libgdal.so.%%MAJOR_VER%% lib/libgdal.so.%%PORTVERSION%% libdata/pkgconfig/gdal.pc Modified: head/graphics/gmt/Makefile ============================================================================== --- head/graphics/gmt/Makefile Thu Jul 9 15:59:11 2015 (r391656) +++ head/graphics/gmt/Makefile Thu Jul 9 16:05:06 2015 (r391657) @@ -3,7 +3,7 @@ PORTNAME= gmt PORTVERSION= 4.5.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.soest.hawaii.edu/%SUBDIR%/ \ ftp://ftp.geologi.uio.no/pub/%SUBDIR%/ \ Modified: head/graphics/mapnik/Makefile ============================================================================== --- head/graphics/mapnik/Makefile Thu Jul 9 15:59:11 2015 (r391656) +++ head/graphics/mapnik/Makefile Thu Jul 9 16:05:06 2015 (r391657) @@ -4,7 +4,7 @@ PORTNAME= mapnik PORTVERSION= 2.2.0 DISTVERSIONPREFIX= v -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics geography MASTER_SITES= http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/ Added: head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_datasource.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_datasource.cpp Thu Jul 9 16:05:06 2015 (r391657) @@ -0,0 +1,54 @@ +Obtained from: https://github.com/mapnik/mapnik/commit/f68291c5b47b5189d967dba01542262f2013da53 + https://github.com/mapnik/mapnik/commit/f0821d897f66c31755f7012b68191a2ec7a060fb + +--- plugins/input/ogr/ogr_datasource.cpp.orig 2013-06-04 01:35:27 UTC ++++ plugins/input/ogr/ogr_datasource.cpp +@@ -72,7 +72,11 @@ ogr_datasource::~ogr_datasource() + { + // free layer before destroying the datasource + layer_.free_layer(); ++#if GDAL_VERSION_MAJOR >= 2 ++ GDALClose(( GDALDatasetH) dataset_); ++#else + OGRDataSource::DestroyDataSource (dataset_); ++#endif + } + + void ogr_datasource::init(mapnik::parameters const& params) +@@ -82,6 +86,7 @@ void ogr_datasource::init(mapnik::parame + #endif + + // initialize ogr formats ++ // NOTE: in GDAL >= 2.0 this is the same as GDALAllRegister() + OGRRegisterAll(); + + boost::optional<std::string> file = params.get<std::string>("file"); +@@ -112,17 +117,26 @@ void ogr_datasource::init(mapnik::parame + + if (! driver.empty()) + { ++#if GDAL_VERSION_MAJOR >= 2 ++ unsigned int nOpenFlags = GDAL_OF_READONLY | GDAL_OF_VECTOR; ++ const char* papszAllowedDrivers[] = { driver.c_str(), NULL }; ++ dataset_ = static_cast<gdal_dataset_type>(GDALOpenEx(dataset_name_.c_str(),nOpenFlags,papszAllowedDrivers,NULL,NULL)); ++#else + OGRSFDriver * ogr_driver = OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName(driver.c_str()); + if (ogr_driver && ogr_driver != NULL) + { + dataset_ = ogr_driver->Open((dataset_name_).c_str(), FALSE); + } +- ++#endif + } + else + { + // open ogr driver +- dataset_ = OGRSFDriverRegistrar::Open((dataset_name_).c_str(), FALSE); ++#if GDAL_VERSION_MAJOR >= 2 ++ dataset_ = static_cast<gdal_dataset_type>(OGROpen(dataset_name_.c_str(), FALSE, NULL)); ++#else ++ dataset_ = OGRSFDriverRegistrar::Open(dataset_name_.c_str(), FALSE); ++#endif + } + + if (! dataset_) Added: head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_datasource.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_datasource.hpp Thu Jul 9 16:05:06 2015 (r391657) @@ -0,0 +1,13 @@ +Obtained from: https://github.com/mapnik/mapnik/commit/f68291c5b47b5189d967dba01542262f2013da53 + +--- plugins/input/ogr/ogr_datasource.hpp.orig ++++ plugins/input/ogr/ogr_datasource.hpp +@@ -63,7 +63,7 @@ class ogr_datasource : public mapnik::datasource + mapnik::datasource::datasource_t type_; + std::string dataset_name_; + std::string index_name_; +- OGRDataSource* dataset_; ++ gdal_dataset_type dataset_; + ogr_layer_ptr layer_; + std::string layer_name_; + mapnik::layer_descriptor desc_; Added: head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_layer_ptr.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_layer_ptr.hpp Thu Jul 9 16:05:06 2015 (r391657) @@ -0,0 +1,59 @@ +Obtained from: https://github.com/mapnik/mapnik/commit/f68291c5b47b5189d967dba01542262f2013da53 + https://github.com/mapnik/mapnik/commit/f0821d897f66c31755f7012b68191a2ec7a060fb + +--- plugins/input/ogr/ogr_layer_ptr.hpp.orig ++++ plugins/input/ogr/ogr_layer_ptr.hpp +@@ -29,9 +29,16 @@ + // stl + #include <stdexcept> + +-// ogr ++// gdal ++#include <gdal_version.h> + #include <ogrsf_frmts.h> + ++#if GDAL_VERSION_MAJOR >= 2 ++typedef GDALDataset* gdal_dataset_type; ++#else ++typedef OGRDataSource* gdal_dataset_type; ++#endif ++ + class ogr_layer_ptr + { + public: +@@ -62,7 +69,7 @@ class ogr_layer_ptr + is_valid_ = false; + } + +- void layer_by_name(OGRDataSource* const datasource, ++ void layer_by_name(gdal_dataset_type const datasource, + std::string const& layer_name) + { + free_layer(); +@@ -84,7 +91,7 @@ class ogr_layer_ptr + #endif + } + +- void layer_by_index(OGRDataSource* const datasource, ++ void layer_by_index(gdal_dataset_type const datasource, + int layer_index) + { + free_layer(); +@@ -110,7 +117,7 @@ class ogr_layer_ptr + #endif + } + +- void layer_by_sql(OGRDataSource* const datasource, ++ void layer_by_sql(gdal_dataset_type const datasource, + std::string const& layer_sql) + { + free_layer(); +@@ -179,7 +186,7 @@ class ogr_layer_ptr + } + #endif + +- OGRDataSource* datasource_; ++ gdal_dataset_type datasource_; + OGRLayer* layer_; + std::string layer_name_; + bool owns_layer_; Modified: head/graphics/mapserver/Makefile ============================================================================== --- head/graphics/mapserver/Makefile Thu Jul 9 15:59:11 2015 (r391656) +++ head/graphics/mapserver/Makefile Thu Jul 9 16:05:06 2015 (r391657) @@ -3,7 +3,7 @@ PORTNAME= mapserver PORTVERSION= 6.4.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics www geography MASTER_SITES= http://download.osgeo.org/mapserver/ Modified: head/graphics/osgearth/Makefile ============================================================================== --- head/graphics/osgearth/Makefile Thu Jul 9 15:59:11 2015 (r391656) +++ head/graphics/osgearth/Makefile Thu Jul 9 16:05:06 2015 (r391657) @@ -4,7 +4,7 @@ PORTNAME= osgearth PORTVERSION= 2.5 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics geography MAINTAINER= coder@tuxfamily.org Modified: head/graphics/qgis/Makefile ============================================================================== --- head/graphics/qgis/Makefile Thu Jul 9 15:59:11 2015 (r391656) +++ head/graphics/qgis/Makefile Thu Jul 9 16:05:06 2015 (r391657) @@ -3,6 +3,7 @@ PORTNAME= qgis PORTVERSION= 2.10.0 +PORTREVISION= 1 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de Modified: head/math/pdal/Makefile ============================================================================== --- head/math/pdal/Makefile Thu Jul 9 15:59:11 2015 (r391656) +++ head/math/pdal/Makefile Thu Jul 9 16:05:06 2015 (r391657) @@ -3,6 +3,7 @@ PORTNAME= pdal PORTVERSION= 0.9.8 +PORTREVISION= 1 CATEGORIES= math databases graphics MAINTAINER= coder@tuxfamily.org Modified: head/math/saga/Makefile ============================================================================== --- head/math/saga/Makefile Thu Jul 9 15:59:11 2015 (r391656) +++ head/math/saga/Makefile Thu Jul 9 16:05:06 2015 (r391657) @@ -3,6 +3,7 @@ PORTNAME= saga PORTVERSION= 2.2.0 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507091605.t69G5748030677>