summaryrefslogtreecommitdiff
path: root/gnu/packages/image-processing.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/image-processing.scm')
-rw-r--r--gnu/packages/image-processing.scm23
1 files changed, 13 insertions, 10 deletions
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 5dafd4e955..f99e8c4ae7 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -69,6 +69,7 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
+ #:use-module (gnu packages engineering)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages game-development)
@@ -942,17 +943,17 @@ recalculates.")
(define-public paraview
(package
(name "paraview")
- (version "5.11.1")
+ (version "6.0.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.kitware.com/paraview/paraview.git")
+ (url "https://gitlab.kitware.com/paraview/paraview")
(commit (string-append "v" version))
(recursive? #t)))
(file-name (git-file-name name version))
(sha256
- (base32 "0m1lgkl95f0pyhxp97gq2rf8hibv39v4c49imfj1va40z0flvard"))
+ (base32 "1m1c7vngrpaqdqvnjx4wj0va20hih5rb7rf0a44mp3wqgp4wgy0f"))
(modules '((guix build utils)))
(snippet
;; TODO: Also remove unused bundled libraries and plugins?
@@ -976,7 +977,7 @@ recalculates.")
(for-each (lambda (dir)
(delete-file-recursively
(string-append "VTK/ThirdParty/" dir "/vtk" dir)))
- '(;;"cgns"
+ '("cgns"
"cli11"
;;"diy2"
"doubleconversion"
@@ -984,11 +985,12 @@ recalculates.")
;;"exodusII"
"expat"
;;"exprtk"
+ ;;"fast-float"
;;"fides"
"fmt"
"freetype"
"gl2ps"
- "glew"
+ ;;"glad"
;;"h5part"
"hdf5"
;;"ioss"
@@ -1011,13 +1013,14 @@ recalculates.")
"sqlite"
"theora"
"tiff"
+ ;;"token"
"utf8"
;;"verdict"
+ ;;"viskores"
;;"vpic"
;;"vtkm"
;;"xdmf2"
;;"xdmf3"
- ;;"zfp"
"zlib"))))))
(build-system qt-build-system)
(arguments
@@ -1025,7 +1028,7 @@ recalculates.")
#:build-type "Release" ; 542 MiB in release mode
#:tests? #f ; Downloads test data
#:configure-flags
- #~(let ((doc (string-append #$output "/share/doc/" #$name "-" #$version)))
+ #~(let ((doc (string-append "share/doc/" #$name "-" #$version)))
(list
(string-append "-DCMAKE_INSTALL_DOCDIR=" doc) ; For paraview.qch
@@ -1095,6 +1098,7 @@ recalculates.")
;; External libraries for ParaView and VTK
"-DVTK_MODULE_USE_EXTERNAL_ParaView_protobuf=ON"
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_cgns=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON"
@@ -1102,7 +1106,6 @@ recalculates.")
"-DVTK_MODULE_USE_EXTERNAL_VTK_fmt=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=ON"
- "-DVTK_MODULE_USE_EXTERNAL_VTK_glew=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=ON"
@@ -1148,17 +1151,17 @@ recalculates.")
python-sphinx))
(inputs
(list boost
+ cgns
cli11
curl
double-conversion
eigen
expat
ffmpeg
- fmt
+ fmt-11
freetype
gdal
gl2ps
- glew
gmsh
hdf5
nlohmann-json ;For ParFlow; build fails