summaryrefslogtreecommitdiff
path: root/community/paraview
diff options
context:
space:
mode:
Diffstat (limited to 'community/paraview')
-rw-r--r--community/paraview/12859-VisItBrige-external-tiff-support.diff32
-rw-r--r--community/paraview/PKGBUILD15
2 files changed, 43 insertions, 4 deletions
diff --git a/community/paraview/12859-VisItBrige-external-tiff-support.diff b/community/paraview/12859-VisItBrige-external-tiff-support.diff
new file mode 100644
index 000000000..1901d0146
--- /dev/null
+++ b/community/paraview/12859-VisItBrige-external-tiff-support.diff
@@ -0,0 +1,32 @@
+commit c69690edb180b96081f3e75d0c23bbd5abcb3d65
+Author: Robert Maynard <robert.maynard@kitware.com>
+Date: Mon Jan 9 12:50:32 2012 -0500
+
+ Corrected build issues when using system tiff library.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0b2ee9e..a83beb7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -216,6 +216,9 @@ VISIT_VTK_THIRD_PARTY_INCLUDE(NETCDF vtknetcdf/include)
+ #setup png
+ VISIT_VTK_THIRD_PARTY_INCLUDE(PNG vtkpng)
+
++#setup tiff
++VISIT_VTK_THIRD_PARTY_INCLUDE(TIFF vtktiff)
++
+
+ #-----------------------------------------------------------------------------
+ # Detect packages here. We could probably write macros that we can include from
+diff --git a/visit_vtk/full/CMakeLists.txt b/visit_vtk/full/CMakeLists.txt
+index e83e041..532dc62 100644
+--- a/visit_vtk/full/CMakeLists.txt
++++ b/visit_vtk/full/CMakeLists.txt
+@@ -115,6 +115,6 @@ set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES
+ "${VISIT_SOURCE_DIR}/parser;${tmp_include_dirs}")
+
+ VTK_ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
+-TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkGraphics vtkImaging vtktiff)
++TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkGraphics vtkImaging ${VTK_TIFF_LIBRARIES})
+
+ VISIT_INSTALL_TARGETS(visit_vtk)
diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD
index ba4e3336a..ec065a902 100644
--- a/community/paraview/PKGBUILD
+++ b/community/paraview/PKGBUILD
@@ -4,27 +4,34 @@
pkgname=paraview
pkgver=3.12.0
-pkgrel=1
+pkgrel=2
pkgdesc='Parallel Visualization Application using VTK'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.paraview.org'
license=('custom')
-depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'hdf5' 'libcgns')
+depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'hdf5' 'libcgns2' 'libtiff')
makedepends=('cmake' 'desktop-file-utils' 'boost')
source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz"
'paraview.png'
'paraview.desktop'
- 'fix-boost-graph-api-changes.diff')
+ 'fix-boost-graph-api-changes.diff'
+ '12859-VisItBrige-external-tiff-support.diff')
md5sums=('8feabc6261e2060648eaac593d85b1de'
'db623002bc71a257ddfdd0c9c7b14c3f'
'4e4b7172ed18171c37446fd7c4f1e8f5'
- '2aa5b98288cadd201ffbd057f18929b0')
+ '2aa5b98288cadd201ffbd057f18929b0'
+ '9321279c8fc6f289a7cf228648edcb5f')
build() {
cd ParaView-${pkgver}/VTK
# fix http://www.vtk.org/Bug/view.php?id=12772 remove on next pkgver bump
patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff
+
+ cd ${srcdir}/ParaView-${pkgver}/Utilities/VisItBridge
+ # fix http://paraview.org/Bug/view.php?id=12849 remove on next pkgver bump
+ patch -Np1 -i ${srcdir}/12859-VisItBrige-external-tiff-support.diff
+
mkdir ${srcdir}/build
cd ${srcdir}/build