* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/visit/, sci-visualization/visit/files/
@ 2016-07-27 7:32 Slawek Lis
0 siblings, 0 replies; 2+ messages in thread
From: Slawek Lis @ 2016-07-27 7:32 UTC (permalink / raw
To: gentoo-commits
commit: 3f46a67d297bf991e69daf558a55bf367d62f9e6
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 07:27:21 2016 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 07:27:21 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f46a67d
sci-visualization/visit: version bump to 2.10.3
Reported-by: Andreas Schäfer <gentryx <AT> gmx.de>
Package-Manager: portage-2.3.0_rc1
sci-visualization/visit/Manifest | 1 +
.../visit/files/visit-2.10.3-cmakelist.patch | 10 ++
.../visit-2.10.3-dont_symlink_visit_dir.patch | 18 +++
.../visit/files/visit-2.10.3-findpython.patch | 19 +++
.../visit/files/visit-2.10.3-findsilo.patch | 12 ++
.../visit/files/visit-2.10.3-findvtk.patch | 29 +++++
.../visit/files/visit-2.10.3-vtklibs.patch | 133 +++++++++++++++++++++
.../visit/files/visit-2.10.3-vtkmpi.patch | 46 +++++++
sci-visualization/visit/visit-2.10.3.ebuild | 103 ++++++++++++++++
9 files changed, 371 insertions(+)
diff --git a/sci-visualization/visit/Manifest b/sci-visualization/visit/Manifest
index 2479dc6..620a03f 100644
--- a/sci-visualization/visit/Manifest
+++ b/sci-visualization/visit/Manifest
@@ -1,3 +1,4 @@
+DIST visit2.10.3.tar.gz 89181392 SHA256 05018215c4727eb42d47bb5cc4ff937b2a2ccaca90d141bc7fa426a0843a5dbc SHA512 f7e74191e4ac07da3a1323f1e60581c4a2f8ef439c23a26156e45d8ec2fb4f6decc5593ba4556209ad275ceeb6ffaaccc87d5d623e341771ab97e382cf406c59 WHIRLPOOL 948edb4113f4c5b16e231429c9decc8207d5e9502e0b4ecb47abacc8594187509899cce1e2ee04a4f7ff8e678f8ded047d6ffabe95d92eca493336a943112050
DIST visit2.7.3.tar.gz 82475238 SHA256 e4ed7b20c4c0fb5aac49181f8ddeae3d2d5a73b1662756ddcaa9d08776a7c39f SHA512 5eea2667482a9b70cf4794446da69595c1145839dfae0afdf961589a09b0f3ad41c44b607f96dbb3e4a3c1ba77161d77a1e0342d6a4e2df8bc73040110c7e8f1 WHIRLPOOL a1157d2424d93037e1ffd8dd10ebc47ae9f3d074a63a811bcadf6db5349dea348432e63d414d4a62a156c9423a1d5fdb240f34b2ec4262e8647def40d999759a
DIST visit2.8.2.tar.gz 88008002 SHA256 43d652dde540e3a5db34a2105d89432fa1d018b104ed0508dfb18f4287a43eb3 SHA512 1c2c2b6cad49b32b5cbc7f7ffba5c6ffb98ee88dfeae5c51af5e581ad53fb1efb8fc222b796696e607abd4b748855141de072414bdec1b1ad4e7ac01a928db8d WHIRLPOOL dadfd48bf9522fc67547f2d7fc4332f300d06e3f04f1bd23189f4a6d806286b46420e4caecaba616bf9f954ea3e202efcee7e899d10444304f7f79809e8fc6d9
DIST visit2.9.0.tar.gz 87058013 SHA256 98d7a80d95f4083fffc23a65cff28abd126e2eb0fff43591663818aaa1338fcf SHA512 889a6ff6f0c45064c0705a8a41fd268ad865619e42eb7a3302a520bcb2a3c182a40bc6870ec80c0994fa649f3030f6283b9783fab37b938d4b77fd3c1ab10d15 WHIRLPOOL 8d6e9370fddda7d28c16882a04ac2c196b0c42ffd72436ca601413b7483c72d4b33691a9dc7340d71d536fead3d6692f1491c2bed32ed27ceba0c745b9555380
diff --git a/sci-visualization/visit/files/visit-2.10.3-cmakelist.patch b/sci-visualization/visit/files/visit-2.10.3-cmakelist.patch
new file mode 100644
index 0000000..8c8618a
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.10.3-cmakelist.patch
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig 2015-06-25 07:30:40.907149341 +0200
++++ CMakeLists.txt 2015-06-25 07:30:57.537148929 +0200
+@@ -991,7 +991,6 @@
+ DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+ GROUP_READ GROUP_WRITE GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE
+- CONFIGURATIONS "" None Debug Release RelWithDebInfo MinSizeRel
+ FILES_MATCHING PATTERN "*.h"
+ PATTERN "*.hpp"
+ PATTERN ".svn" EXCLUDE
diff --git a/sci-visualization/visit/files/visit-2.10.3-dont_symlink_visit_dir.patch b/sci-visualization/visit/files/visit-2.10.3-dont_symlink_visit_dir.patch
new file mode 100644
index 0000000..0953e5b
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.10.3-dont_symlink_visit_dir.patch
@@ -0,0 +1,18 @@
+diff -ru visit2.7.1.old2/src/CMakeLists.txt visit2.7.1/src/CMakeLists.txt
+--- visit2.7.1.old2/src/CMakeLists.txt 2014-01-27 22:10:06.520297262 +0100
++++ visit2.7.1/src/CMakeLists.txt 2014-01-27 22:11:30.520298002 +0100
+@@ -807,14 +807,6 @@
+ \"${VISIT_VERSION}\"
+ \"${CMAKE_INSTALL_PREFIX}/beta\")
+ ")
+- ELSE(VISIT_INSTALL_AS_BETA)
+- INSTALL(CODE "
+- MESSAGE(\"Symlinking current to ${VISIT_VERSION}\")
+- EXECUTE_PROCESS(WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}
+- COMMAND \${CMAKE_COMMAND} -E create_symlink
+- \"${VISIT_VERSION}\"
+- \"${CMAKE_INSTALL_PREFIX}/current\")
+- ")
+ ENDIF(VISIT_INSTALL_AS_BETA)
+ ENDIF(WIN32)
+ MARK_AS_ADVANCED(
diff --git a/sci-visualization/visit/files/visit-2.10.3-findpython.patch b/sci-visualization/visit/files/visit-2.10.3-findpython.patch
new file mode 100644
index 0000000..180ffbf
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.10.3-findpython.patch
@@ -0,0 +1,19 @@
+diff -ru visit2.7.1.old/src/CMake/FindVisItPython.cmake visit2.7.1.new/src/CMake/FindVisItPython.cmake
+--- visit2.7.1.old/src/CMake/FindVisItPython.cmake 2013-09-13 21:06:57.000000000 +0200
++++ visit2.7.1.new/src/CMake/FindVisItPython.cmake 2014-01-25 20:30:06.948654123 +0100
+@@ -141,11 +141,12 @@
+ FIND_LIBRARY(PYTHON_LIBRARY
+ NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
+ PATHS
+- ${PYTHON_DIR}/lib
+- ${PYTHON_DIR}/libs
+- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
++ ${PYTHON_DIR}/lib
++ ${PYTHON_DIR}/lib64
++ ${PYTHON_DIR}/libs
++ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
+ NO_DEFAULT_PATH
+ NO_CMAKE_ENVIRONMENT_PATH
+ NO_CMAKE_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH)
+
diff --git a/sci-visualization/visit/files/visit-2.10.3-findsilo.patch b/sci-visualization/visit/files/visit-2.10.3-findsilo.patch
new file mode 100644
index 0000000..04d73c3
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.10.3-findsilo.patch
@@ -0,0 +1,12 @@
+diff -ru visit2.7.1-old/src/CMake/FindSilo.cmake visit2.7.1-new/src/CMake/FindSilo.cmake
+--- visit2.7.1-old/src/CMake/FindSilo.cmake 2013-11-20 20:30:44.000000000 +0100
++++ visit2.7.1-new/src/CMake/FindSilo.cmake 2014-02-01 02:22:29.410541850 +0100
+@@ -90,7 +90,7 @@
+ NO_CMAKE_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH)
+ IF(SILOH5_LIBRARY_EXISTS)
+- SET_UP_THIRD_PARTY(SILO lib include siloh5)
++ SET_UP_THIRD_PARTY(SILO lib include siloh5 hdf5 z)
+ ELSE(SILOH5_LIBRARY_EXISTS)
+ SET_UP_THIRD_PARTY(SILO lib include silo)
+ ENDIF(SILOH5_LIBRARY_EXISTS)
diff --git a/sci-visualization/visit/files/visit-2.10.3-findvtk.patch b/sci-visualization/visit/files/visit-2.10.3-findvtk.patch
new file mode 100644
index 0000000..2fec72e
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.10.3-findvtk.patch
@@ -0,0 +1,29 @@
+--- visit2.8.2/src/CMake/FindVisItVTK.cmake.orig 2015-01-09 12:18:54.467780216 +0100
++++ visit2.8.2/src/CMake/FindVisItVTK.cmake 2015-01-09 12:19:59.737780932 +0100
+@@ -234,15 +234,22 @@
+
+ # check for python wrappers
+ IF (NOT WIN32)
+- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VTK_LIBRARY_DIRS}/python*/)
++ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VTK_LIBRARY_DIRS}/python*/)
+ ELSE (NOT WIN32)
+ IF(${VTK_VERSION} VERSION_LESS "6.1.0")
+- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VISIT_VTK_DIR}/lib)
++ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VISIT_VTK_DIR}/lib)
+ ELSE()
+- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VISIT_VTK_DIR}/lib/python*)
++ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VISIT_VTK_DIR}/lib/python*)
+ ENDIF()
+ ENDIF (NOT WIN32)
+-MESSAGE(STATUS " VTK_PY_WRAPPERS_DIR=${VTK_PY_WRAPPERS_DIR}")
++MESSAGE(STATUS " VTK_PY_WRAPPERS_DIRECTORIES=${VTK_PY_WRAPPERS_DIRECTORIES}")
++
++FOREACH(X ${VTK_PY_WRAPPERS_DIRECTORIES})
++ IF(EXISTS "${X}/site-packages/vtk")
++ SET(VTK_PY_WRAPPERS_DIR "${X}")
++ ENDIF()
++ENDFOREACH(X)
++
+
+ IF(EXISTS ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk)
+ MESSAGE(STATUS "Found VTK Python Wrappers - ${VTK_PY_WRAPPERS_DIR}")
diff --git a/sci-visualization/visit/files/visit-2.10.3-vtklibs.patch b/sci-visualization/visit/files/visit-2.10.3-vtklibs.patch
new file mode 100644
index 0000000..a6b4709
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.10.3-vtklibs.patch
@@ -0,0 +1,133 @@
+diff -ur visit2.8.2-old/src/engine/main/CMakeLists.txt visit2.8.2-new/src/engine/main/CMakeLists.txt
+--- visit2.8.2-old/src/engine/main/CMakeLists.txt 2014-10-01 00:28:19.000000000 +0200
++++ visit2.8.2-new/src/engine/main/CMakeLists.txt 2015-01-05 15:14:43.850783973 +0100
+@@ -188,8 +188,8 @@
+ ${engine_ser_exe_EPlot_ser}
+ engine_ser
+ visit_verdict
+- vtkjpeg
+- vtkpng
++ jpeg
++ png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+@@ -273,8 +273,8 @@
+ ${engine_par_exe_EPlot_par}
+ engine_par
+ visit_verdict
+- vtkjpeg
+- vtkpng
++ jpeg
++ png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/mdserver/main/CMakeLists.txt visit2.8.2-new/src/mdserver/main/CMakeLists.txt
+--- visit2.8.2-old/src/mdserver/main/CMakeLists.txt 2014-08-11 23:45:16.000000000 +0200
++++ visit2.8.2-new/src/mdserver/main/CMakeLists.txt 2015-01-05 15:15:41.810784062 +0100
+@@ -119,10 +119,10 @@
+ visit_verdict
+ vtkCommonCore
+ vtkIOCore
+- vtktiff
++ tiff
+ ${VTKZLIB_LIB}
+- vtkpng
+- vtkjpeg
++ png
++ jpeg
+ ${ZLIB_LIB}
+ ${CMAKE_THREAD_LIBS}
+ ${DL_LIB}
+diff -ur visit2.8.2-old/src/tools/convert/CMakeLists.txt visit2.8.2-new/src/tools/convert/CMakeLists.txt
+--- visit2.8.2-old/src/tools/convert/CMakeLists.txt 2014-08-11 23:46:08.000000000 +0200
++++ visit2.8.2-new/src/tools/convert/CMakeLists.txt 2015-01-05 15:14:28.880783951 +0100
+@@ -105,8 +105,8 @@
+ )
+
+ SET(VTK_EXTRA_LIBS
+-vtkjpeg
+-vtkpng
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/tools/dataserver/CMakeLists.txt visit2.8.2-new/src/tools/dataserver/CMakeLists.txt
+--- visit2.8.2-old/src/tools/dataserver/CMakeLists.txt 2014-08-11 23:46:12.000000000 +0200
++++ visit2.8.2-new/src/tools/dataserver/CMakeLists.txt 2015-01-05 15:13:02.000783818 +0100
+@@ -70,9 +70,9 @@
+ )
+
+ SET(VTK_EXTRA_LIBS
+-vtktiff
+-vtkjpeg
+-vtkpng
++tiff
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt visit2.8.2-new/src/tools/mcurvit/CMakeLists.txt
+--- visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt 2014-08-11 23:46:11.000000000 +0200
++++ visit2.8.2-new/src/tools/mcurvit/CMakeLists.txt 2015-01-05 15:16:02.400784093 +0100
+@@ -104,9 +104,9 @@
+ )
+
+ SET(VTK_EXTRA_LIBS
+-vtktiff
+-vtkjpeg
+-vtkpng
++tiff
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/tools/protocol/CMakeLists.txt visit2.8.2-new/src/tools/protocol/CMakeLists.txt
+--- visit2.8.2-old/src/tools/protocol/CMakeLists.txt 2014-08-11 23:46:14.000000000 +0200
++++ visit2.8.2-new/src/tools/protocol/CMakeLists.txt 2015-01-05 15:12:46.480783795 +0100
+@@ -76,9 +76,9 @@
+ )
+
+ SET(VTK_EXTRA_LIBS
+-vtktiff
+-vtkjpeg
+-vtkpng
++tiff
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/viewer/main/CMakeLists.txt visit2.8.2-new/src/viewer/main/CMakeLists.txt
+--- visit2.8.2-old/src/viewer/main/CMakeLists.txt 2014-08-11 23:46:26.000000000 +0200
++++ visit2.8.2-new/src/viewer/main/CMakeLists.txt 2015-01-05 15:12:11.380783741 +0100
+@@ -279,8 +279,8 @@
+ ${viewer_exe_IPlot}
+ ${viewer_exe_VPlot}
+ viewer
+- vtkpng
+- vtkjpeg
++ png
++ jpeg
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt
+--- visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt 2014-08-11 23:45:14.000000000 +0200
++++ visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt 2015-01-05 15:11:17.680783659 +0100
+@@ -125,9 +125,9 @@
+ ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
+
+ IF(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff vtkFiltersStatisticsGnuR)
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR)
+ ELSE(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff)
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle)
+ ENDIF(HAVE_LIB_R)
+ # Add vtk definitions
+ ADD_TARGET_DEFINITIONS(visit_vtk "${VTK_DEFINITIONS}")
diff --git a/sci-visualization/visit/files/visit-2.10.3-vtkmpi.patch b/sci-visualization/visit/files/visit-2.10.3-vtkmpi.patch
new file mode 100644
index 0000000..40aa7b8
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.10.3-vtkmpi.patch
@@ -0,0 +1,46 @@
+diff -ru visit2.8.2-old/src/tools/annotations/CMakeLists.txt visit2.8.2-new/src/tools/annotations/CMakeLists.txt
+--- visit2.8.2-old/src/tools/annotations/CMakeLists.txt 2014-08-11 23:46:11.000000000 +0200
++++ visit2.8.2-new/src/tools/annotations/CMakeLists.txt 2015-01-07 08:19:35.000735956 +0100
+@@ -54,9 +54,9 @@
+ # Specify the libraries to link against
+ TARGET_LINK_LIBRARIES(text2polys vtkIOLegacy)
+ IF(HAVE_LIB_R)
+-TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR vtksys vtkIOImage)
++TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR vtksys vtkIOMPIImage)
+ ELSE(HAVE_LIB_R)
+-TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtksys vtkIOImage)
++TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtksys vtkIOMPIImage)
+ ENDIF(HAVE_LIB_R)
+ # add vtk definitions
+ ADD_TARGET_DEFINITIONS(time_annotation "${VTK_DEFINITIONS}")
+diff -ru visit2.8.2-old/src/vtkqt/CMakeLists.txt visit2.8.2-new/src/vtkqt/CMakeLists.txt
+--- visit2.8.2-old/src/vtkqt/CMakeLists.txt 2014-08-11 23:46:46.000000000 +0200
++++ visit2.8.2-new/src/vtkqt/CMakeLists.txt 2015-01-07 08:19:00.950735904 +0100
+@@ -64,9 +64,9 @@
+
+ # Specify the libraries to link against on Windows & Mac
+ IF(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} vtkFiltersStatisticsGnuR)
++ TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOMPIImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} vtkFiltersStatisticsGnuR)
+ ELSE(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
++ TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOMPIImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
+ ENDIF(HAVE_LIB_R)
+ # Add vtk definitions
+ ADD_TARGET_DEFINITIONS(vtkqt "${VTK_DEFINITIONS}")
+--- visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt 2015-01-14 13:08:53.249224731 +0100
++++ visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt 2015-01-14 13:08:28.569224460 +0100
+@@ -125,9 +125,11 @@
+ ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
+
+ IF(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR)
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction
++ vtkFiltersFlowPaths vtkIOMPIImage vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR)
+ ELSE(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle)
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction
++ vtkFiltersFlowPaths vtkIOMPIImage vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle)
+ ENDIF(HAVE_LIB_R)
+ # Add vtk definitions
+ ADD_TARGET_DEFINITIONS(visit_vtk "${VTK_DEFINITIONS}")
diff --git a/sci-visualization/visit/visit-2.10.3.ebuild b/sci-visualization/visit/visit-2.10.3.ebuild
new file mode 100644
index 0000000..26ca18b
--- /dev/null
+++ b/sci-visualization/visit/visit-2.10.3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="A software that delivers parallel interactive visualizations"
+HOMEPAGE="https://wci.llnl.gov/codes/visit/home.html"
+SRC_URI="http://portal.nersc.gov/svn/visit/trunk/releases/${PV}/${PN}${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cgns debug hdf5 mpi netcdf silo tcmalloc threads"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ tcmalloc? ( dev-util/google-perftools )
+ cgns? ( sci-libs/cgnslib )
+ hdf5? ( sci-libs/hdf5 )
+ netcdf? ( sci-libs/netcdf )
+ silo? ( sci-libs/silo )
+ >=sci-libs/vtk-6.0.0[imaging,mpi=,python,rendering,qt4,${PYTHON_USEDEP}]
+ sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}${PV}/src"
+PATCHES=(
+ "${FILESDIR}/${P}-findpython.patch"
+ "${FILESDIR}/${P}-findsilo.patch"
+ "${FILESDIR}/${P}-findvtk.patch"
+ "${FILESDIR}/${P}-vtklibs.patch"
+ "${FILESDIR}/${P}-dont_symlink_visit_dir.patch"
+ "${FILESDIR}/${P}-cmakelist.patch"
+)
+
+src_prepare() {
+ for p in ${PATCHES[@]} ; do
+ epatch "${p}"
+ done
+ if use mpi ; then
+ epatch "${FILESDIR}/${P}-vtkmpi.patch"
+ fi
+
+ sed -i 's/exec python $frontendlauncherpy $0 ${1+"$@"}/exec '${EPYTHON}' $frontendlauncherpy $0 ${1+"$@"}/g' "bin/frontendlauncher"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX=/opt/visit
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_DIR="${EPREFIX}/usr"
+ -DVISIT_PYTHON_SKIP_INSTALL=true
+ -DVISIT_VTK_SKIP_INSTALL=true
+ -DQT_BIN="${EPREFIX}/usr/bin"
+ -DVISIT_ZLIB_DIR="${EPREFIX}/usr"
+ -DVISIT_HEADERS_SKIP_INSTALL=false
+ $(cmake-utils_use threads VISIT_THREAD)
+ )
+ if use hdf5; then
+ mycmakeargs+=( -DHDF5_DIR="${EPREFIX}/usr" )
+ fi
+ if use tcmalloc; then
+ mycmakeargs+=( -DTCMALLOC_DIR="${EPREFIX}/usr" )
+ fi
+ if use cgns; then
+ mycmakeargs+=( -DCGNS_DIR="${EPREFIX}/usr" )
+ fi
+ if use silo; then
+ mycmakeargs+=( -DSILO_DIR="${EPREFIX}/usr" )
+ fi
+ if use netcdf; then
+ mycmakeargs+=( -DNETCDF_DIR="${EPREFIX}/usr" )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ PACKAGES_DIR="${ROOT}opt/${PN}/${PV}/linux-$(arch)/lib/site-packages"
+ cd "${ED}${PACKAGES_DIR}"
+ for i in *; do
+ dosym "${PACKAGES_DIR}/${i}" "$(python_get_sitedir)/$i"
+ done
+
+ cat > "${T}"/99visit <<- EOF
+ PATH=${EPREFIX}/opt/${PN}/bin
+ LDPATH=${EPREFIX}/opt/${PN}/${PV}/linux-$(arch)/lib/
+ EOF
+ doenvd "${T}"/99visit
+}
+
+pkg_postinst () {
+ ewarn "Remember to run "
+ ewarn "env-update && source /etc/profile"
+ ewarn "if you want to use visit in already opened session"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-visualization/visit/, sci-visualization/visit/files/
@ 2017-07-12 8:06 Slawek Lis
0 siblings, 0 replies; 2+ messages in thread
From: Slawek Lis @ 2017-07-12 8:06 UTC (permalink / raw
To: gentoo-commits
commit: 37684c941195b81370dd018e6e3acc7f057b2da2
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 08:13:27 2017 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Wed Jul 12 08:13:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37684c94
sci-visualization/visit: version bump to 2.12.3
Reported in bug 624196
Package-Manager: Portage-2.3.6, Repoman-2.3.2
sci-visualization/visit/Manifest | 1 +
.../visit/files/visit-2.12.3-cmakelist.patch | 10 ++
.../visit-2.12.3-dont_symlink_visit_dir.patch | 18 +++
.../visit/files/visit-2.12.3-findpython.patch | 19 +++
.../visit/files/visit-2.12.3-findsilo.patch | 12 ++
.../visit/files/visit-2.12.3-findvtk.patch | 29 +++++
.../visit/files/visit-2.12.3-qwt.patch | 14 +++
.../visit/files/visit-2.12.3-vtklibs.patch | 133 +++++++++++++++++++++
.../visit/files/visit-2.12.3-vtkmpi.patch | 46 +++++++
sci-visualization/visit/visit-2.12.3.ebuild | 112 +++++++++++++++++
10 files changed, 394 insertions(+)
diff --git a/sci-visualization/visit/Manifest b/sci-visualization/visit/Manifest
index 620a03fddf9..012eac0332e 100644
--- a/sci-visualization/visit/Manifest
+++ b/sci-visualization/visit/Manifest
@@ -1,4 +1,5 @@
DIST visit2.10.3.tar.gz 89181392 SHA256 05018215c4727eb42d47bb5cc4ff937b2a2ccaca90d141bc7fa426a0843a5dbc SHA512 f7e74191e4ac07da3a1323f1e60581c4a2f8ef439c23a26156e45d8ec2fb4f6decc5593ba4556209ad275ceeb6ffaaccc87d5d623e341771ab97e382cf406c59 WHIRLPOOL 948edb4113f4c5b16e231429c9decc8207d5e9502e0b4ecb47abacc8594187509899cce1e2ee04a4f7ff8e678f8ded047d6ffabe95d92eca493336a943112050
+DIST visit2.12.3.tar.gz 80491441 SHA256 2dd351a291ee3e79926bc00391ca89b202cfa4751331b0fdee1b960c7922161f SHA512 78e939657a556040fc593766855c06a5bef85c76d3c43cd6a941ea90517e49ad556f1b10aa5b984327260001d3b53c67b8cb4692ba04ffbad8b6fefac704e842 WHIRLPOOL d82cbf7bac524b4fef25b129ba43ea6015c7f27f4945a05e2cdac76248c922eac82b88d9db51a0f93df9a1d835eb0d26ca3bbdf454341346013c142e678dfe1a
DIST visit2.7.3.tar.gz 82475238 SHA256 e4ed7b20c4c0fb5aac49181f8ddeae3d2d5a73b1662756ddcaa9d08776a7c39f SHA512 5eea2667482a9b70cf4794446da69595c1145839dfae0afdf961589a09b0f3ad41c44b607f96dbb3e4a3c1ba77161d77a1e0342d6a4e2df8bc73040110c7e8f1 WHIRLPOOL a1157d2424d93037e1ffd8dd10ebc47ae9f3d074a63a811bcadf6db5349dea348432e63d414d4a62a156c9423a1d5fdb240f34b2ec4262e8647def40d999759a
DIST visit2.8.2.tar.gz 88008002 SHA256 43d652dde540e3a5db34a2105d89432fa1d018b104ed0508dfb18f4287a43eb3 SHA512 1c2c2b6cad49b32b5cbc7f7ffba5c6ffb98ee88dfeae5c51af5e581ad53fb1efb8fc222b796696e607abd4b748855141de072414bdec1b1ad4e7ac01a928db8d WHIRLPOOL dadfd48bf9522fc67547f2d7fc4332f300d06e3f04f1bd23189f4a6d806286b46420e4caecaba616bf9f954ea3e202efcee7e899d10444304f7f79809e8fc6d9
DIST visit2.9.0.tar.gz 87058013 SHA256 98d7a80d95f4083fffc23a65cff28abd126e2eb0fff43591663818aaa1338fcf SHA512 889a6ff6f0c45064c0705a8a41fd268ad865619e42eb7a3302a520bcb2a3c182a40bc6870ec80c0994fa649f3030f6283b9783fab37b938d4b77fd3c1ab10d15 WHIRLPOOL 8d6e9370fddda7d28c16882a04ac2c196b0c42ffd72436ca601413b7483c72d4b33691a9dc7340d71d536fead3d6692f1491c2bed32ed27ceba0c745b9555380
diff --git a/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch b/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch
new file mode 100644
index 00000000000..8c8618a2421
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig 2015-06-25 07:30:40.907149341 +0200
++++ CMakeLists.txt 2015-06-25 07:30:57.537148929 +0200
+@@ -991,7 +991,6 @@
+ DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+ GROUP_READ GROUP_WRITE GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE
+- CONFIGURATIONS "" None Debug Release RelWithDebInfo MinSizeRel
+ FILES_MATCHING PATTERN "*.h"
+ PATTERN "*.hpp"
+ PATTERN ".svn" EXCLUDE
diff --git a/sci-visualization/visit/files/visit-2.12.3-dont_symlink_visit_dir.patch b/sci-visualization/visit/files/visit-2.12.3-dont_symlink_visit_dir.patch
new file mode 100644
index 00000000000..0953e5b9e60
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-dont_symlink_visit_dir.patch
@@ -0,0 +1,18 @@
+diff -ru visit2.7.1.old2/src/CMakeLists.txt visit2.7.1/src/CMakeLists.txt
+--- visit2.7.1.old2/src/CMakeLists.txt 2014-01-27 22:10:06.520297262 +0100
++++ visit2.7.1/src/CMakeLists.txt 2014-01-27 22:11:30.520298002 +0100
+@@ -807,14 +807,6 @@
+ \"${VISIT_VERSION}\"
+ \"${CMAKE_INSTALL_PREFIX}/beta\")
+ ")
+- ELSE(VISIT_INSTALL_AS_BETA)
+- INSTALL(CODE "
+- MESSAGE(\"Symlinking current to ${VISIT_VERSION}\")
+- EXECUTE_PROCESS(WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}
+- COMMAND \${CMAKE_COMMAND} -E create_symlink
+- \"${VISIT_VERSION}\"
+- \"${CMAKE_INSTALL_PREFIX}/current\")
+- ")
+ ENDIF(VISIT_INSTALL_AS_BETA)
+ ENDIF(WIN32)
+ MARK_AS_ADVANCED(
diff --git a/sci-visualization/visit/files/visit-2.12.3-findpython.patch b/sci-visualization/visit/files/visit-2.12.3-findpython.patch
new file mode 100644
index 00000000000..180ffbf379a
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-findpython.patch
@@ -0,0 +1,19 @@
+diff -ru visit2.7.1.old/src/CMake/FindVisItPython.cmake visit2.7.1.new/src/CMake/FindVisItPython.cmake
+--- visit2.7.1.old/src/CMake/FindVisItPython.cmake 2013-09-13 21:06:57.000000000 +0200
++++ visit2.7.1.new/src/CMake/FindVisItPython.cmake 2014-01-25 20:30:06.948654123 +0100
+@@ -141,11 +141,12 @@
+ FIND_LIBRARY(PYTHON_LIBRARY
+ NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
+ PATHS
+- ${PYTHON_DIR}/lib
+- ${PYTHON_DIR}/libs
+- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
++ ${PYTHON_DIR}/lib
++ ${PYTHON_DIR}/lib64
++ ${PYTHON_DIR}/libs
++ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
+ NO_DEFAULT_PATH
+ NO_CMAKE_ENVIRONMENT_PATH
+ NO_CMAKE_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH)
+
diff --git a/sci-visualization/visit/files/visit-2.12.3-findsilo.patch b/sci-visualization/visit/files/visit-2.12.3-findsilo.patch
new file mode 100644
index 00000000000..04d73c37fc1
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-findsilo.patch
@@ -0,0 +1,12 @@
+diff -ru visit2.7.1-old/src/CMake/FindSilo.cmake visit2.7.1-new/src/CMake/FindSilo.cmake
+--- visit2.7.1-old/src/CMake/FindSilo.cmake 2013-11-20 20:30:44.000000000 +0100
++++ visit2.7.1-new/src/CMake/FindSilo.cmake 2014-02-01 02:22:29.410541850 +0100
+@@ -90,7 +90,7 @@
+ NO_CMAKE_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH)
+ IF(SILOH5_LIBRARY_EXISTS)
+- SET_UP_THIRD_PARTY(SILO lib include siloh5)
++ SET_UP_THIRD_PARTY(SILO lib include siloh5 hdf5 z)
+ ELSE(SILOH5_LIBRARY_EXISTS)
+ SET_UP_THIRD_PARTY(SILO lib include silo)
+ ENDIF(SILOH5_LIBRARY_EXISTS)
diff --git a/sci-visualization/visit/files/visit-2.12.3-findvtk.patch b/sci-visualization/visit/files/visit-2.12.3-findvtk.patch
new file mode 100644
index 00000000000..2fec72e1f4f
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-findvtk.patch
@@ -0,0 +1,29 @@
+--- visit2.8.2/src/CMake/FindVisItVTK.cmake.orig 2015-01-09 12:18:54.467780216 +0100
++++ visit2.8.2/src/CMake/FindVisItVTK.cmake 2015-01-09 12:19:59.737780932 +0100
+@@ -234,15 +234,22 @@
+
+ # check for python wrappers
+ IF (NOT WIN32)
+- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VTK_LIBRARY_DIRS}/python*/)
++ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VTK_LIBRARY_DIRS}/python*/)
+ ELSE (NOT WIN32)
+ IF(${VTK_VERSION} VERSION_LESS "6.1.0")
+- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VISIT_VTK_DIR}/lib)
++ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VISIT_VTK_DIR}/lib)
+ ELSE()
+- FILE(GLOB VTK_PY_WRAPPERS_DIR ${VISIT_VTK_DIR}/lib/python*)
++ FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VISIT_VTK_DIR}/lib/python*)
+ ENDIF()
+ ENDIF (NOT WIN32)
+-MESSAGE(STATUS " VTK_PY_WRAPPERS_DIR=${VTK_PY_WRAPPERS_DIR}")
++MESSAGE(STATUS " VTK_PY_WRAPPERS_DIRECTORIES=${VTK_PY_WRAPPERS_DIRECTORIES}")
++
++FOREACH(X ${VTK_PY_WRAPPERS_DIRECTORIES})
++ IF(EXISTS "${X}/site-packages/vtk")
++ SET(VTK_PY_WRAPPERS_DIR "${X}")
++ ENDIF()
++ENDFOREACH(X)
++
+
+ IF(EXISTS ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk)
+ MESSAGE(STATUS "Found VTK Python Wrappers - ${VTK_PY_WRAPPERS_DIR}")
diff --git a/sci-visualization/visit/files/visit-2.12.3-qwt.patch b/sci-visualization/visit/files/visit-2.12.3-qwt.patch
new file mode 100644
index 00000000000..b714aec4563
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-qwt.patch
@@ -0,0 +1,14 @@
+--- CMake/FindQwt.cmake.orig 2017-07-12 07:46:34.560120549 +0200
++++ CMake/FindQwt.cmake 2017-07-12 07:46:58.120121063 +0200
+@@ -54,7 +54,10 @@
+ SET(QWT_LIBRARY ${QWT_LIBRARY_DIR}/${QWT_LIB}/qwt)
+ ENDIF(VISIT_STATIC)
+ ELSE (WIN32)
+- SET_UP_THIRD_PARTY(QWT lib include qwt)
++ SET(QWT_FOUND true CACHE BOOL "QWT library found" FORCE)
++ SET(QWT_INCLUDE_DIR "/usr/include/qwt6")
++ SET(QWT_LIBRARY_DIR "/usr/lib")
++ SET(QWT_LIB "/usr/lib/libqwt6-qt5.so")
+ SET(QWT_LIBRARY ${QWT_LIB} CACHE STRING "name of qwt library" FORCE)
+ ENDIF (WIN32)
+
diff --git a/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch b/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch
new file mode 100644
index 00000000000..a6b47096e81
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch
@@ -0,0 +1,133 @@
+diff -ur visit2.8.2-old/src/engine/main/CMakeLists.txt visit2.8.2-new/src/engine/main/CMakeLists.txt
+--- visit2.8.2-old/src/engine/main/CMakeLists.txt 2014-10-01 00:28:19.000000000 +0200
++++ visit2.8.2-new/src/engine/main/CMakeLists.txt 2015-01-05 15:14:43.850783973 +0100
+@@ -188,8 +188,8 @@
+ ${engine_ser_exe_EPlot_ser}
+ engine_ser
+ visit_verdict
+- vtkjpeg
+- vtkpng
++ jpeg
++ png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+@@ -273,8 +273,8 @@
+ ${engine_par_exe_EPlot_par}
+ engine_par
+ visit_verdict
+- vtkjpeg
+- vtkpng
++ jpeg
++ png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/mdserver/main/CMakeLists.txt visit2.8.2-new/src/mdserver/main/CMakeLists.txt
+--- visit2.8.2-old/src/mdserver/main/CMakeLists.txt 2014-08-11 23:45:16.000000000 +0200
++++ visit2.8.2-new/src/mdserver/main/CMakeLists.txt 2015-01-05 15:15:41.810784062 +0100
+@@ -119,10 +119,10 @@
+ visit_verdict
+ vtkCommonCore
+ vtkIOCore
+- vtktiff
++ tiff
+ ${VTKZLIB_LIB}
+- vtkpng
+- vtkjpeg
++ png
++ jpeg
+ ${ZLIB_LIB}
+ ${CMAKE_THREAD_LIBS}
+ ${DL_LIB}
+diff -ur visit2.8.2-old/src/tools/convert/CMakeLists.txt visit2.8.2-new/src/tools/convert/CMakeLists.txt
+--- visit2.8.2-old/src/tools/convert/CMakeLists.txt 2014-08-11 23:46:08.000000000 +0200
++++ visit2.8.2-new/src/tools/convert/CMakeLists.txt 2015-01-05 15:14:28.880783951 +0100
+@@ -105,8 +105,8 @@
+ )
+
+ SET(VTK_EXTRA_LIBS
+-vtkjpeg
+-vtkpng
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/tools/dataserver/CMakeLists.txt visit2.8.2-new/src/tools/dataserver/CMakeLists.txt
+--- visit2.8.2-old/src/tools/dataserver/CMakeLists.txt 2014-08-11 23:46:12.000000000 +0200
++++ visit2.8.2-new/src/tools/dataserver/CMakeLists.txt 2015-01-05 15:13:02.000783818 +0100
+@@ -70,9 +70,9 @@
+ )
+
+ SET(VTK_EXTRA_LIBS
+-vtktiff
+-vtkjpeg
+-vtkpng
++tiff
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt visit2.8.2-new/src/tools/mcurvit/CMakeLists.txt
+--- visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt 2014-08-11 23:46:11.000000000 +0200
++++ visit2.8.2-new/src/tools/mcurvit/CMakeLists.txt 2015-01-05 15:16:02.400784093 +0100
+@@ -104,9 +104,9 @@
+ )
+
+ SET(VTK_EXTRA_LIBS
+-vtktiff
+-vtkjpeg
+-vtkpng
++tiff
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/tools/protocol/CMakeLists.txt visit2.8.2-new/src/tools/protocol/CMakeLists.txt
+--- visit2.8.2-old/src/tools/protocol/CMakeLists.txt 2014-08-11 23:46:14.000000000 +0200
++++ visit2.8.2-new/src/tools/protocol/CMakeLists.txt 2015-01-05 15:12:46.480783795 +0100
+@@ -76,9 +76,9 @@
+ )
+
+ SET(VTK_EXTRA_LIBS
+-vtktiff
+-vtkjpeg
+-vtkpng
++tiff
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/viewer/main/CMakeLists.txt visit2.8.2-new/src/viewer/main/CMakeLists.txt
+--- visit2.8.2-old/src/viewer/main/CMakeLists.txt 2014-08-11 23:46:26.000000000 +0200
++++ visit2.8.2-new/src/viewer/main/CMakeLists.txt 2015-01-05 15:12:11.380783741 +0100
+@@ -279,8 +279,8 @@
+ ${viewer_exe_IPlot}
+ ${viewer_exe_VPlot}
+ viewer
+- vtkpng
+- vtkjpeg
++ png
++ jpeg
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ur visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt
+--- visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt 2014-08-11 23:45:14.000000000 +0200
++++ visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt 2015-01-05 15:11:17.680783659 +0100
+@@ -125,9 +125,9 @@
+ ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
+
+ IF(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff vtkFiltersStatisticsGnuR)
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR)
+ ELSE(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff)
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle)
+ ENDIF(HAVE_LIB_R)
+ # Add vtk definitions
+ ADD_TARGET_DEFINITIONS(visit_vtk "${VTK_DEFINITIONS}")
diff --git a/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch b/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch
new file mode 100644
index 00000000000..40aa7b8e2e5
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch
@@ -0,0 +1,46 @@
+diff -ru visit2.8.2-old/src/tools/annotations/CMakeLists.txt visit2.8.2-new/src/tools/annotations/CMakeLists.txt
+--- visit2.8.2-old/src/tools/annotations/CMakeLists.txt 2014-08-11 23:46:11.000000000 +0200
++++ visit2.8.2-new/src/tools/annotations/CMakeLists.txt 2015-01-07 08:19:35.000735956 +0100
+@@ -54,9 +54,9 @@
+ # Specify the libraries to link against
+ TARGET_LINK_LIBRARIES(text2polys vtkIOLegacy)
+ IF(HAVE_LIB_R)
+-TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR vtksys vtkIOImage)
++TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR vtksys vtkIOMPIImage)
+ ELSE(HAVE_LIB_R)
+-TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtksys vtkIOImage)
++TARGET_LINK_LIBRARIES(time_annotation vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtksys vtkIOMPIImage)
+ ENDIF(HAVE_LIB_R)
+ # add vtk definitions
+ ADD_TARGET_DEFINITIONS(time_annotation "${VTK_DEFINITIONS}")
+diff -ru visit2.8.2-old/src/vtkqt/CMakeLists.txt visit2.8.2-new/src/vtkqt/CMakeLists.txt
+--- visit2.8.2-old/src/vtkqt/CMakeLists.txt 2014-08-11 23:46:46.000000000 +0200
++++ visit2.8.2-new/src/vtkqt/CMakeLists.txt 2015-01-07 08:19:00.950735904 +0100
+@@ -64,9 +64,9 @@
+
+ # Specify the libraries to link against on Windows & Mac
+ IF(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} vtkFiltersStatisticsGnuR)
++ TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOMPIImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} vtkFiltersStatisticsGnuR)
+ ELSE(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
++ TARGET_LINK_LIBRARIES(vtkqt vtkCommonCore vtkGUISupportQtOpenGL vtkIOMPIImage vtkRenderingOpenGL vtkRenderingFreeTypeOpenGL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
+ ENDIF(HAVE_LIB_R)
+ # Add vtk definitions
+ ADD_TARGET_DEFINITIONS(vtkqt "${VTK_DEFINITIONS}")
+--- visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt 2015-01-14 13:08:53.249224731 +0100
++++ visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt 2015-01-14 13:08:28.569224460 +0100
+@@ -125,9 +125,11 @@
+ ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
+
+ IF(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR)
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction
++ vtkFiltersFlowPaths vtkIOMPIImage vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtkFiltersStatisticsGnuR)
+ ELSE(HAVE_LIB_R)
+- TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle)
++ TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction
++ vtkFiltersFlowPaths vtkIOMPIImage vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle)
+ ENDIF(HAVE_LIB_R)
+ # Add vtk definitions
+ ADD_TARGET_DEFINITIONS(visit_vtk "${VTK_DEFINITIONS}")
diff --git a/sci-visualization/visit/visit-2.12.3.ebuild b/sci-visualization/visit/visit-2.12.3.ebuild
new file mode 100644
index 00000000000..dbff0685ca9
--- /dev/null
+++ b/sci-visualization/visit/visit-2.12.3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="A software that delivers parallel interactive visualizations"
+HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/visit"
+SRC_URI="http://portal.nersc.gov/svn/visit/trunk/releases/${PV}/${PN}${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cgns debug hdf5 mpi netcdf silo tcmalloc threads xdmf2"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ tcmalloc? ( dev-util/google-perftools )
+ cgns? ( sci-libs/cgnslib )
+ hdf5? ( sci-libs/hdf5 )
+ netcdf? ( sci-libs/netcdf )
+ silo? ( sci-libs/silo )
+ =sci-libs/vtk-6.1.0*[imaging,mpi=,python,rendering,qt5,xdmf2?,${PYTHON_USEDEP}]
+ sys-libs/zlib
+ x11-libs/qwt:6"
+DEPEND="${RDEPEND}
+ xdmf2? ( sci-libs/xdmf2 )
+"
+
+S="${WORKDIR}/${PN}${PV}/src"
+PATCHES=(
+ "${FILESDIR}/${P}-findpython.patch"
+ "${FILESDIR}/${P}-findsilo.patch"
+ "${FILESDIR}/${P}-findvtk.patch"
+ "${FILESDIR}/${P}-vtklibs.patch"
+ "${FILESDIR}/${P}-dont_symlink_visit_dir.patch"
+ "${FILESDIR}/${P}-cmakelist.patch"
+ "${FILESDIR}/${P}-qwt.patch"
+)
+
+src_prepare() {
+ for p in ${PATCHES[@]} ; do
+ epatch "${p}"
+ done
+ if use mpi ; then
+ epatch "${FILESDIR}/${P}-vtkmpi.patch"
+ fi
+
+ sed -i 's/exec python $frontendlauncherpy $0 ${1+"$@"}/exec '${EPYTHON}' $frontendlauncherpy $0 ${1+"$@"}/g' "bin/frontendlauncher"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX=/opt/visit
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_DIR="${EPREFIX}/usr"
+ -DVISIT_PYTHON_SKIP_INSTALL=true
+ -DVISIT_VTK_SKIP_INSTALL=true
+ -DQT_BIN="${EPREFIX}/usr/bin"
+ -DVISIT_ZLIB_DIR="${EPREFIX}/usr"
+ -DVISIT_HEADERS_SKIP_INSTALL=false
+ -DVISIT_QWT_DIR="${EPREFIX}/usr"
+ -DVISIT_QT5=true
+ -DVISIT_QT_DIR=/usr/lib/qt5/
+ $(cmake-utils_use threads VISIT_THREAD)
+ )
+ if use hdf5; then
+ mycmakeargs+=( -DHDF5_DIR="${EPREFIX}/usr" )
+ fi
+ if use tcmalloc; then
+ mycmakeargs+=( -DTCMALLOC_DIR="${EPREFIX}/usr" )
+ fi
+ if use cgns; then
+ mycmakeargs+=( -DCGNS_DIR="${EPREFIX}/usr" )
+ fi
+ if use silo; then
+ mycmakeargs+=( -DSILO_DIR="${EPREFIX}/usr" )
+ fi
+ if use netcdf; then
+ mycmakeargs+=( -DNETCDF_DIR="${EPREFIX}/usr" )
+ fi
+ if use xdmf2; then
+ mycmakeargs+=( -DOPT_VTK_MODS="vtklibxml2" -DVISIT_XDMF_DIR=/usr/ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ PACKAGES_DIR="${ROOT}opt/${PN}/${PV}/linux-$(arch)/lib/site-packages"
+ cd "${ED}${PACKAGES_DIR}"
+ for i in *; do
+ dosym "${PACKAGES_DIR}/${i}" "$(python_get_sitedir)/$i"
+ done
+
+ cat > "${T}"/99visit <<- EOF
+ PATH=${EPREFIX}/opt/${PN}/bin
+ LDPATH=${EPREFIX}/opt/${PN}/${PV}/linux-$(arch)/lib/
+ EOF
+ doenvd "${T}"/99visit
+}
+
+pkg_postinst () {
+ ewarn "Remember to run "
+ ewarn "env-update && source /etc/profile"
+ ewarn "if you want to use visit in already opened session"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-07-12 8:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-27 7:32 [gentoo-commits] repo/gentoo:master commit in: sci-visualization/visit/, sci-visualization/visit/files/ Slawek Lis
-- strict thread matches above, loose matches on Subject: below --
2017-07-12 8:06 Slawek Lis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox