From 03c73b3995d9dbf86c5caffab5a7b3a0e359f549 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sat, 7 Feb 2026 14:41:31 +0100 Subject: gnu: vtk: Update to 9.4.2 and add vtk-9.3. * gnu/packages/image-processing.scm (vtk): Update to 9.4.2. [origin]: Adapt snippet. (vtk-9.3): Add back the previous version. (opencv)[inputs], * gnu/packages/geo.scm (ogs-serial)[inputs], * gnu/packages/python-science.scm (python-pyvista)[inputs]: Replace vtk by vtk-9.3. Change-Id: I1a567bc30c7845fdd647db0f93cef2cafe1ced76 --- gnu/packages/image-processing.scm | 45 ++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 10 deletions(-) (limited to 'gnu/packages/image-processing.scm') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index cad0f970fef..8129dce1a66 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2024 Nicolas Graves ;;; Copyright © 2025 Jake Forster ;;; Copyright © 2025 Anderson Torres -;;; Copyright © 2025 Andreas Enge +;;; Copyright © 2025, 2026 Andreas Enge ;;; Copyright © 2025 dan ;;; Copyright © 2026 Cayetano Santos ;;; @@ -353,7 +353,7 @@ many popular formats.") (define-public vtk (package (name "vtk") - (version "9.3.1") + (version "9.4.2") (source (origin (method url-fetch) (uri (string-append "https://vtk.org/files/release/" @@ -361,7 +361,7 @@ many popular formats.") "/VTK-" version ".tar.gz")) (sha256 (base32 - "1f6ac40db7wkb3bfh31d71qc5gy44cw29r6v4cyxrlm09q4fqm43")) + "00kahpi53hld3ip3cfswdnvfg4llmabq0w2kzqq2mcbbm46qxj9n")) (modules '((guix build utils))) (snippet '(begin @@ -371,13 +371,9 @@ many popular formats.") (string-append "ThirdParty/" dir "/vtk" dir))) ;; pugixml depended upon unconditionally '("doubleconversion" "eigen" "expat" "freetype" "gl2ps" - "glew" "hdf5" "jpeg" "jsoncpp" "libharu" "libproj" + "hdf5" "jpeg" "jsoncpp" "libharu" "libproj" "libxml2" "lz4" "netcdf" "ogg" "png" "sqlite" "theora" - "tiff" "zlib")) - (substitute* "IO/ExportPDF/vtkPDFContextDevice2D.cxx" - (("\\bHPDF_UINT16 (noPen|dash|dot|denseDot|dashDot|dashDotDot)\\b" - _ var) - (string-append "HPDF_REAL " var))))))) + "tiff" "zlib")))))) (properties `((release-monitoring-url . "https://vtk.org/download/"))) (build-system cmake-build-system) (arguments @@ -486,6 +482,35 @@ a suite of 3D interaction widgets, supports parallel processing, and integrates with various databases on GUI toolkits such as Qt and Tk.") (license license:bsd-3))) +(define-public vtk-9.3 + (package + (inherit vtk) + (version "9.3.1") + (source (origin + (method url-fetch) + (uri (string-append "https://vtk.org/files/release/" + (version-major+minor version) + "/VTK-" version ".tar.gz")) + (sha256 + (base32 + "1f6ac40db7wkb3bfh31d71qc5gy44cw29r6v4cyxrlm09q4fqm43")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each + (lambda (dir) + (delete-file-recursively + (string-append "ThirdParty/" dir "/vtk" dir))) + ;; pugixml depended upon unconditionally + '("doubleconversion" "eigen" "expat" "freetype" "gl2ps" + "glew" "hdf5" "jpeg" "jsoncpp" "libharu" "libproj" + "libxml2" "lz4" "netcdf" "ogg" "png" "sqlite" "theora" + "tiff" "zlib")) + (substitute* "IO/ExportPDF/vtkPDFContextDevice2D.cxx" + (("\\bHPDF_UINT16 (noPen|dash|dot|denseDot|dashDot|dashDotDot)\\b" + _ var) + (string-append "HPDF_REAL " var))))))))) + (define-public vktdiff (package (name "vtkdiff") @@ -773,7 +798,7 @@ different data arrays similar to those available in the numdiff software.") protobuf python python-numpy - vtk + vtk-9.3 zlib)) ;; These three CVEs are not a problem of OpenCV, see: ;; https://github.com/opencv/opencv/issues/10998 -- cgit v1.3