Andreas Tille pushed to branch master at Debian Med / mia
Commits: 7980c179 by Andreas Tille at 2022-06-18T10:26:29+02:00 Build against vtk9 - - - - - 9025af0a by Andreas Tille at 2022-06-18T10:27:58+02:00 Patch to build against vtk9 - - - - - 4 changed files: - debian/changelog - debian/control - debian/patches/series - + debian/patches/vtk9.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,15 @@ +mia (2.4.7-10) UNRELEASED; urgency=medium + + [ Andreas Tille ] + * Build against vtk9 + Closes: #1013159 + + [ Francois Mazen ] + * Patch to build against vtk9 + Closes: #1012689 + + -- Andreas Tille <[email protected]> Sat, 18 Jun 2022 10:23:07 +0200 + mia (2.4.7-9) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -23,7 +23,7 @@ Build-Depends: cmake, libopenexr-dev, libpng-dev, libtiff-dev, - libvtk7-dev, + libvtk9-dev, libvistaio-dev, libxml2-dev, python3-lxml ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ fix-boost-headers.patch fix-g++11.diff 0001-Fix-compilation-with-latest-BOOST.patch +vtk9.patch ===================================== debian/patches/vtk9.patch ===================================== @@ -0,0 +1,67 @@ +Author: Francois Mazen <[email protected]> +Last-Update: Sat, 11 Jun 2022 18:57:02 UTC +Bug-Debian: https://bugs.debian.org/1012689 +Description: Build against vtk9 + +--- a/addons/vtk/CMakeLists.txt ++++ b/addons/vtk/CMakeLists.txt +@@ -20,9 +20,9 @@ + + IF(WITH_VTKIO) + if (STRICT_DEPENDECIES) +- FIND_PACKAGE(VTK REQUIRED COMPONENTS vtkIOImage vtkIOXML vtkIOLegacy) ++ FIND_PACKAGE(VTK REQUIRED COMPONENTS IOImage IOXML IOLegacy) + else (STRICT_DEPENDECIES) +- FIND_PACKAGE(VTK COMPONENTS vtkIOImage vtkIOXML vtkIOLegacy) ++ FIND_PACKAGE(VTK COMPONENTS IOImage IOXML IOLegacy) + endif (STRICT_DEPENDECIES) + IF(VTK_FOUND) + DEFINE_PROPERTY(GLOBAL PROPERTY HAVE_VTK_PROP BRIEF_DOCS "yeah" FULL_DOCS "yeah") +@@ -41,8 +41,17 @@ + SET(VTK_LINK_LIBS_3D ${SELECTED_VTK_LIBS} mia3d) + + PLUGIN_WITH_TEST_AND_PREFIX2("mesh" "io" vtkmesh "${VTK_LINK_LIBS_MESH}") ++ target_link_libraries(mesh-io-vtkmesh ${VTK_LIBRARIES}) ++ target_link_libraries(mesh-io-vtkmesh-common ${VTK_LIBRARIES}) ++ target_link_libraries(test-mesh-io-vtkmesh ${VTK_LIBRARIES}) + PLUGIN_WITH_TEST_AND_PREFIX2("3dvf" "io" vtkvf "${VTK_LINK_LIBS_3D}") ++ target_link_libraries(3dvf-io-vtkvf ${VTK_LIBRARIES}) ++ target_link_libraries(3dvf-io-vtkvf-common ${VTK_LIBRARIES}) ++ target_link_libraries(test-3dvf-io-vtkvf ${VTK_LIBRARIES}) + PLUGIN_WITH_TEST_AND_PREFIX2("3dimage" "io" vtkimage "${VTK_LINK_LIBS_3D}") ++ target_link_libraries(3dimage-io-vtkimage ${VTK_LIBRARIES}) ++ target_link_libraries(3dimage-io-vtkimage-common ${VTK_LIBRARIES}) ++ target_link_libraries(test-3dimage-io-vtkimage ${VTK_LIBRARIES}) + + ELSEIF(VTK_FOUND) + MESSAGE(MESSAGE "VTK not found, disabled") +--- a/addons/vtk/vtkmesh.cc ++++ b/addons/vtk/vtkmesh.cc +@@ -78,7 +78,8 @@ + // read all cells, if a cell is formed of more than 3 corners, then triangulate, + // if it hes less then 3 corners, ignore it (no wireframes supported here + auto triangles = CVtkMeshIO::PTrianglefield(new CVtkMeshIO::CTrianglefield ()); +- vtkIdType npts, *pts; ++ vtkIdType npts; ++ vtkIdType const *pts; + auto strips = mesh.GetStrips(); + + while (strips->GetNextCell(npts, pts)) { +@@ -183,7 +184,7 @@ + auto is = mesh.normals_begin(); + + for (auto i = 0; i < n_normals; ++i, ++is) { +- normals->GetTupleValue(i, &is->x); ++ normals->GetTypedTuple(i, &is->x); + cvdebug() << i << ": read normal " << *is << "\n"; + } + } +@@ -217,7 +218,7 @@ + auto is = mesh.color_begin(); + + for (auto i = 0; i < n_colors; ++i, ++is) +- colors->GetTupleValue(i, &is->x); ++ colors->GetTypedTuple(i, &is->x); + } + + PTriangleMesh CVtkMeshIO::do_load(string const& filename) const View it on GitLab: https://salsa.debian.org/med-team/mia/-/compare/e58d2c21497630c461cf2aff1462f77b8fa77a0f...9025af0aa5ca04f5cab68d0d1f754ed05062576e -- View it on GitLab: https://salsa.debian.org/med-team/mia/-/compare/e58d2c21497630c461cf2aff1462f77b8fa77a0f...9025af0aa5ca04f5cab68d0d1f754ed05062576e You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
