diff options
| author | Marius Bakke <marius@gnu.org> | 2022-11-20 07:49:11 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-11-20 07:49:11 +0100 |
| commit | 7d5e045a691fcdbbfb1e75e4f4660396403c1d8d (patch) | |
| tree | fab0d21a5bc004969f9011ce60907754244c218a /gnu/packages/image-processing.scm | |
| parent | b187864f36e7f8ce584a002d28b275c6bf9fced2 (diff) | |
| parent | 8cef05bab6251978018ccab7bb44883676ce8f6c (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/image-processing.scm')
| -rw-r--r-- | gnu/packages/image-processing.scm | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 24282b5ad5..fb45e9b141 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -201,7 +201,9 @@ licences similar to the Modified BSD licence.")))) (base32 "0qpcd3n26q52dpyibm11f5l6cgscdr54p2jish39gc3p1f5h3ws1")) (patches (search-patches "mia-fix-boost-headers.patch" - "mia-vtk9.patch")))) + "mia-vtk9.patch" + "mia-vtk92.patch" + "mia-vtk-version.patch")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -314,7 +316,7 @@ many popular formats.") (define-public vtk (package (name "vtk") - (version "9.0.1") + (version "9.2.2") (source (origin (method url-fetch) (uri (string-append "https://vtk.org/files/release/" @@ -322,9 +324,7 @@ many popular formats.") "/VTK-" version ".tar.gz")) (sha256 (base32 - "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v")) - (patches - (search-patches "vtk-fix-freetypetools-build-failure.patch")) + "0x8h2bwxq2870067j7wqd0qym87pa3inkbri93zrdb0zwwmhlnqw")) (modules '((guix build utils))) (snippet '(begin @@ -373,14 +373,6 @@ many popular formats.") "-DVTK_WRAP_PYTHON=ON" "-DVTK_PYTHON_VERSION:STRING=3" ) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-sources - (lambda _ - (substitute* "Common/Core/vtkFloatingPointExceptions.cxx" - (("<fenv.h>") "<cfenv>")) - (substitute* "Common/Core/CMakeLists.txt" - (("fenv.h") "cfenv"))))) #:tests? #f)) ;XXX: test data not included (inputs (list double-conversion |