diff options
Diffstat (limited to 'community-testing/paraview')
-rw-r--r-- | community-testing/paraview/12859-VisItBrige-external-tiff-support.diff | 32 | ||||
-rw-r--r-- | community-testing/paraview/PKGBUILD | 78 | ||||
-rw-r--r-- | community-testing/paraview/fix-boost-graph-api-changes.diff | 42 | ||||
-rw-r--r-- | community-testing/paraview/paraview.desktop | 10 | ||||
-rw-r--r-- | community-testing/paraview/paraview.png | bin | 367 -> 0 bytes |
5 files changed, 0 insertions, 162 deletions
diff --git a/community-testing/paraview/12859-VisItBrige-external-tiff-support.diff b/community-testing/paraview/12859-VisItBrige-external-tiff-support.diff deleted file mode 100644 index 1901d0146..000000000 --- a/community-testing/paraview/12859-VisItBrige-external-tiff-support.diff +++ /dev/null @@ -1,32 +0,0 @@ -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-testing/paraview/PKGBUILD b/community-testing/paraview/PKGBUILD deleted file mode 100644 index 32fce25f2..000000000 --- a/community-testing/paraview/PKGBUILD +++ /dev/null @@ -1,78 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Michele Mocciola <mickele> -# Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name> - -pkgname=paraview -pkgver=3.12.0 -pkgrel=3 -pkgdesc='Parallel Visualization Application using VTK' -arch=('i686' 'x86_64') -url='http://www.paraview.org' -license=('custom') -depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'hdf5' 'libcgns2' 'libtiff' 'libtheora') -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' - '12859-VisItBrige-external-tiff-support.diff') -md5sums=('8feabc6261e2060648eaac593d85b1de' - 'db623002bc71a257ddfdd0c9c7b14c3f' - '4e4b7172ed18171c37446fd7c4f1e8f5' - '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 - - # flags to enable using system libs - local cmake_system_flags="" - for lib in HDF5 FREETYPE JPEG PNG TIFF ZLIB EXPAT LIBXML2 OGGTHEORA; do - cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON " - done - - # flags to use python2 instead of python which is 3.x.x on archlinux - local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so" - - # enable when http://paraview.org/Bug/view.php?id=12718 gets fixed - #-DCMAKE_SKIP_RPATH:BOOL=YES \ - # the following flags enable the feature request at https://bugs.archlinux.org/task/27525 - # -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON -DVISIT_BUILD_READER_CGNS:BOOL=ON - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DVTK_USE_BOOST:BOOL=ON \ - -DPARAVIEW_USE_MPI:BOOL=ON \ - -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \ - -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \ - -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON \ - -DVISIT_BUILD_READER_CGNS:BOOL=ON \ - ${cmake_system_flags} \ - ${cmake_system_python_flags} \ - ../ParaView-${pkgver} - - make -} - -package() { - cd build - - make DESTDIR=${pkgdir} install - - # Install license - install -Dm644 ${srcdir}/ParaView-${pkgver}/License_v1.2.txt ${pkgdir}/usr/share/licenses/paraview/LICENSE - - # Install desktop shortcuts - install -Dm644 ${srcdir}/paraview.png ${pkgdir}/usr/share/pixmaps/paraview.png - desktop-file-install --dir=${pkgdir}/usr/share/applications ${srcdir}/paraview.desktop -} diff --git a/community-testing/paraview/fix-boost-graph-api-changes.diff b/community-testing/paraview/fix-boost-graph-api-changes.diff deleted file mode 100644 index 37d78665b..000000000 --- a/community-testing/paraview/fix-boost-graph-api-changes.diff +++ /dev/null @@ -1,42 +0,0 @@ -commit d3ecc2c459dd1df937fc97887581ace1036da533 -Author: Marcus D. Hanwell <marcus.hanwell@kitware.com> -Date: Tue Dec 13 15:36:06 2011 -0500 - - BUG: 12772 fixes for change in Boost graph API - - This fixes bug 12772, where an API change in Boost was causing - compilation failures using Boost 1.38. Thanks to Orion Poplawski for - reporting the issue and posting the patch. - - Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06 - -diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx -index c789f6b..cf7cd47 100644 ---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx -+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx -@@ -47,6 +47,15 @@ using namespace boost; - vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); - - -+namespace { -+ vtkIdType unwrap_edge_id(vtkEdgeType const &e) { -+ return e.Id; -+ } -+ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { -+ return e.underlying_desc.Id; -+ } -+} -+ - // Redefine the bfs visitor, the only visitor we - // are using is the tree_edge visitor. - template <typename IdMap> -@@ -95,7 +104,8 @@ public: - - // Copy the vertex and edge data from the graph to the tree. - tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); -- tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); -+ tree->GetEdgeData()->CopyData(graph->GetEdgeData(), -+ unwrap_edge_id(e), tree_e.Id); - } - - private: diff --git a/community-testing/paraview/paraview.desktop b/community-testing/paraview/paraview.desktop deleted file mode 100644 index 2f5b8ec69..000000000 --- a/community-testing/paraview/paraview.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=ParaView -GenericName=Data Viewer -Comment=ParaView allows visualization of large data sets -Type=Application -Terminal=false -Icon=paraview -Categories=Graphics; -Exec=/usr/bin/paraview diff --git a/community-testing/paraview/paraview.png b/community-testing/paraview/paraview.png Binary files differdeleted file mode 100644 index 6e39f3d4f..000000000 --- a/community-testing/paraview/paraview.png +++ /dev/null |