forked from pool/insighttoolkit
Accepting request 890515 from home:badshah400:branches:Application:Geo
- Update to version 5.2.0. - Drop upstreamed patches: reproducible.patch, itklbfgs-linking.patch, and nrrdio-linking.patch. OBS-URL: https://build.opensuse.org/request/show/890515 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/insighttoolkit?expand=0&rev=39
This commit is contained in:
Dirk Stoecker
Git OBS Bridge
parent
37a274647d
commit
cc82399bfd
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:651284ce6f68e8bd31db176a6b53f5679209a8ed5b6b5480c3591d66c6e10b60
|
||||
size 20799488
|
||||
3
insighttoolkit-5.2.0.tar.gz
Normal file
3
insighttoolkit-5.2.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e53961cd78df8bcfaf8bd8b813ae2cafdde984c7650a2ddf7dcf808df463ea74
|
||||
size 20944980
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 5 01:18:35 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Update to version 5.2.0:
|
||||
* No release notes.
|
||||
- Drop upstreamed patches:
|
||||
* reproducible.patch,
|
||||
* itklbfgs-linking.patch, and
|
||||
* nrrdio-linking.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 10 00:02:33 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package insighttoolkit
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2016 Angelos Tzotsos <tzotsos@opensuse.org>.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -23,18 +23,12 @@
|
||||
%define libname lib%{name}5
|
||||
|
||||
Name: insighttoolkit
|
||||
Version: 5.1.2
|
||||
Version: 5.2.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 proper linking against math library [gh#InsightSoftwareConsortium/ITK#1867, gh#InsightSoftwareConsortium/ITK#1878]
|
||||
Patch1: nrrdio-linking.patch
|
||||
# PATCH-FIX-UPSTREAM proper linking against math library [gh#InsightSoftwareConsortium/ITK#1867, gh#InsightSoftwareConsortium/ITK#1878]
|
||||
Patch3: itklbfgs-linking.patch
|
||||
# PATCH-FIX-OPENSUSE reproducible.patch boo#1100677 gh#InsightSoftwareConsortium/ITK#1939
|
||||
Patch100: reproducible.patch
|
||||
BuildRequires: CastXML-devel
|
||||
BuildRequires: bison
|
||||
BuildRequires: cmake
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
Index: InsightToolkit-5.1.0/Modules/ThirdParty/libLBFGS/src/CMakeLists.txt
|
||||
===================================================================
|
||||
--- InsightToolkit-5.1.0.orig/Modules/ThirdParty/libLBFGS/src/CMakeLists.txt
|
||||
+++ InsightToolkit-5.1.0/Modules/ThirdParty/libLBFGS/src/CMakeLists.txt
|
||||
@@ -17,6 +17,10 @@ set(ITK3P_INSTALL_RUNTIME_DIR "${ITKLIBL
|
||||
set(ITK3P_INSTALL_LIBRARY_DIR "${ITKLIBLBFGS_INSTALL_LIBRARY_DIR}")
|
||||
set(ITK3P_INSTALL_ARCHIVE_DIR "${ITKLIBLBFGS_INSTALL_ARCHIVE_DIR}")
|
||||
|
||||
+IF(UNIX)
|
||||
+ TARGET_LINK_LIBRARIES(itklbfgs m)
|
||||
+ENDIF(UNIX)
|
||||
+
|
||||
INSTALL(TARGETS itklbfgs
|
||||
EXPORT ${ITK3P_INSTALL_EXPORT_NAME}
|
||||
RUNTIME DESTINATION ${ITK3P_INSTALL_RUNTIME_DIR} COMPONENT RuntimeLibraries
|
||||
@ -1,18 +0,0 @@
|
||||
diff --git a/Modules/ThirdParty/NrrdIO/src/NrrdIO/CMakeLists.txt b/Modules/ThirdParty/NrrdIO/src/NrrdIO/CMakeLists.txt
|
||||
index 6c706f096a9..3039e426de5 100644
|
||||
--- a/Modules/ThirdParty/NrrdIO/src/NrrdIO/CMakeLists.txt
|
||||
+++ b/Modules/ThirdParty/NrrdIO/src/NrrdIO/CMakeLists.txt
|
||||
@@ -64,7 +64,12 @@ ENDIF(QNANHIBIT)
|
||||
ADD_DEFINITIONS(-DTEEM_ZLIB=1)
|
||||
|
||||
ADD_LIBRARY(ITKNrrdIO ${nrrdio_SRCS} )
|
||||
-TARGET_LINK_LIBRARIES(ITKNrrdIO ${ITKZLIB_LIBRARIES})
|
||||
+
|
||||
+IF(UNIX)
|
||||
+ TARGET_LINK_LIBRARIES(ITKNrrdIO ${ITKZLIB_LIBRARIES} m)
|
||||
+ELSE(UNIX)
|
||||
+ TARGET_LINK_LIBRARIES(ITKNrrdIO ${ITKZLIB_LIBRARIES})
|
||||
+ENDIF(UNIX)
|
||||
|
||||
IF(ITK_LIBRARY_PROPERTIES)
|
||||
SET_TARGET_PROPERTIES(ITKNrrdIO PROPERTIES ${ITK_LIBRARY_PROPERTIES})
|
||||
@ -1,20 +0,0 @@
|
||||
Author: Bernhard M. Wiedemann <bwiedemann suse de>
|
||||
Date: 2020-07-30
|
||||
|
||||
https://bugzilla.opensuse.org/show_bug.cgi?id=1100677
|
||||
|
||||
packages do not build reproducibly from compile-time CPU-detection
|
||||
|
||||
Index: InsightToolkit-5.1.0/CMake/ITKSetStandardCompilerFlags.cmake
|
||||
===================================================================
|
||||
--- InsightToolkit-5.1.0.orig/CMake/ITKSetStandardCompilerFlags.cmake
|
||||
+++ InsightToolkit-5.1.0/CMake/ITKSetStandardCompilerFlags.cmake
|
||||
@@ -241,7 +241,7 @@ function(check_compiler_optimization_fla
|
||||
set(InstructionSetOptimizationFlags
|
||||
# https://gcc.gnu.org/onlinedocs/gcc-4.8.0/gcc/i386-and-x86_002d64-Options.html
|
||||
# NOTE the corei7 release date was 2008
|
||||
- -mtune=native # Tune the code for the computer used compile ITK, but allow running on generic cpu archetectures
|
||||
+ #-mtune=native # boo#1100677 - disabled to not consider build machine CPU for reproducible results
|
||||
-march=corei7 # Use ABI settings to support corei7 (circa 2008 ABI feature sets, core-avx circa 2013)
|
||||
)
|
||||
endif()
|
||||
Loading…
Reference in New Issue
Block a user