diff --git a/_constraints b/_constraints index 13513d1..e904401 100644 --- a/_constraints +++ b/_constraints @@ -2,10 +2,10 @@ - 24 + 28 - 6 + 12 @@ -14,7 +14,7 @@ - 2000 + 5000 diff --git a/add-missing-includes.patch b/add-missing-includes.patch deleted file mode 100644 index 241dfda..0000000 --- a/add-missing-includes.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: ITK-5.3.0/Modules/Filtering/MathematicalMorphology/include/itkMathematicalMorphologyEnums.h -=================================================================== ---- ITK-5.3.0.orig/Modules/Filtering/MathematicalMorphology/include/itkMathematicalMorphologyEnums.h -+++ ITK-5.3.0/Modules/Filtering/MathematicalMorphology/include/itkMathematicalMorphologyEnums.h -@@ -20,6 +20,7 @@ - - #include - #include "ITKMathematicalMorphologyExport.h" -+#include - - - namespace itk diff --git a/insighttoolkit-5.3.0.tar.gz b/insighttoolkit-5.3.0.tar.gz deleted file mode 100644 index c5e18b3..0000000 --- a/insighttoolkit-5.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64e7e8094a5023c8f68ee042459d6319581fadb35e2fe90a4ae230ce36369db1 -size 21844157 diff --git a/insighttoolkit-5.4.0.tar.gz b/insighttoolkit-5.4.0.tar.gz new file mode 100644 index 0000000..9df5b95 --- /dev/null +++ b/insighttoolkit-5.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d71a36fc0aee2c9257fe128f7657feb1e671461bd48561b620619f290c71795e +size 22509357 diff --git a/insighttoolkit.changes b/insighttoolkit.changes index 628ab29..4a11752 100644 --- a/insighttoolkit.changes +++ b/insighttoolkit.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Jul 8 06:30:25 UTC 2024 - Atri Bhattacharya + +- Update to version 5.4.0: + * No release notes. +- Drop patches incorporated upstream: + * insighttoolkit-swig4_1-compat.patch + * add-missing-includes.patch +- Disable python bindings for openSUSE < 1650 as python >= 3.8 is + required and also for openSUSE >= 1650 as an unreleased version + of swig is required. + +------------------------------------------------------------------- +Fri Jan 19 12:53:49 UTC 2024 - Atri Bhattacharya + +- Add insighttoolkit-swig4_1-compat.patch -- Add swig 4.1+ + compatibility by defining SWIGPY_SLICEOBJECT; patch picked from + upstream commit [gh#InsightSoftwareConsortium/ITK#3782]. + ------------------------------------------------------------------- Mon Nov 6 16:15:38 UTC 2023 - Dominique Leuenberger diff --git a/insighttoolkit.spec b/insighttoolkit.spec index e8a62e2..35eff2b 100644 --- a/insighttoolkit.spec +++ b/insighttoolkit.spec @@ -1,7 +1,7 @@ # # spec file for package insighttoolkit # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2016 Angelos Tzotsos . # # All modifications and additions to the file contributed by third parties @@ -19,7 +19,7 @@ %global __builder ninja %define tarname ITK -%define libname lib%{name}5_3-1 +%define libname lib%{name}5_4-1 # Do not use system eigen on aarch64 until fixed upstream: # https://github.com/InsightSoftwareConsortium/ITK/issues/2903 @@ -29,23 +29,21 @@ %bcond_without system_eigen %endif -# Python bindings must be turned off until https://github.com/InsightSoftwareConsortium/ITK/issues/3782 is resolved -%if 0%{?suse_version} >= 1550 +# Python >= 3.8 is required +%if 0%{?suse_version} > 1650 %bcond_with python %else -%bcond_without python +# Unreleased master branch of swig required +%bcond_with python %endif Name: insighttoolkit -Version: 5.3.0 +Version: 5.4.0 Release: 0 Summary: Toolkit for scientific image processing, segmentation, and registration License: Apache-2.0 URL: https://www.itk.org -Source: https://github.com/InsightSoftwareConsortium/ITK/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM add-missing-includes.patch -- Add missing #include -Patch0: add-missing-includes.patch - +Source0: https://github.com/InsightSoftwareConsortium/ITK/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: CastXML-devel BuildRequires: bison BuildRequires: cmake @@ -71,8 +69,8 @@ BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(zlib) %if %{with python} -BuildRequires: python3-devel -BuildRequires: swig >= 4.0 +BuildRequires: python3-devel >= 3.8 +BuildRequires: swig >= 4.3 %endif %if %{with system_eigen} BuildRequires: pkgconfig(eigen3) @@ -152,7 +150,6 @@ This package provides the modules for ITK's python bindings. -DITK_USE_SYSTEM_SWIG:BOOL=ON \ -DITK_USE_SYSTEM_VXL:BOOL=OFF \ -DVXL_BUILD_CORE_NUMERICS:BOOL=OFF \ - -DVCL_INCLUDE_CXX_0X:BOOL=ON \ -DITK_FORBID_DOWNLOADS=ON \ -DITK_WRAP_PYTHON:BOOL=%{?with_python:ON}%{!?with_python:OFF}