From 11daf1c0a118f6588e38d64458bfd7eecfbd545e Mon Sep 17 00:00:00 2001 From: Benjamin Trigona-Harany Date: Sat, 17 Apr 2021 13:08:44 +0200 Subject: [PATCH] academic/ITK: Downgrade and add GCC 10 support. --- academic/ITK/ITK.SlackBuild | 41 +++++++++++++++++++++++++++++++++---- academic/ITK/ITK.info | 8 ++++---- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/academic/ITK/ITK.SlackBuild b/academic/ITK/ITK.SlackBuild index fd9e8128f0..b5974946e1 100644 --- a/academic/ITK/ITK.SlackBuild +++ b/academic/ITK/ITK.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=ITK SRCNAM=InsightToolkit -VERSION=${VERSION:-5.1.2} +VERSION=${VERSION:-4.13.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -63,7 +63,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +tar xvf $CWD/$SRCNAM-$VERSION.tar.xz cd $SRCNAM-$VERSION chown -R root:root . find -L . \ @@ -72,13 +72,46 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 <<'endpatch' +--- InsightToolkit-4.13.2/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h.cp ++++ InsightToolkit-4.13.2/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h +@@ -96,6 +96,28 @@ + # define VCL_GCC_81 + # else + # define VCL_GCC_80 ++# endif ++# elif (__GNUC__==9) ++# define VCL_GCC_9 ++# if (__GNUC_MINOR__ > 2 ) ++# define VCL_GCC_93 ++# elif (__GNUC_MINOR__ > 1 ) ++# define VCL_GCC_92 ++# elif (__GNUC_MINOR__ > 0 ) ++# define VCL_GCC_91 ++# else ++# define VCL_GCC_90 ++# endif ++# elif (__GNUC__==10) ++# define VCL_GCC_10 ++# if (__GNUC_MINOR__ > 2 ) ++# define VCL_GCC_103 ++# elif (__GNUC_MINOR__ > 1 ) ++# define VCL_GCC_102 ++# elif (__GNUC_MINOR__ > 0 ) ++# define VCL_GCC_101 ++# else ++# define VCL_GCC_100 + # endif + # else + # error "Dunno about this gcc" +endpatch + sed -i "s/lib\b/lib${LIBDIRSUFFIX}/" CMakeLists.txt sed -i "s|/opj_config.h|& \$\{CMAKE_CURRENT_BINARY_DIR\}/openjpeg_mangle.h|" \ Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/CMakeLists.txt mkdir -p build cd build - export "PATH=/opt/cmake-202x/bin:$PATH" cmake \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ @@ -89,7 +122,7 @@ cd build -DBUILD_EXAMPLES=OFF \ -DITK_USE_SYSTEM_LIBRARIES=ON \ -DITK_USE_SYSTEM_DCMTK=ON \ - -DITK_USE_SYSTEM_EIGEN=OFF \ + -DITK_USE_SYSTEM_DOUBLECONVERSION=ON \ -DITK_USE_SYSTEM_EXPAT=ON \ -DITK_USE_SYSTEM_FFTW=ON \ -DITK_USE_SYSTEM_HDF5=ON \ diff --git a/academic/ITK/ITK.info b/academic/ITK/ITK.info index 9479aaaac9..d72260cfa6 100644 --- a/academic/ITK/ITK.info +++ b/academic/ITK/ITK.info @@ -1,10 +1,10 @@ PRGNAM="ITK" -VERSION="5.1.2" +VERSION="4.13.2" HOMEPAGE="https://itk.org" -DOWNLOAD="https://github.com/InsightSoftwareConsortium/ITK/releases/download/v5.1.2/InsightToolkit-5.1.2.tar.gz" -MD5SUM="e939fc61e7354eba20f98fbd7b034ec2" +DOWNLOAD="https://github.com/InsightSoftwareConsortium/ITK/releases/download/v4.13.2/InsightToolkit-4.13.2.tar.xz" +MD5SUM="d140ddabe22428e86bc5053e0d268872" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="cmake-202x double-conversion gtest hdf5" +REQUIRES="double-conversion gtest hdf5" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net"