diff options
Diffstat (limited to 'community/vtk')
-rw-r--r-- | community/vtk/PKGBUILD | 37 | ||||
-rw-r--r-- | community/vtk/fixkernelversioncheck.diff | 19 | ||||
-rw-r--r-- | community/vtk/missingheader.diff | 28 |
3 files changed, 37 insertions, 47 deletions
diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 585ffb34a..e84d52c7b 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' 'mips64el') 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 } diff --git a/community/vtk/fixkernelversioncheck.diff b/community/vtk/fixkernelversioncheck.diff new file mode 100644 index 000000000..165f07366 --- /dev/null +++ b/community/vtk/fixkernelversioncheck.diff @@ -0,0 +1,19 @@ +--- a/Utilities/vtkhdf5/ConfigureChecks.cmake ++++ b/Utilities/vtkhdf5/ConfigureChecks.cmake +@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION) + ENDIF (HDF5_WANT_DCONV_EXCEPTION) + + SET (LINUX_LFS 0) +-IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") ++IF (CMAKE_SYSTEM MATCHES "Linux") + # Linux Specific flags + ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE) + OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON) + IF (HDF5_ENABLE_LARGE_FILE) + SET (LARGEFILE 1) + ENDIF (HDF5_ENABLE_LARGE_FILE) +-ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") ++ENDIF (CMAKE_SYSTEM MATCHES "Linux") + SET (HDF5_EXTRA_FLAGS) + IF (LINUX_LFS) + SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) diff --git a/community/vtk/missingheader.diff b/community/vtk/missingheader.diff deleted file mode 100644 index 47956d81d..000000000 --- a/community/vtk/missingheader.diff +++ /dev/null @@ -1,28 +0,0 @@ -From be4c4f115793598f6c8937a98bdd1f227d471540 Mon Sep 17 00:00:00 2001 -From: Brad King <brad.king@kitware.com> -Date: Tue, 19 Apr 2011 15:25:09 -0400 -Subject: [PATCH] MetaIO: Add missing include <stddef.h> for ptrdiff_t - -Fixes error "ptrdiff_t was not declared in this scope". - -Author: David Doria <daviddoria@gmail.com> -Change-Id: I1e0dee67d26681f4119ac1fd00ecec3d139eb726 ---- - Utilities/vtkmetaio/metaUtils.cxx | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/Utilities/vtkmetaio/metaUtils.cxx b/Utilities/vtkmetaio/metaUtils.cxx -index dcb26ca..27bde1e 100644 ---- a/Utilities/vtkmetaio/metaUtils.cxx -+++ b/Utilities/vtkmetaio/metaUtils.cxx -@@ -18,6 +18,7 @@ - - #include <stdio.h> - #include <ctype.h> -+#include <stddef.h> - - #include <sys/stat.h> - #include <fcntl.h> --- -1.7.0 - |