Update to 3.8.0

PR:		ports/147266
Submitted by:	Stas Timokhin (maintainer)
This commit is contained in:
Max Brazhnikov 2010-06-05 13:07:51 +00:00
parent ff6f7edfce
commit 1504a2809c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=255779
12 changed files with 636 additions and 530 deletions

View File

@ -6,10 +6,10 @@
#
PORTNAME= paraview
PORTVERSION= 3.6.2
PORTREVISION= 1
PORTVERSION= 3.8.0
CATEGORIES= science graphics
MASTER_SITES= http://www.paraview.org/files/v3.6/
MASTER_SITES= http://www.paraview.org/files/v3.8/
DISTNAME= ParaView-${PORTVERSION}
MAINTAINER= devel@stasyan.com
COMMENT= ParaView is a powerful scientific data visualization application
@ -31,6 +31,7 @@ USE_XORG= x11 xt
USE_GMAKE= yes
USE_LDCONFIG= yes
USE_CMAKE= yes
CONFLICTS= vtk-5.*
CMAKE_ARGS+= -DPARAVIEW_USE_SYSTEM_HDF5=1 \
-DBUILD_SHARED_LIBS="ON" \
-DVTK_USE_SYSTEM_PNG="ON" \
@ -43,16 +44,36 @@ CMAKE_ARGS+= -DPARAVIEW_USE_SYSTEM_HDF5=1 \
-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1 \
-DQT_ASSISTANT_EXECUTABLE="${LOCALBASE}/bin/assistant-qt4" \
-DVTK_INSTALL_QT_PLUGIN_DIR="${PREFIX}/${QT_PLUGINDIR_REL}/designer" \
-DCMAKE_INCLUDE_DIRECTORIES_BEFORE="ON" \
-DPARAVIEW_INSTALL_DEVELOPMENT="ON"
-DPARAVIEW_INSTALL_DEVELOPMENT="ON" \
-DPV_INSTALL_DOC_DIR=${DOCSDIR}
# -DVTK_PYTHON_INCLUDE_PATH=${PYTHON_INCLUDEDIR} \
# -DPYTHON_INCLUDE_PATH:FILEPATH=${PYTHON_INCLUDEDIR} \
# -DVTK_WRAP_PYTHON:BOOL=ON \
# -DPARAVIEW_ENABLE_PYTHON:BOOL=ON
# -DVTK_PYTHON_SETUP_ARGS:STRING='--prefix="${PREFIX}"' \
OPTIONS= MANGLEDMESA "Use off-screen (Mangled) Mesa" Off
# VTKMPEG2 "Install patented MPEG2 encoder module" Off \
# GL2PS "Install support conversion OpenGL to PostScript" On
.if defined(WITH_MANGLEDMESA)
LIB_DEPENDS+= MesaGL.14:${PORTSDIR}/graphics/mesagl
CMAKE_ARGS+= -DVTK_OPENGL_HAS_OSMESA:BOOL=OFF \
-DVTK_USE_MANGLED_MESA:BOOL=ON \
-DMANGLED_MESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
-DMANGLED_MESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libMesaGL.so \
-DMANGLED_OSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
-DMANGLED_OSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libMesaOSMesa.so
.else
LIB_DEPENDS+= OSMesa.7:${PORTSDIR}/graphics/libosmesa
CMAKE_ARGS+= -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so
.endif
MAKE_JOBS_SAFE= yes
CMAKE_OUTSOURCE= yes
PATCH_WRKSRC= ${WRKDIR}/ParaView3
WRKSRC= ${WRKDIR}/ParaView3/build
CMAKE_SOURCE_PATH= ..
PLIST_SUB+= VERMAJORMINOR=3.6
PLIST_SUB+= VERMAJORMINOR=3.8
CMAKE2INST= ParaViewConfig.cmake \
ParaViewLibraryDepends.cmake cmake_install.cmake
LIB_INSTDIR= ${PREFIX}/lib/${PORTNAME}-${PORTVERSION:R}
@ -63,18 +84,15 @@ LIB_INSTDIR= ${PREFIX}/lib/${PORTNAME}-${PORTVERSION:R}
BROKEN= does not build on 6.x
.endif
post-extract:
${MKDIR} ${WRKSRC}
post-patch:
${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
${PATCH_WRKSRC}/VTK/IO/vtkPNGReader.cxx
post-install:
.for c2f in ${CMAKE2INST}
${SED} -e 's|${WRKSRC}|${LIB_INSTDIR}|g' \
${SED} -e 's|${BUILD_WRKSRC}|${LIB_INSTDIR}|g' \
-e 's|${PATCH_WRKSRC}|${LIB_INSTDIR}|g' \
${WRKSRC}/${c2f} > ${LIB_INSTDIR}/`${BASENAME} ${c2f}`
${BUILD_WRKSRC}/${c2f} > ${LIB_INSTDIR}/`${BASENAME} ${c2f}`
.endfor
${INSTALL_DATA} ${PATCH_WRKSRC}/ParaViewUse.cmake \
${PREFIX}/lib/${PORTNAME}-${PORTVERSION:R}

View File

@ -1,3 +1,3 @@
MD5 (paraview-3.6.2.tar.gz) = 1c004eb82e291452efb45527745a78e4
SHA256 (paraview-3.6.2.tar.gz) = 062f581a6f3fda5cead647fb32b0fab6d9bb3be38aace5e4080dab38a9eaea04
SIZE (paraview-3.6.2.tar.gz) = 28323172
MD5 (ParaView-3.8.0.tar.gz) = 4f371631c373452b202a3d91f2cca12f
SHA256 (ParaView-3.8.0.tar.gz) = fe26c5aab225e804a9d890007d3963988c5f1000bdb270576dc9c2549c6a4078
SIZE (ParaView-3.8.0.tar.gz) = 31703024

View File

@ -1,49 +0,0 @@
--- Applications/Client/CMakeLists.txt.orig 2009-09-27 20:18:25.000000000 +0700
+++ Applications/Client/CMakeLists.txt 2009-09-27 20:18:49.000000000 +0700
@@ -527,26 +527,26 @@
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)
-
- ENDFOREACH(qtlib)
-ENDIF(NOT Q_WS_MAC)
+#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)
# 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

