public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-visualization/paraview/files: paraview-3.6.2-hdf-1.8.3.patch paraview-3.6.2-qt.patch paraview-3.6.2-no-doc-finder.patch paraview-3.6.2-pointsprite-disable.patch paraview-3.6.2-about.html.patch paraview-3.6.2-assistant.patch paraview-3.6.2-findcg-cmake.patch
@ 2010-01-16 19:58 Markus Dittrich (markusle)
  0 siblings, 0 replies; only message in thread
From: Markus Dittrich (markusle) @ 2010-01-16 19:58 UTC (permalink / raw
  To: gentoo-commits

markusle    10/01/16 19:58:32

  Added:                paraview-3.6.2-hdf-1.8.3.patch
                        paraview-3.6.2-qt.patch
                        paraview-3.6.2-no-doc-finder.patch
                        paraview-3.6.2-pointsprite-disable.patch
                        paraview-3.6.2-about.html.patch
                        paraview-3.6.2-assistant.patch
                        paraview-3.6.2-findcg-cmake.patch
  Log:
  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).
  (Portage version: 2.1.7.16/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-visualization/paraview/files/paraview-3.6.2-hdf-1.8.3.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-hdf-1.8.3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-hdf-1.8.3.patch?rev=1.1&content-type=text/plain

Index: paraview-3.6.2-hdf-1.8.3.patch
===================================================================
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;
 



1.1                  sci-visualization/paraview/files/paraview-3.6.2-qt.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-qt.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-qt.patch?rev=1.1&content-type=text/plain

Index: paraview-3.6.2-qt.patch
===================================================================
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



1.1                  sci-visualization/paraview/files/paraview-3.6.2-no-doc-finder.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-no-doc-finder.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-no-doc-finder.patch?rev=1.1&content-type=text/plain

Index: paraview-3.6.2-no-doc-finder.patch
===================================================================
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)



1.1                  sci-visualization/paraview/files/paraview-3.6.2-pointsprite-disable.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-pointsprite-disable.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-pointsprite-disable.patch?rev=1.1&content-type=text/plain

Index: paraview-3.6.2-pointsprite-disable.patch
===================================================================
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}
+#)



1.1                  sci-visualization/paraview/files/paraview-3.6.2-about.html.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-about.html.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-about.html.patch?rev=1.1&content-type=text/plain

Index: paraview-3.6.2-about.html.patch
===================================================================
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(



1.1                  sci-visualization/paraview/files/paraview-3.6.2-assistant.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-assistant.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-assistant.patch?rev=1.1&content-type=text/plain

Index: paraview-3.6.2-assistant.patch
===================================================================
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 = "\\";



1.1                  sci-visualization/paraview/files/paraview-3.6.2-findcg-cmake.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-findcg-cmake.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.6.2-findcg-cmake.patch?rev=1.1&content-type=text/plain

Index: paraview-3.6.2-findcg-cmake.patch
===================================================================
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"






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2010-01-16 19:58 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-16 19:58 [gentoo-commits] gentoo-x86 commit in sci-visualization/paraview/files: paraview-3.6.2-hdf-1.8.3.patch paraview-3.6.2-qt.patch paraview-3.6.2-no-doc-finder.patch paraview-3.6.2-pointsprite-disable.patch paraview-3.6.2-about.html.patch paraview-3.6.2-assistant.patch paraview-3.6.2-findcg-cmake.patch Markus Dittrich (markusle)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox