[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#57685] [PATCH v2 3/3] gnu: vtk: Use system libHaru.
From: |
Paul A. Patience |
Subject: |
[bug#57685] [PATCH v2 3/3] gnu: vtk: Use system libHaru. |
Date: |
Mon, 12 Sep 2022 19:25:45 +0000 |
* 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.
---
gnu/packages/image-processing.scm | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/image-processing.scm
b/gnu/packages/image-processing.scm
index 0225f72651..4600c71ce0 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -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
--
2.37.3