View File

@ -1,49 +0,0 @@
--- Applications/StreamingParaView/CMakeLists.txt.orig 2009-09-27 20:18:57.000000000 +0700
+++ Applications/StreamingParaView/CMakeLists.txt 2009-09-27 20:19:25.000000000 +0700
@@ -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)
-
- ENDFOREACH(qtlib)
-ENDIF(NOT Q_WS_MAC)
+#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)
# 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

View File

@ -0,0 +1,11 @@
--- Plugins/PointSprite/CMakeLists.txt.orig 2009-07-28 21:17:26.000000000 +0700
+++ Plugins/PointSprite/CMakeLists.txt 2010-04-19 16:41:17.000000000 +0700
@@ -25,6 +25,8 @@
#--------------------------------------------------
# Find and Use ParaView
#--------------------------------------------------
+INCLUDE_DIRECTORIES(BEFORE ${QT_QTCORE_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(BEFORE ${QT_QTGUI_INCLUDE_DIR})
IF (ParaView_SOURCE_DIR)
INCLUDE_DIRECTORIES(
${PARAVIEW_INCLUDE_DIRS}

View File

@ -0,0 +1,11 @@
--- Plugins/PointSprite/ParaViewPlugin/CMakeLists.txt.orig 2010-03-19 22:12:33.000000000 +0600
+++ Plugins/PointSprite/ParaViewPlugin/CMakeLists.txt 2010-04-19 16:40:56.000000000 +0700
@@ -17,6 +17,8 @@
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/Resources
)
+INCLUDE_DIRECTORIES(BEFORE ${QT_QTCORE_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(BEFORE ${QT_QTGUI_INCLUDE_DIR})
set(SM_SOURCES
vtkSMPointSpriteRepresentationProxy.cxx

View File

@ -1,11 +0,0 @@
--- Qt/Components/CMakeLists.txt.orig 2009-12-07 13:27:33.000000000 +0600
+++ Qt/Components/CMakeLists.txt 2009-12-07 13:28:16.000000000 +0600
@@ -27,7 +27,7 @@
SET(EXTRA_PQ_COMPONENT_SOURCES pqSiloPanel.cxx)
ENDIF(PARAVIEW_USE_SILO)
-INCLUDE_DIRECTORIES(
+INCLUDE_DIRECTORIES(AFTER
${QtPython_BINARY_DIR}
${QtPython_SOURCE_DIR}
${pqComponents_BINARY_DIR}

View File

@ -1,14 +1,14 @@
--- Qt/Core/CMakeLists.txt.orig 2009-12-03 16:47:26.000000000 +0600
+++ Qt/Core/CMakeLists.txt 2009-12-03 16:56:19.000000000 +0600
@@ -2,9 +2,10 @@
# Any build configured headers should be added to this
--- Qt/Core/CMakeLists.txt.orig 2010-04-16 10:20:51.000000000 +0700
+++ Qt/Core/CMakeLists.txt 2010-04-16 10:21:00.000000000 +0700
@@ -5,6 +5,11 @@
# variable so that they also get installed.
+
SET (dynamicHeaders)
-INCLUDE_DIRECTORIES(
+INCLUDE_DIRECTORIES(AFTER
+INCLUDE_DIRECTORIES(BEFORE ${QT_QTDESIGNER_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(BEFORE ${QT_QTGUI_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(BEFORE ${QT_QTSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(BEFORE ${QT_QTCORE_INCLUDE_DIR})
+
INCLUDE_DIRECTORIES(
${VTK_INCLUDE_DIR}
${PARAVIEW_INCLUDE_DIRS}
${ParaView_SOURCE_DIR}/VTK/GUISupport/Qt

View File

@ -1,11 +1,14 @@
--- VTK/GUISupport/Qt/CMakeLists.txt.orig 2009-12-03 14:47:44.000000000 +0600
+++ VTK/GUISupport/Qt/CMakeLists.txt 2009-12-03 14:47:49.000000000 +0600
@@ -190,7 +190,7 @@
--- VTK/GUISupport/Qt/CMakeLists.txt.orig 2010-03-08 21:22:50.000000000 +0600
+++ VTK/GUISupport/Qt/CMakeLists.txt 2010-04-16 11:21:17.000000000 +0700
@@ -164,7 +164,10 @@
${QT_QTGUI_LIBRARY}
)
ENDIF(QT_QTGUI_LIBRARY)
- INCLUDE_DIRECTORIES(${QT_QTDESIGNER_INCLUDE_DIR})
+ INCLUDE_DIRECTORIES(BEFORE ${QT_QTDESIGNER_INCLUDE_DIR})
QT4_WRAP_CPP ( PluginMocSrcs ${PluginMocHeaders} )
ELSE(DESIRED_QT_VERSION MATCHES 4)
QT_WRAP_CPP ( QVTKWidgetPlugin PluginMocSrcs ${PluginMocHeaders} )
)
ENDIF(QT_QTGUI_LIBRARY)
-INCLUDE_DIRECTORIES(${QT_QTDESIGNER_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(BEFORE ${QT_QTDESIGNER_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(BEFORE ${QT_QTGUI_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(BEFORE ${QT_QTSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(BEFORE ${QT_QTCORE_INCLUDE_DIR})
QT4_WRAP_CPP ( PluginMocSrcs ${PluginMocHeaders} )
# add QVTK plugin from sources

View File

@ -1,11 +0,0 @@
--- VTK/Examples/GUI/Qt/GraphicsView/CMakeLists.txt.orig 2009-12-03 14:37:13.000000000 +0600
+++ VTK/Examples/GUI/Qt/GraphicsView/CMakeLists.txt 2009-12-03 14:37:25.000000000 +0600
@@ -26,7 +26,7 @@
)
# Use the include path and library for Qt that is used by VTK.
-INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
+INCLUDE_DIRECTORIES(BEFORE ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR})
ADD_EXECUTABLE( qtgraphicsview MACOSX_BUNDLE ${SRCS})

View File

@ -1,11 +0,0 @@
--- VTK/Examples/GUI/Qt/ImageViewer/CMakeLists.txt.orig 2009-12-03 14:37:31.000000000 +0600
+++ VTK/Examples/GUI/Qt/ImageViewer/CMakeLists.txt 2009-12-03 14:37:38.000000000 +0600
@@ -22,7 +22,7 @@
)
# Use the include path and library for Qt that is used by VTK.
-INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
+INCLUDE_DIRECTORIES(BEFORE ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR})
ADD_EXECUTABLE( qtimageviewer MACOSX_BUNDLE ${SRCS})

File diff suppressed because it is too large Load Diff