diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2010-01-16 19:58:32 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2010-01-16 19:58:32 +0000 |
| commit | aedb391dd45af4ea0c9a5e0b73d5b253ff4c7c84 (patch) | |
| tree | 990c1a17a577239e1cc1b17f6479486b7ec19e08 /sci-visualization/paraview | |
| parent | old (diff) | |
| download | historical-aedb391dd45af4ea0c9a5e0b73d5b253ff4c7c84.tar.gz historical-aedb391dd45af4ea0c9a5e0b73d5b253ff4c7c84.tar.bz2 historical-aedb391dd45af4ea0c9a5e0b73d5b253ff4c7c84.zip | |
Version bump. This new ebuild fully utilizes the cmake-utils eclass and adds desktop entries for both paraview and OverView (this fixes bugs #299627, #287589, #273117).
Package-Manager: portage-2.1.7.16/cvs/Linux x86_64
Diffstat (limited to 'sci-visualization/paraview')
11 files changed, 609 insertions, 4 deletions
diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog index 63cfbabda593..91708bcc7a30 100644 --- a/sci-visualization/paraview/ChangeLog +++ b/sci-visualization/paraview/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for sci-visualization/paraview -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.43 2009/11/24 04:05:41 markusle Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.44 2010/01/16 19:58:32 markusle Exp $ + +*paraview-3.6.2 (16 Jan 2010) + + 16 Jan 2010; Markus Dittrich <markusle@gentoo.org> +paraview-3.6.2.ebuild, + +files/paraview-3.6.2-assistant.patch, + +files/paraview-3.6.2-findcg-cmake.patch, + +files/paraview-3.6.2-hdf-1.8.3.patch, + +files/paraview-3.6.2-no-doc-finder.patch, + +files/paraview-3.6.2-pointsprite-disable.patch, + +files/paraview-3.6.2-about.html.patch, + +files/paraview-3.6.2-qt.patch, metadata.xml: + Version bump. This new ebuild fully utilizes the cmake-utils eclass and + adds desktop entries for both paraview and OverView (this fixes bugs + #299627, #287589, #273117). Thanks much to Francois Bissey + <f.r.bissey@massey.ac.nz> for his great help with the ebuild. 24 Nov 2009; Markus Dittrich <markusle@gentoo.org> paraview-3.6.1-r1.ebuild: diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest index 19684472dac2..e7d273410f33 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -4,10 +4,21 @@ AUX paraview-3.6.1-install-fix.patch 6861 RMD160 4c65e8f95670a740b67146cbf943e8d AUX paraview-3.6.1-no-doc-finder.patch 787 RMD160 e3669d31061d69cb2007be0aa9be2d83de465745 SHA1 591e47194d9a02bc0277906cb3aac1742a6bee37 SHA256 7c264e9ab359928f5d3d23369b07ea9a698554434357744622f1267a2df732b6 AUX paraview-3.6.1-pointsprite-disable.patch 617 RMD160 bef259c2e5edf7b3a8af32a204432d2761ac0834 SHA1 624f682127a5b382475bd0e7a65cab1b9c51c228 SHA256 fb413c38df3461c8840de776442de37171bfeabc42d83be8699d205d41b7b4d6 AUX paraview-3.6.1-qt.patch 7544 RMD160 0396a656029cc1f9562e6b16eb739a8e7960565a SHA1 409c19532bc2ed48cb22c344e1d9db0960147e9a SHA256 d678173f19a393010949582e8353b3e9436fd02bea940a0df49cda90ed4874a4 +AUX paraview-3.6.2-about.html.patch 465 RMD160 741b41273da14ef18ac660dc9ce55e463a16576b SHA1 fd640d5a700feca67df8a7b3fdf7e0f80b62f01f SHA256 5a1701f2839eefc552cd66d52863d6993e6cc18e02084e633c3c6971ab27e88c +AUX paraview-3.6.2-assistant.patch 1108 RMD160 5852514c1c79c56b4a24a4e20cf4735a7ab33f39 SHA1 bf1fa7b628f62d49aba7658462fe76911f7534f9 SHA256 dd5777aadefd960eee1cdc8fb08b838a1229e67cf27c6431dd19986ab654b01e +AUX paraview-3.6.2-findcg-cmake.patch 1152 RMD160 d32da54534c104ca6b3e9bd088b4644590c24f8d SHA1 ab89deef0fb2760cf52c299298f511dd4e43cd92 SHA256 6f51bf693800e8d1d8112f15a793283d4672617c0f7385ad908af97f7f067db0 +AUX paraview-3.6.2-hdf-1.8.3.patch 2701 RMD160 0c6399a18041597c53a856f20e986587b0a9d334 SHA1 c10beace922a3c2566ca7e38c3bf28c746211d96 SHA256 7a283a8ce1d03ddbe93e1d0aae5b26e4b7034607e40472620dbd51869c6015da +AUX paraview-3.6.2-no-doc-finder.patch 773 RMD160 0d76cb7cbd73049473fcd82244b6f4e3766b4276 SHA1 68e0e162f9ebb4bf3d231dbed62ecd53647457b3 SHA256 c90134760ea0995d69f35dc4f5e1d3c43faa4288c2b35cec03a5ece809b6675b +AUX paraview-3.6.2-pointsprite-disable.patch 608 RMD160 07f18332dc7d1313d0909ef7c2bcdfaf9c7d8ec4 SHA1 6602447fc07dacddd7a89ce163213fad1eb76386 SHA256 066559838cbe54408e3d5f17c5ca132e76757ea371a055def27ec710c2df2048 +AUX paraview-3.6.2-qt.patch 7324 RMD160 e5038a2642eee257008181ee3bcba0b1fb95dc62 SHA1 5660eba6e25ecb0e04a171143e6478de9c029ea0 SHA256 1b8b5af8a39e9e50eeb6ddd0cf357c6d3848084c36ffc549c633d06253ad3f65 DIST paraview-3.6.1-openfoam-gpl-r120.patch.bz2 3180 RMD160 224b93d767864043c26eff12fe8843d82a9c8d54 SHA1 683d29cb4e05641928435685abcf96aa296e8794 SHA256 b05e3c9ce20d149ad40f7f3e9bc63f7e197f83eeae7fca6aad6e060c3d585fc4 DIST paraview-3.6.1-openfoam-r120.patch.bz2 58046 RMD160 dec759a9d0bebd83bee6d998cefb25ab0b74ead2 SHA1 83dad388583da99600876055424df3cf7f87b4a5 SHA256 047a1908b7995ef5569c8fcf0b4e2c7aa8239b11b08f0854bbee7cabf9ac026a DIST paraview-3.6.1.tar.gz 27119089 RMD160 8892434c1096d18e83bce6c62f1a7b07a8be1f0a SHA1 aedbe3bf8d831816972129c185565b582e331b53 SHA256 df71c052a4f85a568d3e4a4b55abb257c976795492d3991e32fe4100c3fd8a4e +DIST paraview-3.6.2-openfoam-gpl-r173.patch.bz2 3402 RMD160 2ceb036486b2757eeeed8eae36593be2a70a3a36 SHA1 ea2ac1f92b529973164469c5fc3fdbc0407f8ccd SHA256 3e8751f7747a0067b8532d399a4dc253c71ce50d39fc3b17d38e16060196fc99 +DIST paraview-3.6.2-openfoam-r173.patch.bz2 54275 RMD160 930785f07883a2fc952569a2908600d911627b24 SHA1 ca255ec222e9f8884f4e090df8e860946246b249 SHA256 87c62931de1484dd71fe2f1b36eafdb85eb27127cb42825819a67730118ae6ce +DIST paraview-3.6.2.tar.gz 28323172 RMD160 0f14419100d6d7fd7cc0ca3d385da41397a96da8 SHA1 5a2fad2bd2eaa39dbcbd3f592edfaedb780f63ff SHA256 062f581a6f3fda5cead647fb32b0fab6d9bb3be38aace5e4080dab38a9eaea04 EBUILD paraview-3.6.1-r1.ebuild 9571 RMD160 b3f54c931f6f1d1ea0b021f1e47c92910613c65e SHA1 2ce54d3de1ccc2a156ee699c9fa4b399c697318a SHA256 efd2af6317b8b4ac710f11c1b54a341cf74affe5b02546bba0ec58efcefaf24e EBUILD paraview-3.6.1.ebuild 9491 RMD160 f7677e326122f8303452f2e04be6b5594d63d685 SHA1 7150ec41d01de82c381e4335d048b09bf7b04f6a SHA256 79c2ad8a1b7ebc7f3abe2f628c7ee15fc304a161c307f042b9e4ad631410c970 -MISC ChangeLog 8944 RMD160 94332759757cc871d13cf8b2718a47cacc3519d1 SHA1 445208a2aea7d5637f6abac274f2cb6d8173fc74 SHA256 e1f2cbfcadeff95de8ccab024937c5fbec61d714bb0a219e5493d3cacaf0adc7 -MISC metadata.xml 399 RMD160 131a5c96291217e416af0d726c40ed5624e3bf7b SHA1 f4b99deaa2bb2bf39c32b16fb8bfff81fb14759d SHA256 8c9a511c364dce29e73c21df5a6e51e94817e33e16a27127bba8f4ec9f3ba9cb +EBUILD paraview-3.6.2.ebuild 9370 RMD160 92ac6309fe681088aa4c9996cf868b68a2f3bf69 SHA1 40f59154414acc41f43400af6e2d9d825560aedb SHA256 15edc65ea77d03c3d969d41f9182ff540823203247673d8fe2103d562f4ac71c +MISC ChangeLog 9637 RMD160 f00a035c6571728d117ec9948878d91fd1992ffb SHA1 ec61bfb33015137baf79d943bb8db67e6c61b2dc SHA256 ed38be22f88485e9992e3f9e2398b4265d5537079af25ec750460ba887351bc7 +MISC metadata.xml 665 RMD160 e1e973749b838df0d1e6f08874c7e29f45a18381 SHA1 4be610c3d1f9eeca08ad57eedc90f937f69c5d39 SHA256 07414d0fbe0b6091fe16769a967d1b5b6e20c40e6c871f7e31f2135b11b5d932 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 new file mode 100644 index 000000000000..80ac406c9a28 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.6.2-about.html.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000000..e1540db5b30f --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.6.2-assistant.patch @@ -0,0 +1,24 @@ +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-findcg-cmake.patch b/sci-visualization/paraview/files/paraview-3.6.2-findcg-cmake.patch new file mode 100644 index 000000000000..3ec474ad9e59 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.6.2-findcg-cmake.patch @@ -0,0 +1,35 @@ +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 +@@ -82,6 +82,7 @@ + FIND_PROGRAM( CG_COMPILER cgc + /usr/bin + /usr/local/bin ++ /opt/nvidia-cg-toolkit/bin + DOC "The Cg Compiler" + ) + GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH) +@@ -89,6 +90,7 @@ + FIND_PATH( CG_INCLUDE_PATH Cg/cg.h + /usr/include + /usr/local/include ++ /opt/nvidia-cg-toolkit/include + ${CG_COMPILER_SUPER_DIR}/include + DOC "The directory where Cg/cg.h resides" + ) +@@ -98,6 +100,7 @@ + /usr/lib + /usr/local/lib64 + /usr/local/lib ++ /opt/nvidia-cg-toolkit/lib + ${CG_COMPILER_SUPER_DIR}/lib64 + ${CG_COMPILER_SUPER_DIR}/lib + DOC "The Cg runtime library" +@@ -108,6 +111,7 @@ + /usr/lib + /usr/local/lib64 + /usr/local/lib ++ /opt/nvidia-cg-toolkit/lib + ${CG_COMPILER_SUPER_DIR}/lib64 + ${CG_COMPILER_SUPER_DIR}/lib + DOC "The Cg runtime library" diff --git a/sci-visualization/paraview/files/paraview-3.6.2-hdf-1.8.3.patch b/sci-visualization/paraview/files/paraview-3.6.2-hdf-1.8.3.patch new file mode 100644 index 000000000000..5499bdfc2291 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.6.2-hdf-1.8.3.patch @@ -0,0 +1,71 @@ +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-no-doc-finder.patch b/sci-visualization/paraview/files/paraview-3.6.2-no-doc-finder.patch new file mode 100644 index 000000000000..4681c2517ffd --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.6.2-no-doc-finder.patch @@ -0,0 +1,18 @@ +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-pointsprite-disable.patch b/sci-visualization/paraview/files/paraview-3.6.2-pointsprite-disable.patch new file mode 100644 index 000000000000..0c66b358d9f2 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.6.2-pointsprite-disable.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000000..f2ea294ed871 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.6.2-qt.patch @@ -0,0 +1,145 @@ +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/metadata.xml b/sci-visualization/paraview/metadata.xml index 9c2b0e6361c2..55e4b5ee7a05 100644 --- a/sci-visualization/paraview/metadata.xml +++ b/sci-visualization/paraview/metadata.xml @@ -9,5 +9,9 @@ <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='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> </use> </pkgmetadata> diff --git a/sci-visualization/paraview/paraview-3.6.2.ebuild b/sci-visualization/paraview/paraview-3.6.2.ebuild new file mode 100644 index 000000000000..1b0115e0d109 --- /dev/null +++ b/sci-visualization/paraview/paraview-3.6.2.ebuild @@ -0,0 +1,257 @@ +# Copyright 1999-2010 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.1 2010/01/16 19:58:32 markusle Exp $ + +EAPI="2" + +inherit distutils eutils flag-o-matic toolchain-funcs versionator python qt4 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="~x86 ~amd64" +SLOT="0" +IUSE="mpi +python hdf5 doc examples +gui plugins boost streaming cg overview mysql postgres odbc" +RDEPEND="hdf5? ( sci-libs/hdf5 ) + mpi? ( || ( + sys-cluster/openmpi + sys-cluster/mpich2[cxx] ) ) + python? ( dev-lang/python:2.6 ) + gui? ( x11-libs/qt-gui:4 + x11-libs/qt-qt3support:4 + x11-libs/qt-opengl:4 + x11-libs/qt-assistant:4 ) + mysql? ( virtual/mysql ) + postgres? ( virtual/postgresql-base ) + odbc? ( dev-db/unixODBC ) + dev-libs/libxml2 + media-libs/libpng + media-libs/jpeg + media-libs/tiff + media-video/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.37 ) + 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 +} + +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 + + if use hdf5 && 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" +} + +src_configure() { + python_version + 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 + -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 hdf5 PARAVIEW_USE_SYSTEM_HDF5) + $(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 + if use hdf5; then + append-flags -DH5_USE_16_API + fi + + 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.png \ + || 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.png \ + || 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 +} |