summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/vtk/files')
-rw-r--r--sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch12
-rw-r--r--sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch194
-rw-r--r--sci-libs/vtk/files/vtk-5.4.2-cg-path.patch35
-rw-r--r--sci-libs/vtk/files/vtk-5.4.2-libpng14.patch20
-rw-r--r--sci-libs/vtk/files/vtk-5.6.0-R.patch57
-rw-r--r--sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch13
-rw-r--r--sci-libs/vtk/files/vtk-5.6.0-cg-path.patch36
-rw-r--r--sci-libs/vtk/files/vtk-5.6.0-libpng14.patch22
-rw-r--r--sci-libs/vtk/files/vtk-5.6.0-odbc.patch12
9 files changed, 401 insertions, 0 deletions
diff --git a/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch b/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch
new file mode 100644
index 0000000..c7da786
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch
@@ -0,0 +1,12 @@
+diff -Naur VTK/CMakeLists.txt VTK.new/CMakeLists.txt
+--- VTK/CMakeLists.txt 2008-05-13 17:50:09.000000000 -0400
++++ VTK.new/CMakeLists.txt 2008-10-05 10:34:42.000000000 -0400
+@@ -182,7 +182,7 @@
+ # Compute the proper location for installing the Tcl package. This
+ # must be a fixed relative path below the library install location and
+ # is therefore not settable by parent projects.
+-SET(VTK_INSTALL_TCL_DIR ${VTK_INSTALL_LIB_DIR})
++SET(VTK_INSTALL_TCL_DIR ${VTK_INSTALL_PACKAGE_DIR})
+
+ IF(NOT VTK_INSTALL_JAVA_DIR)
+ SET(VTK_INSTALL_JAVA_DIR ${VTK_INSTALL_PACKAGE_DIR}/java)
diff --git a/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch b/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch
new file mode 100644
index 0000000..90c6d6a
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch
@@ -0,0 +1,194 @@
+diff --git a/Infovis/Testing/Cxx/TestBoostAdapter.cxx b/Infovis/Testing/Cxx/TestBoostAdapter.cxx
+index 6af2855..484a9e0 100644
+--- a/Infovis/Testing/Cxx/TestBoostAdapter.cxx
++++ b/Infovis/Testing/Cxx/TestBoostAdapter.cxx
+@@ -36,8 +36,8 @@
+ #include <boost/graph/strong_components.hpp>
+ #include <boost/graph/dijkstra_shortest_paths.hpp>
+ #include <boost/graph/transitive_closure.hpp>
+-#include <boost/property_map.hpp>
+-#include <boost/vector_property_map.hpp>
++#include <boost/property_map/property_map.hpp>
++#include <boost/property_map/vector_property_map.hpp>
+
+ #include "vtkGraph.h"
+ #include "vtkBoostGraphAdapter.h"
+diff --git a/Infovis/vtkBoostBiconnectedComponents.cxx b/Infovis/vtkBoostBiconnectedComponents.cxx
+index 6799dd0..dd759d5 100644
+--- a/Infovis/vtkBoostBiconnectedComponents.cxx
++++ b/Infovis/vtkBoostBiconnectedComponents.cxx
+@@ -32,7 +32,7 @@
+ #include "vtkGraph.h"
+ #include "vtkBoostGraphAdapter.h"
+ #include <boost/graph/biconnected_components.hpp>
+-#include <boost/vector_property_map.hpp>
++#include <boost/property_map/vector_property_map.hpp>
+ #include <boost/version.hpp>
+ #include <vtksys/stl/vector>
+ #include <vtksys/stl/utility>
+diff --git a/Infovis/vtkBoostBrandesCentrality.cxx b/Infovis/vtkBoostBrandesCentrality.cxx
+index e214a72..443c039 100644
+--- a/Infovis/vtkBoostBrandesCentrality.cxx
++++ b/Infovis/vtkBoostBrandesCentrality.cxx
+@@ -36,7 +36,7 @@
+
+ #include <boost/graph/adjacency_list.hpp>
+ #include <boost/graph/betweenness_centrality.hpp>
+-#include <boost/vector_property_map.hpp>
++#include <boost/property_map/vector_property_map.hpp>
+
+ using namespace boost;
+
+diff --git a/Infovis/vtkBoostBreadthFirstSearch.cxx b/Infovis/vtkBoostBreadthFirstSearch.cxx
+index 7fab585..6e56a7c 100644
+--- a/Infovis/vtkBoostBreadthFirstSearch.cxx
++++ b/Infovis/vtkBoostBreadthFirstSearch.cxx
+@@ -46,8 +46,8 @@
+
+ #include <boost/graph/visitors.hpp>
+ #include <boost/graph/breadth_first_search.hpp>
+-#include <boost/property_map.hpp>
+-#include <boost/vector_property_map.hpp>
++#include <boost/property_map/property_map.hpp>
++#include <boost/property_map/vector_property_map.hpp>
+ #include <boost/pending/queue.hpp>
+
+ #include <vtksys/stl/utility> // for pair
+diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+index 5c64516..64ee7b5 100644
+--- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx
++++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+@@ -39,7 +39,7 @@
+ #include "vtkTree.h"
+
+ #include <boost/graph/breadth_first_search.hpp>
+-#include <boost/vector_property_map.hpp>
++#include <boost/property_map/vector_property_map.hpp>
+ #include <boost/pending/queue.hpp>
+
+ using namespace boost;
+diff --git a/Infovis/vtkBoostConnectedComponents.cxx b/Infovis/vtkBoostConnectedComponents.cxx
+index 69e9d8f..c88f4ab 100644
+--- a/Infovis/vtkBoostConnectedComponents.cxx
++++ b/Infovis/vtkBoostConnectedComponents.cxx
+@@ -33,7 +33,7 @@
+
+ #include "vtkBoostGraphAdapter.h"
+ #include <boost/graph/strong_components.hpp>
+-#include <boost/vector_property_map.hpp>
++#include <boost/property_map/vector_property_map.hpp>
+
+ using namespace boost;
+
+diff --git a/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx b/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx
+index b0c89de..7ea3aa9 100644
+--- a/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx
++++ b/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx
+@@ -40,7 +40,7 @@ PURPOSE. See the above copyright notice for more information.
+ #include "vtkTree.h"
+
+ #include <boost/graph/kruskal_min_spanning_tree.hpp>
+-#include <boost/vector_property_map.hpp>
++#include <boost/property_map/vector_property_map.hpp>
+ #include <boost/pending/queue.hpp>
+
+ using namespace boost;
+diff --git a/Infovis/vtkBoostPrimMinimumSpanningTree.cxx b/Infovis/vtkBoostPrimMinimumSpanningTree.cxx
+index 935d0f7..48716fd 100644
+--- a/Infovis/vtkBoostPrimMinimumSpanningTree.cxx
++++ b/Infovis/vtkBoostPrimMinimumSpanningTree.cxx
+@@ -39,7 +39,7 @@ PURPOSE. See the above copyright notice for more information.
+ #include "vtkTree.h"
+
+ #include <boost/graph/prim_minimum_spanning_tree.hpp>
+-#include <boost/vector_property_map.hpp>
++#include <boost/property_map/vector_property_map.hpp>
+ #include <boost/pending/queue.hpp>
+
+ using namespace boost;
+diff --git a/Infovis/vtkTreeLayoutStrategy.cxx b/Infovis/vtkTreeLayoutStrategy.cxx
+index 6efa586..222afe9 100644
+--- a/Infovis/vtkTreeLayoutStrategy.cxx
++++ b/Infovis/vtkTreeLayoutStrategy.cxx
+@@ -375,8 +375,8 @@ 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/vector_property_map.hpp>
++#include <boost/property_map/property_map.hpp>
++#include <boost/property_map/vector_property_map.hpp>
+ #include <boost/pending/queue.hpp>
+
+ using namespace boost;
+diff --git a/Parallel/vtkPBGLBreadthFirstSearch.cxx b/Parallel/vtkPBGLBreadthFirstSearch.cxx
+index 2b4681b..eebeaa9 100644
+--- a/Parallel/vtkPBGLBreadthFirstSearch.cxx
++++ b/Parallel/vtkPBGLBreadthFirstSearch.cxx
+@@ -50,8 +50,8 @@
+ #include <boost/graph/distributed/breadth_first_search.hpp>
+ #include <boost/parallel/algorithm.hpp>
+ #include <boost/graph/visitors.hpp>
+-#include <boost/property_map.hpp>
+-#include <boost/vector_property_map.hpp>
++#include <boost/property_map/property_map.hpp>
++#include <boost/property_map/vector_property_map.hpp>
+ #include <boost/pending/queue.hpp>
+
+ #include <vtksys/stl/utility> // for pair
+diff --git a/Parallel/vtkPBGLGraphAdapter.h b/Parallel/vtkPBGLGraphAdapter.h
+index 7b467b0..bacfd3a 100644
+--- a/Parallel/vtkPBGLGraphAdapter.h
++++ b/Parallel/vtkPBGLGraphAdapter.h
+@@ -31,7 +31,7 @@
+ #include <boost/graph/distributed/mpi_process_group.hpp>
+ #include <boost/graph/properties.hpp>
+ #include <boost/graph/parallel/container_traits.hpp>
+-#include <boost/parallel/local_property_map.hpp>
++#include <boost/property_map/parallel/local_property_map.hpp>
+ #include <boost/serialization/base_object.hpp>
+ #include <boost/functional/hash.hpp>
+ //ETX
+diff --git a/Parallel/vtkPBGLMinimumSpanningTree.cxx b/Parallel/vtkPBGLMinimumSpanningTree.cxx
+index da4647e..f9c3229 100644
+--- a/Parallel/vtkPBGLMinimumSpanningTree.cxx
++++ b/Parallel/vtkPBGLMinimumSpanningTree.cxx
+@@ -48,8 +48,8 @@
+ #include <boost/graph/distributed/dehne_gotz_min_spanning_tree.hpp>
+ #include <boost/graph/distributed/vertex_list_adaptor.hpp>
+ #include <boost/parallel/global_index_map.hpp>
+-#include <boost/property_map.hpp>
+-#include <boost/vector_property_map.hpp>
++#include <boost/property_map/property_map.hpp>
++#include <boost/property_map/vector_property_map.hpp>
+ #include <boost/pending/queue.hpp>
+
+ #include <vtksys/stl/utility> // for pair
+diff --git a/Parallel/vtkPBGLShortestPaths.cxx b/Parallel/vtkPBGLShortestPaths.cxx
+index 074143f..8517304 100644
+--- a/Parallel/vtkPBGLShortestPaths.cxx
++++ b/Parallel/vtkPBGLShortestPaths.cxx
+@@ -49,8 +49,8 @@
+
+ #include <boost/graph/distributed/delta_stepping_shortest_paths.hpp>
+ #include <boost/parallel/algorithm.hpp>
+-#include <boost/property_map.hpp>
+-#include <boost/vector_property_map.hpp>
++#include <boost/property_map/property_map.hpp>
++#include <boost/property_map/vector_property_map.hpp>
+
+ #include <vtksys/stl/utility> // for pair
+
+diff --git a/Parallel/vtkPBGLVertexColoring.cxx b/Parallel/vtkPBGLVertexColoring.cxx
+index 9aa87a0..301a245 100644
+--- a/Parallel/vtkPBGLVertexColoring.cxx
++++ b/Parallel/vtkPBGLVertexColoring.cxx
+@@ -47,7 +47,7 @@
+
+ #include <boost/graph/distributed/boman_et_al_graph_coloring.hpp>
+ #include <boost/parallel/algorithm.hpp>
+-#include <boost/property_map.hpp>
++#include <boost/property_map/property_map.hpp>
+
+ #include <vtksys/stl/utility> // for pair
+
diff --git a/sci-libs/vtk/files/vtk-5.4.2-cg-path.patch b/sci-libs/vtk/files/vtk-5.4.2-cg-path.patch
new file mode 100644
index 0000000..53d43ee
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.4.2-cg-path.patch
@@ -0,0 +1,35 @@
+diff -Naur VTK/CMake/FindCg.cmake VTK.new/CMake/FindCg.cmake
+--- VTK/CMake/FindCg.cmake 2005-10-04 11:25:51.000000000 -0400
++++ VTK.new/CMake/FindCg.cmake 2009-07-17 14:10:30.000000000 -0400
+@@ -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-libs/vtk/files/vtk-5.4.2-libpng14.patch b/sci-libs/vtk/files/vtk-5.4.2-libpng14.patch
new file mode 100644
index 0000000..1f12ae9
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.4.2-libpng14.patch
@@ -0,0 +1,20 @@
+--- IO/vtkPNGReader.cxx
++++ IO/vtkPNGReader.cxx
+@@ -116,7 +116,7 @@
+ // 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 @@
+ // 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
diff --git a/sci-libs/vtk/files/vtk-5.6.0-R.patch b/sci-libs/vtk/files/vtk-5.6.0-R.patch
new file mode 100644
index 0000000..1327121
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.6.0-R.patch
@@ -0,0 +1,57 @@
+diff --git a/CMake/FindR.cmake b/CMake/FindR.cmake
+index ee49570..c830db0 100644
+--- a/CMake/FindR.cmake
++++ b/CMake/FindR.cmake
+@@ -18,13 +18,12 @@ IF (R_COMMAND)
+ ENDIF (R_COMMAND)
+ SET(CMAKE_FIND_APPBUNDLE ${TEMP_CMAKE_FIND_APPBUNDLE})
+
+-FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/local/lib /usr/local/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h")
++FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/lib /usr/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h")
+ FIND_LIBRARY(R_LIBRARY_BASE R PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "R library (example libR.a, libR.dylib, etc.).")
+-FIND_LIBRARY(R_LIBRARY_BLAS Rblas PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rblas library (example libRblas.a, libRblas.dylib, etc.).")
+-FIND_LIBRARY(R_LIBRARY_LAPACK Rlapack PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rlapack library (example libRlapack.a, libRlapack.dylib, etc.).")
++FIND_LIBRARY(R_LIBRARY_MATH Rmath PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rmath library (example libRmath.a, libRmath.dylib, etc.).")
+ FIND_LIBRARY(R_LIBRARY_READLINE readline DOC "(Optional) system readline library. Only required if the R libraries were build with readline support.")
+
+-SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_BLAS} ${R_LIBRARY_LAPACK} ${R_LIBRARY_BASE})
++SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_MATH} ${R_LIBRARY_BASE})
+ IF (R_LIBRARY_READLINE)
+ SET(R_LIBRARIES ${R_LIBRARIES} ${R_LIBRARY_READLINE})
+ ENDIF (R_LIBRARY_READLINE)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9d4e881..1a828a4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1054,8 +1054,18 @@ IF(VTK_WRAP_JAVA)
+ ENDIF(JAVA_AWT_LIBRARY)
+ ENDIF(VTK_WRAP_JAVA)
+
++IF(VTK_USE_GNU_R)
++ FIND_PACKAGE(R)
++ENDIF(VTK_USE_GNU_R)
+
+-
++IF(VTK_USE_BOOST)
++ if (VTK_USE_PARALLEL_BGL)
++ FIND_PACKAGE(Boost 1.39.0 REQUIRED
++ COMPONENTS mpi serialization filesystem system graph_parallel)
++ else (VTK_USE_PARALLEL_BGL)
++ FIND_PACKAGE(Boost REQUIRED)
++ endif (VTK_USE_PARALLEL_BGL)
++ENDIF(VTK_USE_BOOST)
+ #-----------------------------------------------------------------------------
+ # The entire VTK tree should use the same include path.
+
+diff --git a/Graphics/vtkRInterface.cxx b/Graphics/vtkRInterface.cxx
+index 324e845..56a4869 100644
+--- a/Graphics/vtkRInterface.cxx
++++ b/Graphics/vtkRInterface.cxx
+@@ -23,6 +23,7 @@
+ #undef HAVE_UINTPTR_T
+ #ifdef HAVE_VTK_UINTPTR_T
+ #define HAVE_UINTPTR_T HAVE_VTK_UINTPTR_T
++#include <stdint.h>
+ #endif
+
+ #include "vtkInformation.h"
diff --git a/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch b/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch
new file mode 100644
index 0000000..9319378
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch
@@ -0,0 +1,13 @@
+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;
diff --git a/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch b/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch
new file mode 100644
index 0000000..984bf50
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch
@@ -0,0 +1,36 @@
+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"
diff --git a/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch b/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch
new file mode 100644
index 0000000..db1f87d
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch
@@ -0,0 +1,22 @@
+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
diff --git a/sci-libs/vtk/files/vtk-5.6.0-odbc.patch b/sci-libs/vtk/files/vtk-5.6.0-odbc.patch
new file mode 100644
index 0000000..be24af1
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.6.0-odbc.patch
@@ -0,0 +1,12 @@
+diff -Naur CMake/FindODBC.cmake.orig CMake/FindODBC.cmake
+--- CMake/FindODBC.cmake.orig 2008-10-08 13:51:36.000000000 -0400
++++ CMake/FindODBC.cmake 2010-01-21 22:11:26.000000000 -0500
+@@ -30,7 +30,7 @@
+ )
+
+ FIND_LIBRARY( ODBC_LIBRARY
+- NAMES iodbc unixodbc
++ NAMES iodbc unixodbc odbc
+ PATHS
+ /usr/lib
+ /usr/lib/odbc