8.2+

2 files changed, 50 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6a0c10cdc47c..119328bd01c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Thu Jul  7 21:42:44 UTC 2016
 pkgbase = vtk-git
-	pkgdesc = Open-source software system for image processing, 3D graphics, volume rendering and visualization
-	pkgver = 7.0.0.1656.gba7417a
+	pkgdesc = A software system for 3D computer graphics, image processing, and visualization
+	pkgver = 8.2.0.2155.g955aceec0f
 	pkgrel = 1
 	url = http://www.vtk.org
 	arch = i686
@@ -13,16 +11,15 @@ pkgbase = vtk-git
 	makedepends = doxygen
 	makedepends = boost
 	makedepends = java-environment
+	makedepends = utf8cpp
 	depends = jsoncpp
 	depends = libxt
-	depends = tk
-	depends = netcdf-cxx-legacy
-	depends = ffmpeg
-	depends = gdal
-	depends = gl2ps-svn
+	depends = double-conversion
+	depends = hdf5
+	depends = python
 	provides = vtk
 	conflicts = vtk
-	source = vtk::git+https://github.com/Kitware/VTK.git
+	source = git+https://gitlab.kitware.com/vtk/vtk.git
 	sha256sums = SKIP
 
 pkgname = vtk-git
diff --git a/PKGBUILD b/PKGBUILD
index 4065fd1f3196..80d05bf8224b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,63 +1,70 @@
-# Maintainer: Peter Mattern <pmattern at arcor dot de>
-
-# Notes on dependencies
-# - Java: In order to discover all components needed the binary directory that's included in PATH by files
-#   /etc/profile.d/jre.* of package java-runtime-common isn't sufficient but the JDK needs to be found.
-#   Hence its path is set in JAVA_HOME.
-# - NetCDF: System library can still be accessed via the legacy C++ API only, see
-#   http://www.vtk.org/Bug/view.php?id=15549.
-# - PROJ.4: System library doesn't get recognized, see http://www.vtk.org/Bug/view.php?id=14126. In tree
-#   version is used which doesn't introduce problems as all relevant upstream names are changed by default.
-
-_pkgname=vtk
-pkgname=$_pkgname-git
-pkgver=7.0.0.1656.gba7417a
+pkgname=vtk-git
+pkgver=8.2.0.2155.g955aceec0f
 pkgrel=1
-pkgdesc='Open-source software system for image processing, 3D graphics, volume rendering and visualization'
+pkgdesc='A software system for 3D computer graphics, image processing, and visualization'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org'
 license=('BSD')
-depends=('jsoncpp' 'libxt' 'tk' 'netcdf-cxx-legacy' 'ffmpeg' 'gdal' 'gl2ps-svn')
-makedepends=('git' 'cmake' 'doxygen' 'boost' 'java-environment')
-provides=("$_pkgname")
-conflicts=("$_pkgname")
-source=("$_pkgname::git+https://github.com/Kitware/VTK.git")
+depends=('jsoncpp' 'libxt' 'double-conversion' 'hdf5' 'python')
+makedepends=('git' 'cmake' 'doxygen' 'boost' 'java-environment' 'utf8cpp')
+provides=("vtk")
+conflicts=("vtk")
+source=("git+https://gitlab.kitware.com/vtk/vtk.git")
 sha256sums=("SKIP")
 
 pkgver() {
-  cd $_pkgname
+  cd "${srcdir}/vtk"
   git describe | sed 's:^v::;s:-:.:g'
 }
 
+prepare() {
+  cd "${srcdir}/vtk"
+  curl -L https://gitlab.kitware.com/vtk/vtk/merge_requests/5560.patch | patch -p1  
+}
+
 build() {
+  cd "${srcdir}/vtk"
   export JAVA_HOME=/usr/lib/jvm/default
-  rm -Rf build && mkdir build && cd build
+  mkdir -p build && cd build
   cmake $srcdir/$_pkgname \
       -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_DOCUMENTATION=ON \
+      -DCMAKE_INSTALL_LIBDIR=lib \
+      -DCMAKE_BUILD_TYPE=Release \
       -DBUILD_SHARED_LIBS=ON \
       -DBUILD_TESTING=OFF \
       -DVTK_LEGACY_REMOVE=ON \
-      -DVTK_USE_CXX11_FEATURES=ON \
       -DVTK_USE_LARGE_DATA=ON \
-      -DVTK_USE_SYSTEM_LIBRARIES=ON \
-      -DVTK_USE_SYSTEM_LIBPROJ4=OFF \
-      -DVTK_USE_SYSTEM_XDMF3=OFF \
-      -DModule_vtkIOFFMPEG=ON \
-      -DModule_vtkIOGDAL=ON \
-      -DModule_vtkxdmf3=ON \
-      -DModule_vtkIOXdmf3=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=OFF \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_glew=OFF \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_libproj=OFF \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_lz4=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_lzma=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_png=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_sqlite=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_utf8=ON \
+      -DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON \
+      -DVTK_BUILD_TESTING=OFF \
+      -DVTK_PYTHON_VERSION="3" \
       -DVTK_WRAP_JAVA=ON \
       -DVTK_WRAP_PYTHON=ON \
-      -DVTK_WRAP_TCL=ON
+      ..
   make
 }
 
 package() {
-  cd build
+  cd "${srcdir}/vtk/build"
   make DESTDIR="$pkgdir" install
-  # Place XdmfConfig.cmake of internal XDMF at a more reasonable location
-  mkdir -p $pkgdir/usr/lib/cmake/XDMF && mv $pkgdir/usr/XdmfConfig.cmake $pkgdir/usr/lib/cmake/XDMF/
   # Pack license
-  install -D -m644 $srcdir/$_pkgname/Copyright.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -D -m644 $srcdir/vtk/Copyright.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }