diff --git a/mingw-w64-itk/PKGBUILD b/mingw-w64-itk/PKGBUILD index c801c3be24..d079010062 100644 --- a/mingw-w64-itk/PKGBUILD +++ b/mingw-w64-itk/PKGBUILD @@ -3,8 +3,8 @@ _realname=itk pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=5.3.0 -pkgrel=8 +pkgver=5.4.0 +pkgrel=1 pkgdesc='An open-source C++ toolkit for medical image processing (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64') @@ -15,6 +15,7 @@ msys2_references=( ) license=('spdx:Apache-2.0') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" + "${MINGW_PACKAGE_PREFIX}-dcmtk" "${MINGW_PACKAGE_PREFIX}-double-conversion" "${MINGW_PACKAGE_PREFIX}-expat" "${MINGW_PACKAGE_PREFIX}-fftw" @@ -23,6 +24,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libjpeg" "${MINGW_PACKAGE_PREFIX}-libpng" "${MINGW_PACKAGE_PREFIX}-libtiff" + #"${MINGW_PACKAGE_PREFIX}-opencl-icd" "${MINGW_PACKAGE_PREFIX}-zlib") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" @@ -56,14 +58,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-utf8cpp") optdepends=("${MINGW_PACKAGE_PREFIX}-opencv: ITK-OpenCV bridge" "${MINGW_PACKAGE_PREFIX}-vtk: ITK-VTK bridge") -source=("https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${pkgver}/InsightToolkit-${pkgver}.tar.gz" - "001-add-missing-header-with-gcc-13.patch::https://github.com/InsightSoftwareConsortium/ITK/commit/d3b5e8ba.patch") -sha256sums=('57a4471133dc8f76bde3d6eb45285c440bd40d113428884a1487472b7b71e383' - 'b14f2309056beb48ea58d6b9b3839f99f500eee01c32c3165b3d9b448b2c8e2e') +source=("https://github.com/InsightSoftwareConsortium/ITK/archive/v${pkgver}/ITK-${pkgver}.tar.gz") +sha256sums=('d71a36fc0aee2c9257fe128f7657feb1e671461bd48561b620619f290c71795e') prepare() { - cd "${srcdir}"/InsightToolkit-${pkgver} - patch -p1 -i "${srcdir}"/001-add-missing-header-with-gcc-13.patch + cd "${srcdir}"/ITK-${pkgver} } build() { @@ -89,7 +88,8 @@ build() { -DITK_INSTALL_DOC_DIR=share/doc/ITK \ -DITK_INSTALL_PACKAGE_DIR=lib/cmake/ITK \ -DITK_CUSTOM_LIBRARY_SUFFIX="" \ - -DITK_LEGACY_REMOVE=OFF \ + -DITK_LEGACY_REMOVE=ON \ + -DITK_FUTURE_LEGACY_REMOVE=ON \ -DITK_BUILD_DEFAULT_MODULES=OFF \ -DITKGroup_Core=ON \ -DITKGroup_IO=$([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] && echo "ON" || echo "OFF") \ @@ -108,25 +108,27 @@ build() { -DUSE_FFTWD=ON \ -DUSE_FFTWF=ON \ -DITK_USE_SYSTEM_LIBRARIES=ON \ + -DITK_USE_SYSTEM_DCMTK=ON \ -DITK_USE_SYSTEM_DOUBLECONVERSION=ON \ -DITK_USE_SYSTEM_EIGEN=ON \ -DITK_USE_SYSTEM_EXPAT=ON \ -DITK_USE_SYSTEM_FFTW=ON \ + -DITK_USE_SYSTEM_GDCM=ON \ -DITK_USE_SYSTEM_GOOGLETEST=ON \ -DITK_USE_SYSTEM_HDF5=ON \ -DITK_USE_SYSTEM_JPEG=ON \ + -DITK_USE_SYSTEM_MINC=OFF \ -DITK_USE_SYSTEM_PNG=ON \ -DITK_USE_SYSTEM_TIFF=ON \ -DITK_USE_SYSTEM_VXL=OFF \ -DITK_USE_SYSTEM_ZLIB=ON \ - -DITK_USE_SYSTEM_GDCM=ON \ -DITK_SKIP_PATH_LENGTH_CHECKS=1 \ -DITK_FORBID_DOWNLOADS=ON \ -DVNL_CONFIG_THREAD_SAFE=ON \ -DVNL_CONFIG_ENABLE_SSE2_ROUNDING=ON \ -DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python \ "${_extra_config[@]}" \ - "../InsightToolkit-${pkgver}" + "../ITK-${pkgver}" ${MINGW_PREFIX}/bin/cmake --build . } @@ -142,8 +144,8 @@ package() { find "lib/cmake/${_realname}" -name '*.cmake' -exec \ sed -s "s|${PREFIX_DEPS}|\${ITK_INSTALL_PREFIX}|g" -i {} \; - install -Dm644 "${srcdir}/InsightToolkit-${pkgver}/LICENSE" "share/licenses/${_realname}/LICENSE" - install -Dm644 "${srcdir}/InsightToolkit-${pkgver}/NOTICE" "share/licenses/${_realname}/NOTICE" - install -Dm644 "${srcdir}/InsightToolkit-${pkgver}/Modules/ThirdParty/KWSys/src/KWSys/Copyright.txt" \ + install -Dm644 "${srcdir}/ITK-${pkgver}/LICENSE" "share/licenses/${_realname}/LICENSE" + install -Dm644 "${srcdir}/ITK-${pkgver}/NOTICE" "share/licenses/${_realname}/NOTICE" + install -Dm644 "${srcdir}/ITK-${pkgver}/Modules/ThirdParty/KWSys/src/KWSys/Copyright.txt" \ "share/licenses/${_realname}/KWSys/Copyright.txt" }