[med-svn] [Git][med-team/sight][master] Add new patch to build with itk5

[Flavien Bridault (@fbridault-guest)]

Flavien Bridault pushed to branch master at Debian Med / sight


Commits:
d73beb2d by Flavien Bridault at 2022-01-24T12:52:42+01:00
Add new patch to build with itk5


- - - - -


4 changed files:

- debian/changelog
- debian/patches/fix-itk-build.patch
- + debian/patches/fix-itk5-build.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,9 @@
 sight (21.0.0-4) UNRELEASED; urgency=medium
 
+  [Flavien Bridault]
+  * d/p/: add patch to build with insighttoolkit5-dev
+
+  [Andreas Tille]
   * Team upload.
   * Switch (Build-)Depends from libinsighttoolkit4-dev to
     libinsighttoolkit5-dev


=====================================
debian/patches/fix-itk-build.patch
=====================================
@@ -1,17 +1,5 @@
 Author: Flavien Bridault <fbridault at ircad.fr>
 Description: Remove service that requires ITKFFT which is not available on i386
---- sight.orig/libs/filter/image/CMakeLists.txt
-+++ sight/libs/filter/image/CMakeLists.txt
-@@ -1,7 +1,7 @@
- sight_add_target( filter_image TYPE LIBRARY PCH pchServiceOmp )
- 
--find_package(ITK QUIET COMPONENTS ITKLabelMap ITKOptimizersv4 ITKTransform ITKFFT REQUIRED)
--target_link_libraries(filter_image PUBLIC ITKLabelMap ITKOptimizersv4 ITKTransform ITKFFT)
-+find_package(ITK QUIET COMPONENTS ITKLabelMap ITKOptimizersv4 ITKTransform REQUIRED)
-+target_link_libraries(filter_image PUBLIC ITKLabelMap ITKOptimizersv4 ITKTransform)
- 
- if(MSVC)
-     find_package(ITK QUIET COMPONENTS ITKSmoothing ITKRegistrationMethodsv4 REQUIRED)
 --- sight.orig/libs/filter/image/MIPMatchingRegistration.hpp
 +++ sight/libs/filter/image/MIPMatchingRegistration.hpp
 @@ -34,7 +34,6 @@


=====================================
debian/patches/fix-itk5-build.patch
=====================================
@@ -0,0 +1,50 @@
+Author: Flavien Bridault <fbridault at ircad.fr>
+Description: Fix build with ITK5. This notably disables
+  the build  of SpheroidExtraction which requires the 
+  module ITKReview, currently not built on Debian
+Bug: https://git.ircad.fr/sight/sight/-/issues/827
+--- sight.orig/libs/filter/image/SpheroidExtraction.cpp
++++ sight/libs/filter/image/SpheroidExtraction.cpp
+@@ -19,6 +19,7 @@
+  * License along with Sight. If not, see <https://www.gnu.org/licenses/>.
+  *
+  ***********************************************************************/
++#if 0
+ #ifndef WIN32
+ 
+ #include "filter/image/SpheroidExtraction.hpp"
+@@ -172,3 +173,4 @@
+ } // namespace sight::filter::image.
+ 
+ #endif // ifndef WIN32
++#endif
+--- sight.orig/libs/filter/image/test/tu/SpheroidExtractionTest.cpp
++++ sight/libs/filter/image/test/tu/SpheroidExtractionTest.cpp
+@@ -19,6 +19,7 @@
+  * License along with Sight. If not, see <https://www.gnu.org/licenses/>.
+  *
+  ***********************************************************************/
++#if 0
+ #ifndef WIN32
+ 
+ #include "SpheroidExtractionTest.hpp"
+@@ -210,3 +211,4 @@
+ } //namespace sight::filter::image.
+ 
+ #endif // ifndef WIN32
++#endif
+--- sight.orig/libs/filter/image/CMakeLists.txt
++++ sight/libs/filter/image/CMakeLists.txt
+@@ -3,10 +3,8 @@
+ find_package(ITK QUIET COMPONENTS ITKLabelMap ITKOptimizersv4 ITKTransform ITKFFT REQUIRED)
+ target_link_libraries(filter_image PUBLIC ITKLabelMap ITKOptimizersv4 ITKTransform ITKFFT)
+ 
+-if(MSVC)
+-    find_package(ITK QUIET COMPONENTS ITKSmoothing ITKRegistrationMethodsv4 REQUIRED)
+-    target_link_libraries(filter_image PUBLIC ITKSmoothing ITKRegistrationMethodsv4)
+-endif()
++find_package(ITK QUIET COMPONENTS ITKSmoothing ITKRegistrationMethodsv4 REQUIRED)
++target_link_libraries(filter_image PUBLIC ITKSmoothing ITKRegistrationMethodsv4)
+ 
+ find_package(OpenMP QUIET)
+ if (OPENMP_FOUND)


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
+fix-itk5-build.patch
 skip-samples-build.patch
 add_missing_includes.patch
 fix-dynamic-load.patch



View it on GitLab: https://salsa.debian.org/med-team/sight/-/commit/d73beb2ddb9fd5ab7b9405352563fffd776fd032

-- 
View it on GitLab: https://salsa.debian.org/med-team/sight/-/commit/d73beb2ddb9fd5ab7b9405352563fffd776fd032
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220124/354d2e2e/attachment-0001.htm>