From: "Paul A. Patience" <paul@apatience.com>
To: 57685@debbugs.gnu.org
Cc: "Paul A. Patience" <paul@apatience.com>
Subject: [bug#57685] [PATCH v2 3/3] gnu: vtk: Use system libHaru.
Date: Mon, 12 Sep 2022 19:25:45 +0000 [thread overview]
Message-ID: <20220912192510.420112-4-paul@apatience.com> (raw)
In-Reply-To: <20220912192510.420112-1-paul@apatience.com>
* 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
next prev parent reply other threads:[~2022-09-12 19:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-08 19:51 [bug#57685] [PATCH] gnu: libharu: Update to 2.4.1 Paul A. Patience
2022-09-10 9:55 ` Christopher Baines
2022-09-12 19:25 ` [bug#57685] [PATCH v2 0/3] gnu: libharu: Update to 2.4.2 Paul A. Patience
2022-09-12 19:25 ` [bug#57685] [PATCH v2 1/3] " Paul A. Patience
2022-09-12 19:25 ` [bug#57685] [PATCH v2 2/3] gnu: saga: Fix build with newer libHaru Paul A. Patience
2022-09-12 19:25 ` Paul A. Patience [this message]
2022-09-17 17:20 ` bug#57685: [PATCH v2 0/3] gnu: libharu: Update to 2.4.2 Christopher Baines
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220912192510.420112-4-paul@apatience.com \
--to=paul@apatience.com \
--cc=57685@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.