1
0

Accepting request 543869 from home:Guillaume_G:branches:Application:Geo

- Change group from 'Development/Libraries' to 'Development/Libraries/C and C++'
- Update to 4.12.2 (Fix Tumbleweed build)
- Remove doubleconv.patch

OBS-URL: https://build.opensuse.org/request/show/543869
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/insighttoolkit?expand=0&rev=5
This commit is contained in:
Bruno Friedmann 2017-11-20 12:41:12 +00:00 committed by Git OBS Bridge
parent 7e0c75aaa4
commit 3ebfb92e05
5 changed files with 29 additions and 31 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea0011fc99a6303427b236c3ceaf54688224350ce1a216b64c9771ab3194b15f
size 11717872

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5cd89d3b302e8518397c873a889adb3da4edda2314aae7258d7a200057af89e3
size 12247552

View File

@ -1,11 +0,0 @@
diff -ruN InsightToolkit-4.10.0.orig/Modules/Core/Common/src/CMakeLists.txt InsightToolkit-4.10.0/Modules/Core/Common/src/CMakeLists.txt
--- InsightToolkit-4.10.0.orig/Modules/Core/Common/src/CMakeLists.txt 2016-05-26 18:32:22.000000000 +0300
+++ InsightToolkit-4.10.0/Modules/Core/Common/src/CMakeLists.txt 2016-10-02 12:41:04.693983157 +0300
@@ -135,6 +135,7 @@
add_library( ITKCommon ${ITK_LIBRARY_BUILD_TYPE} ${ITKCommon_SRCS})
itk_module_link_dependencies()
+include_directories( /usr/include/double-conversion )
target_link_libraries(ITKCommon LINK_PUBLIC itksys ITKVNLInstantiation)
if(UNIX)

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Nov 20 12:32:06 UTC 2017 - guillaume@opensuse.org
- Change group from 'Development/Libraries' to 'Development/Libraries/C and C++'
-------------------------------------------------------------------
Mon Nov 20 09:58:51 UTC 2017 - guillaume@opensuse.org
- Update to 4.12.2 (Fix Tumbleweed build)
- Remove doubleconv.patch
-------------------------------------------------------------------
Sun Oct 2 11:00:00 UTC 2016 - tzotsos@opensuse.org

View File

@ -19,17 +19,17 @@
%define tarname InsightToolkit
Name: insighttoolkit
Version: 4.10.0
Version: 4.12.2
Release: 0
Summary: Insight Segmentation and Registration Toolkit
License: Apache-2.0
Group: Development/Libraries
Group: Development/Libraries/C and C++
Url: http://www.itk.org
Source0: http://sourceforge.net/projects/itk/files/itk/4.10/%{tarname}-%{version}.tar.xz
Source0: http://sourceforge.net/projects/itk/files/itk/4.12/%{tarname}-%{version}.tar.xz
Patch0: nrrdio-linking.patch
Patch1: doubleconv.patch
Patch2: dcmtk-cmake.patch
Patch1: dcmtk-cmake.patch
BuildRequires: cmake >= 2.8.0
BuildRequires: dcmtk
BuildRequires: dcmtk-devel
BuildRequires: fdupes
BuildRequires: fftw3-devel
@ -45,6 +45,12 @@ BuildRequires: libtiff-devel
BuildRequires: python-devel
BuildRequires: sed
BuildRequires: swig
%if 0%{suse_version} > 1320
# Indirect DCMTK dep. Should DCMTK be fixed?
# tcpd-devel is needed for libwrap.so on Tumbleweed (> Leap 42.3)
BuildRequires: tcpd-devel
BuildRequires: libnsl-devel
%endif
BuildRequires: vtk-devel
BuildRequires: xz
BuildRequires: zlib-devel
@ -56,7 +62,7 @@ an extensive suite of software tools for image analysis.
%package devel
Summary: Development files for ITK
Group: Development/Libraries
Group: Development/Libraries/C and C++
Requires: dcmtk-devel
Requires: fftw3-devel
Requires: fftw3-threads-devel
@ -88,7 +94,6 @@ analysis..
%setup -q -n %{tarname}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%cmake \
@ -110,8 +115,6 @@ analysis..
-DITK_USE_SYSTEM_TIFF:BOOL=ON \
-DITK_USE_SYSTEM_VXL:BOOL=OFF \
-DITK_USE_SYSTEM_ZLIB:BOOL=ON \
-DITK_USE_SYSTEM_GCCXML:BOOL=OFF \
-DITK_USE_SYSTEM_SWIG:BOOL=ON \
-DITK_USE_SYSTEM_EXPAT:BOOL=ON \
-DModule_ITKDCMTK:BOOL=ON \
-DModule_ITKIOPhilipsREC:BOOL=OFF \
@ -123,11 +126,6 @@ analysis..
-DModule_ITKDeprecated:BOOL=OFF \
-DITKV3_COMPATIBILITY:BOOL=ON \
-DVCL_INCLUDE_CXX_0X:BOOL=ON \
-DITK_WRAP_DIMS="2;3;4" \
-DITK_WRAP_double:BOOL=ON \
-DITK_WRAP_vector_double:BOOL=ON \
-DITK_WRAP_covariant_vector_double:BOOL=ON \
-DITK_WRAP_complex_double:BOOL=ON \
-DITK_WRAPPING:BOOL=OFF \
-DITK_WRAP_PYTHON:BOOL=OFF \
-DCMAKE_BUILD_TYPE:STRING="Release"
@ -141,9 +139,9 @@ make VERBOSE=1 %{?_smp_mflags}
%if "%{_lib}" == "lib64"
mkdir -p %{buildroot}%{_libdir}
mv %{buildroot}%{_libexecdir}/* %{buildroot}%{_libdir}/
sed -i 's|/lib/|/lib64/|g' %{buildroot}%{_libdir}/cmake/ITK-4.10/ITKConfig.cmake
sed -i 's|/lib/|/lib64/|g' %{buildroot}%{_libdir}/cmake/ITK-4.10/ITKTargets.cmake
sed -i 's|/lib/|/lib64/|g' %{buildroot}%{_libdir}/cmake/ITK-4.10/ITKTargets-release.cmake
sed -i 's|/lib/|/lib64/|g' %{buildroot}%{_libdir}/cmake/ITK-4.12/ITKConfig.cmake
sed -i 's|/lib/|/lib64/|g' %{buildroot}%{_libdir}/cmake/ITK-4.12/ITKTargets.cmake
sed -i 's|/lib/|/lib64/|g' %{buildroot}%{_libdir}/cmake/ITK-4.12/ITKTargets-release.cmake
%endif
rm -rf %{buildroot}%{_libexecdir}/debug