diff options
| author | Jake Forster <jakecameron.forster@gmail.com> | 2025-06-22 12:02:49 +0930 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-06-30 14:30:40 +0200 |
| commit | aa2f243ab724ead8f7c06f0a9dc8c1a4874de7fe (patch) | |
| tree | c901613e34accaa47c6674b9061edd0755d264c2 /gnu/packages/image-processing.scm | |
| parent | cd8f7f8d891a787ac6c275f04405676c7586b7ff (diff) | |
gnu: insight-toolkit: Update to 5.4.4.
* gnu/packages/image-processing (insight-toolkit): Update to 5.4.4.
[source] Switch to git-fetch; apply patch.
[arguments]<#:configure-flags>: Add -DITK_USE_SYSTEM_SWIG=ON,
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON, -DITK_USE_PYTHON_LIMITED_API=OFF and
-DBUILD_TESTING=OFF. Add -DHDF5_DIR set to HDF5's lib/cmake.
[inputs]: Add libaec.
[native-inputs]: Add git-minimal; replace swig with swig-next.
* gnu/packages/patches/insight-toolkit-fix-build.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register patch.
Change-Id: Ifbf73709e773649fb00c2d46848d3418daaf98c1
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/image-processing.scm')
| -rw-r--r-- | gnu/packages/image-processing.scm | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index c84290205df..cf6da9bbb50 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | ;;; Copyright © 2022 Paul A. Patience <paul@apatience.com> | 24 | ;;; Copyright © 2022 Paul A. Patience <paul@apatience.com> |
| 25 | ;;; Copyright © 2023 Cairn <cairn@pm.me> | 25 | ;;; Copyright © 2023 Cairn <cairn@pm.me> |
| 26 | ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> | 26 | ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> |
| 27 | ;;; Copyright © 2025 Jake Forster <jakecameron.forster@gmail.com> | ||
| 27 | ;;; | 28 | ;;; |
| 28 | ;;; This file is part of GNU Guix. | 29 | ;;; This file is part of GNU Guix. |
| 29 | ;;; | 30 | ;;; |
| @@ -1238,15 +1239,20 @@ libraries designed for computer vision research and implementation.") | |||
| 1238 | (define-public insight-toolkit | 1239 | (define-public insight-toolkit |
| 1239 | (package | 1240 | (package |
| 1240 | (name "insight-toolkit") | 1241 | (name "insight-toolkit") |
| 1241 | (version "5.0.0") | 1242 | (version "5.4.4") |
| 1242 | (source | 1243 | (source |
| 1243 | (origin | 1244 | (origin |
| 1244 | (method url-fetch) | 1245 | (method git-fetch) |
| 1245 | (uri (string-append "https://github.com/InsightSoftwareConsortium/ITK/" | 1246 | (uri (git-reference |
| 1246 | "releases/download/v" version "/InsightToolkit-" | 1247 | (url "https://github.com/InsightSoftwareConsortium/ITK") |
| 1247 | version ".tar.xz")) | 1248 | (commit (string-append "v" version)))) |
| 1249 | (file-name (git-file-name name version)) | ||
| 1248 | (sha256 | 1250 | (sha256 |
| 1249 | (base32 "0bs63mk4q8jmx38f031jy5w5n9yy5ng9x8ijwinvjyvas8cichqi")))) | 1251 | (base32 "1l5rby8jj8726k380aivycmhn56cz56mr9k3r56c8hkkrfwwng50")) |
| 1252 | ;; This patch is required to build with both ITK_USE_GPU=ON and | ||
| 1253 | ;; ITK_WRAP_PYTHON=ON. | ||
| 1254 | ;; <https://github.com/InsightSoftwareConsortium/ITK/pull/4842> | ||
| 1255 | (patches (search-patches "insight-toolkit-fix-build.patch")))) | ||
| 1250 | (build-system cmake-build-system) | 1256 | (build-system cmake-build-system) |
| 1251 | (outputs '("out" "python")) | 1257 | (outputs '("out" "python")) |
| 1252 | (arguments | 1258 | (arguments |
| @@ -1255,7 +1261,15 @@ libraries designed for computer vision research and implementation.") | |||
| 1255 | #~(list "-DITK_USE_GPU=ON" | 1261 | #~(list "-DITK_USE_GPU=ON" |
| 1256 | "-DITK_USE_SYSTEM_LIBRARIES=ON" | 1262 | "-DITK_USE_SYSTEM_LIBRARIES=ON" |
| 1257 | "-DITK_USE_SYSTEM_CASTXML=ON" | 1263 | "-DITK_USE_SYSTEM_CASTXML=ON" |
| 1264 | "-DITK_USE_SYSTEM_SWIG=ON" | ||
| 1265 | (string-append "-DHDF5_DIR=" #$(this-package-input "hdf5") | ||
| 1266 | "/lib/cmake") | ||
| 1258 | "-DBUILD_SHARED_LIBS=ON" | 1267 | "-DBUILD_SHARED_LIBS=ON" |
| 1268 | ;; Without this flag, there are shared libraries installed | ||
| 1269 | ;; in PY_SITE_PACKAGES_PATH/itk instead of #$output/lib and | ||
| 1270 | ;; RUNPATHs contain the *build directory* of | ||
| 1271 | ;; PY_SITE_PACKAGES_PATH/itk. | ||
| 1272 | "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" | ||
| 1259 | "-DITK_WRAPPING=ON" | 1273 | "-DITK_WRAPPING=ON" |
| 1260 | "-DITK_WRAP_PYTHON=ON" | 1274 | "-DITK_WRAP_PYTHON=ON" |
| 1261 | "-DITK_DYNAMIC_LOADING=ON" | 1275 | "-DITK_DYNAMIC_LOADING=ON" |
| @@ -1267,7 +1281,10 @@ libraries designed for computer vision research and implementation.") | |||
| 1267 | "/lib/python" python-version | 1281 | "/lib/python" python-version |
| 1268 | "/site-packages"))) | 1282 | "/site-packages"))) |
| 1269 | (string-append "-DPY_SITE_PACKAGES_PATH=" python-lib-path)) | 1283 | (string-append "-DPY_SITE_PACKAGES_PATH=" python-lib-path)) |
| 1270 | "-DCMAKE_CXX_STANDARD=17") | 1284 | ;; Python is not built with Py_LIMITED_API. |
| 1285 | "-DITK_USE_PYTHON_LIMITED_API=OFF" | ||
| 1286 | "-DCMAKE_CXX_STANDARD=17" | ||
| 1287 | "-DBUILD_TESTING=OFF") | ||
| 1271 | 1288 | ||
| 1272 | #:phases #~(modify-phases %standard-phases | 1289 | #:phases #~(modify-phases %standard-phases |
| 1273 | (add-after 'unpack 'do-not-tune | 1290 | (add-after 'unpack 'do-not-tune |
| @@ -1298,6 +1315,7 @@ libraries designed for computer vision research and implementation.") | |||
| 1298 | fftw | 1315 | fftw |
| 1299 | fftwf | 1316 | fftwf |
| 1300 | hdf5 | 1317 | hdf5 |
| 1318 | libaec | ||
| 1301 | libjpeg-turbo | 1319 | libjpeg-turbo |
| 1302 | libpng | 1320 | libpng |
| 1303 | libtiff | 1321 | libtiff |
| @@ -1308,7 +1326,7 @@ libraries designed for computer vision research and implementation.") | |||
| 1308 | vxl-1 | 1326 | vxl-1 |
| 1309 | zlib)) | 1327 | zlib)) |
| 1310 | (native-inputs | 1328 | (native-inputs |
| 1311 | (list castxml pkg-config swig which)) | 1329 | (list castxml git-minimal pkg-config swig-next which)) |
| 1312 | 1330 | ||
| 1313 | ;; The 'CMake/ITKSetStandardCompilerFlags.cmake' file normally sets | 1331 | ;; The 'CMake/ITKSetStandardCompilerFlags.cmake' file normally sets |
| 1314 | ;; '-mtune=native -march=corei7', suggesting there's something to be | 1332 | ;; '-mtune=native -march=corei7', suggesting there's something to be |
