TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: vtk: Use system libHaru.

Browse source 
* gnu/packages/image-processing.scm (vtk)[snippet]: Delete bundled
libHaru and patch VTK for newer libHaru. Reindent and remove trailing
boolean.
[arguments]: Specify external libHaru in configure flags.
[inputs]: Add libharu.

Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
Paul A. Patience 2022-09-12 19:25:45 +00:00 committed by Christopher Baines
parent 229425fa53
commit c00e1c87f2
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/image-processing.scm
View file

@ -324,14 +324,18 @@ (define-public vtk
(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" "libproj" "libxml2" "lz4"
"netcdf" "ogg" "png" "sqlite" "theora" "tiff" "zlib"))
#t))))
(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)))))))
(properties `((release-monitoring-url . "https://vtk.org/download/")))
(build-system cmake-build-system)
(arguments
@ -348,6 +352,7 @@ (define-public vtk
"-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_lz4=ON"
@ -381,6 +386,7 @@ (define-public vtk
glew
glu
hdf5
libharu
libjpeg-turbo
jsoncpp
libtheora