Date: Friday, September 25, 2015 @ 12:41:14 Author: schiv Revision: 141594
upgpkg: vtk 6.1.0-11 patch and build against gdal2 Added: vtk/trunk/.contrib vtk/trunk/gdal2.patch Modified: vtk/trunk/PKGBUILD -------------+ .contrib | 6 ++++++ PKGBUILD | 20 +++++++++----------- gdal2.patch | 31 +++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 11 deletions(-) Added: .contrib =================================================================== --- .contrib (rev 0) +++ .contrib 2015-09-25 10:41:14 UTC (rev 141594) @@ -0,0 +1,6 @@ +# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> +# Contributor: leepesjee <lpeschier at xs4all dot nl> +# Contributor: Olivier Medoc +# Contributor: ignotus +# Contributor: Fabian Moser +# Contributor: djscholl Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-09-25 10:12:38 UTC (rev 141593) +++ PKGBUILD 2015-09-25 10:41:14 UTC (rev 141594) @@ -1,12 +1,7 @@ # $Id$ -# Maintainer: Andrzej Giniewicz <ggi...@gmail.com> +# Maintainer: Ray Rashif <sc...@archlinux.org> +# Contributor: Andrzej Giniewicz <ggi...@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> -# Contributor: leepesjee <lpeschier at xs4all dot nl> -# Contributor: Olivier Medoc -# Contributor: ignotus -# Contributor: Fabian Moser -# Contributor: djscholl # TODO: for Qt5 see FS#43007 @@ -13,12 +8,12 @@ pkgname=vtk pkgver=6.1.0 _majorver=6.1 -pkgrel=10 +pkgrel=11 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.' arch=('i686' 'x86_64') url='http://www.vtk.org/' license=('BSD') -depends=('boost-libs' 'ffmpeg' 'qtwebkit' 'lesstif' 'mariadb' 'gdal1' 'unixodbc' 'openmpi' 'jsoncpp') +depends=('boost-libs' 'ffmpeg' 'qtwebkit' 'lesstif' 'mariadb' 'gdal' 'unixodbc' 'openmpi' 'jsoncpp') makedepends=('boost' 'cmake' 'java-environment' 'doxygen' 'gnuplot' 'tk' 'wget' 'python2-matplotlib' 'python2-twisted') optdepends=('python2: python bindings' 'java-runtime: java bindings' @@ -31,7 +26,7 @@ source=("http://www.vtk.org/files/release/${_majorver}/VTK-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${_majorver}/VTKData-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${_majorver}/VTKLargeData-${pkgver}.tar.gz" - mesa.diff hdf5.diff vtk-type.patch) + mesa.diff hdf5.diff vtk-type.patch gdal2.patch) options=(staticlibs) md5sums=('25e4dfb3bad778722dcaec80cd5dab7d' 'f82c8fe151279c0422ab8a6cfe991c94' @@ -38,7 +33,8 @@ '5bc47885923ef30e3ac77fcdf6d4e599' '381921f3169facf5d6ef22de3cb3fbe5' '1cf6b69312ed424a3595c3c11c82750d' - 'ec131e2c51b826d75bd996a410745279') + 'ec131e2c51b826d75bd996a410745279' + 'e85edd330937a2395a233e0cb6be0b83') prepare() { cd "${srcdir}"/VTK-$pkgver @@ -47,6 +43,7 @@ patch -Np1 -i "${srcdir}/mesa.diff" patch -Np1 -i "${srcdir}/hdf5.diff" patch -Np1 -i "${srcdir}/vtk-type.patch" + patch -Np1 -i "${srcdir}/gdal2.patch" sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ @@ -75,6 +72,7 @@ cmake \ -Wno-dev \ + -DCMAKE_SKIP_RPATH=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ -DBUILD_DOCUMENTATION:BOOL=ON \ Added: gdal2.patch =================================================================== --- gdal2.patch (rev 0) +++ gdal2.patch 2015-09-25 10:41:14 UTC (rev 141594) @@ -0,0 +1,31 @@ +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 +@@ -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;