Compare commits
2 Commits
Author | SHA1 | Date |
---|---|---|
|
f089780bd9 | |
|
c0c478c84f |
|
@ -0,0 +1,31 @@
|
|||
diff -up VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx\~ ParaView-3.12.0/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
|
||||
--- VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx~ 2011-11-08 21:56:37.000000000 +0100
|
||||
+++ VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx 2011-12-06 01:11:42.487760688 +0100
|
||||
@@ -47,6 +47,15 @@ using namespace boost;
|
||||
vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
|
||||
|
||||
|
||||
+namespace {
|
||||
+ vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
|
||||
+ return e.Id;
|
||||
+ }
|
||||
+ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
|
||||
+ return e.underlying_desc.Id;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
// Redefine the bfs visitor, the only visitor we
|
||||
// are using is the tree_edge visitor.
|
||||
template <typename IdMap>
|
||||
@@ -95,7 +104,8 @@ public:
|
||||
|
||||
// Copy the vertex and edge data from the graph to the tree.
|
||||
tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v);
|
||||
- tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id);
|
||||
+ tree->GetEdgeData()->CopyData(graph->GetEdgeData(),
|
||||
+ unwrap_edge_id(e), tree_e.Id);
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
Diff finished. Tue Dec 6 01:13:13 2011
|
|
@ -0,0 +1,11 @@
|
|||
diff -up VTK/Utilities/vtknetcdf/CMakeLists.txt.soname VTK/Utilities/vtknetcdf/CMakeLists.txt
|
||||
--- VTK/Utilities/vtknetcdf/CMakeLists.txt.soname 2011-08-24 07:37:14.000000000 -0600
|
||||
+++ VTK/Utilities/vtknetcdf/CMakeLists.txt 2012-05-24 14:01:52.533509691 -0600
|
||||
@@ -298,6 +298,7 @@ ADD_DEFINITIONS("-DNC_DLL_EXPORT")
|
||||
# Apply user-defined properties to the library target.
|
||||
IF(VTK_LIBRARY_PROPERTIES)
|
||||
SET_TARGET_PROPERTIES(vtkNetCDF PROPERTIES ${VTK_LIBRARY_PROPERTIES})
|
||||
+ SET_TARGET_PROPERTIES(vtkNetCDF_cxx PROPERTIES ${VTK_LIBRARY_PROPERTIES})
|
||||
ENDIF(VTK_LIBRARY_PROPERTIES)
|
||||
|
||||
IF(NOT VTK_INSTALL_NO_LIBRARIES)
|
13
vtk.spec
13
vtk.spec
|
@ -7,7 +7,7 @@
|
|||
Summary: The Visualization Toolkit - A high level 3D visualization library
|
||||
Name: vtk
|
||||
Version: 5.8.0
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
# This is a variant BSD license, a cross between BSD and ZLIB.
|
||||
# For all intents, it has the same rights and restrictions as BSD.
|
||||
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
|
||||
|
@ -15,6 +15,11 @@ License: BSD
|
|||
Group: System Environment/Libraries
|
||||
Source: http://www.vtk.org/files/release/5.8/%{name}-%{version}.tar.gz
|
||||
Patch1: vtk-5.2.0-gcc43.patch
|
||||
# Add soname to libvtkNetCDF_cxx
|
||||
# http://vtk.org/Bug/view.php?id=12207
|
||||
Patch2: vtk-soname.patch
|
||||
# Patch to fix compilation with boost 1.48
|
||||
Patch3: vtk-boost-1.48.0-bfs.patch
|
||||
# Use system libraries
|
||||
# http://public.kitware.com/Bug/view.php?id=11823
|
||||
Patch5: vtk-5.6.1-system.patch
|
||||
|
@ -130,6 +135,8 @@ programming languages.
|
|||
%prep
|
||||
%setup -q -n VTK
|
||||
%patch1 -p1 -b .gcc43
|
||||
%patch2 -p1 -b .soname
|
||||
%patch3 -p1 -b .boost
|
||||
%patch5 -p1 -b .system
|
||||
|
||||
# Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version}
|
||||
|
@ -390,6 +397,10 @@ rm -rf %{buildroot}
|
|||
%doc vtk-examples/Examples
|
||||
|
||||
%changelog
|
||||
* Thu May 24 2012 Orion Poplawski <orion@cora.nwra.com> - 5.8.0-6
|
||||
- Add patch to add soname to libvtkNetCDF_cxx
|
||||
- Add patch to compile with boost 1.48
|
||||
|
||||
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.8.0-5
|
||||
- Rebuilt for c++ ABI breakage
|
||||
|
||||
|
|
Loading…
Reference in New Issue