diff options
22 files changed, 40 insertions, 934 deletions
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog index 3763fd959..593ce9f32 100644 --- a/sci-libs/vtk/ChangeLog +++ b/sci-libs/vtk/ChangeLog @@ -2,6 +2,20 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.108 2013/06/05 01:21:35 lu_zero Exp $ + 16 Jul 2013; Justin Lecher <jlec@gentoo.org> vtk-6.0.0.ebuild, + -files/vtk-5.2.0-tcl-install.patch, + -files/vtk-5.4.2-boost-property_map.patch, -files/vtk-5.4.2-cg-path.patch, + -files/vtk-5.4.2-libpng14.patch, -files/vtk-5.6.0-R.patch, + -files/vtk-5.6.0-boost-property_map.patch, -files/vtk-5.6.0-cg-path.patch, + -files/vtk-5.6.0-ffmpeg.patch, -files/vtk-5.6.0-libpng14.patch, + -files/vtk-5.6.0-odbc.patch, -files/vtk-5.6.1-ffmpeg.patch, + -files/vtk-5.6.1-gcc-46.patch, -files/vtk-5.6.1-libav-0.8.patch, + -files/vtk-5.6.1-libpng15.patch, -files/vtk-5.8.0-R.patch, + -files/vtk-5.8.0-boost.patch, -files/vtk-5.10.1-ffmpeg-1.patch, + -files/vtk-5.10.1-libav-9.patch, -files/vtk-5.10.1-tcl8.6.patch, + metadata.xml: + Version BUmp + *vtk-6.0.0 (11 Jul 2013) 11 Jul 2013; Justin Lecher <jlec@gentoo.org> +vtk-6.0.0.ebuild, diff --git a/sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch b/sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch deleted file mode 100644 index 2cefb1259..000000000 --- a/sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch +++ /dev/null @@ -1,49 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=450464 - -Index: VTK5.10.1/IO/vtkFFMPEGWriter.cxx -=================================================================== ---- VTK5.10.1.orig/IO/vtkFFMPEGWriter.cxx -+++ VTK5.10.1/IO/vtkFFMPEGWriter.cxx -@@ -192,13 +192,6 @@ int vtkFFMPEGWriterInternal::Start() - c->bit_rate_tolerance = this->Writer->GetBitRateTolerance(); - } - -- //apply the chosen parameters -- if (av_set_parameters(this->avFormatContext, NULL) < 0) -- { -- vtkGenericWarningMacro (<< "Invalid output format parameters." ); -- return 0; -- } -- - //manufacture a codec with the chosen parameters - AVCodec *codec = avcodec_find_encoder(c->codec_id); - if (!codec) -@@ -259,14 +252,17 @@ int vtkFFMPEGWriterInternal::Start() - - - //Finally, open the file and start it off. -- if (url_fopen(&this->avFormatContext->pb, this->avFormatContext->filename, URL_WRONLY) < 0) -+ if (avio_open(&this->avFormatContext->pb, this->avFormatContext->filename, AVIO_FLAG_WRITE) < 0) - { - vtkGenericWarningMacro (<< "Could not open " << this->Writer->GetFileName() << "." ); - return 0; - } - this->openedFile = 1; - -- av_write_header(this->avFormatContext); -+ if(avformat_write_header(this->avFormatContext, NULL) < 0) { -+ vtkGenericWarningMacro (<< "Failed to write header." ); -+ return 0; -+ } - return 1; - } - -@@ -391,7 +387,7 @@ void vtkFFMPEGWriterInternal::End() - #ifdef VTK_FFMPEG_OLD_URL_FCLOSE - url_fclose(&this->avFormatContext->pb); - #else -- url_fclose(this->avFormatContext->pb); -+ avio_close(this->avFormatContext->pb); - #endif - this->openedFile = 0; - } diff --git a/sci-libs/vtk/files/vtk-5.10.1-libav-9.patch b/sci-libs/vtk/files/vtk-5.10.1-libav-9.patch deleted file mode 100644 index eb7b71c5e..000000000 --- a/sci-libs/vtk/files/vtk-5.10.1-libav-9.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff -burN VTK5.10.1.old/IO/vtkFFMPEGWriter.cxx VTK5.10.1/IO/vtkFFMPEGWriter.cxx ---- VTK5.10.1.old/IO/vtkFFMPEGWriter.cxx 2013-05-25 01:26:52.768954436 +0200 -+++ VTK5.10.1/IO/vtkFFMPEGWriter.cxx 2013-05-25 11:13:53.112672449 +0200 -@@ -60,9 +60,6 @@ - - AVStream *avStream; - -- unsigned char *codecBuf; -- int codecBufSize; -- - AVFrame *rgbInput; - AVFrame *yuvOutput; - -@@ -83,7 +80,6 @@ - - this->avStream = NULL; - -- this->codecBuf = NULL; - this->rgbInput = NULL; - this->yuvOutput = NULL; - -@@ -140,7 +136,7 @@ - strcpy(this->avFormatContext->filename, this->Writer->GetFileName()); - - //create a stream for that file -- this->avStream = av_new_stream(this->avFormatContext, 0); -+ this->avStream = avformat_new_stream(this->avFormatContext, NULL); - if (!this->avStream) - { - vtkGenericWarningMacro (<< "Could not create video stream."); -@@ -199,7 +195,7 @@ - vtkGenericWarningMacro (<< "Codec not found." ); - return 0; - } -- if (avcodec_open(c, codec) < 0) -+ if (avcodec_open2(c, codec, NULL) < 0) - { - vtkGenericWarningMacro (<< "Could not open codec."); - return 0; -@@ -207,15 +203,6 @@ - - //create buffers for the codec to work with. - -- //working compression space -- this->codecBufSize = 2*c->width*c->height*4; //hopefully this is enough -- this->codecBuf = new unsigned char[this->codecBufSize]; -- if (!this->codecBuf) -- { -- vtkGenericWarningMacro (<< "Could not make codec working space." ); -- return 0; -- } -- - //for the output of the writer's input... - this->rgbInput = avcodec_alloc_frame(); - if (!this->rgbInput) -@@ -316,38 +303,24 @@ - return 0; - } - #endif -- -+ AVPacket pkt = { 0 }; -+ int got_frame; - - //run the encoder -- int toAdd = avcodec_encode_video(cc, -- this->codecBuf, -- this->codecBufSize, -- this->yuvOutput); -+ int ret = avcodec_encode_video2(cc, -+ &pkt, -+ this->yuvOutput, -+ &got_frame); - - //dump the compressed result to file -- if (toAdd) -+ if (got_frame) - { -- //create an avpacket to output the compressed result -- AVPacket pkt; -- av_init_packet(&pkt); -- -- //to do playback at actual recorded rate, this will need more work -- pkt.pts = cc->coded_frame->pts; -- //pkt.dts = ?; not dure what decompression time stamp should be -- pkt.data = this->codecBuf; -- pkt.size = toAdd; - pkt.stream_index = this->avStream->index; -- if (cc->coded_frame->key_frame) //treat keyframes well -- { -- pkt.flags |= AV_PKT_FLAG_KEY; -- } -- pkt.duration = 0; //presentation duration in time_base units or 0 if NA -- pkt.pos = -1; //byte position in stream or -1 if NA - -- toAdd = av_write_frame(this->avFormatContext, &pkt); -+ ret = av_write_frame(this->avFormatContext, &pkt); - } - -- if (toAdd) //should not have anything left over -+ if (ret < 0) //should not have anything left over - { - vtkGenericWarningMacro (<< "Problem encoding frame." ); - return 0; -@@ -373,12 +346,6 @@ - this->rgbInput = NULL; - } - -- if (this->codecBuf) -- { -- av_free(this->codecBuf); -- this->codecBuf = NULL; -- } -- - if (this->avFormatContext) - { - if (this->openedFile) -Binary files VTK5.10.1.old/IO/.vtkFFMPEGWriter.cxx.swp and VTK5.10.1/IO/.vtkFFMPEGWriter.cxx.swp differ diff --git a/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch b/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch deleted file mode 100644 index ed7ec08c2..000000000 --- a/sci-libs/vtk/files/vtk-5.10.1-tcl8.6.patch +++ /dev/null @@ -1,57 +0,0 @@ - Common/vtkTclUtil.cxx | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -diff --git a/Common/vtkTclUtil.cxx b/Common/vtkTclUtil.cxx -index 390b0a4..2b7bccb 100644 ---- a/Common/vtkTclUtil.cxx -+++ b/Common/vtkTclUtil.cxx -@@ -21,6 +21,12 @@ - #include <string> - #include <vtksys/SystemTools.hxx> - -+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6) -+#define vtkTclGetErrorLine(m) (m->errorLine) -+#else -+#define vtkTclGetErrorLine(m) (Tcl_GetErrorLine(m)) -+#endif -+ - extern "C" - { - #if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4) -@@ -490,13 +496,15 @@ VTKTCL_EXPORT void vtkTclVoidFunc(void *arg) - vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << - arg2->command << endl << - Tcl_GetVar(arg2->interp,(char *)("errorInfo"),0) << -- " at line number " << arg2->interp->errorLine); -+ " at line number " << -+ vtkTclGetErrorLine(arg2->interp)); - } - else - { - vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << - arg2->command << endl << -- " at line number " << arg2->interp->errorLine); -+ " at line number " << -+ vtkTclGetErrorLine(arg2->interp)); - } - } - } -@@ -723,14 +731,15 @@ void vtkTclCommand::Execute(vtkObject *, unsigned long, void *) - vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << - this->StringCommand << endl << - Tcl_GetVar(this->Interp,(char *)("errorInfo"),0) << -- " at line number " << this->Interp->errorLine); -+ " at line number " << -+ vtkTclGetErrorLine(this->Interp)); - } - else - { - vtkGenericWarningMacro("Error returned from vtk/tcl callback:\n" << - this->StringCommand << endl << -- " at line number " << -- this->Interp->errorLine); -+ " at line number " << -+ vtkTclGetErrorLine(this->Interp)); - } - } - else if (res == -1) 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 deleted file mode 100644 index c7da78678..000000000 --- a/sci-libs/vtk/files/vtk-5.2.0-tcl-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 90c6d6a1f..000000000 --- a/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch +++ /dev/null @@ -1,194 +0,0 @@ -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 deleted file mode 100644 index 53d43ee80..000000000 --- a/sci-libs/vtk/files/vtk-5.4.2-cg-path.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index 1f12ae926..000000000 --- a/sci-libs/vtk/files/vtk-5.4.2-libpng14.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index 1327121c2..000000000 --- a/sci-libs/vtk/files/vtk-5.6.0-R.patch +++ /dev/null @@ -1,57 +0,0 @@ -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 deleted file mode 100644 index 9319378ac..000000000 --- a/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 984bf5008..000000000 --- a/sci-libs/vtk/files/vtk-5.6.0-cg-path.patch +++ /dev/null @@ -1,36 +0,0 @@ -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-ffmpeg.patch b/sci-libs/vtk/files/vtk-5.6.0-ffmpeg.patch deleted file mode 100644 index 2b600c067..000000000 --- a/sci-libs/vtk/files/vtk-5.6.0-ffmpeg.patch +++ /dev/null @@ -1,42 +0,0 @@ - CMake/vtkFFMPEGTestAvAlloc.cxx | 2 +- - CMake/vtkFFMPEGTestURLFClose.cxx | 2 +- - IO/vtkFFMPEGWriter.cxx | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMake/vtkFFMPEGTestAvAlloc.cxx b/CMake/vtkFFMPEGTestAvAlloc.cxx -index ad691e3..1025c22 100644 ---- a/CMake/vtkFFMPEGTestAvAlloc.cxx -+++ b/CMake/vtkFFMPEGTestAvAlloc.cxx -@@ -1,6 +1,6 @@ - extern "C" { - #ifdef HAS_OLD_HEADER --# include <ffmpeg/avformat.h> -+# include <libavformat/avformat.h> - #else - # include <libavformat/avformat.h> - #endif -diff --git a/CMake/vtkFFMPEGTestURLFClose.cxx b/CMake/vtkFFMPEGTestURLFClose.cxx -index 0bf4314..8c1df58 100644 ---- a/CMake/vtkFFMPEGTestURLFClose.cxx -+++ b/CMake/vtkFFMPEGTestURLFClose.cxx -@@ -1,6 +1,6 @@ - extern "C" { - #ifdef HAS_OLD_HEADER --# include <ffmpeg/avformat.h> -+# include <libavformat/avformat.h> - #else - # include <libavformat/avformat.h> - #endif -diff --git a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx -index b109c08..e056418 100644 ---- a/IO/vtkFFMPEGWriter.cxx -+++ b/IO/vtkFFMPEGWriter.cxx -@@ -22,7 +22,7 @@ - - extern "C" { - #ifdef VTK_FFMPEG_HAS_OLD_HEADER --# include <ffmpeg/avformat.h> -+# include <libavformat/avformat.h> - #else - # include <libavformat/avformat.h> - #endif diff --git a/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch b/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch deleted file mode 100644 index db1f87d3a..000000000 --- a/sci-libs/vtk/files/vtk-5.6.0-libpng14.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index be24af11a..000000000 --- a/sci-libs/vtk/files/vtk-5.6.0-odbc.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 diff --git a/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch b/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch deleted file mode 100644 index 34ec52885..000000000 --- a/sci-libs/vtk/files/vtk-5.6.1-ffmpeg.patch +++ /dev/null @@ -1,42 +0,0 @@ - CMake/vtkFFMPEGTestAvAlloc.cxx | 2 +- - CMake/vtkFFMPEGTestURLFClose.cxx | 2 +- - IO/vtkFFMPEGWriter.cxx | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMake/vtkFFMPEGTestAvAlloc.cxx b/CMake/vtkFFMPEGTestAvAlloc.cxx -index ad691e3..32489d5 100644 ---- a/CMake/vtkFFMPEGTestAvAlloc.cxx -+++ b/CMake/vtkFFMPEGTestAvAlloc.cxx -@@ -1,6 +1,6 @@ - extern "C" { - #ifdef HAS_OLD_HEADER --# include <ffmpeg/avformat.h> -+# include <libavformat/avformat.h> - #else - # include <libavformat/avformat.h> - #endif -diff --git a/CMake/vtkFFMPEGTestURLFClose.cxx b/CMake/vtkFFMPEGTestURLFClose.cxx -index 0bf4314..1c10a93 100644 ---- a/CMake/vtkFFMPEGTestURLFClose.cxx -+++ b/CMake/vtkFFMPEGTestURLFClose.cxx -@@ -1,6 +1,6 @@ - extern "C" { - #ifdef HAS_OLD_HEADER --# include <ffmpeg/avformat.h> -+# include <libavformat/avformat.h> - #else - # include <libavformat/avformat.h> - #endif -diff --git a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx -index 52673ef..ffbb78f 100644 ---- a/IO/vtkFFMPEGWriter.cxx -+++ b/IO/vtkFFMPEGWriter.cxx -@@ -22,7 +22,7 @@ - - extern "C" { - #ifdef VTK_FFMPEG_HAS_OLD_HEADER --# include <ffmpeg/avformat.h> -+# include <libavformat/avformat.h> - #else - # include <libavformat/avformat.h> - #endif diff --git a/sci-libs/vtk/files/vtk-5.6.1-gcc-46.patch b/sci-libs/vtk/files/vtk-5.6.1-gcc-46.patch deleted file mode 100644 index 263e24f69..000000000 --- a/sci-libs/vtk/files/vtk-5.6.1-gcc-46.patch +++ /dev/null @@ -1,29 +0,0 @@ - Common/vtkPythonUtil.cxx | 2 ++ - Utilities/vtkmetaio/metaUtils.cxx | 1 + - 2 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/Common/vtkPythonUtil.cxx b/Common/vtkPythonUtil.cxx -index 7bc7660..d218e0d 100644 ---- a/Common/vtkPythonUtil.cxx -+++ b/Common/vtkPythonUtil.cxx -@@ -31,6 +31,8 @@ - #include <vtkstd/map> - #include <vtkstd/string> - -+#include <cstddef> -+ - // Silent warning like - // "dereferencing type-punned pointer will break strict-aliasing rules" - // it happens because this kind of expression: (long *)&ptr -diff --git a/Utilities/vtkmetaio/metaUtils.cxx b/Utilities/vtkmetaio/metaUtils.cxx -index 08d3e8d..bbcc9ec 100644 ---- a/Utilities/vtkmetaio/metaUtils.cxx -+++ b/Utilities/vtkmetaio/metaUtils.cxx -@@ -37,6 +37,7 @@ - #include <stdlib.h> - #include <string.h> - #include <string> -+#include <cstddef> - - #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580) - #include <mem.h> diff --git a/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch b/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch deleted file mode 100644 index 523919d6f..000000000 --- a/sci-libs/vtk/files/vtk-5.6.1-libav-0.8.patch +++ /dev/null @@ -1,66 +0,0 @@ -Description: Upstream changes introduced in version 5.6.1-6.1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - vtk (5.6.1-6.1) unstable; urgency=low - . - [ Michael Schutte ] - * Non-maintainer upload. - * Remove absolute paths to required libraries from - /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes: - #506992. Due to the multiarch transition, the original behavior - frequently causes reverse build-deps to FTBFS. This change should - probably be reverted once all required libraries are multiarched. - . - [ Steve M. Robbins ] - * Override lintian diagnostic about embedded libraries ftgl and sqlite. - * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav - 0.7. - . - The person named in the Author field signed this changelog entry. -Author: Steve M. Robbins <smr@debian.org> -Bug-Debian: http://bugs.debian.org/506992 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx -+++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx -@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start() - } - - //choose avi media file format -- this->avOutputFormat = guess_format("avi", NULL, NULL); -+ this->avOutputFormat = av_guess_format("avi", NULL, NULL); - if (!this->avOutputFormat) - { - vtkGenericWarningMacro (<< "Could not open the avi media file format."); -@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start() - //Set up the codec. - AVCodecContext *c = this->avStream->codec; - c->codec_id = (CodecID)this->avOutputFormat->video_codec; -- c->codec_type = CODEC_TYPE_VIDEO; -+ c->codec_type = AVMEDIA_TYPE_VIDEO; - c->width = this->Dim[0]; - c->height = this->Dim[1]; - c->pix_fmt = PIX_FMT_YUVJ420P; -@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm - pkt.stream_index = this->avStream->index; - if (cc->coded_frame->key_frame) //treat keyframes well - { -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - } - pkt.duration = 0; //presentation duration in time_base units or 0 if NA - pkt.pos = -1; //byte position in stream or -1 if NA diff --git a/sci-libs/vtk/files/vtk-5.6.1-libpng15.patch b/sci-libs/vtk/files/vtk-5.6.1-libpng15.patch deleted file mode 100644 index 5bb5cbfb8..000000000 --- a/sci-libs/vtk/files/vtk-5.6.1-libpng15.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://bugs.gentoo.org/378393 - ---- VTK/IO/vtkPNGWriter.cxx -+++ VTK/IO/vtkPNGWriter.cxx -@@ -147,7 +147,7 @@ - void vtkPNGWriteErrorFunction(png_structp png_ptr, - png_const_charp vtkNotUsed(error_msg)) - { -- longjmp(png_ptr->jmpbuf, 1); -+ longjmp(png_jmpbuf(png_ptr), 1); - } - } - -@@ -223,7 +223,7 @@ - png_init_io(png_ptr, this->TempFP); - png_set_error_fn(png_ptr, png_ptr, - vtkPNGWriteErrorFunction, vtkPNGWriteWarningFunction); -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - fclose(this->TempFP); - this->SetErrorCode(vtkErrorCode::OutOfDiskSpaceError); diff --git a/sci-libs/vtk/files/vtk-5.8.0-R.patch b/sci-libs/vtk/files/vtk-5.8.0-R.patch deleted file mode 100644 index ce6dcde59..000000000 --- a/sci-libs/vtk/files/vtk-5.8.0-R.patch +++ /dev/null @@ -1,45 +0,0 @@ -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/sci-libs/vtk/files/vtk-5.8.0-boost.patch b/sci-libs/vtk/files/vtk-5.8.0-boost.patch deleted file mode 100644 index 30a0e9a4c..000000000 --- a/sci-libs/vtk/files/vtk-5.8.0-boost.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx -index c789f6b..13e7cb6 100644 ---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx -+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx -@@ -47,6 +47,21 @@ using namespace boost; - vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); - - -+#if BOOST_VERSION >= 104800 // Boost 1.48.x -+namespace { -+ vtkIdType unwrap_edge_id(vtkEdgeType const &e) { -+ return e.Id; -+ } -+ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { -+# if BOOST_VERSION == 104800 -+ return e.underlying_desc.Id; -+# else -+ return e.underlying_descx.Id; -+# endif -+ } -+} -+#endif -+ - // Redefine the bfs visitor, the only visitor we - // are using is the tree_edge visitor. - template <typename IdMap> -@@ -95,7 +106,12 @@ public: - - // Copy the vertex and edge data from the graph to the tree. - tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); -+#if BOOST_VERSION < 104800 // Boost 1.48.x - tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); -+#else -+ tree->GetEdgeData()->CopyData(graph->GetEdgeData(), -+ unwrap_edge_id(e), tree_e.Id); -+#endif - } - - private: diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml index d61334b67..50d848a13 100644 --- a/sci-libs/vtk/metadata.xml +++ b/sci-libs/vtk/metadata.xml @@ -12,6 +12,7 @@ <flag name="chemistry">Add chemistry support</flag> <flag name="cg">Use nvidia's cg shaders</flag> <flag name="patented">Build patented classes</flag> + <flag name="offscreen">Offscreen rendering through OSMesa</flag> <flag name="R">Enable support for dev-lang/R</flag> </use> </pkgmetadata> diff --git a/sci-libs/vtk/vtk-6.0.0.ebuild b/sci-libs/vtk/vtk-6.0.0.ebuild index e8d08927f..36a30ba34 100644 --- a/sci-libs/vtk/vtk-6.0.0.ebuild +++ b/sci-libs/vtk/vtk-6.0.0.ebuild @@ -23,9 +23,14 @@ SRC_URI=" LICENSE="BSD LGPL-2" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" SLOT="0" -IUSE="boost chemistry cg doc examples ffmpeg java mpi mysql odbc patented postgres python qt4 R test theora threads tk video_cards_nvidia X" +IUSE=" + boost chemistry cg doc examples ffmpeg java mpi mysql odbc offscreen + patented postgres python qt4 R test theora threads tk + video_cards_nvidia X" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + ^^ ( X offscreen )" RDEPEND=" dev-libs/expat @@ -38,6 +43,7 @@ RDEPEND=" sys-libs/zlib virtual/jpeg virtual/opengl + x11-libs/gl2ps x11-libs/libX11 x11-libs/libXmu x11-libs/libXt @@ -50,6 +56,7 @@ RDEPEND=" mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) + offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql-base ) python? ( ${PYTHON_DEPS} @@ -68,22 +75,15 @@ RDEPEND=" video_cards_nvidia? ( media-video/nvidia-settings ) R? ( dev-lang/R )" DEPEND="${RDEPEND} - java? ( >=virtual/jdk-1.5 ) - boost? ( >=dev-libs/boost-1.40.0[mpi?] ) - dev-util/cmake" + boost? ( >=dev-libs/boost-1.40.0[mpi?] ) + doc? ( app-doc/doxygen ) + java? ( >=virtual/jdk-1.5 ) + dev-util/cmake" S="${WORKDIR}"/VTK${PV/_rc/.rc} PATCHES=( "${FILESDIR}"/${P}-cg-path.patch -# "${FILESDIR}"/${PN}-5.6.0-cg-path.patch -# "${FILESDIR}"/${PN}-5.2.0-tcl-install.patch -# "${FILESDIR}"/${PN}-5.8.0-R.patch -# "${FILESDIR}"/${PN}-5.6.0-odbc.patch -# "${FILESDIR}"/${PN}-5.6.1-ffmpeg.patch -# "${FILESDIR}"/${PN}-5.6.1-libav-0.8.patch -# "${FILESDIR}"/${PN}-5.10.1-tcl8.6.patch -# "${FILESDIR}"/${PN}-5.10.1-ffmpeg-1.patch ) pkg_setup() { @@ -132,13 +132,13 @@ src_configure() { -DVTK_USE_HYBRID=ON -DVTK_USE_GL2PS=ON -DVTK_USE_RENDERING=ON - -DLD_LIBRARY_PATCH="${BUILD_DIR}/lib" ) # use flag triggered options mycmakeargs+=( $(cmake-utils_use boost VTK_USE_BOOST) $(cmake-utils_use cg VTK_USE_CG_SHADERS) + $(cmake-utils_use chemistry VTK_USE_CHEMISTRY) $(cmake-utils_use doc DOCUMENTATION_HTML_HELP) $(cmake-utils_use_build doc DOCUMENTATION) $(cmake-utils_use java VTK_USE_JAVA) @@ -147,6 +147,8 @@ src_configure() { $(cmake-utils_use patented VTK_USE_PATENTED) $(cmake-utils_use postgres VTK_USE_POSTGRES) $(cmake-utils_use odbc VTK_USE_ODBC) + $(cmake-utils_use offscreen VTK_OPENGL_HAS_OSMESA) + $(cmake-utils_use offscreen VTK_OPENGL_HAS_OSMESA) $(cmake-utils_use qt4 VTK_USE_QT) $(cmake-utils_use theora VTK_USE_OGGTHEORA_ENCODER) $(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER) @@ -156,7 +158,6 @@ src_configure() { $(cmake-utils_use X VTK_USE_X) $(cmake-utils_use X VTK_USE_GUISUPPORT) $(cmake-utils_use R VTK_USE_GNU_R) - $(cmake-utils_use chemistry VTK_USE_CHEMISTRY) ) use tk && @@ -233,23 +234,22 @@ src_configure() { } src_install() { - cmake-utils_src_install - # install docs - dohtml "${S}"/README.html || die "Failed to install docs" + HTML_DOCS=( "${S}"/README.html ) + + cmake-utils_src_install # install Tcl docs docinto vtk_tcl - dodoc "${S}"/Wrapping/Tcl/README || \ - die "Failed to install Tcl docs" + dodoc "${S}"/Wrapping/Tcl/README # install examples if use examples; then insinto /usr/share/${PN} - mv -v Examples examples - doins -r examples || die - mv -v "${WORKDIR}"/{VTKData${PV},data} || die - doins -r "${WORKDIR}"/data || die + mv -v Examples examples || die + doins -r examples + mv -v "${WORKDIR}"/{VTKDATA${PV},data} || die + doins -r "${WORKDIR}"/data fi #install big docs @@ -258,7 +258,7 @@ src_install() { rm -f *.md5 || die "Failed to remove superfluous hashes" einfo "Installing API docs. This may take some time." insinto "/usr/share/doc/${PF}/api-docs" - doins -r ./* || die "Failed to install docs" + doins -r ./* fi # environment |