[gentoo-commits] proj/sci:master commit in: sci-libs/itk/files/, sci-libs/itk/
commit: 42b8aadc9ce1de416e55dba98c3ba02a0177366f Author: Horea Christian chymera eu> AuthorDate: Thu Sep 15 07:02:53 2022 + Commit: Horea Christian gmail com> CommitDate: Thu Sep 15 07:02:53 2022 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=42b8aadc sci-libs/itk: add 5.1.0 Signed-off-by: Horea Christian chymera.eu> sci-libs/itk/files/itk-5.1.0-downloads.patch | 20 +++ sci-libs/itk/files/itk-5.1.0-include_limits.patch | 10 ++ sci-libs/itk/files/tests.patch| 41 + sci-libs/itk/itk-5.1.0.ebuild | 191 ++ 4 files changed, 262 insertions(+) diff --git a/sci-libs/itk/files/itk-5.1.0-downloads.patch b/sci-libs/itk/files/itk-5.1.0-downloads.patch new file mode 100644 index 0..34fdb76d1 --- /dev/null +++ b/sci-libs/itk/files/itk-5.1.0-downloads.patch @@ -0,0 +1,20 @@ +--- a/CMake/ITKDownloadSetup.cmake 2020-07-30 19:03:10.330325423 -0400 b/CMake/ITKDownloadSetup.cmake 2020-07-30 19:03:10.330325423 -0400 +@@ -11,7 +11,7 @@ + + macro(itk_download_attempt_check _name) + if(ITK_FORBID_DOWNLOADS) +-message(SEND_ERROR "Attempted to download ${_name} when ITK_FORBID_DOWNLOADS is ON") ++message(WARNING "Attempted to download ${_name} when ITK_FORBID_DOWNLOADS is ON") + endif() + endmacro() + +--- a/Modules/Remote/GenericLabelInterpolator.remote.cmake 2020-04-25 14:30:53.0 -0400 b/Modules/Remote/GenericLabelInterpolator.remote.cmake 2020-04-25 14:30:53.0 -0400 +@@ -44,6 +44,4 @@ + itk_fetch_module(GenericLabelInterpolator + "A generic interpolator for multi-label images." + MODULE_COMPLIANCE_LEVEL 2 +- GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKGenericLabelInterpolator.git +- GIT_TAG b95fe46c7f4fe8002af67c67e6fe4e1f087bf6b7 + ) diff --git a/sci-libs/itk/files/itk-5.1.0-include_limits.patch b/sci-libs/itk/files/itk-5.1.0-include_limits.patch new file mode 100644 index 0..9a8fae820 --- /dev/null +++ b/sci-libs/itk/files/itk-5.1.0-include_limits.patch @@ -0,0 +1,10 @@ +--- a/Modules/ThirdParty/GDCM/src/gdcm/Source/MediaStorageAndFileFormat/gdcmImageChangePhotometricInterpretation.h a/Modules/ThirdParty/GDCM/src/gdcm/Source/MediaStorageAndFileFormat/gdcmImageChangePhotometricInterpretation.h +@@ -16,6 +16,7 @@ + + #include "gdcmImageToImageFilter.h" + #include "gdcmPhotometricInterpretation.h" ++#include + + namespace gdcm + { diff --git a/sci-libs/itk/files/tests.patch b/sci-libs/itk/files/tests.patch new file mode 100644 index 0..c24714e4d --- /dev/null +++ b/sci-libs/itk/files/tests.patch @@ -0,0 +1,41 @@ +Known to fail by upstream: +https://github.com/InsightSoftwareConsortium/ITK/issues/1212#issuecomment-527998115 + +--- a/Modules/Bridge/VtkGlue/test/CMakeLists.txt 2019-09-09 00:45:14.736032139 +0200 b/Modules/Bridge/VtkGlue/test/CMakeLists.txt 2019-09-09 00:49:42.183935497 +0200 +@@ -7,8 +7,6 @@ + if(NOT VTK_RENDERING_BACKEND STREQUAL "None") + list(APPEND ITKVtkGlueTests + itkVtkMedianFilterTest.cxx +-itkVtkConnectedComponentImageFilterTest.cxx +-QuickViewTest.cxx + # ### runViewImage ### + # No test generated. Use it for view images (2D or 3D) with: + # ITKVtkGlueTestDriver runViewImage image_file +@@ -40,26 +38,3 @@ + NAME itkVTKImageToImageFilterTest + COMMAND ITKVtkGlueTestDriver + itkVTKImageToImageFilterTest) +- +-if(NOT VTK_RENDERING_BACKEND STREQUAL "None") +- itk_add_test( +-NAME itkVtkMedianImageFilterTest +-COMMAND ITKVtkGlueTestDriver +- itkVtkMedianFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} 2) +- set_property(TEST itkVtkMedianImageFilterTest APPEND PROPERTY LABELS REQUIRES_DISPLAY) +- +- itk_add_test( +-NAME QuickViewTest +-COMMAND ITKVtkGlueTestDriver +- --compare DATA{Baseline/QuickViewTest.png,:} +- ${ITK_TEST_OUTPUT_DIR}/QuickViewTest0.png +- --compareNumberOfPixelsTolerance 1500 +- QuickViewTest DATA{${ITK_DATA_ROOT}/Input/peppers.png} ${ITK_TEST_OUTPUT_DIR}) +- set_property(TEST QuickViewTest APPEND PROPERTY LABELS REQUIRES_DISPLAY) +- +- itk_add_test( +-NAME itkVtkConnectedComponentImageFilterTest +-COMMAND ITKVtkGlueTestDriver +- itkVtkConnectedComponentImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png}) +- set_property(TEST itkVtkConnectedComponentImageFilterTest APPEND PROPERTY LABELS REQUIRES_DISPLAY) +-endif() diff --git a/sci-libs/itk/itk-5.1.0.ebuild b/sci-libs/itk/itk-5.1.0.ebuild new file mode 100644 index 0..34d2c215d --- /dev/null +++ b/sci-libs/itk/itk-5.1.0.ebuild @@ -0,0 +1,191 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit cmake python-single-r1 + +MY_PN="InsightToolkit" +MY_P="${MY_PN}-${PV}" +GLI_HASH="a02cbeaf28cb3d28ac66b9ac651073530eb6ab78"
[gentoo-commits] proj/sci:master commit in: sci-libs/itk/files/, sci-libs/itk/
commit: 3b227d5588eaac724032273e19541ee81aa53034 Author: Horea Christian chymera eu> AuthorDate: Mon Jan 10 00:38:53 2022 + Commit: Horea Christian gmail com> CommitDate: Mon Jan 10 00:38:53 2022 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=3b227d55 sci-libs/itk: fixed missing limits issue for newer GCC Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Horea Christian chymera.eu> sci-libs/itk/files/itk-5.1.0-include_limits.patch | 10 ++ sci-libs/itk/itk-5.0.1.ebuild | 10 +- sci-libs/itk/itk-5.1.0.ebuild | 11 ++- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/sci-libs/itk/files/itk-5.1.0-include_limits.patch b/sci-libs/itk/files/itk-5.1.0-include_limits.patch new file mode 100644 index 0..9a8fae820 --- /dev/null +++ b/sci-libs/itk/files/itk-5.1.0-include_limits.patch @@ -0,0 +1,10 @@ +--- a/Modules/ThirdParty/GDCM/src/gdcm/Source/MediaStorageAndFileFormat/gdcmImageChangePhotometricInterpretation.h a/Modules/ThirdParty/GDCM/src/gdcm/Source/MediaStorageAndFileFormat/gdcmImageChangePhotometricInterpretation.h +@@ -16,6 +16,7 @@ + + #include "gdcmImageToImageFilter.h" + #include "gdcmPhotometricInterpretation.h" ++#include + + namespace gdcm + { diff --git a/sci-libs/itk/itk-5.0.1.ebuild b/sci-libs/itk/itk-5.0.1.ebuild index 9c8ce63eb..c0a74b27f 100644 --- a/sci-libs/itk/itk-5.0.1.ebuild +++ b/sci-libs/itk/itk-5.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -159,11 +159,11 @@ src_install() { dodoc -r "${S}"/Examples/* fi - echo "ITK_DATA_ROOT=${EROOT}/usr/share/${PN}/data" > ${T}/40${PN} - local ldpath="${EROOT}/usr/$(get_libdir)/InsightToolkit" + echo "ITK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data" > ${T}/40${PN} + local ldpath="${EPREFIX}/usr/$(get_libdir)/InsightToolkit" if use python; then - echo "PYTHONPATH=${EROOT}/usr/$(get_libdir)/InsightToolkit/WrapITK/Python" >> "${T}"/40${PN} - ldpath="${ldpath}:${EROOT}/usr/$(get_libdir)/InsightToolkit/WrapITK/lib" + echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/InsightToolkit/WrapITK/Python" >> "${T}"/40${PN} + ldpath="${ldpath}:${EPREFIX}/usr/$(get_libdir)/InsightToolkit/WrapITK/lib" fi echo "LDPATH=${ldpath}" >> "${T}"/40${PN} doenvd "${T}"/40${PN} diff --git a/sci-libs/itk/itk-5.1.0.ebuild b/sci-libs/itk/itk-5.1.0.ebuild index d437d0298..8c9e48dba 100644 --- a/sci-libs/itk/itk-5.1.0.ebuild +++ b/sci-libs/itk/itk-5.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -72,6 +72,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/tests.patch "${FILESDIR}"/${P}-downloads.patch + "${FILESDIR}"/${P}-include_limits.patch ) pkg_pretend() { @@ -171,11 +172,11 @@ src_install() { dodoc -r "${S}"/Examples/* fi - echo "ITK_DATA_ROOT=${EROOT}/usr/share/${PN}/data" > ${T}/40${PN} - local ldpath="${EROOT}/usr/$(get_libdir)/InsightToolkit" + echo "ITK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data" > ${T}/40${PN} + local ldpath="${EPREFIX}/usr/$(get_libdir)/InsightToolkit" if use python; then - echo "PYTHONPATH=${EROOT}/usr/$(get_libdir)/InsightToolkit/WrapITK/Python" >> "${T}"/40${PN} - ldpath="${ldpath}:${EROOT}/usr/$(get_libdir)/InsightToolkit/WrapITK/lib" + echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/InsightToolkit/WrapITK/Python" >> "${T}"/40${PN} + ldpath="${ldpath}:${EPREFIX}/usr/$(get_libdir)/InsightToolkit/WrapITK/lib" fi echo "LDPATH=${ldpath}" >> "${T}"/40${PN} doenvd "${T}"/40${PN}
[gentoo-commits] proj/sci:master commit in: sci-libs/itk/files/, sci-libs/itk/
commit: be1836449dfcf8edc09329c66bb389a879f15fac Author: Sébastien Fabbro bicatali AT gentoo DOT org AuthorDate: Thu Apr 10 17:59:32 2014 + Commit: Sebastien Fabbro bicatali AT gentoo DOT org CommitDate: Thu Apr 10 17:59:32 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=be183644 sci-libs/itk: Version bump. Reworked ebuild Package-Manager: portage-2.2.8-prefix --- sci-libs/itk/ChangeLog | 11 ++ ...p-TransformFileReader-TransformFileWriter.patch | 50 +++ ...itkQuasiNewtonOptimizerv4-wrapping-warnin.patch | 28 ...itkGradientDescentOptimizerv4-wrapping-wa.patch | 73 ++ ...OptimizerParameterScalesEstimatorTemplate.patch | 30 .../0005-make-gdcm-helper-library-static.patch | 11 ++ sci-libs/itk/files/nrrdio-linking.patch| 15 ++ sci-libs/itk/itk-4.5.1.ebuild | 154 + 8 files changed, 372 insertions(+) diff --git a/sci-libs/itk/ChangeLog b/sci-libs/itk/ChangeLog index 6aeb88a..b68a4b5 100644 --- a/sci-libs/itk/ChangeLog +++ b/sci-libs/itk/ChangeLog @@ -2,6 +2,17 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*itk-4.5.1 (10 Apr 2014) + + 10 Apr 2014; Sébastien Fabbro bicat...@gentoo.org + +files/0001-BUG-Wrap-TransformFileReader-TransformFileWriter.patch, + +files/0002-COMP-Fixed-itkQuasiNewtonOptimizerv4-wrapping-warnin.patch, + +files/0003-COMP-Fixed-itkGradientDescentOptimizerv4-wrapping-wa.patch, + +files/0004-COMP-Warp-OptimizerParameterScalesEstimatorTemplate.patch, + +files/0005-make-gdcm-helper-library-static.patch, + +files/nrrdio-linking.patch, +itk-4.5.1.ebuild: + sci-libs/itk: Version bump. Reworked ebuild + 06 Jan 2014; Justin Lecher j...@gentoo.org metadata.xml: Fix missing local USE diff --git a/sci-libs/itk/files/0001-BUG-Wrap-TransformFileReader-TransformFileWriter.patch b/sci-libs/itk/files/0001-BUG-Wrap-TransformFileReader-TransformFileWriter.patch new file mode 100644 index 000..094ee32 --- /dev/null +++ b/sci-libs/itk/files/0001-BUG-Wrap-TransformFileReader-TransformFileWriter.patch @@ -0,0 +1,50 @@ +From d069b7b94287dae15fcaf707775f5dd2bbebcc38 Mon Sep 17 00:00:00 2001 +From: Matt McCormick matt.mccorm...@kitware.com +Date: Wed, 5 Feb 2014 15:52:34 -0500 +Subject: [PATCH 1/3] BUG: Wrap TransformFileReader, TransformFileWriter. + +Missing CMakeLists.txt in the wrapping directory. Need to explicitly include +the headers after Template was appended to the class name. + +Suggested-by: Sami Koho sami.k...@gmail.com + +Change-Id: I6f994bb18f37d5adf1d0f0311fa73506c41239a7 +--- + Modules/IO/TransformBase/wrapping/CMakeLists.txt | 3 +++ + Modules/IO/TransformBase/wrapping/itkTransformFileReader.wrap | 2 ++ + Modules/IO/TransformBase/wrapping/itkTransformFileWriter.wrap | 2 ++ + 3 files changed, 7 insertions(+) + create mode 100644 Modules/IO/TransformBase/wrapping/CMakeLists.txt + +diff --git a/Modules/IO/TransformBase/wrapping/CMakeLists.txt b/Modules/IO/TransformBase/wrapping/CMakeLists.txt +new file mode 100644 +index 000..6072567 +--- /dev/null b/Modules/IO/TransformBase/wrapping/CMakeLists.txt +@@ -0,0 +1,3 @@ ++itk_wrap_module(ITKIOTransformBase) ++itk_auto_load_submodules() ++itk_end_wrap_module() +diff --git a/Modules/IO/TransformBase/wrapping/itkTransformFileReader.wrap b/Modules/IO/TransformBase/wrapping/itkTransformFileReader.wrap +index 9b52fbc..662df9e 100644 +--- a/Modules/IO/TransformBase/wrapping/itkTransformFileReader.wrap b/Modules/IO/TransformBase/wrapping/itkTransformFileReader.wrap +@@ -1,3 +1,5 @@ ++set(WRAPPER_AUTO_INCLUDE_HEADERS OFF) ++itk_wrap_include(itkTransformFileReader.h) + itk_wrap_class(itk::TransformFileReaderTemplate POINTER) + foreach(t ${WRAP_ITK_REAL}) + itk_wrap_template(${ITKM_${t}} ${ITKT_${t}}) +diff --git a/Modules/IO/TransformBase/wrapping/itkTransformFileWriter.wrap b/Modules/IO/TransformBase/wrapping/itkTransformFileWriter.wrap +index 4f1ac4a..356aaf3 100644 +--- a/Modules/IO/TransformBase/wrapping/itkTransformFileWriter.wrap b/Modules/IO/TransformBase/wrapping/itkTransformFileWriter.wrap +@@ -1,3 +1,5 @@ ++set(WRAPPER_AUTO_INCLUDE_HEADERS OFF) ++itk_wrap_include(itkTransformFileWriter.h) + itk_wrap_class(itk::TransformFileWriterTemplate POINTER) + foreach(t ${WRAP_ITK_REAL}) + itk_wrap_template(${ITKM_${t}} ${ITKT_${t}}) +-- +1.8.5.3 + diff --git a/sci-libs/itk/files/0002-COMP-Fixed-itkQuasiNewtonOptimizerv4-wrapping-warnin.patch b/sci-libs/itk/files/0002-COMP-Fixed-itkQuasiNewtonOptimizerv4-wrapping-warnin.patch new file mode 100644 index 000..4c74d54 --- /dev/null +++ b/sci-libs/itk/files/0002-COMP-Fixed-itkQuasiNewtonOptimizerv4-wrapping-warnin.patch @@ -0,0 +1,28 @@ +From 66d2955fbe5528d9df216c639277d1d2686447e5 Mon Sep 17 00:00:00 2001 +From: Michka Popoff michkapop...@gmail.com +Date: Fri, 7 Feb 2014 19:24:49 +0100 +Subject: [PATCH 2/3] COMP: