diff options
author | Julian Ospald <hasufell@gentoo.org> | 2013-02-11 21:29:20 +0000 |
---|---|---|
committer | Julian Ospald <hasufell@gentoo.org> | 2013-02-11 21:29:20 +0000 |
commit | fd4e3b3486d1628394ae11856635da9f039dd88d (patch) | |
tree | 2572214f4e7c1e2453e1f923fc9fbae2d71f9489 /sci-visualization | |
parent | Stable on amd64, wrt bug #456374 (diff) | |
download | gentoo-2-fd4e3b3486d1628394ae11856635da9f039dd88d.tar.gz gentoo-2-fd4e3b3486d1628394ae11856635da9f039dd88d.tar.bz2 gentoo-2-fd4e3b3486d1628394ae11856635da9f039dd88d.zip |
version bump wrt #317345
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'sci-visualization')
22 files changed, 979 insertions, 673 deletions
diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog index fdb18a304e3b..86192f8a6808 100644 --- a/sci-visualization/paraview/ChangeLog +++ b/sci-visualization/paraview/ChangeLog @@ -1,6 +1,26 @@ # ChangeLog for sci-visualization/paraview -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.61 2012/05/06 23:13:07 pesa Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.62 2013/02/11 21:29:20 hasufell Exp $ + +*paraview-3.98.0 (11 Feb 2013) + + 11 Feb 2013; Julian Ospald <hasufell@gentoo.org> -paraview-3.6.2.ebuild, + -files/paraview-3.6.2-about.html.patch, + -files/paraview-3.6.2-assistant.patch, + -files/paraview-3.6.2-boost-property_map.patch, + -files/paraview-3.6.2-findcg-cmake.patch, -files/paraview-3.6.2-h5part.patch, + -files/paraview-3.6.2-hdf-1.8.3.patch, -files/paraview-3.6.2-libpng14.patch, + -files/paraview-3.6.2-libpng15.patch, + -files/paraview-3.6.2-no-doc-finder.patch, -files/paraview-3.6.2-odbc.patch, + -files/paraview-3.6.2-pointsprite-disable.patch, + -files/paraview-3.6.2-qt.patch, +paraview-3.98.0.ebuild, + +files/paraview-3.98.0-gcc-4.7.patch, +files/paraview-3.98.0-mpi4py.patch, + +files/paraview-3.98.0-pvblot.patch, + +files/paraview-3.98.0-removesqlite.patch, + +files/paraview-3.98.0-vtk-cg-path.patch, + +files/paraview-3.98.0-vtknetcd.patch, + +files/paraview-3.98.0-xdmf-cstring.patch: + version bump wrt #317345 06 May 2012; Davide Pesavento <pesa@gentoo.org> paraview-3.6.2.ebuild: Stop inheriting deprecated qt4 eclass (it wasn't used anyway). diff --git a/sci-visualization/paraview/files/paraview-3.6.2-about.html.patch b/sci-visualization/paraview/files/paraview-3.6.2-about.html.patch deleted file mode 100644 index 80ac406c9a28..000000000000 --- a/sci-visualization/paraview/files/paraview-3.6.2-about.html.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ParaView3/Documentation/CMakeLists.txt ParaView3.new/Documentation/CMakeLists.txt ---- ParaView3/Documentation/CMakeLists.txt 2008-12-22 16:06:00.000000000 -0500 -+++ ParaView3.new/Documentation/CMakeLists.txt 2010-01-16 11:02:15.000000000 -0500 -@@ -155,7 +155,7 @@ - - install( - FILES "${ParaView_BINARY_DIR}/about.html" -- DESTINATION ${PV_INSTALL_BIN_DIR} -+ DESTINATION ${PV_EXE_INSTALL}/Documentation - COMPONENT Runtime) - - configure_file( diff --git a/sci-visualization/paraview/files/paraview-3.6.2-assistant.patch b/sci-visualization/paraview/files/paraview-3.6.2-assistant.patch deleted file mode 100644 index e1540db5b30f..000000000000 --- a/sci-visualization/paraview/files/paraview-3.6.2-assistant.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur ParaView3/Applications/OverView/Core/MainWindow.cxx ParaView3.new/Applications/OverView/Core/MainWindow.cxx ---- ParaView3/Applications/OverView/Core/MainWindow.cxx 2009-05-06 16:01:51.000000000 -0400 -+++ ParaView3.new/Applications/OverView/Core/MainWindow.cxx 2010-01-14 18:52:54.000000000 -0500 -@@ -933,7 +933,7 @@ - QString assistantExe; - QString profileFile; - -- const char* assistantName = "assistant"; -+ const char* assistantName = "paraview-assistant"; - #if defined(Q_WS_WIN) - const char* binDir = "\\"; - const char* binDir1 = "\\..\\"; -diff -Naur ParaView3/Qt/Components/pqClientMainWindow.cxx ParaView3.new/Qt/Components/pqClientMainWindow.cxx ---- ParaView3/Qt/Components/pqClientMainWindow.cxx 2009-09-22 13:37:21.000000000 -0400 -+++ ParaView3.new/Qt/Components/pqClientMainWindow.cxx 2010-01-14 18:53:18.000000000 -0500 -@@ -1041,7 +1041,7 @@ - QString assistantExe; - QString profileFile; - -- const char* assistantName = "assistant"; -+ const char* assistantName = "paraview-assistant"; - #if defined(Q_WS_WIN) - const char* extString = ".exe"; - const char* binDir = "\\"; diff --git a/sci-visualization/paraview/files/paraview-3.6.2-boost-property_map.patch b/sci-visualization/paraview/files/paraview-3.6.2-boost-property_map.patch deleted file mode 100644 index e6919c549570..000000000000 --- a/sci-visualization/paraview/files/paraview-3.6.2-boost-property_map.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur ParaView3/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx ParaView3.new/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx ---- ParaView3/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx 2008-11-01 15:22:38.000000000 -0400 -+++ ParaView3.new/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx 2010-01-21 18:43:37.000000000 -0500 -@@ -36,7 +36,7 @@ - #include <boost/graph/strong_components.hpp> - #include <boost/graph/dijkstra_shortest_paths.hpp> - #include <boost/graph/transitive_closure.hpp> --#include <boost/property_map.hpp> -+#include <boost/property_map/property_map.hpp> - #include <boost/vector_property_map.hpp> - - #include "vtkGraph.h" -diff -Naur ParaView3/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx ParaView3.new/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx ---- ParaView3/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx 2009-03-13 12:11:50.000000000 -0400 -+++ ParaView3.new/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx 2010-01-21 18:43:16.000000000 -0500 -@@ -46,7 +46,7 @@ - - #include <boost/graph/visitors.hpp> - #include <boost/graph/breadth_first_search.hpp> --#include <boost/property_map.hpp> -+#include <boost/property_map/property_map.hpp> - #include <boost/vector_property_map.hpp> - #include <boost/pending/queue.hpp> - diff --git a/sci-visualization/paraview/files/paraview-3.6.2-h5part.patch b/sci-visualization/paraview/files/paraview-3.6.2-h5part.patch deleted file mode 100644 index 59f27d0bb6ab..000000000000 --- a/sci-visualization/paraview/files/paraview-3.6.2-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.6.2-hdf-1.8.3.patch b/sci-visualization/paraview/files/paraview-3.6.2-hdf-1.8.3.patch deleted file mode 100644 index 5499bdfc2291..000000000000 --- a/sci-visualization/paraview/files/paraview-3.6.2-hdf-1.8.3.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx ParaView3.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx ---- ParaView3/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2009-06-17 17:00:28.000000000 -0400 -+++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2010-01-16 10:09:22.000000000 -0500 -@@ -132,9 +132,15 @@ - static herr_t H5FD_dsm_flush(H5FD_t *_file); - #endif - static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2); -+#ifdef H5_USE_16_API -+static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t); -+static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t, haddr_t addr); -+static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file); -+#else - static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file); - static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr); - static haddr_t H5FD_dsm_get_eof(H5FD_t *_file); -+#endif - static herr_t H5FD_dsm_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, - DSM_HSIZE_T size, void *buf); - static herr_t H5FD_dsm_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, -@@ -159,6 +165,7 @@ - H5FD_dsm_close, /*close */ - H5FD_dsm_cmp, /*cmp */ - NULL, /*query */ -+ NULL, /*type map */ - NULL, /*alloc */ - NULL, /*free */ - H5FD_dsm_get_eoa, /*get_eoa */ -@@ -168,6 +175,7 @@ - H5FD_dsm_read, /*read */ - H5FD_dsm_write, /*write */ - NULL, /*flush */ -+ NULL, /*truncate */ - NULL, /*lock */ - NULL, /*unlock */ - H5FD_FLMAP_SINGLE /*fl_map */ -@@ -594,7 +602,11 @@ - *------------------------------------------------------------------------- - */ - static haddr_t -+#ifdef H5_USE_16_API -+H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t) -+#else - H5FD_dsm_get_eoa(H5FD_t *_file) -+#endif - { - H5FD_dsm_t *file = (H5FD_dsm_t*)_file; - -@@ -622,7 +634,11 @@ - *------------------------------------------------------------------------- - */ - static herr_t -+#ifdef H5_USE_16_API -+H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t, haddr_t addr) -+#else - H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr) -+#endif - { - H5FD_dsm_t *file = (H5FD_dsm_t*)_file; - -@@ -663,7 +679,11 @@ - *------------------------------------------------------------------------- - */ - static haddr_t -+#ifdef H5_USE_16_API -+H5FD_dsm_get_eof(const H5FD_t *_file) -+#else - H5FD_dsm_get_eof(H5FD_t *_file) -+#endif - { - H5FD_dsm_t *file = (H5FD_dsm_t*)_file; - diff --git a/sci-visualization/paraview/files/paraview-3.6.2-libpng14.patch b/sci-visualization/paraview/files/paraview-3.6.2-libpng14.patch deleted file mode 100644 index 30947a82eb0a..000000000000 --- a/sci-visualization/paraview/files/paraview-3.6.2-libpng14.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ur ParaView3.orig/VTK/IO/vtkPNGReader.cxx ParaView3/VTK/IO/vtkPNGReader.cxx ---- ParaView3.orig/VTK/IO/vtkPNGReader.cxx 2006-09-22 00:23:24.000000000 +0300 -+++ ParaView3/VTK/IO/vtkPNGReader.cxx 2010-05-12 15:28:30.000000000 +0300 -@@ -116,7 +116,7 @@ - // 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 @@ - // 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 -ur ParaView3.orig/VTK/Utilities/vtkpng/png.h ParaView3/VTK/Utilities/vtkpng/png.h ---- ParaView3.orig/VTK/Utilities/vtkpng/png.h 2004-04-28 18:49:22.000000000 +0300 -+++ ParaView3/VTK/Utilities/vtkpng/png.h 2010-05-12 15:28:00.000000000 +0300 -@@ -1330,7 +1330,7 @@ - #if defined(PNG_READ_EXPAND_SUPPORTED) - /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */ - extern PNG_EXPORT(void,png_set_expand) PNGARG((png_structp png_ptr)); --extern PNG_EXPORT(void,png_set_gray_1_2_4_to_8) PNGARG((png_structp png_ptr)); -+extern PNG_EXPORT(void,png_set_expand_gray_1_2_4_to_8) PNGARG((png_structp png_ptr)); - extern PNG_EXPORT(void,png_set_palette_to_rgb) PNGARG((png_structp png_ptr)); - extern PNG_EXPORT(void,png_set_tRNS_to_alpha) PNGARG((png_structp png_ptr)); - #endif -diff -ur ParaView3.orig/VTK/Utilities/vtkpng/vtk_png_mangle.h ParaView3/VTK/Utilities/vtkpng/vtk_png_mangle.h ---- ParaView3.orig/VTK/Utilities/vtkpng/vtk_png_mangle.h 2004-10-26 19:56:45.000000000 +0300 -+++ ParaView3/VTK/Utilities/vtkpng/vtk_png_mangle.h 2010-05-12 15:27:25.000000000 +0300 -@@ -229,7 +229,7 @@ - #define png_set_gAMA vtk_png_set_gAMA - #define png_set_gAMA_fixed vtk_png_set_gAMA_fixed - #define png_set_gamma vtk_png_set_gamma --#define png_set_gray_1_2_4_to_8 vtk_png_set_gray_1_2_4_to_8 -+#define png_set_expand_gray_1_2_4_to_8 vtk_png_set_gray_1_2_4_to_8 - #define png_set_gray_to_rgb vtk_png_set_gray_to_rgb - #define png_set_hIST vtk_png_set_hIST - #define png_set_iCCP vtk_png_set_iCCP diff --git a/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch b/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch deleted file mode 100644 index db910b709891..000000000000 --- a/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- VTK/IO/vtkPNGWriter.cxx -+++ VTK/IO/vtkPNGWriter.cxx -@@ -148,7 +148,7 @@ - void vtkPNGWriteErrorFunction(png_structp png_ptr, - png_const_charp vtkNotUsed(error_msg)) - { -- longjmp(png_ptr->jmpbuf, 1); -+ longjmp(png_jmpbuf(png_ptr), 1); - } - } - -@@ -224,7 +224,7 @@ - png_init_io(png_ptr, this->TempFP); - png_set_error_fn(png_ptr, png_ptr, - vtkPNGWriteErrorFunction, vtkPNGWriteWarningFunction); -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - fclose(this->TempFP); - this->SetErrorCode(vtkErrorCode::OutOfDiskSpaceError); diff --git a/sci-visualization/paraview/files/paraview-3.6.2-no-doc-finder.patch b/sci-visualization/paraview/files/paraview-3.6.2-no-doc-finder.patch deleted file mode 100644 index 4681c2517ffd..000000000000 --- a/sci-visualization/paraview/files/paraview-3.6.2-no-doc-finder.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt ---- ParaView3/Applications/Client/CMakeLists.txt 2010-01-04 10:24:37.000000000 -0500 -+++ ParaView3.new/Applications/Client/CMakeLists.txt 2010-01-14 21:03:25.000000000 -0500 -@@ -128,10 +128,10 @@ - "${CMAKE_CURRENT_BINARY_DIR}/CMake/tmp/pqClientDocFinder.txt" - @ONLY - IMMEDIATE) -- INSTALL( -- FILES "${CMAKE_CURRENT_BINARY_DIR}/CMake/tmp/pqClientDocFinder.txt" -- DESTINATION ${PV_INSTALL_BIN_DIR} -- COMPONENT Runtime) -+ # INSTALL( -+ # FILES "${CMAKE_CURRENT_BINARY_DIR}/CMake/tmp/pqClientDocFinder.txt" -+ # DESTINATION ${PV_INSTALL_BIN_DIR} -+ # COMPONENT Runtime) - ENDIF(NOT PV_INSTALL_NO_RUNTIME) - - IF(BUILD_TESTING) diff --git a/sci-visualization/paraview/files/paraview-3.6.2-odbc.patch b/sci-visualization/paraview/files/paraview-3.6.2-odbc.patch deleted file mode 100644 index 309b3ee06acd..000000000000 --- a/sci-visualization/paraview/files/paraview-3.6.2-odbc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ParaView3/VTK/CMake/FindODBC.cmake ParaView3.new/VTK/CMake/FindODBC.cmake ---- ParaView3/VTK/CMake/FindODBC.cmake 2008-10-08 13:51:36.000000000 -0400 -+++ ParaView3.new/VTK/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/paraview-3.6.2-pointsprite-disable.patch b/sci-visualization/paraview/files/paraview-3.6.2-pointsprite-disable.patch deleted file mode 100644 index 0c66b358d9f2..000000000000 --- a/sci-visualization/paraview/files/paraview-3.6.2-pointsprite-disable.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur ParaView3/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt ParaView3.new/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt ---- ParaView3/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt 2009-06-15 09:02:06.000000000 -0400 -+++ ParaView3.new/Plugins/PointSprite/Examples/Rendering/Cxx/CMakeLists.txt 2010-01-16 09:59:21.000000000 -0500 -@@ -5,6 +5,6 @@ - - target_link_libraries(${exe} CSCS_PointSprite_Rendering vtkIO) - --install(TARGETS ${exe} -- RUNTIME DESTINATION ${PROJECT_BINARY_DIR} --) -+#install(TARGETS ${exe} -+# RUNTIME DESTINATION ${PROJECT_BINARY_DIR} -+#) diff --git a/sci-visualization/paraview/files/paraview-3.6.2-qt.patch b/sci-visualization/paraview/files/paraview-3.6.2-qt.patch deleted file mode 100644 index f2ea294ed871..000000000000 --- a/sci-visualization/paraview/files/paraview-3.6.2-qt.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt ---- ParaView3/Applications/Client/CMakeLists.txt 2010-01-04 10:24:37.000000000 -0500 -+++ ParaView3.new/Applications/Client/CMakeLists.txt 2010-01-14 18:43:52.000000000 -0500 -@@ -564,54 +564,54 @@ - - # Install system libraries on Linux (will not work on any other Unix - # yet) --FOREACH(fmpglib avcodec avformat avutil) -- IF(FFMPEG_${fmpglib}_LIBRARY) -- GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH) -- GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME) -- FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*") -- INSTALL(CODE " --MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${FFMPEG_LIB_NAME_tmp}\") --EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp} -- COMMAND tar c ${FFMPEG_LIB_LIST} -- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}) -- " COMPONENT Runtime) -+#FOREACH(fmpglib avcodec avformat avutil) -+# IF(FFMPEG_${fmpglib}_LIBRARY) -+# GET_FILENAME_COMPONENT(FFMPEG_LIB_DIR_tmp ${FFMPEG_${fmpglib}_LIBRARY} PATH) -+# GET_FILENAME_COMPONENT(FFMPEG_LIB_NAME_tmp ${FFMPEG_${fmpglib}_LIBRARY} NAME) -+# FILE(GLOB FFMPEG_LIB_LIST RELATIVE ${FFMPEG_LIB_DIR_tmp} "${FFMPEG_${fmpglib}_LIBRARY}*") -+# INSTALL(CODE " -+#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${FFMPEG_LIB_NAME_tmp}\") -+#EXECUTE_PROCESS (WORKING_DIRECTORY ${FFMPEG_LIB_DIR_tmp} -+# COMMAND tar c ${FFMPEG_LIB_LIST} -+# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}) -+# " COMPONENT Runtime) - #INSTALL(FILES ${FFMPEG_${fmpglib}_LIBRARY} DESTINATION ${PV_INSTALL_LIB_DIR}) - -- ENDIF(FFMPEG_${fmpglib}_LIBRARY) --ENDFOREACH(fmpglib) -+ # ENDIF(FFMPEG_${fmpglib}_LIBRARY) -+ #ENDFOREACH(fmpglib) - --SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL) -+ #SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL) - # the variable and library names are not the same --IF (WIN32) -- SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT) --ELSE (WIN32) -- SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT) --ENDIF (WIN32) -+#IF (WIN32) -+# SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT) -+#ELSE (WIN32) -+# SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT) -+#ENDIF (WIN32) - - IF (VTK_USE_QVTK_QTOPENGL) - SET (QTLIBLIST ${QTLIBLIST} QTOPENGL) - ENDIF (VTK_USE_QVTK_QTOPENGL) - --IF(NOT Q_WS_MAC) -- FOREACH(qtlib ${QTLIBLIST}) -- IF (NOT WIN32) -- #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR}) -- GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH) -- GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME) -- FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*") -- INSTALL(CODE " --MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\") --EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp} -- COMMAND tar c ${QT_LIB_LIST} -- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}) -- " COMPONENT Runtime) -- ELSE (NOT WIN32) -- GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH) -- INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime) -- ENDIF (NOT WIN32) -+#IF(NOT Q_WS_MAC) -+# FOREACH(qtlib ${QTLIBLIST}) -+# IF (NOT WIN32) -+# #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR}) -+# GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH) -+# GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME) -+# FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*") -+# INSTALL(CODE " -+#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\") -+#EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp} -+# COMMAND tar c ${QT_LIB_LIST} -+# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}) -+# " COMPONENT Runtime) -+# ELSE (NOT WIN32) -+# GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH) -+# INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime) -+# ENDIF (NOT WIN32) - -- ENDFOREACH(qtlib) --ENDIF(NOT Q_WS_MAC) -+# ENDFOREACH(qtlib) -+#ENDIF(NOT Q_WS_MAC) - - # Hard-coded install rules for anything left to install. These should - # probably go to a local cmake file. Change to match the build system's -diff -Naur ParaView3/Applications/StreamingParaView/CMakeLists.txt ParaView3.new/Applications/StreamingParaView/CMakeLists.txt ---- ParaView3/Applications/StreamingParaView/CMakeLists.txt 2009-03-04 09:24:27.000000000 -0500 -+++ ParaView3.new/Applications/StreamingParaView/CMakeLists.txt 2010-01-14 18:44:44.000000000 -0500 -@@ -198,26 +198,26 @@ - SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT) - ENDIF (WIN32) - --IF(NOT Q_WS_MAC) -- FOREACH(qtlib ${QTLIBLIST}) -- IF (NOT WIN32) -- #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR}) -- GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH) -- GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME) -- FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*") -- INSTALL(CODE " --MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\") --EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp} -- COMMAND tar c ${QT_LIB_LIST} -- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}) -- " COMPONENT Runtime) -- ELSE (NOT WIN32) -- GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH) -- INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime) -- ENDIF (NOT WIN32) -+#IF(NOT Q_WS_MAC) -+# FOREACH(qtlib ${QTLIBLIST}) -+# IF (NOT WIN32) -+# #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR}) -+# GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH) -+# GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME) -+# FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*") -+# INSTALL(CODE " -+#MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}/${QT_LIB_NAME_tmp}\") -+#EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp} -+# COMMAND tar c ${QT_LIB_LIST} -+# COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}) -+# " COMPONENT Runtime) -+# ELSE (NOT WIN32) -+# GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH) -+# INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime) -+# ENDIF (NOT WIN32) - -- ENDFOREACH(qtlib) --ENDIF(NOT Q_WS_MAC) -+# ENDFOREACH(qtlib) -+#ENDIF(NOT Q_WS_MAC) - - # Hard-coded install rules for anything left to install. These should - # probably go to a local cmake file. Change to match the build system's diff --git a/sci-visualization/paraview/files/paraview-3.98.0-gcc-4.7.patch b/sci-visualization/paraview/files/paraview-3.98.0-gcc-4.7.patch new file mode 100644 index 000000000000..1b941cfa9431 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.98.0-gcc-4.7.patch @@ -0,0 +1,28 @@ +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/FreeType/vtkFreeTypeTools.cxx ++++ b/VTK/Rendering/FreeType/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/FreeType/vtkFreeTypeUtilities.cxx ++++ b/VTK/Rendering/FreeType/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.98.0-mpi4py.patch b/sci-visualization/paraview/files/paraview-3.98.0-mpi4py.patch new file mode 100644 index 000000000000..7017694a2770 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.98.0-mpi4py.patch @@ -0,0 +1,12 @@ +disable internal mpi4py copy + +--- ParaView-3.98.0-src/CMakeLists.txt ++++ ParaView-3.98.0-src/CMakeLists.txt +@@ -555,7 +555,6 @@ + + add_subdirectory(CommandLineExecutables) + add_subdirectory(Applications) +-add_subdirectory(Utilities/mpi4py) + + #------------------------------------------------------------------------------ + # We add a mechanism to incorporate arbitrary install rules into the diff --git a/sci-visualization/paraview/files/paraview-3.98.0-pvblot.patch b/sci-visualization/paraview/files/paraview-3.98.0-pvblot.patch new file mode 100644 index 000000000000..9fe24e174652 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.98.0-pvblot.patch @@ -0,0 +1,55 @@ +From 970710b6b57a14762881a83c2e20d0db067fd1b4 Mon Sep 17 00:00:00 2001 +From: Nikhil Shetty <nikhil.shetty@kitware.com> +Date: Tue, 11 Dec 2012 15:56:16 -0500 +Subject: [PATCH] BUGFIX: Fixing cmake error configuring pvblot plugin + +- There are duplicate configure step below in the CMakeLists.txt +file. +- One with the ${EXECUTABLE_OUTPUT_PATH} is unpredictable and deleted. +- One with ${ParaView_BINARY_DIR} is preferred. +- Also there was a small bug with the $script_ext variable. +- $script_exe should actuall be $script_ext + +Change-Id: Ice9419ea80e5be9b8506900ebdf9e40174055d51 +--- + Plugins/pvblot/CMakeLists.txt | 13 +++---------- + 1 files changed, 3 insertions(+), 10 deletions(-) + +diff --git a/Plugins/pvblot/CMakeLists.txt b/Plugins/pvblot/CMakeLists.txt +index 5b1120d..29a3924 100644 +--- a/Plugins/pvblot/CMakeLists.txt ++++ b/Plugins/pvblot/CMakeLists.txt +@@ -69,18 +69,11 @@ ENDIF (PARAVIEW_BUILD_QT_GUI) + GET_TARGET_PROPERTY(PVBLOT_PVPYTHON_EXECUTABLE pvpython LOCATION) + SET(PVBLOT_BLOTISH_PATH "${CMAKE_CURRENT_SOURCE_DIR}") + +-SET(script_extension) ++SET(script_ext) + IF(WIN32 AND NOT CYGWIN) + SET(script_ext ".bat") + ENDIF(WIN32 AND NOT CYGWIN) + +-CONFIGURE_FILE( +- "${CMAKE_CURRENT_SOURCE_DIR}/pvblot${script_exe}.in" +- "${EXECUTABLE_OUTPUT_PATH}/pvblot${script_exe}" +- @ONLY +- ) +- +- + ############################################################################# + # Set up pvblot script for when ParaView is installed. This includes + # installing the Python source files. +@@ -94,8 +87,8 @@ SET(PVBLOT_BLOTISH_PATH "${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR}") + + + CONFIGURE_FILE( +- "${CMAKE_CURRENT_SOURCE_DIR}/pvblot${script_exe}.in" +- "${ParaView_BINARY_DIR}/CMake/tmp/pvblot${script_exe}" ++ "${CMAKE_CURRENT_SOURCE_DIR}/pvblot${script_ext}.in" ++ "${ParaView_BINARY_DIR}/CMake/tmp/pvblot${script_ext}" + @ONLY + ) + +-- +1.7.0 + diff --git a/sci-visualization/paraview/files/paraview-3.98.0-removesqlite.patch b/sci-visualization/paraview/files/paraview-3.98.0-removesqlite.patch new file mode 100644 index 000000000000..be495b4fbb3a --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.98.0-removesqlite.patch @@ -0,0 +1,517 @@ +Description: Import patch from VTK to remove sqlite +Author: Mathieu Malaterre <mathieu.malaterre@gmail.com> +Last-Update: Mon Feb 11 14:58:03 UTC 2013 + +remove the internal copy of sqlite (vtksqlite) +http://patch-tracker.debian.org/patch/series/view/paraview/3.14.1-7/removesqlite.patch + +--- VTK/IO/SQL/vtkSQLiteDatabase.cxx ++++ VTK/IO/SQL/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); + } +--- VTK/IO/SQL/vtkSQLiteQuery.cxx ++++ VTK/IO/SQL/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; +--- VTK/IO/SQL/vtkSQLiteDatabase.h ++++ VTK/IO/SQL/vtkSQLiteDatabase.h +@@ -49,7 +49,7 @@ + class vtkSQLQuery; + class vtkSQLiteQuery; + class vtkStringArray; +-struct vtk_sqlite3; ++struct sqlite3; + + class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase + { +@@ -147,7 +147,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 +--- VTK/IO/SQL/vtkSQLiteQuery.h ++++ VTK/IO/SQL/vtkSQLiteQuery.h +@@ -47,7 +47,7 @@ + class vtkSQLiteDatabase; + class vtkVariant; + class vtkVariantArray; +-struct vtk_sqlite3_stmt; ++struct sqlite3_stmt; + + class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery + { +@@ -155,7 +155,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; +--- VTK/ThirdParty/sqlite/CMakeLists.txt ++++ VTK/ThirdParty/sqlite/CMakeLists.txt +@@ -1,4 +1,4 @@ +-set(vtksqlite_THIRD_PARTY 1) +-set(vtksqlite_LIBRARIES vtksqlite) ++#set(vtksqlite_THIRD_PARTY 1) ++set(vtksqlite_LIBRARIES sqlite3) + vtk_module_export_info() +-add_subdirectory(vtksqlite) ++#add_subdirectory(vtksqlite) diff --git a/sci-visualization/paraview/files/paraview-3.6.2-findcg-cmake.patch b/sci-visualization/paraview/files/paraview-3.98.0-vtk-cg-path.patch index 3ec474ad9e59..58ddde97d4fb 100644 --- a/sci-visualization/paraview/files/paraview-3.6.2-findcg-cmake.patch +++ b/sci-visualization/paraview/files/paraview-3.98.0-vtk-cg-path.patch @@ -1,6 +1,5 @@ -diff -Naur ParaView3/VTK/CMake/FindCg.cmake ParaView3.new/VTK/CMake/FindCg.cmake ---- ParaView3/VTK/CMake/FindCg.cmake 2005-10-04 11:25:51.000000000 -0400 -+++ ParaView3.new/VTK/CMake/FindCg.cmake 2010-01-15 09:39:17.000000000 -0500 +--- ParaView-3.98.0-src/VTK/CMake/FindCg.cmake ++++ ParaView-3.98.0-src/VTK/CMake/FindCg.cmake @@ -82,6 +82,7 @@ FIND_PROGRAM( CG_COMPILER cgc /usr/bin @@ -17,18 +16,20 @@ diff -Naur ParaView3/VTK/CMake/FindCg.cmake ParaView3.new/VTK/CMake/FindCg.cmake ${CG_COMPILER_SUPER_DIR}/include DOC "The directory where Cg/cg.h resides" ) -@@ -98,6 +100,7 @@ +@@ -98,6 +100,8 @@ /usr/lib /usr/local/lib64 /usr/local/lib ++ /opt/nvidia-cg-toolkit/lib64 + /opt/nvidia-cg-toolkit/lib ${CG_COMPILER_SUPER_DIR}/lib64 ${CG_COMPILER_SUPER_DIR}/lib DOC "The Cg runtime library" -@@ -108,6 +111,7 @@ +@@ -108,6 +112,8 @@ /usr/lib /usr/local/lib64 /usr/local/lib ++ /opt/nvidia-cg-toolkit/lib64 + /opt/nvidia-cg-toolkit/lib ${CG_COMPILER_SUPER_DIR}/lib64 ${CG_COMPILER_SUPER_DIR}/lib diff --git a/sci-visualization/paraview/files/paraview-3.98.0-vtknetcd.patch b/sci-visualization/paraview/files/paraview-3.98.0-vtknetcd.patch new file mode 100644 index 000000000000..a478b7dfc2d4 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.98.0-vtknetcd.patch @@ -0,0 +1,79 @@ +adapted from debian patch need to be applied after paraview-3.14.1-removesqlite.patch + +--- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt ++++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt +@@ -1,8 +1,8 @@ +-set(vtknetcdf_THIRD_PARTY 1) +-set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx) +-set(vtknetcdf_INCLUDE_DIRS +- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include +- ${vtknetcdf_BINARY_DIR}/vtknetcdf +- ) ++#set(vtknetcdf_THIRD_PARTY 1) ++set(vtknetcdf_LIBRARIES netcdf netcdf_c++) ++#set(vtknetcdf_INCLUDE_DIRS ++# ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include ++# ${vtknetcdf_BINARY_DIR}/vtknetcdf ++# ) + vtk_module_export_info() +-add_subdirectory(vtknetcdf) ++#add_subdirectory(vtknetcdf) +--- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h ++++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h +@@ -16,6 +16,6 @@ + #define __vtk_netcdf_h + + /* Use the netcdf library configured for VTK. */ +-#include <vtknetcdf/include/netcdf.h> ++#include <netcdf.h> + + #endif +--- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h ++++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h +@@ -16,6 +16,6 @@ + #define __vtk_netcdfcpp_h + + /* Use the netcdf library configured for VTK. */ +-#include <vtknetcdf/cxx/netcdfcpp.h> ++#include <netcdfcpp.h> + + #endif +--- ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt ++++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt +@@ -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) +--- ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt ++++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt +@@ -241,7 +241,7 @@ + + + VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS}) +-TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF) ++TARGET_LINK_LIBRARIES(vtkexoIIc netcdf) + + IF(NOT VTK_INSTALL_NO_DEVELOPMENT) + # INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR}/vtkexodus2 .h +--- ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt ++++ ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt +@@ -10,5 +10,5 @@ + + vtk_module_library(vtkIONetCDF ${Module_SRCS}) + +-target_link_libraries(vtkIONetCDF vtkNetCDF_cxx) ++target_link_libraries(vtkIONetCDF netcdf netcdf_c++) + set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "") +--- ParaView-3.98.0-src/VTK/IO/ParallelNetCDF/CMakeLists.txt ++++ ParaView-3.98.0-src/VTK/IO/ParallelNetCDF/CMakeLists.txt +@@ -8,4 +8,4 @@ + + vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS}) + +-target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx) ++target_link_libraries(vtkIOParallelNetCDF netcdf netcdf_c++) diff --git a/sci-visualization/paraview/files/paraview-3.98.0-xdmf-cstring.patch b/sci-visualization/paraview/files/paraview-3.98.0-xdmf-cstring.patch new file mode 100644 index 000000000000..665f40ad4fa7 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.98.0-xdmf-cstring.patch @@ -0,0 +1,12 @@ +gcc header fix + +--- ParaView-3.98.0-src/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfObject.h ++++ ParaView-3.98.0-src/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfObject.h +@@ -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/metadata.xml b/sci-visualization/paraview/metadata.xml index 15a2b39d26a3..e852a0334c91 100644 --- a/sci-visualization/paraview/metadata.xml +++ b/sci-visualization/paraview/metadata.xml @@ -3,11 +3,10 @@ <pkgmetadata> <herd>sci</herd> <use> - <flag name='plugins'>Build and install additional plugins</flag> <flag name='boost'>Enable the usage of dev-libs/boost</flag> - <flag name='gui'>Build paraview's gui not just the server</flag> + <flag name='coprocessing'>Enable the coprocessing infrastructure which is mainly useful in the context of clusters</flag> <flag name='cg'>Add support for nvidia's cg shaders</flag> - <flag name='streaming'>Enable streaming paraview application</flag> - <flag name='overview'>Enable the OverView plugin framework</flag> + <flag name='nvcontrol'>Add NVCONTROL support for OpenGL options</flag> + <flag name='plugins'>Build and install additional plugins</flag> </use> </pkgmetadata> diff --git a/sci-visualization/paraview/paraview-3.6.2.ebuild b/sci-visualization/paraview/paraview-3.6.2.ebuild deleted file mode 100644 index b3faf841fb3f..000000000000 --- a/sci-visualization/paraview/paraview-3.6.2.ebuild +++ /dev/null @@ -1,266 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.2.ebuild,v 1.18 2012/05/06 23:13:07 pesa Exp $ - -EAPI="3" - -PYTHON_DEPEND="python? 2:2.6" - -inherit eutils flag-o-matic toolchain-funcs versionator python cmake-utils - -MAIN_PV=$(get_major_version) -MAJOR_PV=$(get_version_component_range 1-2) - -DESCRIPTION="ParaView is a powerful scientific data visualization application" -HOMEPAGE="http://www.paraview.org" -SRC_URI="mirror://gentoo/${P}.tar.gz - mirror://gentoo/${P}-openfoam-gpl-r173.patch.bz2 - mirror://gentoo/${P}-openfoam-r173.patch.bz2" - -LICENSE="paraview GPL-2" -KEYWORDS="~amd64 ~ppc ~x86" -SLOT="0" -IUSE="boost cg doc examples +gui mpi mysql plugins +python postgres streaming odbc overview" -RDEPEND="sci-libs/hdf5[mpi=] - mpi? ( || ( - sys-cluster/openmpi - sys-cluster/mpich2[cxx] ) ) - gui? ( x11-libs/qt-gui:4 - x11-libs/qt-qt3support:4 - x11-libs/qt-opengl:4 - || ( >=x11-libs/qt-assistant-4.7.0:4[compat] - <x11-libs/qt-assistant-4.7.0:4 ) ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-base ) - odbc? ( dev-db/unixODBC ) - dev-libs/libxml2:2 - media-libs/libpng - virtual/jpeg - media-libs/tiff - virtual/ffmpeg - 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} - boost? ( >=dev-libs/boost-1.40.0 ) - doc? ( app-doc/doxygen ) - >=dev-util/cmake-2.6.4" - -PVLIBDIR="$(get_libdir)/${PN}-${MAJOR_PV}" -S="${WORKDIR}"/ParaView${MAIN_PV} - -pkg_setup() { - if (use overview) && (! use gui); then - die "the overview plugin requires the USE='gui'" - fi - use python && python_set_active_version 2 -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-qt.patch - epatch "${FILESDIR}"/${P}-findcg-cmake.patch - epatch "${FILESDIR}"/${P}-assistant.patch - epatch "${DISTDIR}"/${P}-openfoam-r173.patch.bz2 - epatch "${DISTDIR}"/${P}-openfoam-gpl-r173.patch.bz2 - epatch "${FILESDIR}"/${P}-no-doc-finder.patch - epatch "${FILESDIR}"/${P}-pointsprite-disable.patch - epatch "${FILESDIR}"/${P}-about.html.patch - epatch "${FILESDIR}"/${P}-boost-property_map.patch - epatch "${FILESDIR}"/${P}-odbc.patch - epatch "${FILESDIR}"/${P}-h5part.patch - epatch "${FILESDIR}"/${P}-libpng14.patch - epatch "${FILESDIR}"/${P}-libpng15.patch - - if has_version '>=sci-libs/hdf5-1.8.0'; then - epatch "${FILESDIR}"/${P}-hdf-1.8.3.patch - fi - - # fix GL issues - sed -e "s:DEPTH_STENCIL_EXT:DEPTH_COMPONENT24:" \ - -i VTK/Rendering/vtkOpenGLRenderWindow.cxx \ - || die "Failed to fix GL issues." - - # fix plugin install directory - sed -e "s:\${PV_INSTALL_BIN_DIR}/plugins:/usr/${PVLIBDIR}/plugins:" \ - -i CMake/ParaViewPlugins.cmake \ - || die "Failed to fix plugin install directories" - - # bug 348151 - sed -e 's/CURRENT_VERSION 2.6/CURRENT_VERSION 2.7 2.6/' \ - -i VTK/CMake/FindPythonLibs.cmake || die -} - -src_configure() { - mycmakeargs=( - -DPV_INSTALL_LIB_DIR="${PVLIBDIR}" - -DCMAKE_INSTALL_PREFIX=/usr - -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=OFF - -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) - - # 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 mpi PARAVIEW_USE_MPI) - $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON) - $(cmake-utils_use doc BUILD_DOCUMENTATION) - $(cmake-utils_use examples BUILD_EXAMPLES) - $(cmake-utils_use cg VTK_USE_CG_SHADERS) - $(cmake-utils_use streaming PARAVIEW_BUILD_StreamingParaView) - $(cmake-utils_use odbc VTK_USE_ODBC) - $(cmake-utils_use mysql VTK_USE_MYSQL) - $(cmake-utils_use mysql XDMF_USE_MYSQL) - $(cmake-utils_use postgres VTK_USE_POSTGRES)) - - if use gui; then - mycmakeargs+=(-DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer) - fi - - # all the logic needed for overview - # we enable all plugins that are either required by overview - # or require overview to work - mycmakeargs+=( - $(cmake-utils_use overview VTK_USE_N_WAY_ARRAYS) - $(cmake-utils_use overview PARAVIEW_BUILD_OverView) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientGraphView) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientRecordView) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientTableView) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientTreeView) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_Infovis) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_SQLDatabaseGraphSourcePanel) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_SQLDatabaseTableSourcePanel) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_TableToGraphPanel) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_Array) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientGeoView) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientGeoView2D) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientGraphViewFrame) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ClientHierarchyView) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_CommonToolbar) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_GraphLayoutFilterPanel) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_SplitTableFieldPanel) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_StatisticsToolbar) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_TableToSparseArrayPanel) - $(cmake-utils_use overview PARAVIEW_BUILD_PLUGIN_ThresholdTablePanel)) - - # the rest of the plugins - mycmakeargs+=( - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ChartViewFrame) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ClientAttributeView) - $(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_Streaming) - $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_netCDFReaders)) - - if use python; then - mycmakeargs+=($(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_pvblot)) - fi - - # we also need to append -DH5Tget_array_dims_vers=1 to our CFLAGS - # to make sure we can compile against >=hdf5-1.8.3 - append-flags -DH5_USE_16_API - - cmake-utils_src_configure - # overview needs a second configure to pick things up - use overview && cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # rename the assistant wrapper - if use gui; then - mv "${D}"/usr/bin/assistant "${D}"/usr/bin/paraview-assistant \ - || die "Failed to rename assistant wrapper" - chmod 0755 "${D}"/usr/${PVLIBDIR}/assistant-real \ - || die "Failed to change permissions on assistant wrapper" - fi - - # since there is no install target for OverView we have to - # do things manually - if use overview; then - exeinto /usr/"${PVLIBDIR}" - newexe "${CMAKE_BUILD_DIR}"/bin/OverView OverView-real \ - || die "Failed to install OverView binary" - dolib.so "${CMAKE_BUILD_DIR}"/bin/libOverViewCore.so \ - || die "Failed to install OverViewCore shared object" - - insinto /usr/"${PVLIBDIR}"/OverView-startup - insopts -m0744 - doins "${CMAKE_BUILD_DIR}"/bin/OverView-startup/lib*.so \ - || die "Failed to install OverView libraries" - - dosym /usr/"${PVLIBDIR}"/OverView-real /usr/bin/OverView \ - || die "Failed to create OverView symlink" - - newicon "${S}"/Applications/OverView/Icon.png overview.png \ - || die "Failed to create OverView icon" - make_desktop_entry OverView "OverView" overview \ - || die "Failed to install OverView desktop icon" - fi - - # set up the environment - echo "LDPATH=/usr/${PVLIBDIR}" >> "${T}"/40${PN} - echo "PYTHONPATH=/usr/${PVLIBDIR}" >> "${T}"/40${PN} - doenvd "${T}"/40${PN} - - # this binary does not work and probably should not be installed - rm -f "${D}/usr/bin/vtkSMExtractDocumentation" \ - || die "Failed to remove vtkSMExtractDocumentation" - - # rename /usr/bin/lproj to /usr/bin/lproj_paraview to avoid - # a file collision with vtk which installs the same file - mv "${D}/usr/bin/lproj" "${D}/usr/bin/lproj_paraview" \ - || die "Failed to rename /usr/bin/lproj" - - # last but not least lets make a desktop entry - newicon "${S}"/Applications/Client/ParaViewLogo.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 "The binary /usr/bin/lproj has been renamed to" - elog "/usr/bin/lproj_paraview to avoid a file collision" - elog "with vtk." - echo -} diff --git a/sci-visualization/paraview/paraview-3.98.0.ebuild b/sci-visualization/paraview/paraview-3.98.0.ebuild new file mode 100644 index 000000000000..53868201424d --- /dev/null +++ b/sci-visualization/paraview/paraview-3.98.0.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.98.0.ebuild,v 1.1 2013/02/11 21:29:20 hasufell Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_6 python2_7 ) +inherit eutils multilib versionator python-single-r1 cmake-utils + +MAIN_PV=$(get_major_version) +MAJOR_PV=$(get_version_component_range 1-2) +MY_P="ParaView-${PV}-src" + +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}.tgz" +RESTRICT="mirror" + +LICENSE="paraview GPL-2" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="boost cg coprocessing doc examples ffmpeg mpi mysql nvcontrol plugins python qt4 sqlite tcl test tk" + +RDEPEND=" + dev-db/sqlite:3 + dev-libs/expat + dev-libs/libxml2:2 + dev-libs/protobuf + media-libs/freetype + media-libs/libpng:0 + media-libs/libtheora + media-libs/tiff + sci-libs/hdf5[mpi=] + ~sci-libs/netcdf-4.1.3[cxx,hdf5] + sys-libs/zlib + virtual/jpeg + virtual/opengl + x11-libs/gl2ps + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXt + coprocessing? ( + plugins? ( + dev-python/PyQt4 + x11-libs/qt-gui:4 + ) + ) + ffmpeg? ( virtual/ffmpeg ) + mpi? ( virtual/mpi[cxx,romio] ) + mysql? ( virtual/mysql ) + python? ( + ${PYTHON_DEPS} + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/sip[${PYTHON_USEDEP}] + mpi? ( dev-python/mpi4py ) + qt4? ( dev-python/PyQt4[opengl,webkit,${PYTHON_USEDEP}] ) + ) + qt4? ( + x11-libs/qt-gui:4 + x11-libs/qt-opengl:4 + x11-libs/qt-assistant:4[compat] + x11-libs/qt-sql:4 + x11-libs/qt-webkit:4 + ) + sqlite? ( dev-db/sqlite ) + tcl? ( dev-lang/tcl ) + tk? ( dev-lang/tk )" +DEPEND="${RDEPEND} + boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] ) + doc? ( app-doc/doxygen )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + use python && python-single-r1_pkg_setup + PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} +} + +src_prepare() { + # see patch headers for description + epatch "${FILESDIR}"/${P}-xdmf-cstring.patch \ + "${FILESDIR}"/${P}-mpi4py.patch \ + "${FILESDIR}"/${P}-removesqlite.patch \ + "${FILESDIR}"/${P}-gcc-4.7.patch \ + "${FILESDIR}"/${P}-vtknetcd.patch \ + "${FILESDIR}"/${P}-vtk-cg-path.patch \ + "${FILESDIR}"/${P}-pvblot.patch + + # lib64 fixes + sed -i \ + -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ + VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/CMakeLists.txt || die + sed -i \ + -e "s:\/lib\/python:\/$(get_libdir)\/python:g" \ + VTK/ThirdParty/xdmf2/vtkxdmf2/CMake/setup_install_paths.py || die + sed -i \ + -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \ + {,Plugins/SciberQuestToolKit/}CMakeLists.txt \ + ParaViewCore/PythonSupport/vtkPVPythonInterpretor.cxx || die + + # no proper switch + use nvcontrol || { + sed -i \ + -e '/VTK_USE_NVCONTROL/s#1#0#' \ + VTK/Rendering/OpenGL/CMakeLists.txt || die + } +} + +src_configure() { + # TODO: use system protobuf + local mycmakeargs=( + -DPV_INSTALL_LIB_DIR="${PVLIBDIR}" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr + -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 + -DBUILD_SHARED_LIBS=ON + -DVTK_USE_SYSTEM_EXPAT=ON + -DVTK_USE_SYSTEM_FREETYPE=ON + -DVTK_USE_SYSTEM_GL2PS=ON + -DVTK_USE_SYSTEM_HDF5=ON + -DVTK_USE_SYSTEM_JPEG=ON + -DVTK_USE_SYSTEM_LIBXML2=ON + -DVTK_USE_SYSTEM_OGGTHEORA=ON + -DVTK_USE_SYSTEM_PNG=ON + -DVTK_USE_SYSTEM_PROTOBUF=OFF + -DVTK_USE_SYSTEM_TIFF=ON + -DVTK_USE_SYSTEM_XDMF2=OFF + -DVTK_USE_SYSTEM_ZLIB=ON + -DCMAKE_VERBOSE_MAKEFILE=ON + -DCMAKE_COLOR_MAKEFILE=TRUE + -DVTK_USE_OFFSCREEN=TRUE + -DCMAKE_USE_PTHREADS=ON + -DVTK_USE_FFMPEG_ENCODER=OFF + -DPROTOC_LOCATION=$(type -P protoc) + -DVTK_Group_StandAlone=ON + ) + + # TODO: XDMF_USE_MYSQL? + mycmakeargs+=( + $(cmake-utils_use qt4 PARAVIEW_BUILD_QT_GUI) + $(cmake-utils_use qt4 Module_vtkGUISupportQtOpenGL) + $(cmake-utils_use qt4 Module_vtkGUISupportQtSQL) + $(cmake-utils_use qt4 Module_vtkGUISupportQtWebkit) + $(cmake-utils_use qt4 Module_vtkRenderingQt) + $(cmake-utils_use qt4 Module_vtkViewsQt) + $(cmake-utils_use qt4 VTK_Group_ParaViewQt) + $(cmake-utils_use qt4 VTK_Group_Qt) + $(cmake-utils_use boost Module_vtkInfovisBoost) + $(cmake-utils_use boost Module_vtkInfovisBoostGraphAlg) + $(cmake-utils_use mpi PARAVIEW_USE_MPI) + $(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND) + $(cmake-utils_use mpi PARAVIEW_USE_ICE_T) + $(cmake-utils_use mpi VTK_Group_MPI) + $(cmake-utils_use mpi VTK_XDMF_USE_MPI) + $(cmake-utils_use mpi XDMF_BUILD_MPI) + $(cmake-utils_use python PARAVIEW_ENABLE_PYTHON) + $(cmake-utils_use python VTK_Group_ParaViewPython) + $(cmake-utils_use python XDMF_WRAP_PYTHON) + $(cmake-utils_use python Module_pqPython) + $(cmake-utils_use python Module_vtkWrappingPython) + $(cmake-utils_use python Module_vtkPVPythonSupport) + $(cmake-utils_use doc BUILD_DOCUMENTATION) + $(cmake-utils_use examples BUILD_EXAMPLES) + $(cmake-utils_use cg VTK_USE_CG_SHADERS) + $(cmake-utils_use mysql Module_vtkIOMySQL) + $(cmake-utils_use sqlite Module_vtksqlite) + $(cmake-utils_use coprocessing PARAVIEW_ENABLE_COPROCESSING) + $(cmake-utils_use coprocessing VTK_Group_CoProcessing) + $(cmake-utils_use ffmpeg PARAVIEW_ENABLE_FFMPEG) + $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) + $(cmake-utils_use ffmpeg Module_vtkIOFFMPEG) + $(cmake-utils_use tk VTK_Group_Tk) + $(cmake-utils_use tk VTK_USE_TK) + $(cmake-utils_use tk Module_vtkRenderingTk) + $(cmake-utils_use tcl Module_vtkTclTk) + $(cmake-utils_use test BUILD_TESTING) + ) + + if use qt4 ; then + mycmakeargs+=( -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer ) + if use python ; then + # paraview cannot guess sip directory properly + mycmakeargs+=( -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" ) + fi + fi + + # TODO: MantaView VaporPlugin VRPlugin + mycmakeargs+=( + $(cmake-utils_use plugins PARAVIEW_INSTALL_DEVELOPMENT) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AdiosReader) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIReaderWriter) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ArrowGlyph) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_GMVReader) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Pacman) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PrismPlugin) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_QuadView) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SciberQuestToolKit) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC) + $(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UnvertaintyRendering) + ) + + 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} + + newicon "${S}"/Applications/ParaView/pvIcon.png paraview.png + make_desktop_entry paraview "Paraview" paraview + + use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV} +} + +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 +} |