Sat Sep 3 23:14:38 UTC 2011

1 files changed, 18 insertions, 19 deletions

diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD
index 5ca8bca0f..6d3d8a7bc 100644
--- a/community/vtk/PKGBUILD
+++ b/community/vtk/PKGBUILD
@@ -7,8 +7,8 @@
 # Contributor: djscholl
 
 pkgname=vtk
-pkgver=5.6.1
-pkgrel=7
+pkgver=5.8.0
+pkgrel=1
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org'
@@ -17,21 +17,19 @@ depends=('libpng' 'libtiff' 'freetype2' 'python2' 'java-runtime' 'tk' 'boost' 'f
 optdepends=('gnuplot: plotting tools'
             'graphviz: drawing tools')
 makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa')
-source=("http://www.vtk.org/files/release/${pkgver:0:3}/${pkgname}-${pkgver}.tar.gz"
+source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz"
         "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz"
-        'missingheader.diff')
-md5sums=('b80a76435207c5d0f74dfcab15b75181'
-         '67263bd972f923d39a60f01104368779'
-         'f7c60ac3ccaf61c41ca508e53d895d3e')
+        'fixkernelversioncheck.diff')
+md5sums=('37b7297d02d647cc6ca95b38174cb41f'
+         'a05295b81930e894fc0e31866f399151'
+         '9e137af23701f76fc727222ebac23389')
 
 build() {
   cd VTK
 
-  # remove next time version bump
-  patch -Np1 -i ${srcdir}/missingheader.diff
-
-  # remove next time version bump
-  sed -i '31 i#include <vtksys/cstddef>' Common/vtkPythonUtil.cxx
+  # fix compilation error: http://vtk.org/Bug/view.php?id=12568
+  # remove next bunp
+  patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff
 
   # fix for libpng 1.4 - remove next time version bump
   for _FILE in `grep -Rl "png_set_gray_1_2_4_to_8" *`
@@ -83,7 +81,8 @@ build() {
     ${srcdir}/VTK
 
   # j1 is used because of a bug in building with multiple threads
-  make -j1
+  #make -j1
+  make
 }
 
 package() {
@@ -92,16 +91,16 @@ package() {
   make DESTDIR=${pkgdir} install
 
   # Move the vtk.jar to the arch-specific location
-  install -dv ${pkgdir}/usr/share/java/${pkgname}
-  mv -v ${pkgdir}/usr/lib/${pkgname}-${pkgver:0:3}/java/${pkgname}.jar \
-    ${pkgdir}/usr/share/java/${pkgname}
+  install -dv ${pkgdir}/usr/share/java/vtk
+  mv -v ${pkgdir}/usr/lib/vtk-${pkgver:0:3}/java/vtk.jar \
+    ${pkgdir}/usr/share/java/vtk
 
   # Install license
-  install -dv ${pkgdir}/usr/share/licenses/${pkgname}
+  install -dv ${pkgdir}/usr/share/licenses/vtk
   install -m644 ${srcdir}/VTK/Copyright.txt \
-    ${pkgdir}/usr/share/licenses/${pkgname}
+    ${pkgdir}/usr/share/licenses/vtk
 
   # Put an entry in /etc/ld.so.conf.d
   install -dv ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/${pkgname}-${pkgver:0:3}" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
+  echo "/usr/lib/vtk-${pkgver:0:3}" > ${pkgdir}/etc/ld.so.conf.d/vtk.conf
 }