[gentoo-commits] gentoo-x86 commit in sci-libs/vtk/files: vtk-5.6.0-cg-path.patch vtk-5.6.0-libpng14.patch vtk-5.6.0-boost-property_map.patch

[Justin Lecher (jlec)]

jlec        10/05/28 11:51:25

  Added:                vtk-5.6.0-cg-path.patch vtk-5.6.0-libpng14.patch
                        vtk-5.6.0-boost-property_map.patch
  Log:
  Version Bump #321505; Added support for ogg R; prelimary support for PREFIX
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-libs/vtk/files/vtk-5.6.0-cg-path.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch?rev=1.1&content-type=text/plain

Index: vtk-5.6.0-cg-path.patch
===================================================================
diff --git a/CMake/FindCg.cmake b/CMake/FindCg.cmake
index ceb41de..5eb6003 100644
--- a/CMake/FindCg.cmake
+++ b/CMake/FindCg.cmake
@@ -82,6 +82,7 @@ ELSE (APPLE)
     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 @@ ELSE (APPLE)
     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 @@ ELSE (APPLE)
       /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 @@ ELSE (APPLE)
       /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"



1.1                  sci-libs/vtk/files/vtk-5.6.0-libpng14.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch?rev=1.1&content-type=text/plain

Index: vtk-5.6.0-libpng14.patch
===================================================================
diff --git a/IO/vtkPNGReader.cxx b/IO/vtkPNGReader.cxx
index d1f5c2f..0bf00e4 100644
--- a/IO/vtkPNGReader.cxx
+++ b/IO/vtkPNGReader.cxx
@@ -116,7 +116,7 @@ void vtkPNGReader::ExecuteInformation()
   // minimum of a byte per pixel
   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) 
     {
-    png_set_gray_1_2_4_to_8(png_ptr);
+    png_set_expand_gray_1_2_4_to_8(png_ptr);
     }
 
   // add alpha if any alpha found
@@ -225,7 +225,7 @@ void vtkPNGReaderUpdate2(vtkPNGReader *self, OT *outPtr,
   // minimum of a byte per pixel
   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) 
     {
-    png_set_gray_1_2_4_to_8(png_ptr);
+    png_set_expand_gray_1_2_4_to_8(png_ptr);
     }
 
   // add alpha if any alpha found



1.1                  sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch?rev=1.1&content-type=text/plain

Index: vtk-5.6.0-boost-property_map.patch
===================================================================
diff --git a/Infovis/vtkBoostGraphAdapter.h b/Infovis/vtkBoostGraphAdapter.h
index 5d113ac..d84cb98 100644
--- a/Infovis/vtkBoostGraphAdapter.h
+++ b/Infovis/vtkBoostGraphAdapter.h
@@ -50,7 +50,7 @@ namespace boost {
   // These need to be defined before including other boost stuff
 
   // Forward declarations are required here, so that we aren't forced
-  // to include boost/property_map.hpp.
+  // to include boost/property_map/property_map.hpp.
   template<typename> class property_traits;
   class read_write_property_map_tag;
 
diff --git a/Infovis/vtkTreeLayoutStrategy.cxx b/Infovis/vtkTreeLayoutStrategy.cxx
index 4a764ea..74d0b53 100644
--- a/Infovis/vtkTreeLayoutStrategy.cxx
+++ b/Infovis/vtkTreeLayoutStrategy.cxx
@@ -388,7 +388,7 @@ void vtkTreeLayoutStrategy::PrintSelf(ostream& os, vtkIndent indent)
 #include "vtkTreeToBoostAdapter.h"
 #include <boost/graph/visitors.hpp>
 #include <boost/graph/depth_first_search.hpp>
-#include <boost/property_map.hpp>
+#include <boost/property_map/property_map.hpp>
 #include <boost/pending/queue.hpp>
 
 using namespace boost;