Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/vtk/files: vtk-5.6.0-R.patch vtk-5.4.2-boost-property_map.patch vtk-5.6.0-boost-property_map.patch
Date: Fri, 28 May 2010 20:05:27
Message-Id: 20100528200522.42B592CF39@corvid.gentoo.org
1 jlec 10/05/28 20:05:22
2
3 Modified: vtk-5.4.2-boost-property_map.patch
4 vtk-5.6.0-boost-property_map.patch
5 Added: vtk-5.6.0-R.patch
6 Log:
7 Fixed correct detection R libs
8 (Portage version: 2.2_rc67/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.2 sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch?r1=1.1&r2=1.2
16
17 Index: vtk-5.4.2-boost-property_map.patch
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/files/vtk-5.4.2-boost-property_map.patch,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- vtk-5.4.2-boost-property_map.patch 21 Jan 2010 23:38:27 -0000 1.1
24 +++ vtk-5.4.2-boost-property_map.patch 28 May 2010 20:05:22 -0000 1.2
25 @@ -1,66 +1,188 @@
26 -diff -Naur VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx VTK.new/Infovis/Testing/Cxx/TestBoostAdapter.cxx
27 ---- VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx 2008-11-01 15:22:38.000000000 -0400
28 -+++ VTK.new/Infovis/Testing/Cxx/TestBoostAdapter.cxx 2010-01-21 17:53:23.000000000 -0500
29 -@@ -36,7 +36,7 @@
30 +diff --git a/Infovis/Testing/Cxx/TestBoostAdapter.cxx b/Infovis/Testing/Cxx/TestBoostAdapter.cxx
31 +index 6af2855..484a9e0 100644
32 +--- a/Infovis/Testing/Cxx/TestBoostAdapter.cxx
33 ++++ b/Infovis/Testing/Cxx/TestBoostAdapter.cxx
34 +@@ -36,8 +36,8 @@
35 #include <boost/graph/strong_components.hpp>
36 #include <boost/graph/dijkstra_shortest_paths.hpp>
37 #include <boost/graph/transitive_closure.hpp>
38 -#include <boost/property_map.hpp>
39 +-#include <boost/vector_property_map.hpp>
40 +#include <boost/property_map/property_map.hpp>
41 - #include <boost/vector_property_map.hpp>
42 ++#include <boost/property_map/vector_property_map.hpp>
43
44 #include "vtkGraph.h"
45 -diff -Naur VTK/Infovis/vtkBoostBreadthFirstSearch.cxx VTK.new/Infovis/vtkBoostBreadthFirstSearch.cxx
46 ---- VTK/Infovis/vtkBoostBreadthFirstSearch.cxx 2008-12-02 11:42:38.000000000 -0500
47 -+++ VTK.new/Infovis/vtkBoostBreadthFirstSearch.cxx 2010-01-21 17:52:56.000000000 -0500
48 -@@ -46,7 +46,7 @@
49 + #include "vtkBoostGraphAdapter.h"
50 +diff --git a/Infovis/vtkBoostBiconnectedComponents.cxx b/Infovis/vtkBoostBiconnectedComponents.cxx
51 +index 6799dd0..dd759d5 100644
52 +--- a/Infovis/vtkBoostBiconnectedComponents.cxx
53 ++++ b/Infovis/vtkBoostBiconnectedComponents.cxx
54 +@@ -32,7 +32,7 @@
55 + #include "vtkGraph.h"
56 + #include "vtkBoostGraphAdapter.h"
57 + #include <boost/graph/biconnected_components.hpp>
58 +-#include <boost/vector_property_map.hpp>
59 ++#include <boost/property_map/vector_property_map.hpp>
60 + #include <boost/version.hpp>
61 + #include <vtksys/stl/vector>
62 + #include <vtksys/stl/utility>
63 +diff --git a/Infovis/vtkBoostBrandesCentrality.cxx b/Infovis/vtkBoostBrandesCentrality.cxx
64 +index e214a72..443c039 100644
65 +--- a/Infovis/vtkBoostBrandesCentrality.cxx
66 ++++ b/Infovis/vtkBoostBrandesCentrality.cxx
67 +@@ -36,7 +36,7 @@
68 +
69 + #include <boost/graph/adjacency_list.hpp>
70 + #include <boost/graph/betweenness_centrality.hpp>
71 +-#include <boost/vector_property_map.hpp>
72 ++#include <boost/property_map/vector_property_map.hpp>
73 +
74 + using namespace boost;
75 +
76 +diff --git a/Infovis/vtkBoostBreadthFirstSearch.cxx b/Infovis/vtkBoostBreadthFirstSearch.cxx
77 +index 7fab585..6e56a7c 100644
78 +--- a/Infovis/vtkBoostBreadthFirstSearch.cxx
79 ++++ b/Infovis/vtkBoostBreadthFirstSearch.cxx
80 +@@ -46,8 +46,8 @@
81
82 #include <boost/graph/visitors.hpp>
83 #include <boost/graph/breadth_first_search.hpp>
84 -#include <boost/property_map.hpp>
85 +-#include <boost/vector_property_map.hpp>
86 +#include <boost/property_map/property_map.hpp>
87 - #include <boost/vector_property_map.hpp>
88 ++#include <boost/property_map/vector_property_map.hpp>
89 #include <boost/pending/queue.hpp>
90
91 -diff -Naur VTK/Parallel/vtkPBGLBreadthFirstSearch.cxx VTK.new/Parallel/vtkPBGLBreadthFirstSearch.cxx
92 ---- VTK/Parallel/vtkPBGLBreadthFirstSearch.cxx 2008-12-04 16:17:46.000000000 -0500
93 -+++ VTK.new/Parallel/vtkPBGLBreadthFirstSearch.cxx 2010-01-21 17:53:58.000000000 -0500
94 -@@ -50,7 +50,7 @@
95 + #include <vtksys/stl/utility> // for pair
96 +diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
97 +index 5c64516..64ee7b5 100644
98 +--- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx
99 ++++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
100 +@@ -39,7 +39,7 @@
101 + #include "vtkTree.h"
102 +
103 + #include <boost/graph/breadth_first_search.hpp>
104 +-#include <boost/vector_property_map.hpp>
105 ++#include <boost/property_map/vector_property_map.hpp>
106 + #include <boost/pending/queue.hpp>
107 +
108 + using namespace boost;
109 +diff --git a/Infovis/vtkBoostConnectedComponents.cxx b/Infovis/vtkBoostConnectedComponents.cxx
110 +index 69e9d8f..c88f4ab 100644
111 +--- a/Infovis/vtkBoostConnectedComponents.cxx
112 ++++ b/Infovis/vtkBoostConnectedComponents.cxx
113 +@@ -33,7 +33,7 @@
114 +
115 + #include "vtkBoostGraphAdapter.h"
116 + #include <boost/graph/strong_components.hpp>
117 +-#include <boost/vector_property_map.hpp>
118 ++#include <boost/property_map/vector_property_map.hpp>
119 +
120 + using namespace boost;
121 +
122 +diff --git a/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx b/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx
123 +index b0c89de..7ea3aa9 100644
124 +--- a/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx
125 ++++ b/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx
126 +@@ -40,7 +40,7 @@ PURPOSE. See the above copyright notice for more information.
127 + #include "vtkTree.h"
128 +
129 + #include <boost/graph/kruskal_min_spanning_tree.hpp>
130 +-#include <boost/vector_property_map.hpp>
131 ++#include <boost/property_map/vector_property_map.hpp>
132 + #include <boost/pending/queue.hpp>
133 +
134 + using namespace boost;
135 +diff --git a/Infovis/vtkBoostPrimMinimumSpanningTree.cxx b/Infovis/vtkBoostPrimMinimumSpanningTree.cxx
136 +index 935d0f7..48716fd 100644
137 +--- a/Infovis/vtkBoostPrimMinimumSpanningTree.cxx
138 ++++ b/Infovis/vtkBoostPrimMinimumSpanningTree.cxx
139 +@@ -39,7 +39,7 @@ PURPOSE. See the above copyright notice for more information.
140 + #include "vtkTree.h"
141 +
142 + #include <boost/graph/prim_minimum_spanning_tree.hpp>
143 +-#include <boost/vector_property_map.hpp>
144 ++#include <boost/property_map/vector_property_map.hpp>
145 + #include <boost/pending/queue.hpp>
146 +
147 + using namespace boost;
148 +diff --git a/Infovis/vtkTreeLayoutStrategy.cxx b/Infovis/vtkTreeLayoutStrategy.cxx
149 +index 6efa586..222afe9 100644
150 +--- a/Infovis/vtkTreeLayoutStrategy.cxx
151 ++++ b/Infovis/vtkTreeLayoutStrategy.cxx
152 +@@ -375,8 +375,8 @@ void vtkTreeLayoutStrategy::PrintSelf(ostream& os, vtkIndent indent)
153 + #include "vtkTreeToBoostAdapter.h"
154 + #include <boost/graph/visitors.hpp>
155 + #include <boost/graph/depth_first_search.hpp>
156 +-#include <boost/property_map.hpp>
157 +-#include <boost/vector_property_map.hpp>
158 ++#include <boost/property_map/property_map.hpp>
159 ++#include <boost/property_map/vector_property_map.hpp>
160 + #include <boost/pending/queue.hpp>
161 +
162 + using namespace boost;
163 +diff --git a/Parallel/vtkPBGLBreadthFirstSearch.cxx b/Parallel/vtkPBGLBreadthFirstSearch.cxx
164 +index 2b4681b..eebeaa9 100644
165 +--- a/Parallel/vtkPBGLBreadthFirstSearch.cxx
166 ++++ b/Parallel/vtkPBGLBreadthFirstSearch.cxx
167 +@@ -50,8 +50,8 @@
168 #include <boost/graph/distributed/breadth_first_search.hpp>
169 #include <boost/parallel/algorithm.hpp>
170 #include <boost/graph/visitors.hpp>
171 -#include <boost/property_map.hpp>
172 +-#include <boost/vector_property_map.hpp>
173 +#include <boost/property_map/property_map.hpp>
174 - #include <boost/vector_property_map.hpp>
175 ++#include <boost/property_map/vector_property_map.hpp>
176 #include <boost/pending/queue.hpp>
177
178 -diff -Naur VTK/Parallel/vtkPBGLMinimumSpanningTree.cxx VTK.new/Parallel/vtkPBGLMinimumSpanningTree.cxx
179 ---- VTK/Parallel/vtkPBGLMinimumSpanningTree.cxx 2008-12-04 16:17:46.000000000 -0500
180 -+++ VTK.new/Parallel/vtkPBGLMinimumSpanningTree.cxx 2010-01-21 17:54:18.000000000 -0500
181 -@@ -48,7 +48,7 @@
182 + #include <vtksys/stl/utility> // for pair
183 +diff --git a/Parallel/vtkPBGLGraphAdapter.h b/Parallel/vtkPBGLGraphAdapter.h
184 +index 7b467b0..bacfd3a 100644
185 +--- a/Parallel/vtkPBGLGraphAdapter.h
186 ++++ b/Parallel/vtkPBGLGraphAdapter.h
187 +@@ -31,7 +31,7 @@
188 + #include <boost/graph/distributed/mpi_process_group.hpp>
189 + #include <boost/graph/properties.hpp>
190 + #include <boost/graph/parallel/container_traits.hpp>
191 +-#include <boost/parallel/local_property_map.hpp>
192 ++#include <boost/property_map/parallel/local_property_map.hpp>
193 + #include <boost/serialization/base_object.hpp>
194 + #include <boost/functional/hash.hpp>
195 + //ETX
196 +diff --git a/Parallel/vtkPBGLMinimumSpanningTree.cxx b/Parallel/vtkPBGLMinimumSpanningTree.cxx
197 +index da4647e..f9c3229 100644
198 +--- a/Parallel/vtkPBGLMinimumSpanningTree.cxx
199 ++++ b/Parallel/vtkPBGLMinimumSpanningTree.cxx
200 +@@ -48,8 +48,8 @@
201 #include <boost/graph/distributed/dehne_gotz_min_spanning_tree.hpp>
202 #include <boost/graph/distributed/vertex_list_adaptor.hpp>
203 #include <boost/parallel/global_index_map.hpp>
204 -#include <boost/property_map.hpp>
205 +-#include <boost/vector_property_map.hpp>
206 +#include <boost/property_map/property_map.hpp>
207 - #include <boost/vector_property_map.hpp>
208 ++#include <boost/property_map/vector_property_map.hpp>
209 #include <boost/pending/queue.hpp>
210
211 -diff -Naur VTK/Parallel/vtkPBGLShortestPaths.cxx VTK.new/Parallel/vtkPBGLShortestPaths.cxx
212 ---- VTK/Parallel/vtkPBGLShortestPaths.cxx 2009-02-23 16:08:57.000000000 -0500
213 -+++ VTK.new/Parallel/vtkPBGLShortestPaths.cxx 2010-01-21 17:54:36.000000000 -0500
214 -@@ -49,7 +49,7 @@
215 + #include <vtksys/stl/utility> // for pair
216 +diff --git a/Parallel/vtkPBGLShortestPaths.cxx b/Parallel/vtkPBGLShortestPaths.cxx
217 +index 074143f..8517304 100644
218 +--- a/Parallel/vtkPBGLShortestPaths.cxx
219 ++++ b/Parallel/vtkPBGLShortestPaths.cxx
220 +@@ -49,8 +49,8 @@
221
222 #include <boost/graph/distributed/delta_stepping_shortest_paths.hpp>
223 #include <boost/parallel/algorithm.hpp>
224 -#include <boost/property_map.hpp>
225 +-#include <boost/vector_property_map.hpp>
226 +#include <boost/property_map/property_map.hpp>
227 - #include <boost/vector_property_map.hpp>
228 ++#include <boost/property_map/vector_property_map.hpp>
229
230 #include <vtksys/stl/utility> // for pair
231 -diff -Naur VTK/Parallel/vtkPBGLVertexColoring.cxx VTK.new/Parallel/vtkPBGLVertexColoring.cxx
232 ---- VTK/Parallel/vtkPBGLVertexColoring.cxx 2008-07-31 13:56:53.000000000 -0400
233 -+++ VTK.new/Parallel/vtkPBGLVertexColoring.cxx 2010-01-21 17:53:40.000000000 -0500
234 +
235 +diff --git a/Parallel/vtkPBGLVertexColoring.cxx b/Parallel/vtkPBGLVertexColoring.cxx
236 +index 9aa87a0..301a245 100644
237 +--- a/Parallel/vtkPBGLVertexColoring.cxx
238 ++++ b/Parallel/vtkPBGLVertexColoring.cxx
239 @@ -47,7 +47,7 @@
240
241 #include <boost/graph/distributed/boman_et_al_graph_coloring.hpp>
242
243
244
245 1.2 sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch
246
247 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch?rev=1.2&view=markup
248 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch?rev=1.2&content-type=text/plain
249 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch?r1=1.1&r2=1.2
250
251 Index: vtk-5.6.0-boost-property_map.patch
252 ===================================================================
253 RCS file: /var/cvsroot/gentoo-x86/sci-libs/vtk/files/vtk-5.6.0-boost-property_map.patch,v
254 retrieving revision 1.1
255 retrieving revision 1.2
256 diff -u -r1.1 -r1.2
257 --- vtk-5.6.0-boost-property_map.patch 28 May 2010 11:51:25 -0000 1.1
258 +++ vtk-5.6.0-boost-property_map.patch 28 May 2010 20:05:22 -0000 1.2
259 @@ -1,16 +1,3 @@
260 -diff --git a/Infovis/vtkBoostGraphAdapter.h b/Infovis/vtkBoostGraphAdapter.h
261 -index 5d113ac..d84cb98 100644
262 ---- a/Infovis/vtkBoostGraphAdapter.h
263 -+++ b/Infovis/vtkBoostGraphAdapter.h
264 -@@ -50,7 +50,7 @@ namespace boost {
265 - // These need to be defined before including other boost stuff
266 -
267 - // Forward declarations are required here, so that we aren't forced
268 -- // to include boost/property_map.hpp.
269 -+ // to include boost/property_map/property_map.hpp.
270 - template<typename> class property_traits;
271 - class read_write_property_map_tag;
272 -
273 diff --git a/Infovis/vtkTreeLayoutStrategy.cxx b/Infovis/vtkTreeLayoutStrategy.cxx
274 index 4a764ea..74d0b53 100644
275 --- a/Infovis/vtkTreeLayoutStrategy.cxx
276
277
278
279 1.1 sci-libs/vtk/files/vtk-5.6.0-R.patch
280
281 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.6.0-R.patch?rev=1.1&view=markup
282 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/vtk/files/vtk-5.6.0-R.patch?rev=1.1&content-type=text/plain
283
284 Index: vtk-5.6.0-R.patch
285 ===================================================================
286 diff --git a/CMake/FindR.cmake b/CMake/FindR.cmake
287 index ee49570..c830db0 100644
288 --- a/CMake/FindR.cmake
289 +++ b/CMake/FindR.cmake
290 @@ -18,13 +18,12 @@ IF (R_COMMAND)
291 ENDIF (R_COMMAND)
292 SET(CMAKE_FIND_APPBUNDLE ${TEMP_CMAKE_FIND_APPBUNDLE})
293
294 -FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/local/lib /usr/local/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h")
295 +FIND_PATH(R_INCLUDE_DIR R.h PATHS /usr/lib /usr/lib64 PATH_SUFFIXES R/include DOC "Path to file R.h")
296 FIND_LIBRARY(R_LIBRARY_BASE R PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "R library (example libR.a, libR.dylib, etc.).")
297 -FIND_LIBRARY(R_LIBRARY_BLAS Rblas PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rblas library (example libRblas.a, libRblas.dylib, etc.).")
298 -FIND_LIBRARY(R_LIBRARY_LAPACK Rlapack PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rlapack library (example libRlapack.a, libRlapack.dylib, etc.).")
299 +FIND_LIBRARY(R_LIBRARY_MATH Rmath PATHS ${R_BASE_DIR} PATH_SUFFIXES /lib DOC "Rmath library (example libRmath.a, libRmath.dylib, etc.).")
300 FIND_LIBRARY(R_LIBRARY_READLINE readline DOC "(Optional) system readline library. Only required if the R libraries were build with readline support.")
301
302 -SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_BLAS} ${R_LIBRARY_LAPACK} ${R_LIBRARY_BASE})
303 +SET(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_MATH} ${R_LIBRARY_BASE})
304 IF (R_LIBRARY_READLINE)
305 SET(R_LIBRARIES ${R_LIBRARIES} ${R_LIBRARY_READLINE})
306 ENDIF (R_LIBRARY_READLINE)
307 diff --git a/CMakeLists.txt b/CMakeLists.txt
308 index 9d4e881..1a828a4 100644
309 --- a/CMakeLists.txt
310 +++ b/CMakeLists.txt
311 @@ -1054,8 +1054,18 @@ IF(VTK_WRAP_JAVA)
312 ENDIF(JAVA_AWT_LIBRARY)
313 ENDIF(VTK_WRAP_JAVA)
314
315 +IF(VTK_USE_GNU_R)
316 + FIND_PACKAGE(R)
317 +ENDIF(VTK_USE_GNU_R)
318
319 -
320 +IF(VTK_USE_BOOST)
321 + if (VTK_USE_PARALLEL_BGL)
322 + FIND_PACKAGE(Boost 1.39.0 REQUIRED
323 + COMPONENTS mpi serialization filesystem system graph_parallel)
324 + else (VTK_USE_PARALLEL_BGL)
325 + FIND_PACKAGE(Boost REQUIRED)
326 + endif (VTK_USE_PARALLEL_BGL)
327 +ENDIF(VTK_USE_BOOST)
328 #-----------------------------------------------------------------------------
329 # The entire VTK tree should use the same include path.
330
331 diff --git a/Graphics/vtkRInterface.cxx b/Graphics/vtkRInterface.cxx
332 index 324e845..56a4869 100644
333 --- a/Graphics/vtkRInterface.cxx
334 +++ b/Graphics/vtkRInterface.cxx
335 @@ -23,6 +23,7 @@
336 #undef HAVE_UINTPTR_T
337 #ifdef HAVE_VTK_UINTPTR_T
338 #define HAVE_UINTPTR_T HAVE_VTK_UINTPTR_T
339 +#include <stdint.h>
340 #endif
341
342 #include "vtkInformation.h"
Report Message
Find on MARC Find on Google Groups