diff options
| author |   David Seifert <soap@gentoo.org> | 2016-03-25 18:07:07 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2016-03-25 18:07:25 +0100 |
| commit | 996251840da71035c44744e6bce83444bb866975 (patch) | |
| tree | 92901bed23a188afd140c79e62fc1d3203c88839 /sci-libs/vtk/files | |
| parent | dev-util/pycharm-community: Version bump to 2016.1 (diff) | |
| download | gentoo-996251840da71035c44744e6bce83444bb866975.tar.gz gentoo-996251840da71035c44744e6bce83444bb866975.tar.bz2 gentoo-996251840da71035c44744e6bce83444bb866975.zip | |
sci-libs/vtk: Add explicit cast to fix gdal-2.0 breakage
Gentoo-Bug: 554316
Package-Manager: portage-2.2.28
Diffstat (limited to 'sci-libs/vtk/files')
| -rw-r--r-- | sci-libs/vtk/files/vtk-6.1.0-gdal2.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/sci-libs/vtk/files/vtk-6.1.0-gdal2.patch b/sci-libs/vtk/files/vtk-6.1.0-gdal2.patch new file mode 100644 index 000000000000..c21864102278 --- /dev/null +++ b/sci-libs/vtk/files/vtk-6.1.0-gdal2.patch @@ -0,0 +1,33 @@ +diff --git a/IO/GDAL/vtkGDALVectorReader.cxx b/IO/GDAL/vtkGDALVectorReader.cxx +index 86854a0..a0e234a 100644 +--- a/IO/GDAL/vtkGDALVectorReader.cxx ++++ b/IO/GDAL/vtkGDALVectorReader.cxx +# Patch to build against newer GDAL per upstream commit +# https://projects.archlinux.org/svntogit/community.git/tree/trunk/gdal2.patch?h=packages/vtk&id=43307598a98872fd4ce7739e47f5bb4cfcb5372d +@@ -44,7 +44,7 @@ class vtkGDALVectorReader::Internal + public: + Internal( const char* srcName, int srcMode, int appendFeatures, int addFeatIds ) + { +- this->Source = OGRSFDriverRegistrar::Open( srcName, srcMode, &this->Driver ); ++ this->Source = (GDALDataset*) OGROpen( srcName, srcMode, NULL ); + if ( ! this->Source ) + { + this->LastError = CPLGetLastErrorMsg(); +@@ -61,7 +61,7 @@ public: + { + if ( this->Source ) + { +- OGRDataSource::DestroyDataSource( this->Source ); ++ GDALClose( (GDALDatasetH) this->Source ); + } + } + +@@ -304,7 +304,7 @@ public: + return nCells; + } + +- OGRDataSource* Source; ++ GDALDataset* Source; + OGRSFDriver* Driver; + const char* LastError; + int LayerIdx; |