diff options
| author |   Sébastien Fabbro <bicatali@gentoo.org> | 2013-07-25 11:39:37 -0700 |
|---|---|---|
| committer | Sébastien Fabbro <bicatali@gentoo.org> | 2013-07-25 11:39:37 -0700 |
| commit | 338c6547cd47b72e944c0d65115e15b7527a85a1 (patch) | |
| tree | e6421b8b130789c4f7a7cd358f45d0bcf5dadd62 /sci-visualization | |
| parent | fixed profile syntax (diff) | |
| download | sci-338c6547cd47b72e944c0d65115e15b7527a85a1.tar.gz sci-338c6547cd47b72e944c0d65115e15b7527a85a1.tar.bz2 sci-338c6547cd47b72e944c0d65115e15b7527a85a1.zip | |
removed paraview-3, paraview-4 in main tree
Diffstat (limited to 'sci-visualization')
28 files changed, 0 insertions, 2008 deletions
diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog deleted file mode 100644 index df874d135..000000000 --- a/sci-visualization/paraview/ChangeLog +++ /dev/null @@ -1,156 +0,0 @@ -# ChangeLog for sci-visualization/paraview -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 03 Mar 2013; Justin Lecher <jlec@gentoo.org> paraview-3.10.1.ebuild, - paraview-3.12.0.ebuild, paraview-3.14.1-r4.ebuild, metadata.xml: - Update to new qt deps names - - 19 Dec 2012; François Bissey <francois.bissey@canterbury.ac.nz> - paraview-3.14.1-r4.ebuild, files/paraview-3.14.1-vtknetcd.patch: - Fix forgotten instances of vtkNetCDF - - 17 Dec 2012; François Bissey <francois.bissey@canterbury.ac.nz> - paraview-3.14.1-r4.ebuild: - sort webkit dependencies - -*paraview-3.14.1-r4 (20 Sep 2012) - - 20 Sep 2012; François Bissey <francois.bissey@canterbury.ac.nz> - -paraview-3.14.1-r3.ebuild, +paraview-3.14.1-r4.ebuild, metadata.xml: - change postscript useflag to gl2ps as in opencascade - -*paraview-3.14.1-r3 (16 Sep 2012) - - 16 Sep 2012; François Bissey <francois.bissey@canterbury.ac.nz> - -paraview-3.14.1-r2.ebuild, +paraview-3.14.1-r3.ebuild: - add a ps useflags for gl2ps - -*paraview-3.14.1-r2 (31 Aug 2012) - - 31 Aug 2012; François Bissey <francois.bissey@canterbury.ac.nz> - -paraview-3.14.1-r1.ebuild, +paraview-3.14.1-r2.ebuild, - +files/paraview-3.14.1-vtknetcd.patch: - netcdf dealt with - -*paraview-3.14.1-r1 (30 Aug 2012) - - 30 Aug 2012; François Bissey <francois.bissey@canterbury.ac.nz> - -paraview-3.14.1.ebuild, +paraview-3.14.1-r1.ebuild, - +files/paraview-3.14.1-gcc-4.7.patch, +files/paraview-3.14.1-mpi4py.patch, - +files/paraview-3.14.1-python-exit.patch, - +files/paraview-3.14.1-removesqlite.patch: - fix a number of things - -*paraview-3.14.1 (28 Aug 2012) - - 28 Aug 2012; François Bissey <francois.bissey@canterbury.ac.nz> - +paraview-3.14.1.ebuild, +files/paraview-3.14.1-ffmpeg-noinstall.patch, - +files/paraview-3.14.1-xdmf-linking.patch, +files/vtk-5.6.0-odbc.patch, - +files/vtk-5.6.1-ffmpeg.patch, +files/vtk-boost1.49.patch, - +files/vtk-5.6.1-libav-0.8.patch: - 3.14.1 - - 09 Feb 2012; François Bissey <francois.bissey@canterbury.ac.nz> - paraview-3.12.0.ebuild, files/paraview-3.12.0-protobuf.patch: - clean up protobuf mess, go to EAPI 3 (for python QA) - -*paraview-3.12.0 (07 Feb 2012) - - 07 Feb 2012; François Bissey <francois.bissey@canterbury.ac.nz> - +paraview-3.12.0.ebuild, +files/paraview-3.12.0-gcc46.patch, - +files/paraview-3.12.0-protobuf.patch: - introducing paraview-3.12.0 - - 24 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> -paraview-3.8.1.ebuild, - paraview-3.10.1.ebuild, +files/paraview-3.10.1-gcc46.patch: - Drop old, fix building with gcc-4.6, add missing dependency on PyQt4 - -*paraview-3.10.1 (16 Jun 2011) - - 16 Jun 2011; François Bissey <francois.bissey@canterbury.ac.nz> - +paraview-3.10.1.ebuild, metadata.xml: - New paraview ebuild for 3.10.1 - - 13 Apr 2011; Justin Lecher <jlec@gentoo.org> paraview-3.8.1.ebuild: - Fix for python ABI stuff - - 09 Mar 2011; Oliver Borm (boroli) <oli.borm@web.de> paraview-3.8.1.ebuild: - sci-visualization/paraview: removed OFF patch as this is now an external - plugin - - 07 Mar 2011; Justin Lecher <jlec@gentoo.org> paraview-3.8.1.ebuild: - Correct Slots for gtk 3 introduction to tree - - 01 Feb 2011; François Bissey <francois.bissey@canterbury.ac.nz> - paraview-3.8.1.ebuild: - Resolve file collisions with vtk. - - 31 Jan 2011; François Bissey <francois.bissey@canterbury.ac.nz> - paraview-3.8.1.ebuild: - General scrubbing, add plugin development files. - - 10 Jan 2011; Oliver Borm (boroli) <oli.borm@web.de> paraview-3.8.1.ebuild: - added second python path as this seems to be needed for the compile *.so - files - - 29 Dec 2010; François Bissey <f.r.bissey@massey.ac.nz> - -paraview-3.8.0.ebuild, paraview-3.8.1.ebuild: - "patch" for python-2.7, add pkg_postrm to deal with left over python files, - drop old. - - 03 Dec 2010; Oliver Borm (boroli) <oli.borm@web.de> paraview-3.8.1.ebuild: - sci-visualization/paraview: fixed python path - - 30 Nov 2010; Oliver Borm (boroli) <oli.borm@web.de> paraview-3.8.1.ebuild: - sci-visualization/paraview: added new OpenFOAM patch - - 09 Nov 2010; François Bissey <f.r.bissey@massey.ac.nz> - paraview-3.8.0.ebuild, paraview-3.8.1.ebuild: - migrate to virtual/jpeg - - 29 Oct 2010; François Bissey <f.r.bissey@massey.ac.nz> - +paraview-3.8.0.ebuild: - Restore paraview-3.8.0 while working on several issues with 3.8.1 - - 27 Oct 2010; François Bissey <f.r.bissey@massey.ac.nz> - paraview-3.8.1.ebuild: - Fix installation of copies of Qt and ffmpeg and so on. - -*paraview-3.8.1 (27 Oct 2010) - - 27 Oct 2010; François Bissey <f.r.bissey@massey.ac.nz> - -paraview-3.8.0.ebuild, +paraview-3.8.1.ebuild: - Bump to version 3.8.1 - - 12 Oct 2010; François Bissey <f.r.bissey@massey.ac.nz> - paraview-3.8.0.ebuild: - Move to qt4-r2 eclass - - 12 Oct 2010; François Bissey <f.r.bissey@massey.ac.nz> - paraview-3.8.0.ebuild: - fix conditional boost dependency problem. - - 30 Jul 2010; François Bissey <f.r.bissey@massey.ac.nz> - paraview-3.8.0.ebuild: - Correct SRC_URI. - - 11 Jul 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> - metadata.xml: - Silenced repoman. - - 20 Jun 2010; François Bissey <f.r.bissey@massey.ac.nz> - paraview-3.8.0.ebuild, +files/paraview-3.8.0-h5part.patch: - Added a fix for mpi in h5part - hopefully. - -*paraview-3.8.0 (11 Jun 2010) - - 11 Jun 2010; François Bissey <f.r.bissey@massey.ac.nz> - +paraview-3.8.0.ebuild, +files/paraview-3.8.0-installpath.patch, - +files/paraview-3.8.0-pointsprite-example.patch, - +files/paraview-3.8.0-pointsprite-example-install.patch, - +files/paraview-3.8.0-xdmf-bc.patch, - +files/paraview-3.8.0-xdmf-cstring.patch, +files/vtk-5.6.0-cg-path.patch, - +files/vtk-5.6.0-libpng14.patch, +metadata.xml: - Importing paraview-3.8.0 in the overelay. - diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest deleted file mode 100644 index 16fa3fc2a..000000000 --- a/sci-visualization/paraview/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST ParaView-3.10.1.tar.gz 40696006 SHA256 453deee23b6fa62ecb010d951adbc49e740dcb8875680725f93b8f76b9df5cfc SHA512 7110fd549db8b40067f4f8e5951df17067d7b8ad05a73fdbe1bb36d55ac9c25059c643dcb3c7b7cc07619b5dc6eb52a2084e14a17527edcf99fd313e7be10b79 WHIRLPOOL cf92a55eddfe7c4807d200371165a8c949aea6fd7db2016b0f5e17ea5dab1a6fc4f18d9efe14d16db97d7678d4b2df94786f71158aaea564e39912517298c8b7 -DIST ParaView-3.12.0.tar.gz 37510144 SHA256 357a8cc27d4c8fb40ec9f508000edaa802e2a8528bfc61564e2d0bb033041658 SHA512 20f844b75e1a4f8581e213d24ddeefe2404676f86368506c6bf76f1d68cf4d757f137119c8ace16dd322d8411f3b4f8e2201857aee0ec5c483d369040ac896c0 WHIRLPOOL 70f2019fbbd588a2d344ee4ea7a62a69c1cf09f49b8a470c47c622b775c8b898ca7ffea48333c8f02c314ca9afaabf3bb316f86202c3f56a650d748932164d75 -DIST ParaView-3.14.1-Source.tar.gz 41471770 SHA256 84499b2775b2159a6f9afed43e7e48ecde998d094a0afe5e2a97db04e359b6f1 SHA512 9459cf896cc7e188c1b6bdeb567d0ed9edebb708fcce6268bf84d3cd2860a4a25747a85256cd6a5dff7c297ac1941258375238f74169a143031b176a7161873e WHIRLPOOL 4c36e3c5e1cb87a9a1ee06326754578f805e55fa4e6746ad06de28644f2c3d8055541478b7b6cca2d0b39412fdac2121e192fad7679420efafeed6d0f81adf53 diff --git a/sci-visualization/paraview/files/paraview-3.10.1-gcc46.patch b/sci-visualization/paraview/files/paraview-3.10.1-gcc46.patch deleted file mode 100644 index 20be721ec..000000000 --- a/sci-visualization/paraview/files/paraview-3.10.1-gcc46.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/VTK/Utilities/vtkmetaio/metaUtils.cxx -+++ b/VTK/Utilities/vtkmetaio/metaUtils.cxx -@@ -29,6 +29,7 @@ - #include <arpa/inet.h> - #endif - -+#include <stddef.h> - #include <stdlib.h> - #include <string.h> - #include <string> ---- a/VTK/Wrapping/Python/PyVTKObject.cxx -+++ b/VTK/Wrapping/Python/PyVTKObject.cxx -@@ -33,6 +33,7 @@ - #include "vtkObjectBase.h" - #include "vtkDataArray.h" - -+#include <vtksys/cstddef> - #include <vtksys/ios/sstream> - - //-------------------------------------------------------------------- diff --git a/sci-visualization/paraview/files/paraview-3.12.0-gcc46.patch b/sci-visualization/paraview/files/paraview-3.12.0-gcc46.patch deleted file mode 100644 index 15ff5d00c..000000000 --- a/sci-visualization/paraview/files/paraview-3.12.0-gcc46.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/VTK/Utilities/vtkmetaio/metaUtils.cxx -+++ b/VTK/Utilities/vtkmetaio/metaUtils.cxx -@@ -29,6 +29,7 @@ - #include <arpa/inet.h> - #endif - -+#include <stddef.h> - #include <stdlib.h> - #include <string.h> - #include <string> diff --git a/sci-visualization/paraview/files/paraview-3.12.0-protobuf.patch b/sci-visualization/paraview/files/paraview-3.12.0-protobuf.patch deleted file mode 100644 index fe8f4b4a0..000000000 --- a/sci-visualization/paraview/files/paraview-3.12.0-protobuf.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- CMake/ParaViewCommon.cmake.orig 2012-02-03 15:31:08.531644115 +1300 -+++ CMake/ParaViewCommon.cmake 2012-02-03 15:30:36.420633741 +1300 -@@ -526,13 +526,13 @@ - - ######################################################################### - # Configure protobuf --SET (PROTOBUF_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR}) --SET (PROTOBUF_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR}) --SET (PROTOBUF_INSTALL_EXPORT_NAME ${PV_INSTALL_EXPORT_NAME}) --IF (NOT PV_INSTALL_NO_LIBRARIES) -- SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS protobuf) --ENDIF (NOT PV_INSTALL_NO_LIBRARIES) --ADD_SUBDIRECTORY(Utilities/protobuf) -+# SET (PROTOBUF_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR}) -+# SET (PROTOBUF_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR}) -+# SET (PROTOBUF_INSTALL_EXPORT_NAME ${PV_INSTALL_EXPORT_NAME}) -+# IF (NOT PV_INSTALL_NO_LIBRARIES) -+# SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS protobuf) -+# ENDIF (NOT PV_INSTALL_NO_LIBRARIES) -+# ADD_SUBDIRECTORY(Utilities/protobuf) - - ######################################################################### - # Configure mpeg2 encoding ---- CMake/ParaViewMacros.cmake.orig 2012-02-09 13:12:07.518350208 +1300 -+++ CMake/ParaViewMacros.cmake 2012-02-09 13:12:16.863356368 +1300 -@@ -214,6 +214,6 @@ - COMMAND protoc_compiler - --cpp_out=dllexport_decl=VTK_PROTOBUF_EXPORT:${CMAKE_CURRENT_BINARY_DIR} - --proto_path ${path} ${absolute} -- DEPENDS ${in_proto_file} protoc_compiler -+ DEPENDS ${in_proto_file} - ) - ENDFUNCTION (protobuf_generate) ---- ParaViewCore/ServerImplementation/CMakeLists.txt.orig 2012-02-09 13:14:15.230434986 +1300 -+++ ParaViewCore/ServerImplementation/CMakeLists.txt 2012-02-09 13:15:04.214467797 +1300 -@@ -86,7 +86,7 @@ - #------------------------------------------------------------------------------ - # Compile protobuf resources. - # run it from a script so we can set necessary paths. --get_target_property(PROTOC_LOCATION protoc_compiler LOCATION) -+SET(PROTOC_LOCATION ${SYSTEM_PB}) - if (WIN32) - get_filename_component(PROTOC_DIR ${PROTOC_LOCATION} PATH) - get_filename_component(PROTOC_PDIR ${PROTOC_DIR} PATH) -@@ -101,7 +101,7 @@ - ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc - COMMAND ${CMAKE_COMMAND} - ARGS -DOutDir=${CMAKE_CFG_INTDIR} -P ${CMAKE_CURRENT_BINARY_DIR}/ExecuteProtoC.cmake -- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Resources/vtkPVMessage.proto protoc_compiler ${ParaView_CMAKE_DIR}/ExecuteProtoC.cmake.in -+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Resources/vtkPVMessage.proto ${ParaView_CMAKE_DIR}/ExecuteProtoC.cmake.in - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - ) - diff --git a/sci-visualization/paraview/files/paraview-3.14.1-ffmpeg-noinstall.patch b/sci-visualization/paraview/files/paraview-3.14.1-ffmpeg-noinstall.patch deleted file mode 100644 index 915725253..000000000 --- a/sci-visualization/paraview/files/paraview-3.14.1-ffmpeg-noinstall.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- CommandLineExecutables/CMakeLists.txt.orig 2012-08-28 14:29:41.472454000 +1200 -+++ CommandLineExecutables/CMakeLists.txt 2012-08-28 14:30:07.959473756 +1200 -@@ -69,15 +69,15 @@ - - #------------------------------------------------------------------------ - # Install ffmpeg, if used. --IF (VTK_USE_FFMPEG_ENCODER) -- FOREACH(fmpglib avcodec avformat avutil) -- IF (FFMPEG_${fmpglib}_LIBRARY) -- pv_install_library(${FFMPEG_${fmpglib}_LIBRARY} -- ${PV_INSTALL_LIB_DIR} -- BrandedRuntime) -- ENDIF(FFMPEG_${fmpglib}_LIBRARY) -- ENDFOREACH(fmpglib) --ENDIF (VTK_USE_FFMPEG_ENCODER) -+#IF (VTK_USE_FFMPEG_ENCODER) -+# FOREACH(fmpglib avcodec avformat avutil) -+# IF (FFMPEG_${fmpglib}_LIBRARY) -+# pv_install_library(${FFMPEG_${fmpglib}_LIBRARY} -+# ${PV_INSTALL_LIB_DIR} -+# BrandedRuntime) -+# ENDIF(FFMPEG_${fmpglib}_LIBRARY) -+# ENDFOREACH(fmpglib) -+#ENDIF (VTK_USE_FFMPEG_ENCODER) - - IF (NOT PV_INSTALL_NO_RUNTIME) - INSTALL(TARGETS smTestDriver diff --git a/sci-visualization/paraview/files/paraview-3.14.1-gcc-4.7.patch b/sci-visualization/paraview/files/paraview-3.14.1-gcc-4.7.patch deleted file mode 100644 index 0da9aab78..000000000 --- a/sci-visualization/paraview/files/paraview-3.14.1-gcc-4.7.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: fix FTBFS with gcc-4.7 -Author: Mathieu Malaterre <malat@debian.org> -Origin: http://anonscm.debian.org/gitweb/?p=collab-maint/vtk.git;a=commitdiff;h=428e763c995bb303805e07da70c1a34fc103d208 -Reviewed-by: Anton Gladky <gladky.anton@gmail.com> -Last-Update: 2012-05-08 - ---- a/VTK/Rendering/vtkFreeTypeTools.cxx -+++ b/VTK/Rendering/vtkFreeTypeTools.cxx -@@ -35,6 +35,8 @@ - using namespace ftgl; - #endif - -+#include <stdint.h> -+ - // Print debug info - #define VTK_FTFC_DEBUG 0 - #define VTK_FTFC_DEBUG_CD 0 ---- a/VTK/Rendering/vtkFreeTypeUtilities.cxx -+++ b/VTK/Rendering/vtkFreeTypeUtilities.cxx -@@ -36,6 +36,8 @@ - using namespace ftgl; - #endif - -+#include <stdint.h> -+ - // Print debug info - - #define VTK_FTFC_DEBUG 0 diff --git a/sci-visualization/paraview/files/paraview-3.14.1-mpi4py.patch b/sci-visualization/paraview/files/paraview-3.14.1-mpi4py.patch deleted file mode 100644 index 95a0d7ac8..000000000 --- a/sci-visualization/paraview/files/paraview-3.14.1-mpi4py.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- CMake/ParaViewCommon.cmake.orig 2012-08-29 13:38:19.392381797 +1200 -+++ CMake/ParaViewCommon.cmake 2012-08-29 13:38:47.271407061 +1200 -@@ -497,9 +497,9 @@ - - ######################################################################### - # Configure mpi4py --IF(PARAVIEW_ENABLE_PYTHON AND PARAVIEW_USE_MPI) -- ADD_SUBDIRECTORY(Utilities/mpi4py) --ENDIF(PARAVIEW_ENABLE_PYTHON AND PARAVIEW_USE_MPI) -+#IF(PARAVIEW_ENABLE_PYTHON AND PARAVIEW_USE_MPI) -+# ADD_SUBDIRECTORY(Utilities/mpi4py) -+#ENDIF(PARAVIEW_ENABLE_PYTHON AND PARAVIEW_USE_MPI) - - - diff --git a/sci-visualization/paraview/files/paraview-3.14.1-python-exit.patch b/sci-visualization/paraview/files/paraview-3.14.1-python-exit.patch deleted file mode 100644 index 03ae27ae5..000000000 --- a/sci-visualization/paraview/files/paraview-3.14.1-python-exit.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- ParaViewCore/ClientServerCore/vtkPythonProgrammableFilter.cxx.orig 2012-08-28 15:42:34.410099857 +1200 -+++ ParaViewCore/ClientServerCore/vtkPythonProgrammableFilter.cxx 2012-08-28 15:45:25.731279418 +1200 -@@ -80,6 +80,16 @@ - } - - //---------------------------------------------------------------------------- -+void vtkPythonProgrammableFilter::DeleteGlobalPythonInterpretor() -+{ -+ if(GlobalPipelineInterpretor) -+ { -+ GlobalPipelineInterpretor->Delete(); -+ GlobalPipelineInterpretor = 0; -+ } -+} -+ -+//---------------------------------------------------------------------------- - vtkPythonProgrammableFilter::vtkPythonProgrammableFilter() : - Implementation(new vtkPythonProgrammableFilterImplementation()) - { ---- ParaViewCore/ClientServerCore/vtkPythonProgrammableFilter.h.orig 2012-08-28 15:42:45.892355278 +1200 -+++ ParaViewCore/ClientServerCore/vtkPythonProgrammableFilter.h 2012-08-28 15:45:54.883213682 +1200 -@@ -102,6 +102,7 @@ - //BTX - static vtkPVPythonInterpretor* GetGlobalPipelineInterpretor(); - //ETX -+static void DeleteGlobalPythonInterpretor(); - protected: - vtkPythonProgrammableFilter(); - ~vtkPythonProgrammableFilter(); ---- Utilities/VTKPythonWrapping/paraview/servermanager.py.orig 2012-08-28 15:47:14.611830975 +1200 -+++ Utilities/VTKPythonWrapping/paraview/servermanager.py 2012-08-28 15:48:11.995520340 +1200 -@@ -40,7 +40,7 @@ - # PURPOSE. See the above copyright notice for more information. - # - #============================================================================== --import paraview, re, os, os.path, new, sys, vtk -+import paraview, re, os, os.path, new, sys, atexit, vtk - - if not paraview.compatibility.minor: - paraview.compatibility.major = 3 -@@ -3027,3 +3027,5 @@ - - def GetNumberOfConnections(): - return len(MultiServerConnections) -+ -+atexit.register(vtkPythonProgrammableFilter.DeleteGlobalPythonInterpretor) diff --git a/sci-visualization/paraview/files/paraview-3.14.1-removesqlite.patch b/sci-visualization/paraview/files/paraview-3.14.1-removesqlite.patch deleted file mode 100644 index 3467fa965..000000000 --- a/sci-visualization/paraview/files/paraview-3.14.1-removesqlite.patch +++ /dev/null @@ -1,526 +0,0 @@ -Description: Import patch from VTK to remove sqlite -Author: Mathieu Malaterre <mathieu.malaterre@gmail.com> -Last-Update: 2011-09-07 - ---- a/VTK/IO/vtkSQLiteDatabase.cxx -+++ b/VTK/IO/vtkSQLiteDatabase.cxx -@@ -29,7 +29,7 @@ - #include <vtksys/ios/fstream> - #include <vtksys/ios/sstream> - --#include <vtksqlite/vtk_sqlite3.h> -+#include <sqlite3.h> - - vtkStandardNewMacro(vtkSQLiteDatabase); - -@@ -307,15 +307,15 @@ - } - } - -- int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); -+ int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); - -- if (result != VTK_SQLITE_OK) -+ if (result != SQLITE_OK) - { - vtkDebugMacro(<<"SQLite open() failed. Error code is " - << result << " and message is " -- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); -+ << sqlite3_errmsg(this->SQLiteInstance) ); - -- vtk_sqlite3_close(this->SQLiteInstance); -+ sqlite3_close(this->SQLiteInstance); - return false; - } - else -@@ -334,8 +334,8 @@ - } - else - { -- int result = vtk_sqlite3_close(this->SQLiteInstance); -- if (result != VTK_SQLITE_OK) -+ int result = sqlite3_close(this->SQLiteInstance); -+ if (result != SQLITE_OK) - { - vtkWarningMacro(<< "Close(): SQLite returned result code " << result); - } -@@ -374,7 +374,7 @@ - if (!status) - { - vtkErrorMacro(<< "GetTables(): Database returned error: " -- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); -+ << sqlite3_errmsg(this->SQLiteInstance) ); - query->Delete(); - return this->Tables; - } -@@ -403,7 +403,7 @@ - if (!status) - { - vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: " -- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); -+ << sqlite3_errmsg(this->SQLiteInstance) ); - query->Delete(); - return NULL; - } -@@ -467,10 +467,10 @@ - // ---------------------------------------------------------------------- - bool vtkSQLiteDatabase::HasError() - { -- return (vtk_sqlite3_errcode(this->SQLiteInstance)!=VTK_SQLITE_OK); -+ return (sqlite3_errcode(this->SQLiteInstance)!=SQLITE_OK); - } - - const char* vtkSQLiteDatabase::GetLastErrorText() - { -- return vtk_sqlite3_errmsg(this->SQLiteInstance); -+ return sqlite3_errmsg(this->SQLiteInstance); - } ---- a/VTK/IO/vtkSQLiteQuery.cxx -+++ b/VTK/IO/vtkSQLiteQuery.cxx -@@ -25,7 +25,7 @@ - #include "vtkVariant.h" - #include "vtkVariantArray.h" - --#include <vtksqlite/vtk_sqlite3.h> -+#include <sqlite3.h> - - #include <assert.h> - -@@ -43,7 +43,7 @@ - { - this->Statement = NULL; - this->InitialFetch = true; -- this->InitialFetchResult=VTK_SQLITE_DONE; -+ this->InitialFetchResult=SQLITE_DONE; - this->LastErrorText = NULL; - this->TransactionInProgress = false; - } -@@ -61,7 +61,7 @@ - { - if (this->Database != NULL) - { -- vtk_sqlite3_finalize(this->Statement); -+ sqlite3_finalize(this->Statement); - this->Statement = NULL; - } - } -@@ -131,8 +131,8 @@ - if (this->Statement) - { - vtkDebugMacro(<<"Finalizing old statement"); -- int finalizeStatus = vtk_sqlite3_finalize(this->Statement); -- if (finalizeStatus != VTK_SQLITE_OK) -+ int finalizeStatus = sqlite3_finalize(this->Statement); -+ if (finalizeStatus != SQLITE_OK) - { - vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code " - << finalizeStatus); -@@ -151,19 +151,19 @@ - return false; - } - -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -+ sqlite3 *db = dbContainer->SQLiteInstance; - const char *unused_statement; - -- int prepareStatus = vtk_sqlite3_prepare_v2(db, -+ int prepareStatus = sqlite3_prepare_v2(db, - this->Query, - static_cast<int>(strlen(this->Query)), - &this->Statement, - &unused_statement); - -- if (prepareStatus != VTK_SQLITE_OK) -+ if (prepareStatus != SQLITE_OK) - { -- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); -- vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message " -+ this->SetLastErrorText(sqlite3_errmsg(db)); -+ vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message " - << this->GetLastErrorText() - << " on statement: '" - << this->Query << "'"); -@@ -194,31 +194,31 @@ - } - else - { -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } - - vtkDebugMacro(<<"Execute(): Query ready to execute."); - - this->InitialFetch = true; -- int result = vtk_sqlite3_step(this->Statement); -+ int result = sqlite3_step(this->Statement); - this->InitialFetchResult = result; - -- if (result == VTK_SQLITE_DONE) -+ if (result == SQLITE_DONE) - { - this->SetLastErrorText(NULL); - this->Active = true; - return true; - } -- else if (result != VTK_SQLITE_ROW) -+ else if (result != SQLITE_ROW) - { - vtkSQLiteDatabase *dbContainer = - vtkSQLiteDatabase::SafeDownCast(this->Database); - assert(dbContainer != NULL); - -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -+ sqlite3 *db = dbContainer->SQLiteInstance; - -- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); -- vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message " -+ this->SetLastErrorText(sqlite3_errmsg(db)); -+ vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message " - << this->GetLastErrorText()); - this->Active = false; - return false; -@@ -239,7 +239,7 @@ - } - else - { -- return vtk_sqlite3_column_count(this->Statement); -+ return sqlite3_column_count(this->Statement); - } - } - -@@ -259,7 +259,7 @@ - } - else - { -- return vtk_sqlite3_column_name(this->Statement, column); -+ return sqlite3_column_name(this->Statement, column); - } - } - -@@ -279,22 +279,22 @@ - } - else - { -- switch (vtk_sqlite3_column_type(this->Statement, column)) -+ switch (sqlite3_column_type(this->Statement, column)) - { -- case VTK_SQLITE_INTEGER: -+ case SQLITE_INTEGER: - return VTK_INT; -- case VTK_SQLITE_FLOAT: -+ case SQLITE_FLOAT: - return VTK_FLOAT; -- case VTK_SQLITE_TEXT: -+ case SQLITE_TEXT: - return VTK_STRING; -- case VTK_SQLITE_BLOB: -+ case SQLITE_BLOB: - return VTK_STRING; // until we have a BLOB type of our own -- case VTK_SQLITE_NULL: -+ case SQLITE_NULL: - return VTK_VOID; // ??? what makes sense here? - default: - { - vtkErrorMacro(<<"GetFieldType(): Unknown data type " -- << vtk_sqlite3_column_type(this->Statement, column) -+ << sqlite3_column_type(this->Statement, column) - <<" from SQLite."); - return VTK_VOID; - } -@@ -315,7 +315,7 @@ - { - vtkDebugMacro(<<"NextRow(): Initial fetch being handled."); - this->InitialFetch = false; -- if (this->InitialFetchResult == VTK_SQLITE_DONE) -+ if (this->InitialFetchResult == SQLITE_DONE) - { - return false; - } -@@ -326,12 +326,12 @@ - } - else - { -- int result = vtk_sqlite3_step(this->Statement); -- if (result == VTK_SQLITE_DONE) -+ int result = sqlite3_step(this->Statement); -+ if (result == SQLITE_DONE) - { - return false; - } -- else if (result == VTK_SQLITE_ROW) -+ else if (result == SQLITE_ROW) - { - return true; - } -@@ -339,8 +339,8 @@ - { - vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); - assert(dbContainer != NULL); -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); -+ sqlite3 *db = dbContainer->SQLiteInstance; -+ this->SetLastErrorText(sqlite3_errmsg(db)); - vtkErrorMacro(<<"NextRow(): Database returned error code " - << result << " with the following message: " - << this->GetLastErrorText()); -@@ -366,33 +366,33 @@ - } - else - { -- switch (vtk_sqlite3_column_type(this->Statement, column)) -+ switch (sqlite3_column_type(this->Statement, column)) - { -- case VTK_SQLITE_INTEGER: -- return vtkVariant(vtk_sqlite3_column_int(this->Statement, column)); -+ case SQLITE_INTEGER: -+ return vtkVariant(sqlite3_column_int(this->Statement, column)); - -- case VTK_SQLITE_FLOAT: -- return vtkVariant(vtk_sqlite3_column_double(this->Statement, column)); -+ case SQLITE_FLOAT: -+ return vtkVariant(sqlite3_column_double(this->Statement, column)); - -- case VTK_SQLITE_TEXT: -+ case SQLITE_TEXT: - { - vtksys_ios::ostringstream str; -- str << vtk_sqlite3_column_text(this->Statement, column); -+ str << sqlite3_column_text(this->Statement, column); - return vtkVariant(vtkStdString(str.str())); - } - -- case VTK_SQLITE_BLOB: -+ case SQLITE_BLOB: - { - // This is a hack ... by passing the BLOB to vtkStdString with an explicit - // byte count, we ensure that the string will store all of the BLOB's bytes, - // even if there are NULL values. - - return vtkVariant(vtkStdString( -- static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)), -- vtk_sqlite3_column_bytes(this->Statement, column))); -+ static_cast<const char*>(sqlite3_column_blob(this->Statement, column)), -+ sqlite3_column_bytes(this->Statement, column))); - } - -- case VTK_SQLITE_NULL: -+ case SQLITE_NULL: - default: - return vtkVariant(); - } -@@ -423,11 +423,11 @@ - vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); - assert(dbContainer != NULL); - -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -+ sqlite3 *db = dbContainer->SQLiteInstance; - char *errorMessage = NULL; -- int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); -+ int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); - -- if (result == VTK_SQLITE_OK) -+ if (result == SQLITE_OK) - { - this->TransactionInProgress = true; - this->SetLastErrorText(NULL); -@@ -451,7 +451,7 @@ - { - if (this->Statement) - { -- vtk_sqlite3_finalize(this->Statement); -+ sqlite3_finalize(this->Statement); - this->Statement = NULL; - } - -@@ -463,11 +463,11 @@ - - vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); - assert(dbContainer != NULL); -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -+ sqlite3 *db = dbContainer->SQLiteInstance; - char *errorMessage = NULL; -- int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); -+ int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); - -- if (result == VTK_SQLITE_OK) -+ if (result == SQLITE_OK) - { - this->TransactionInProgress = false; - this->SetLastErrorText(NULL); -@@ -499,11 +499,11 @@ - - vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); - assert(dbContainer != NULL); -- vtk_sqlite3 *db = dbContainer->SQLiteInstance; -+ sqlite3 *db = dbContainer->SQLiteInstance; - char *errorMessage = NULL; -- int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); -+ int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); - -- if (result == VTK_SQLITE_OK) -+ if (result == SQLITE_OK) - { - this->TransactionInProgress = false; - this->SetLastErrorText(NULL); -@@ -647,11 +647,11 @@ - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } -- int status = vtk_sqlite3_bind_int(this->Statement, index+1, value); -+ int status = sqlite3_bind_int(this->Statement, index+1, value); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - vtksys_ios::ostringstream errormessage; - errormessage << "sqlite_bind_int returned error: " << status; -@@ -676,11 +676,11 @@ - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } -- int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value)); -+ int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite_int64>(value)); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - vtksys_ios::ostringstream errormessage; - errormessage << "sqlite_bind_int64 returned error: " << status; -@@ -705,12 +705,12 @@ - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } - -- int status = vtk_sqlite3_bind_double(this->Statement, index+1, value); -+ int status = sqlite3_bind_double(this->Statement, index+1, value); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - vtksys_ios::ostringstream errormessage; - errormessage << "sqlite_bind_double returned error: " << status; -@@ -734,12 +734,12 @@ - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } - -- int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT); -+ int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - vtksys_ios::ostringstream errormessage; - errormessage << "sqlite_bind_text returned error: " << status; -@@ -763,17 +763,17 @@ - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } - - int status = -- vtk_sqlite3_bind_blob(this->Statement, -+ sqlite3_bind_blob(this->Statement, - index+1, - data, - length, -- VTK_SQLITE_TRANSIENT); -+ SQLITE_TRANSIENT); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - vtksys_ios::ostringstream errormessage; - errormessage << "sqlite_bind_blob returned error: " << status; -@@ -797,12 +797,12 @@ - if (this->Active) - { - this->Active = false; -- vtk_sqlite3_reset(this->Statement); -+ sqlite3_reset(this->Statement); - } - -- int status = vtk_sqlite3_clear_bindings(this->Statement); -+ int status = sqlite3_clear_bindings(this->Statement); - -- if (status != VTK_SQLITE_OK) -+ if (status != SQLITE_OK) - { - vtksys_ios::ostringstream errormessage; - errormessage << "sqlite_clear_bindings returned error: " << status; ---- a/VTK/IO/vtkSQLiteDatabase.h -+++ b/VTK/IO/vtkSQLiteDatabase.h -@@ -48,7 +48,7 @@ - class vtkSQLQuery; - class vtkSQLiteQuery; - class vtkStringArray; --struct vtk_sqlite3; -+struct sqlite3; - - class VTK_IO_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase - { -@@ -146,7 +146,7 @@ - virtual bool ParseURL(const char* url); - - private: -- vtk_sqlite3 *SQLiteInstance; -+ sqlite3 *SQLiteInstance; - - // We want this to be private, a user of this class - // should not be setting this for any reason ---- a/VTK/IO/vtkSQLiteQuery.h -+++ b/VTK/IO/vtkSQLiteQuery.h -@@ -46,7 +46,7 @@ - class vtkSQLiteDatabase; - class vtkVariant; - class vtkVariantArray; --struct vtk_sqlite3_stmt; -+struct sqlite3_stmt; - - class VTK_IO_EXPORT vtkSQLiteQuery : public vtkSQLQuery - { -@@ -154,7 +154,7 @@ - vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented. - void operator=(const vtkSQLiteQuery &); // Not implemented. - -- vtk_sqlite3_stmt *Statement; -+ sqlite3_stmt *Statement; - bool InitialFetch; - int InitialFetchResult; - char *LastErrorText; ---- a/VTK/Utilities/CMakeLists.txt -+++ b/VTK/Utilities/CMakeLists.txt -@@ -55,7 +55,7 @@ - SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS vtkmetaio) - ENDIF(NOT VTK_INSTALL_NO_LIBRARIES) - ENDIF(VTK_USE_METAIO) --ADD_SUBDIRECTORY(vtksqlite) -+#ADD_SUBDIRECTORY(vtksqlite) - - IF(VTK_HAS_EXODUS) - ADD_SUBDIRECTORY(vtkexodus2) ---- a/VTK/IO/CMakeLists.txt -+++ b/VTK/IO/CMakeLists.txt -@@ -19,7 +19,7 @@ - SET(KIT_JAVA_LIBS vtkFilteringJava) - SET(KIT_INTERFACE_LIBRARIES vtkFiltering) - SET(KIT_LIBS vtkDICOMParser vtkNetCDF vtkNetCDF_cxx LSDyna -- ${_VTK_METAIO_LIB} vtksqlite -+ ${_VTK_METAIO_LIB} sqlite3 - ${VTK_PNG_LIBRARIES} ${VTK_ZLIB_LIBRARIES} ${VTK_JPEG_LIBRARIES} - ${VTK_TIFF_LIBRARIES} ${VTK_EXPAT_LIBRARIES} ${VTK_OGGTHEORA_LIBRARIES} - ${KWSYS_NAMESPACE}) diff --git a/sci-visualization/paraview/files/paraview-3.14.1-vtknetcd.patch b/sci-visualization/paraview/files/paraview-3.14.1-vtknetcd.patch deleted file mode 100644 index f6f9e4e45..000000000 --- a/sci-visualization/paraview/files/paraview-3.14.1-vtknetcd.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- VTK/Utilities/CMakeLists.txt.orig 2012-08-31 13:55:56.616827748 +1200 -+++ VTK/Utilities/CMakeLists.txt 2012-08-31 13:56:43.487830247 +1200 -@@ -47,7 +47,7 @@ - SET( verdict_INSTALL_LIB_DIR ${VTK_INSTALL_LIB_DIR_CM24}) - ADD_SUBDIRECTORY(verdict) - --ADD_SUBDIRECTORY(vtknetcdf) -+#ADD_SUBDIRECTORY(vtknetcdf) - IF(VTK_USE_METAIO) - SET(METAIO_FOR_VTK 1) - ADD_SUBDIRECTORY(vtkmetaio) ---- VTK/Utilities/vtk_netcdf.h.orig 2012-08-31 13:57:25.704832693 +1200 -+++ VTK/Utilities/vtk_netcdf.h 2012-08-31 13:57:59.823834877 +1200 -@@ -16,6 +16,6 @@ - #define __vtk_netcdf_h - - /* Use the netcdf library configured for VTK. */ --#include <vtknetcdf/include/netcdf.h> -+#include <netcdf.h> - - #endif ---- VTK/Utilities/vtk_netcdfcpp.h.orig 2012-08-31 13:58:48.800838210 +1200 -+++ VTK/Utilities/vtk_netcdfcpp.h 2012-08-31 13:59:31.223841343 +1200 -@@ -16,6 +16,6 @@ - #define __vtk_netcdfcpp_h - - /* Use the netcdf library configured for VTK. */ --#include <vtknetcdf/cxx/netcdfcpp.h> -+#include <netcdfcpp.h> - - #endif ---- VTK/Utilities/vtkexodus2/CMakeLists.txt.orig 2012-08-31 14:01:26.536856845 +1200 -+++ VTK/Utilities/vtkexodus2/CMakeLists.txt 2012-08-31 14:02:11.503872711 +1200 -@@ -241,7 +241,7 @@ - - - VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS}) --TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF) -+TARGET_LINK_LIBRARIES(vtkexoIIc netcdf) - - # Apply user-defined properties to the library target. - IF(VTK_LIBRARY_PROPERTIES) ---- VTK/Utilities/vtkexodus2/test/CMakeLists.txt.orig 2012-08-31 14:02:39.696882673 +1200 -+++ VTK/Utilities/vtkexodus2/test/CMakeLists.txt 2012-08-31 14:02:59.743889790 +1200 -@@ -21,7 +21,7 @@ - ) - - ADD_EXECUTABLE( ExoIICTests ${ExoIICTests} ) --TARGET_LINK_LIBRARIES( ExoIICTests vtkCommon vtkexoIIc vtkNetCDF ) -+TARGET_LINK_LIBRARIES( ExoIICTests vtkCommon vtkexoIIc netcdf ) - - SET( TestsToRun ${ExoIICTests} ) - REMOVE( TestsToRun ExoIICTests.cxx ) ---- VTK/IO/CMakeLists.txt.orig 2012-08-31 14:05:00.657933170 +1200 -+++ VTK/IO/CMakeLists.txt 2012-08-31 14:06:18.024961299 +1200 -@@ -18,7 +18,7 @@ - SET(KIT_PYTHON_LIBS vtkFilteringPythonD) - SET(KIT_JAVA_LIBS vtkFilteringJava) - SET(KIT_INTERFACE_LIBRARIES vtkFiltering) --SET(KIT_LIBS vtkDICOMParser vtkNetCDF vtkNetCDF_cxx LSDyna -+SET(KIT_LIBS vtkDICOMParser netcdf netcdf_c++ LSDyna - ${_VTK_METAIO_LIB} sqlite3 - ${VTK_PNG_LIBRARIES} ${VTK_ZLIB_LIBRARIES} ${VTK_JPEG_LIBRARIES} - ${VTK_TIFF_LIBRARIES} ${VTK_EXPAT_LIBRARIES} ${VTK_OGGTHEORA_LIBRARIES} ---- VTK/vtkIncludeDirectories.cmake.orig 2012-08-31 15:36:06.599955661 +1200 -+++ VTK/vtkIncludeDirectories.cmake 2012-08-31 15:37:35.759045094 +1200 -@@ -193,7 +193,7 @@ - VTK_THIRD_PARTY_INCLUDE2(TIFF) - VTK_THIRD_PARTY_INCLUDE2(EXPAT) - VTK_THIRD_PARTY_INCLUDE2(LIBXML2) --VTK_THIRD_PARTY_INCLUDE(NETCDF vtknetcdf/include) -+#VTK_THIRD_PARTY_INCLUDE(NETCDF vtknetcdf/include) - VTK_THIRD_PARTY_INCLUDE2(Exodus2) - IF(VTK_USE_GL2PS) - VTK_THIRD_PARTY_INCLUDE2(GL2PS) ---- Plugins/StreamingView/VTK/CMakeLists.txt.orig 2012-12-20 09:43:26.858734060 +1300 -+++ Plugins/StreamingView/VTK/CMakeLists.txt 2012-12-20 09:44:49.472845455 +1300 -@@ -10,7 +10,7 @@ - INCLUDE ( ${VTK_USE_FILE} ) - - SET ( VTK_LINK_LIBRARIES -- vtkRendering vtkGraphics vtkFiltering vtkCommon vtkIO vtkImaging vtkNetCDF) -+ vtkRendering vtkGraphics vtkFiltering vtkCommon vtkIO vtkImaging netcdf) - - INCLUDE_DIRECTORIES(${VTKNETCDF_BINARY_DIR}) - ---- Utilities/VisItBridge/databases/CMakeLists.txt.orig 2012-12-20 09:43:39.257750799 +1300 -+++ Utilities/VisItBridge/databases/CMakeLists.txt 2012-12-20 09:45:45.321920591 +1300 -@@ -163,7 +163,7 @@ - #build all the readers into a single library - vtk_add_library(vtk${KIT} ${Kit_SRCS} ${VISIT_DB_SOURCES}) - --target_link_libraries(vtk${KIT} vtkVisItAVTAlgorithms vtkNetCDF) -+target_link_libraries(vtk${KIT} vtkVisItAVTAlgorithms netcdf) - if(PARAVIEW_HDF5_LIBRARIES) - target_link_libraries(vtk${KIT} ${PARAVIEW_HDF5_LIBRARIES}) - endif(PARAVIEW_HDF5_LIBRARIES) diff --git a/sci-visualization/paraview/files/paraview-3.14.1-xdmf-linking.patch b/sci-visualization/paraview/files/paraview-3.14.1-xdmf-linking.patch deleted file mode 100644 index 115793158..000000000 --- a/sci-visualization/paraview/files/paraview-3.14.1-xdmf-linking.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: rusr/lib/paraview/libvtkXdmf.so contains an unresolvable - reference to symbol XtDispatchEvent. -Author: Mathieu Malaterre <mathieu.malaterre@gmail.com> -Bug: http://paraview.org/Bug/view.php?id=12576 -Last-Update: 2011-09-07 - ---- a/Utilities/Xdmf2/vtk/CMakeLists.txt -+++ b/Utilities/Xdmf2/vtk/CMakeLists.txt -@@ -105,6 +105,7 @@ - ELSE(VTK_USE_PARALLEL) - TARGET_LINK_LIBRARIES(vtkXdmf vtkIO Xdmf vtkRendering) - ENDIF(VTK_USE_PARALLEL) -+ TARGET_LINK_LIBRARIES(${X11_Xt_LIB}) - - IF (VTK_USE_MPI) - # Needed for mpich 2 diff --git a/sci-visualization/paraview/files/paraview-3.8.0-h5part.patch b/sci-visualization/paraview/files/paraview-3.8.0-h5part.patch deleted file mode 100644 index 59f27d0bb..000000000 --- a/sci-visualization/paraview/files/paraview-3.8.0-h5part.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ParaView3/Plugins/H5PartReader/H5Part/src/H5PartTypes.h ParaView3.new/Plugins/H5PartReader/H5Part/src/H5PartTypes.h ---- ParaView3/Plugins/H5PartReader/H5Part/src/H5PartTypes.h 2009-10-01 15:19:59.000000000 -0400 -+++ ParaView3.new/Plugins/H5PartReader/H5Part/src/H5PartTypes.h 2010-01-30 09:40:22.000000000 -0500 -@@ -17,7 +17,7 @@ - #endif - ; - --#ifndef H5PART_HAS_MPI -+#if !defined(H5PART_HAS_MPI) && !defined(MPI_BOTTOM) - typedef int MPI_Comm; - #endif - diff --git a/sci-visualization/paraview/files/paraview-3.8.0-installpath.patch b/sci-visualization/paraview/files/paraview-3.8.0-installpath.patch deleted file mode 100644 index f59cbfaf2..000000000 --- a/sci-visualization/paraview/files/paraview-3.8.0-installpath.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- Applications/AdaptiveParaView/CMakeLists.txt.orig 2010-06-04 22:40:43.973547693 +1200 -+++ Applications/AdaptiveParaView/CMakeLists.txt 2010-06-04 22:41:37.889549494 +1200 -@@ -45,6 +45,8 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomFilters.xml - ${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomSources.xml - SOURCES ${Application_SOURCE_FILES} -+ INSTALL_BIN_DIR "${PV_INSTALL_BIN_DIR}" -+ INSTALL_LIB_DIR "${PV_INSTALL_LIB_DIR}" - ) - - ADD_EXECUTABLE(ppRawStridedReader2 ppRawStridedReader2.cxx) ---- Applications/ParaView/CMakeLists.txt.orig 2010-06-04 22:42:36.500548837 +1200 -+++ Applications/ParaView/CMakeLists.txt 2010-06-04 22:43:21.355548188 +1200 -@@ -63,6 +63,8 @@ - ${PARAVIEW_EXTRA_GUI_RESOURCES} # Add any compiled in GUI configuration xmls - COMPRESSED_HELP_FILE "${ParaView_BINARY_DIR}/Documentation/paraview.qch" - SOURCES ${ParaView_SOURCE_FILES} -+ INSTALL_BIN_DIR "${PV_INSTALL_BIN_DIR}" -+ INSTALL_LIB_DIR "${PV_INSTALL_LIB_DIR}" - ) - - # Configure the ".plugins" configuration xml for making paraview aware of the ---- Applications/StreamingParaView/CMakeLists.txt.orig 2010-06-04 22:43:46.287547403 +1200 -+++ Applications/StreamingParaView/CMakeLists.txt 2010-06-04 22:44:44.047547909 +1200 -@@ -45,6 +45,8 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomFilters.xml - ${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomSources.xml - SOURCES ${Application_SOURCE_FILES} -+ INSTALL_BIN_DIR "${PV_INSTALL_BIN_DIR}" -+ INSTALL_LIB_DIR "${PV_INSTALL_LIB_DIR}" - ) - - IF(FALSE)#BUILD_TESTING) diff --git a/sci-visualization/paraview/files/paraview-3.8.0-pointsprite-example-install.patch b/sci-visualization/paraview/files/paraview-3.8.0-pointsprite-example-install.patch deleted file mode 100644 index 9a8ab2103..000000000 --- a/sci-visualization/paraview/files/paraview-3.8.0-pointsprite-example-install.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt.orig 2010-06-11 22:54:37.423952532 +1200 -+++ Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt 2010-06-11 22:55:07.546951156 +1200 -@@ -6,5 +6,5 @@ - target_link_libraries(${exe} PointSprite_Rendering vtkIO) - - install(TARGETS ${exe} -- RUNTIME DESTINATION ${PROJECT_BINARY_DIR} -+ RUNTIME DESTINATION ${PV_INSTALL_BIN_DIR} - ) diff --git a/sci-visualization/paraview/files/paraview-3.8.0-pointsprite-example.patch b/sci-visualization/paraview/files/paraview-3.8.0-pointsprite-example.patch deleted file mode 100644 index b88351a07..000000000 --- a/sci-visualization/paraview/files/paraview-3.8.0-pointsprite-example.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- Plugins/PointSprite/CMakeLists.txt.orig -+++ Plugins/PointSprite/CMakeLists.txt -@@ -56,11 +56,17 @@ add_subdirectory(Graphics) - # ----------------------------------------------------------------------------- - # Build the tests - # ----------------------------------------------------------------------------- --set(PointSpritePlugin_BUILD_EXAMPLES ON CACHE BOOL "Build the example.") --if(PointSpritePlugin_BUILD_EXAMPLES) -- add_subdirectory(Examples) --endif(PointSpritePlugin_BUILD_EXAMPLES) --mark_as_advanced(PointSpritePlugin_BUILD_EXAMPLES) -+IF (DEFINED BUILD_EXAMPLES) -+ IF (BUILD_EXAMPLES) -+ add_subdirectory(Examples) -+ ENDIF (BUILD_EXAMPLES) -+ELSE (DEFINED BUILD_EXAMPLES) -+ set(PointSpritePlugin_BUILD_EXAMPLES ON CACHE BOOL "Build the example.") -+ IF(PointSpritePlugin_BUILD_EXAMPLES) -+ add_subdirectory(Examples) -+ ENDIF(PointSpritePlugin_BUILD_EXAMPLES) -+ mark_as_advanced(PointSpritePlugin_BUILD_EXAMPLES) -+ENDIF (DEFINED BUILD_EXAMPLES) - # ----------------------------------------------------------------------------- - # Build the Paraview plugins - # -----------------------------------------------------------------------------
\ No newline at end of file diff --git a/sci-visualization/paraview/files/paraview-3.8.0-xdmf-bc.patch b/sci-visualization/paraview/files/paraview-3.8.0-xdmf-bc.patch deleted file mode 100644 index 99c1ad7f9..000000000 --- a/sci-visualization/paraview/files/paraview-3.8.0-xdmf-bc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Utilities/Xdmf2/libsrc/CMakeLists.txt.orig 2010-06-05 23:02:46.495999925 +1200 -+++ Utilities/Xdmf2/libsrc/CMakeLists.txt 2010-06-07 21:57:25.261616104 +1200 -@@ -503,8 +503,8 @@ - RENAME Xdmf.py) # always named the same regardless of build with or without mpi - - # Compile Byte Code -- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${Xdmf_SOURCE_DIR}/CMake/CompileXdmfByteCode.py -- ${CMAKE_INSTALL_PREFIX}/${XDMF_WRAP_PYTHON_INSTALL_PY_DIR})") -+# INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${Xdmf_SOURCE_DIR}/CMake/CompileXdmfByteCode.py -+# ${XDMF_WRAP_PYTHON_INSTALL_DIR})") - - ENDIF(XDMF_WRAP_PYTHON) - diff --git a/sci-visualization/paraview/files/paraview-3.8.0-xdmf-cstring.patch b/sci-visualization/paraview/files/paraview-3.8.0-xdmf-cstring.patch deleted file mode 100644 index da0647618..000000000 --- a/sci-visualization/paraview/files/paraview-3.8.0-xdmf-cstring.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Utilities/Xdmf2/libsrc/XdmfObject.h.orig 2010-06-01 18:41:14.006986954 +1200 -+++ Utilities/Xdmf2/libsrc/XdmfObject.h 2010-06-01 18:42:48.257851302 +1200 -@@ -82,6 +82,7 @@ - # ifdef UNIX - # include "sys/file.h" - # include "strings.h" -+# include <cstring> - # define STRCASECMP strcasecmp - # define STRNCASECMP strncasecmp - # define STRCMP strcmp diff --git a/sci-visualization/paraview/files/vtk-5.6.0-cg-path.patch b/sci-visualization/paraview/files/vtk-5.6.0-cg-path.patch deleted file mode 100644 index 984bf5008..000000000 --- a/sci-visualization/paraview/files/vtk-5.6.0-cg-path.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/CMake/FindCg.cmake b/CMake/FindCg.cmake -index ceb41de..5eb6003 100644 ---- a/CMake/FindCg.cmake -+++ b/CMake/FindCg.cmake -@@ -82,6 +82,7 @@ ELSE (APPLE) - FIND_PROGRAM( CG_COMPILER cgc - /usr/bin - /usr/local/bin -+ /opt/nvidia-cg-toolkit/bin - DOC "The Cg Compiler" - ) - GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH) -@@ -89,6 +90,7 @@ ELSE (APPLE) - FIND_PATH( CG_INCLUDE_PATH Cg/cg.h - /usr/include - /usr/local/include -+ /opt/nvidia-cg-toolkit/include - ${CG_COMPILER_SUPER_DIR}/include - DOC "The directory where Cg/cg.h resides" - ) -@@ -98,6 +100,7 @@ ELSE (APPLE) - /usr/lib - /usr/local/lib64 - /usr/local/lib -+ /opt/nvidia-cg-toolkit/lib - ${CG_COMPILER_SUPER_DIR}/lib64 - ${CG_COMPILER_SUPER_DIR}/lib - DOC "The Cg runtime library" -@@ -108,6 +111,7 @@ ELSE (APPLE) - /usr/lib - /usr/local/lib64 - /usr/local/lib -+ /opt/nvidia-cg-toolkit/lib - ${CG_COMPILER_SUPER_DIR}/lib64 - ${CG_COMPILER_SUPER_DIR}/lib - DOC "The Cg runtime library" diff --git a/sci-visualization/paraview/files/vtk-5.6.0-libpng14.patch b/sci-visualization/paraview/files/vtk-5.6.0-libpng14.patch deleted file mode 100644 index db1f87d3a..000000000 --- a/sci-visualization/paraview/files/vtk-5.6.0-libpng14.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/IO/vtkPNGReader.cxx b/IO/vtkPNGReader.cxx -index d1f5c2f..0bf00e4 100644 ---- a/IO/vtkPNGReader.cxx -+++ b/IO/vtkPNGReader.cxx -@@ -116,7 +116,7 @@ void vtkPNGReader::ExecuteInformation() - // minimum of a byte per pixel - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - { -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } - - // add alpha if any alpha found -@@ -225,7 +225,7 @@ void vtkPNGReaderUpdate2(vtkPNGReader *self, OT *outPtr, - // minimum of a byte per pixel - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - { -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } - - // add alpha if any alpha found diff --git a/sci-visualization/paraview/files/vtk-5.6.0-odbc.patch b/sci-visualization/paraview/files/vtk-5.6.0-odbc.patch deleted file mode 100644 index be24af11a..000000000 --- a/sci-visualization/paraview/files/vtk-5.6.0-odbc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur CMake/FindODBC.cmake.orig CMake/FindODBC.cmake ---- CMake/FindODBC.cmake.orig 2008-10-08 13:51:36.000000000 -0400 -+++ CMake/FindODBC.cmake 2010-01-21 22:11:26.000000000 -0500 -@@ -30,7 +30,7 @@ - ) - - FIND_LIBRARY( ODBC_LIBRARY -- NAMES iodbc unixodbc -+ NAMES iodbc unixodbc odbc - PATHS - /usr/lib - /usr/lib/odbc diff --git a/sci-visualization/paraview/files/vtk-5.6.1-ffmpeg.patch b/sci-visualization/paraview/files/vtk-5.6.1-ffmpeg.patch deleted file mode 100644 index 34ec52885..000000000 --- a/sci-visualization/paraview/files/vtk-5.6.1-ffmpeg.patch +++ /dev/null @@ -1,42 +0,0 @@ - CMake/vtkFFMPEGTestAvAlloc.cxx | 2 +- - CMake/vtkFFMPEGTestURLFClose.cxx | 2 +- - IO/vtkFFMPEGWriter.cxx | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMake/vtkFFMPEGTestAvAlloc.cxx b/CMake/vtkFFMPEGTestAvAlloc.cxx -index ad691e3..32489d5 100644 ---- a/CMake/vtkFFMPEGTestAvAlloc.cxx -+++ b/CMake/vtkFFMPEGTestAvAlloc.cxx -@@ -1,6 +1,6 @@ - extern "C" { - #ifdef HAS_OLD_HEADER --# include <ffmpeg/avformat.h> -+# include <libavformat/avformat.h> - #else - # include <libavformat/avformat.h> - #endif -diff --git a/CMake/vtkFFMPEGTestURLFClose.cxx b/CMake/vtkFFMPEGTestURLFClose.cxx -index 0bf4314..1c10a93 100644 ---- a/CMake/vtkFFMPEGTestURLFClose.cxx -+++ b/CMake/vtkFFMPEGTestURLFClose.cxx -@@ -1,6 +1,6 @@ - extern "C" { - #ifdef HAS_OLD_HEADER --# include <ffmpeg/avformat.h> -+# include <libavformat/avformat.h> - #else - # include <libavformat/avformat.h> - #endif -diff --git a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx -index 52673ef..ffbb78f 100644 ---- a/IO/vtkFFMPEGWriter.cxx -+++ b/IO/vtkFFMPEGWriter.cxx -@@ -22,7 +22,7 @@ - - extern "C" { - #ifdef VTK_FFMPEG_HAS_OLD_HEADER --# include <ffmpeg/avformat.h> -+# include <libavformat/avformat.h> - #else - # include <libavformat/avformat.h> - #endif diff --git a/sci-visualization/paraview/files/vtk-5.6.1-libav-0.8.patch b/sci-visualization/paraview/files/vtk-5.6.1-libav-0.8.patch deleted file mode 100644 index 523919d6f..000000000 --- a/sci-visualization/paraview/files/vtk-5.6.1-libav-0.8.patch +++ /dev/null @@ -1,66 +0,0 @@ -Description: Upstream changes introduced in version 5.6.1-6.1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - vtk (5.6.1-6.1) unstable; urgency=low - . - [ Michael Schutte ] - * Non-maintainer upload. - * Remove absolute paths to required libraries from - /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes: - #506992. Due to the multiarch transition, the original behavior - frequently causes reverse build-deps to FTBFS. This change should - probably be reverted once all required libraries are multiarched. - . - [ Steve M. Robbins ] - * Override lintian diagnostic about embedded libraries ftgl and sqlite. - * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav - 0.7. - . - The person named in the Author field signed this changelog entry. -Author: Steve M. Robbins <smr@debian.org> -Bug-Debian: http://bugs.debian.org/506992 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx -+++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx -@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start() - } - - //choose avi media file format -- this->avOutputFormat = guess_format("avi", NULL, NULL); -+ this->avOutputFormat = av_guess_format("avi", NULL, NULL); - if (!this->avOutputFormat) - { - vtkGenericWarningMacro (<< "Could not open the avi media file format."); -@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start() - //Set up the codec. - AVCodecContext *c = this->avStream->codec; - c->codec_id = (CodecID)this->avOutputFormat->video_codec; -- c->codec_type = CODEC_TYPE_VIDEO; -+ c->codec_type = AVMEDIA_TYPE_VIDEO; - c->width = this->Dim[0]; - c->height = this->Dim[1]; - c->pix_fmt = PIX_FMT_YUVJ420P; -@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm - pkt.stream_index = this->avStream->index; - if (cc->coded_frame->key_frame) //treat keyframes well - { -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - } - pkt.duration = 0; //presentation duration in time_base units or 0 if NA - pkt.pos = -1; //byte position in stream or -1 if NA diff --git a/sci-visualization/paraview/files/vtk-boost1.49.patch b/sci-visualization/paraview/files/vtk-boost1.49.patch deleted file mode 100644 index b04d3917c..000000000 --- a/sci-visualization/paraview/files/vtk-boost1.49.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: fix FTBFS with boost 1.49 -Author: Dominique Belhachemi <domibel@debian.org> -Origin: http://anonscm.debian.org/gitweb/?p=collab-maint/vtk.git;a=commitdiff;h=55084a11b450e53b2e8786e23dd64a6a6b846e6b -Last-Update: 2012-05-07 - ---- a/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx -+++ b/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx -@@ -49,11 +49,17 @@ - - #if BOOST_VERSION >= 104800 // Boost 1.48.x - namespace { -- vtkIdType unwrap_edge_id(vtkEdgeType const &e) { -+ vtkIdType unwrap_edge_id(vtkEdgeType const &e) -+ { - return e.Id; - } -- vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { -+ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) -+ { -+# if BOOST_VERSION == 104800 - return e.underlying_desc.Id; -+# else -+ return e.underlying_descx.Id; -+# endif - } - } - #endif diff --git a/sci-visualization/paraview/metadata.xml b/sci-visualization/paraview/metadata.xml deleted file mode 100644 index 38ea062d7..000000000 --- a/sci-visualization/paraview/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci</herd> - <maintainer> - <email>markusle@gentoo.org</email> - <name>Markus Dittrich</name> - </maintainer> - <use> - <flag name="plugins">Build and install additional plugins</flag> - <flag name="gui">Build paraview's gui not just the server</flag> - <flag name="cg">Add support for nvidia's cg shaders</flag> - <flag name="boost">Add support for boost</flag> - <flag name="streaming">Enable streaming paraview application</flag> - <flag name="adaptive">Enable the adaptive paraview application</flag> - <flag name="mysql">Build support for MySQL data item in the XDMF format</flag> - <flag name="nvcontrol">Add NVCONTROL support for OpenGL options</flag> - <flag name="webkit">Built support for qt-webkit in vtk</flag> - <flag name="gl2ps">Enables gl2ps PostScript printing library</flag> - <flag name="coprocessing">Enable the coprocessing infrastructure which is mainly useful in the context of clusters</flag> - </use> -</pkgmetadata> diff --git a/sci-visualization/paraview/paraview-3.10.1.ebuild b/sci-visualization/paraview/paraview-3.10.1.ebuild deleted file mode 100644 index ec894f308..000000000 --- a/sci-visualization/paraview/paraview-3.10.1.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -PYTHON_DEPEND="python? 2:2.6" - -inherit cmake-utils eutils flag-o-matic multilib python qt4-r2 toolchain-funcs versionator - -MAIN_PV=$(get_major_version) -MAJOR_PV=$(get_version_component_range 1-2) -MY_P="ParaView-${PV}" - -DESCRIPTION="ParaView is a powerful scientific data visualization application" -HOMEPAGE="http://www.paraview.org" -SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz" -RESTRICT="mirror" - -LICENSE="paraview GPL-2" -KEYWORDS="~x86 ~amd64" -SLOT="0" -IUSE="adaptive cg -coprocessing doc examples +gui mpi mysql nvcontrol plugins +python streaming webkit" - -RDEPEND=" - sci-libs/hdf5[mpi=] - mpi? ( virtual/mpi[cxx,romio] ) - gui? ( - dev-qt/qtgui:4 - dev-qt/qt3support:4 - dev-qt/qtopengl:4 - || ( >=dev-qt/qthelp-4.7.0:4[compat] <dev-qt/qthelp-4.7.0:4 ) - dev-qt/qtsql:4 - webkit? ( dev-qt/qtwebkit:4 ) ) - adaptive? ( - dev-qt/qtgui:4 - dev-qt/qt3support:4 - dev-qt/qtopengl:4 - dev-qt/qthelp:4 - webkit? ( dev-qt/qtwebkit:4 ) ) - mysql? ( virtual/mysql ) - coprocessing? ( plugins? ( dev-qt/qtgui:4 ) ) - python? ( - dev-python/sip - dev-python/PyQt4 - ) - dev-libs/libxml2:2 - media-libs/libpng - virtual/jpeg - media-libs/tiff - dev-libs/expat - sys-libs/zlib - media-libs/freetype - >=app-admin/eselect-opengl-1.0.6-r1 - virtual/opengl - sci-libs/netcdf - x11-libs/libXmu" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - >=dev-util/cmake-2.6.4" - -PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} -S=${WORKDIR}/${MY_P} - -pkg_setup() { - use python && python_set_active_version 2 -} - -src_prepare() { - # gcc header fix - epatch "${FILESDIR}"/${PN}-3.8.0-xdmf-cstring.patch - # disable automatic byte compiling that act directly on the live system - epatch "${FILESDIR}"/${PN}-3.8.0-xdmf-bc.patch - # Install properly pointspritedemo without duplicate DESTDIR - epatch "${FILESDIR}"/${PN}-3.8.0-pointsprite-example-install.patch - # mpi + hdf5 fix - #epatch "${FILESDIR}"/${PN}-3.8.0-h5part.patch - # gcc fix for vtk - epatch "${FILESDIR}"/${P}-gcc46.patch - - # lib64 fixes - sed -i "s:/usr/lib:/usr/$(get_libdir):g" \ - Utilities/Xdmf2/libsrc/CMakeLists.txt || die - sed -i "s:\/lib\/python:\/$(get_libdir)\/python:g" \ - Utilities/Xdmf2/CMake/setup_install_paths.py || die - - # Install internal vtk binaries inside /usr/${PVLIBDIR} - sed -e 's:VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_BIN_DIR}\":VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_LIB_DIR}\":' \ - -i CMake/ParaViewCommon.cmake || die "failed to patch vtk install location" - - cd VTK - epatch "${FILESDIR}"/vtk-5.6.0-cg-path.patch - - # help vtk to find PyQT4 sip if required - sed -e 's:/usr/share/sip/PyQt4:/usr/share/sip:' \ - -i GUISupport/Qt/CMakeLists.txt -} - -src_configure() { - mycmakeargs=( - -DPV_INSTALL_LIB_DIR="${PVLIBDIR}" - -DCMAKE_INSTALL_PREFIX=/usr - -DPV_INSTALL_DOC_DIR="/usr/share/doc/${PF}" - -DEXPAT_INCLUDE_DIR=/usr/include - -DEXPAT_LIBRARY=/usr/$(get_libdir)/libexpat.so - -DOPENGL_gl_LIBRARY=/usr/$(get_libdir)/libGL.so - -DOPENGL_glu_LIBRARY=/usr/$(get_libdir)/libGLU.so - -DCMAKE_SKIP_RPATH=YES - -DVTK_USE_RPATH=OFF - -DBUILD_SHARED_LIBS=ON - -DVTK_USE_SYSTEM_FREETYPE=ON - -DVTK_USE_SYSTEM_JPEG=ON - -DVTK_USE_SYSTEM_PNG=ON - -DVTK_USE_SYSTEM_TIFF=ON - -DVTK_USE_SYSTEM_ZLIB=ON - -DVTK_USE_SYSTEM_EXPAT=ON - -DPARAVIEW_USE_SYSTEM_HDF5=ON - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_COLOR_MAKEFILE=TRUE - -DVTK_USE_SYSTEM_LIBXML2=ON - -DVTK_USE_OFFSCREEN=TRUE - -DCMAKE_USE_PTHREADS=ON - -DBUILD_TESTING=OFF - -DVTK_USE_FFMPEG_ENCODER=OFF - -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES=OFF) - - # use flag triggered options - mycmakeargs+=( - $(cmake-utils_use gui PARAVIEW_BUILD_QT_GUI) - $(cmake-utils_use gui VTK_USE_QVTK) - $(cmake-utils_use gui VTK_USE_QVTK_QTOPENGL) - $(cmake-utils_use mpi PARAVIEW_USE_MPI) - $(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND) - $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON) - $(cmake-utils_use python VTK_WRAP_PYTHON_SIP) - $(cmake-utils_use python XDMF_WRAP_PYTHON) - $(cmake-utils_use doc BUILD_DOCUMENTATION) - $(cmake-utils_use examples BUILD_EXAMPLES) - $(cmake-utils_use cg VTK_USE_CG_SHADERS) - $(cmake-utils_use nvcontrol VTK_USE_NVCONTROL) - $(cmake-utils_use adaptive PARAVIEW_BUILD_AdaptiveParaView) - $(cmake-utils_use streaming PARAVIEW_BUILD_StreamingParaView) - $(cmake-utils_use mysql XDMF_USE_MYSQL) - $(cmake-utils_use coprocessing PARAVIEW_ENABLE_COPROCESSING)) - - if ( use gui || use adaptive ); then - mycmakeargs+=(-DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer - $(cmake-utils_use webkit VTK_QT_USE_WEBKIT)) - if use python ; then - # paraview cannot guess sip directory right probably because a path is not propagated properly - mycmakeargs+=(-DSIP_INCLUDE_DIR=$(python_get_includedir)) - fi - fi - - # the rest of the plugins - mycmakeargs+=( - $(cmake-utils_use plugins PARAVIEW_INSTALL_DEVELOPMENT) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ClientChartView) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_CosmoFilters) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Prism) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIReaderWriter) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingView) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_VisTrailPlugin)) - - if use python; then - mycmakeargs+=($(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_pvblot)) - fi - - if use coprocessing; then - mycmakeargs+=($(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator)) - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # set up the environment - echo "LDPATH=/usr/${PVLIBDIR}" >> "${T}"/40${PN} - echo "PYTHONPATH=/usr/${PVLIBDIR}:/usr/${PVLIBDIR}/site-packages" >> "${T}"/40${PN} - doenvd "${T}"/40${PN} - - # last but not least lets make a desktop entry - newicon "${S}"/Applications/ParaView/pvIcon.png paraview.png \ - || die "Failed to create paraview icon." - make_desktop_entry paraview "Paraview" paraview \ - || die "Failed to install Paraview desktop entry" - -} - -pkg_postinst() { - # with Qt4.5 there seem to be issues reading data files - # under certain locales. Setting LC_ALL=C should fix these. - echo - elog "If you experience data corruption during parsing of" - elog "data files with paraview please try setting your" - elog "locale to LC_ALL=C." - echo -} - -pkg_postrm() { - if use python ; then - python_mod_cleanup /usr/$(get_libdir)/"${PN}-${MAJOR_PV}"/site-packages - fi -} diff --git a/sci-visualization/paraview/paraview-3.12.0.ebuild b/sci-visualization/paraview/paraview-3.12.0.ebuild deleted file mode 100644 index d8bb82697..000000000 --- a/sci-visualization/paraview/paraview-3.12.0.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -PYTHON_DEPEND="python? 2:2.6" - -inherit cmake-utils eutils flag-o-matic multilib python qt4-r2 toolchain-funcs versionator - -MAIN_PV=$(get_major_version) -MAJOR_PV=$(get_version_component_range 1-2) -MY_P="ParaView-${PV}" - -DESCRIPTION="ParaView is a powerful scientific data visualization application" -HOMEPAGE="http://www.paraview.org" -SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz" -RESTRICT="mirror" - -LICENSE="paraview GPL-2" -KEYWORDS="~x86 ~amd64" -SLOT="0" -IUSE="adaptive cg -coprocessing doc examples +gui mpi mysql nvcontrol plugins +python streaming webkit" - -RDEPEND=" - sci-libs/hdf5[mpi=] - mpi? ( virtual/mpi[cxx,romio] ) - gui? ( - dev-qt/qtgui:4 - dev-qt/qt3support:4 - dev-qt/qtopengl:4 - || ( >=dev-qt/qthelp-4.7.0:4[compat] <dev-qt/qthelp-4.7.0:4 ) - dev-qt/qtsql:4 - webkit? ( dev-qt/qtwebkit:4 ) ) - adaptive? ( - dev-qt/qtgui:4 - dev-qt/qt3support:4 - dev-qt/qtopengl:4 - dev-qt/qthelp:4 - webkit? ( dev-qt/qtwebkit:4 ) ) - mysql? ( virtual/mysql ) - coprocessing? ( plugins? ( dev-qt/qtgui:4 ) ) - python? ( - dev-python/sip - dev-python/PyQt4 - ) - dev-libs/libxml2:2 - media-libs/libpng - virtual/jpeg - media-libs/tiff - dev-libs/expat - sys-libs/zlib - media-libs/freetype - >=app-admin/eselect-opengl-1.0.6-r1 - virtual/opengl - sci-libs/netcdf - x11-libs/libXmu" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - dev-libs/protobuf - >=dev-util/cmake-2.6.4" - -PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} -S=${WORKDIR}/${MY_P} - -pkg_setup() { - use python && python_set_active_version 2 -} - -src_prepare() { - # gcc header fix - epatch "${FILESDIR}"/${PN}-3.8.0-xdmf-cstring.patch - # disable automatic byte compiling that act directly on the live system - epatch "${FILESDIR}"/${PN}-3.8.0-xdmf-bc.patch - # mpi + hdf5 fix - #epatch "${FILESDIR}"/${PN}-3.8.0-h5part.patch - # gcc fix for vtk - epatch "${FILESDIR}"/${P}-gcc46.patch - # use system provided protobuf and avoid http://paraview.org/Bug/view.php?id=12852 - epatch "${FILESDIR}"/${P}-protobuf.patch - - # lib64 fixes - sed -i "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ - Utilities/Xdmf2/libsrc/CMakeLists.txt || die - sed -i "s:\/lib\/python:\/$(get_libdir)\/python:g" \ - Utilities/Xdmf2/CMake/setup_install_paths.py || die - - # Install internal vtk binaries inside /usr/${PVLIBDIR} - sed -e 's:VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_BIN_DIR}\":VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_LIB_DIR}\":' \ - -i CMake/ParaViewCommon.cmake || die "failed to patch vtk install location" - - cd VTK - epatch "${FILESDIR}"/vtk-5.6.0-cg-path.patch -} - -src_configure() { - mycmakeargs=( - -DPV_INSTALL_LIB_DIR="${PVLIBDIR}" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DPV_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" - -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include - -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so - -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so - -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so - -DCMAKE_SKIP_RPATH=YES - -DVTK_USE_RPATH=OFF - -DBUILD_SHARED_LIBS=ON - -DVTK_USE_SYSTEM_FREETYPE=ON - -DVTK_USE_SYSTEM_JPEG=ON - -DVTK_USE_SYSTEM_PNG=ON - -DVTK_USE_SYSTEM_TIFF=ON - -DVTK_USE_SYSTEM_ZLIB=ON - -DVTK_USE_SYSTEM_EXPAT=ON - -DPARAVIEW_USE_SYSTEM_HDF5=ON - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_COLOR_MAKEFILE=TRUE - -DVTK_USE_SYSTEM_LIBXML2=ON - -DVTK_USE_OFFSCREEN=TRUE - -DCMAKE_USE_PTHREADS=ON - -DBUILD_TESTING=OFF - -DVTK_USE_FFMPEG_ENCODER=OFF - -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES=OFF - -DSYSTEM_PB=$(which protoc)) - - # use flag triggered options - mycmakeargs+=( - $(cmake-utils_use gui PARAVIEW_BUILD_QT_GUI) - $(cmake-utils_use gui VTK_USE_QVTK) - $(cmake-utils_use gui VTK_USE_QVTK_QTOPENGL) - $(cmake-utils_use mpi PARAVIEW_USE_MPI) - $(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND) - $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON) - $(cmake-utils_use python VTK_WRAP_PYTHON_SIP) - $(cmake-utils_use python XDMF_WRAP_PYTHON) - $(cmake-utils_use doc BUILD_DOCUMENTATION) - $(cmake-utils_use examples BUILD_EXAMPLES) - $(cmake-utils_use cg VTK_USE_CG_SHADERS) - $(cmake-utils_use nvcontrol VTK_USE_NVCONTROL) - $(cmake-utils_use adaptive PARAVIEW_BUILD_AdaptiveParaView) - $(cmake-utils_use streaming PARAVIEW_BUILD_StreamingParaView) - $(cmake-utils_use mysql XDMF_USE_MYSQL) - $(cmake-utils_use coprocessing PARAVIEW_ENABLE_COPROCESSING)) - - if ( use gui || use adaptive ); then - mycmakeargs+=(-DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer - $(cmake-utils_use webkit VTK_QT_USE_WEBKIT)) - if use python ; then - # paraview cannot guess sip directory right probably because a path is not propagated properly - mycmakeargs+=( - -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip" - -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)") - fi - fi - - # the rest of the plugins - mycmakeargs+=( - $(cmake-utils_use plugins PARAVIEW_INSTALL_DEVELOPMENT) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ClientChartView) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_CosmoFilters) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Prism) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIReaderWriter) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingView) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_VisTrailPlugin)) - - if use python; then - mycmakeargs+=($(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_pvblot)) - fi - - if use coprocessing; then - mycmakeargs+=($(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator)) - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # set up the environment - echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" >> "${T}"/40${PN} - echo "PYTHONPATH="${EPREFIX}"/usr/${PVLIBDIR}:/usr/${PVLIBDIR}/site-packages" >> "${T}"/40${PN} - doenvd "${T}"/40${PN} - - # last but not least lets make a desktop entry - newicon "${S}"/Applications/ParaView/pvIcon.png paraview.png \ - || die "Failed to create paraview icon." - make_desktop_entry paraview "Paraview" paraview \ - || die "Failed to install Paraview desktop entry" - -} - -pkg_postinst() { - # with Qt4.5 there seem to be issues reading data files - # under certain locales. Setting LC_ALL=C should fix these. - echo - elog "If you experience data corruption during parsing of" - elog "data files with paraview please try setting your" - elog "locale to LC_ALL=C." - echo -} - -pkg_postrm() { - if use python ; then - python_mod_cleanup "${EPREFIX}"/usr/$(get_libdir)/"${PN}-${MAJOR_PV}"/site-packages - fi -} diff --git a/sci-visualization/paraview/paraview-3.14.1-r4.ebuild b/sci-visualization/paraview/paraview-3.14.1-r4.ebuild deleted file mode 100644 index 4d13a8703..000000000 --- a/sci-visualization/paraview/paraview-3.14.1-r4.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -PYTHON_DEPEND="python? 2:2.6" - -inherit cmake-utils eutils flag-o-matic multilib python qt4-r2 toolchain-funcs versionator - -MAIN_PV=$(get_major_version) -MAJOR_PV=$(get_version_component_range 1-2) -MY_P="ParaView-${PV}-Source" - -DESCRIPTION="ParaView is a powerful scientific data visualization application" -HOMEPAGE="http://www.paraview.org" -SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz" -RESTRICT="mirror" - -LICENSE="paraview GPL-2" -KEYWORDS="~x86 ~amd64" -SLOT="0" -IUSE="boost cg -coprocessing doc examples +gui mpi mysql gl2ps nvcontrol +plugins +python ffmpeg theora" - -RDEPEND=" - ~sci-libs/netcdf-4.1.3[cxx,hdf5] - sci-libs/hdf5[mpi=] - mpi? ( virtual/mpi[cxx,romio] ) - gui? ( - dev-qt/qtgui:4 - dev-qt/qt3support:4 - dev-qt/qtopengl:4 - || ( >=dev-qt/qthelp-4.7.0:4[compat] <dev-qt/qthelp-4.7.0:4 ) - dev-qt/qtsql:4 - dev-qt/qtwebkit:4 ) - mysql? ( virtual/mysql ) - coprocessing? ( plugins? ( - dev-qt/qtgui:4 - dev-python/PyQt4 ) ) - python? ( - dev-python/sip - gui? ( dev-python/PyQt4[opengl,webkit] ) - dev-python/numpy - mpi? ( dev-python/mpi4py ) - ) - ffmpeg? ( virtual/ffmpeg ) - theora? ( media-libs/libtheora ) - gl2ps? ( x11-libs/gl2ps ) - dev-libs/libxml2:2 - dev-db/sqlite:3 - media-libs/libpng - virtual/jpeg - media-libs/tiff - dev-libs/expat - sys-libs/zlib - media-libs/freetype - >=app-admin/eselect-opengl-1.0.6-r1 - virtual/opengl - sci-libs/netcdf - x11-libs/libXmu" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - boost? ( >=dev-libs/boost-1.40.0[mpi?] ) - dev-libs/protobuf - >=dev-util/cmake-2.6.4" - -PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} -S=${WORKDIR}/${MY_P} - -pkg_setup() { - use python && python_set_active_version 2 -} - -src_prepare() { - # gcc header fix - epatch "${FILESDIR}"/${PN}-3.8.0-xdmf-cstring.patch - # disable automatic byte compiling that act directly on the live system - epatch "${FILESDIR}"/${PN}-3.8.0-xdmf-bc.patch - # Do not install ffmpeg libraries if used - epatch "${FILESDIR}"/${PN}-3.14.1-ffmpeg-noinstall.patch - # patch from debian for some underlinking in xdmf - epatch "${FILESDIR}"/${PN}-3.14.1-xdmf-linking.patch - # upstream http://paraview.org/Bug/view.php?id=13222 and - # commit https://github.com/Kitware/ParaView/commit/559af72e540f418310b6425055348336a48ad557 - epatch "${FILESDIR}"/${PN}-3.14.1-python-exit.patch - # disable internal mpi4py copy - epatch "${FILESDIR}"/${PN}-3.14.1-mpi4py.patch - # remove the internal copy of sqlite (vtksqlite) - # http://patch-tracker.debian.org/patch/series/view/paraview/3.14.1-7/removesqlite.patch - epatch "${FILESDIR}"/${PN}-3.14.1-removesqlite.patch - # gcc 4.7 fix - # http://patch-tracker.debian.org/patch/series/view/paraview/3.14.1-7/fix_FTBFS_gcc-4.7.patch - epatch "${FILESDIR}"/${PN}-3.14.1-gcc-4.7.patch - # adapted from debian patch need to be applied after paraview-3.14.1-removesqlite.patch - epatch "${FILESDIR}"/${PN}-3.14.1-vtknetcd.patch - - # lib64 fixes - sed -i "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ - Utilities/Xdmf2/libsrc/CMakeLists.txt || die - sed -i "s:\/lib\/python:\/$(get_libdir)\/python:g" \ - Utilities/Xdmf2/CMake/setup_install_paths.py || die - - # Install internal vtk binaries to PV_INSTALL_LIB_DIR as noted in the comment in the cmake file. - # upstream doesn't even do what they say they do. - sed -e 's:VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_BIN_DIR}\":VTK_INSTALL_BIN_DIR \"/${PV_INSTALL_LIB_DIR}\":' \ - -i CMake/ParaViewCommon.cmake || die "failed to patch vtk install location" - - cd VTK - epatch "${FILESDIR}"/vtk-5.6.0-cg-path.patch - epatch "${FILESDIR}"/vtk-5.6.0-odbc.patch - epatch "${FILESDIR}"/vtk-5.6.1-ffmpeg.patch - epatch "${FILESDIR}"/vtk-5.6.1-libav-0.8.patch - # debian patch for recent boost should work with 1.48 too - epatch "${FILESDIR}"/vtk-boost1.49.patch -} - -src_configure() { - mycmakeargs=( - -DPV_INSTALL_LIB_DIR="${PVLIBDIR}" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DPV_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" - -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include - -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so - -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so - -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so - -DCMAKE_SKIP_RPATH=YES - -DVTK_USE_RPATH=OFF - -DBUILD_SHARED_LIBS=ON - -DVTK_USE_SYSTEM_FREETYPE=ON - -DVTK_USE_SYSTEM_JPEG=ON - -DVTK_USE_SYSTEM_PNG=ON - -DVTK_USE_SYSTEM_TIFF=ON - -DVTK_USE_SYSTEM_ZLIB=ON - -DVTK_USE_SYSTEM_EXPAT=ON - -DPARAVIEW_USE_SYSTEM_HDF5=ON - -DVTK_USE_SYSTEM_HDF5=ON - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_COLOR_MAKEFILE=TRUE - -DVTK_USE_SYSTEM_LIBXML2=ON - -DVTK_USE_OFFSCREEN=TRUE - -DCMAKE_USE_PTHREADS=ON - -DVTK_USE_FFMPEG_ENCODER=OFF - -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES=OFF - -DPROTOC_LOCATION=$(which protoc)) - - # use flag triggered options - mycmakeargs+=( - $(cmake-utils_use gui PARAVIEW_BUILD_QT_GUI) - $(cmake-utils_use gui VTK_USE_QVTK) - $(cmake-utils_use gui VTK_USE_QVTK_QTOPENGL) - $(cmake-utils_use boost VTK_USE_BOOST) - $(cmake-utils_use boost VTK_USE_TEXT_ANALYSIS) - $(cmake-utils_use mpi PARAVIEW_USE_MPI) - $(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND) - $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON) - $(cmake-utils_use python VTK_WRAP_PYTHON_SIP) - $(cmake-utils_use python XDMF_WRAP_PYTHON) - $(cmake-utils_use doc BUILD_DOCUMENTATION) - $(cmake-utils_use examples BUILD_EXAMPLES) - $(cmake-utils_use cg VTK_USE_CG_SHADERS) - $(cmake-utils_use nvcontrol VTK_USE_NVCONTROL) - $(cmake-utils_use mysql XDMF_USE_MYSQL) - $(cmake-utils_use mysql VTK_USE_MYSQL) - $(cmake-utils_use gl2ps VTK_USE_GL2PS) - $(cmake-utils_use gl2ps VTK_USE_SYSTEM_GL2PS) - $(cmake-utils_use coprocessing PARAVIEW_ENABLE_COPROCESSING) - $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) - $(cmake-utils_use theora VTK_USE_THEORA_ENCODER) - $(cmake-utils_use theora VTK_USE_SYSTEM_OGGTHEORA)) - - # testing, disabling vtk testing as vtkpython is tested and will fail. - mycmakeargs+=( - $(cmake-utils_use test BUILD_TESTING) - $(cmake-utils_use test PARAVIEW_DISABLE_VTK_TESTING)) - - if ( use gui ); then - mycmakeargs+=( - -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer - -DVTK_QT_USE_WEBKIT=ON ) - if use python ; then - # paraview cannot guess sip directory right probably because a path is not propagated properly - mycmakeargs+=( - -DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip" - -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)") - fi - fi - - # the rest of the plugins - mycmakeargs+=( - $(cmake-utils_use plugins PARAVIEW_INSTALL_DEVELOPMENT) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ClientChartView) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_CosmoFilters) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Prism) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIReaderWriter) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingView) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_VisTrailPlugin)) - - if use python; then - mycmakeargs+=( - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_pvblot)) - fi - - if use coprocessing; then - mycmakeargs+=($(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator)) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - # set up the environment - echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" >> "${T}"/40${PN} - echo "PYTHONPATH="${EPREFIX}"/usr/${PVLIBDIR}:/usr/${PVLIBDIR}/site-packages" >> "${T}"/40${PN} - doenvd "${T}"/40${PN} - - # last but not least lets make a desktop entry - newicon "${S}"/Applications/ParaView/pvIcon.png paraview.png \ - || die "Failed to create paraview icon." - make_desktop_entry paraview "Paraview" paraview \ - || die "Failed to install Paraview desktop entry" - -} - -pkg_postinst() { - # with Qt4.5 there seem to be issues reading data files - # under certain locales. Setting LC_ALL=C should fix these. - echo - elog "If you experience data corruption during parsing of" - elog "data files with paraview please try setting your" - elog "locale to LC_ALL=C." - elog "If you plan to use paraview component from an existing shell" - elog "you should run env-update and . /etc/profile first" - echo -} - -pkg_postrm() { - if use python ; then - python_mod_cleanup "${EPREFIX}"/usr/$(get_libdir)/"${PN}-${MAJOR_PV}"/site-packages - fi -} |