slis 15/03/16 08:29:05
Added: visit-2.9.0-findpython.patch
visit-2.9.0-dont_symlink_visit_dir.patch
visit-2.9.0-findvtk.patch visit-2.9.0-vtklibs.patch
visit-2.9.0-vtkmpi.patch visit-2.9.0-findsilo.patch
Log:
version bump (543212), thanks to Andreas Schafer
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key
0x55265D89)
Revision Changes Path
1.1 sci-visualization/visit/files/visit-2.9.0-findpython.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/visit/files/visit-2.9.0-findpython.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/visit/files/visit-2.9.0-findpython.patch?rev=1.1&content-type=text/plain
Index: visit-2.9.0-findpython.patch
===================================================================
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)
1.1
sci-visualization/visit/files/visit-2.9.0-dont_symlink_visit_dir.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/visit/files/visit-2.9.0-dont_symlink_visit_dir.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/visit/files/visit-2.9.0-dont_symlink_visit_dir.patch?rev=1.1&content-type=text/plain
Index: visit-2.9.0-dont_symlink_visit_dir.patch
===================================================================
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(
1.1 sci-visualization/visit/files/visit-2.9.0-findvtk.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/visit/files/visit-2.9.0-findvtk.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/visit/files/visit-2.9.0-findvtk.patch?rev=1.1&content-type=text/plain
Index: visit-2.9.0-findvtk.patch
===================================================================
--- 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}")
1.1 sci-visualization/visit/files/visit-2.9.0-vtklibs.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/visit/files/visit-2.9.0-vtklibs.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/visit/files/visit-2.9.0-vtklibs.patch?rev=1.1&content-type=text/plain
Index: visit-2.9.0-vtklibs.patch
===================================================================
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}")
1.1 sci-visualization/visit/files/visit-2.9.0-vtkmpi.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/visit/files/visit-2.9.0-vtkmpi.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/visit/files/visit-2.9.0-vtkmpi.patch?rev=1.1&content-type=text/plain
Index: visit-2.9.0-vtkmpi.patch
===================================================================
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}")
1.1 sci-visualization/visit/files/visit-2.9.0-findsilo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/visit/files/visit-2.9.0-findsilo.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/visit/files/visit-2.9.0-findsilo.patch?rev=1.1&content-type=text/plain
Index: visit-2.9.0-findsilo.patch
===================================================================
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)
