all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#46724] [PATCH] gnu: vtk: Update to 9.0.1
@ 2021-02-23 19:16 Andy Tai
  2021-02-23 19:25 ` [bug#46724] helps OpenCV build Andy Tai
  2021-03-02 19:23 ` [bug#46724] [PATCH] gnu: vtk: Update to 9.0.1 Ludovic Courtès
  0 siblings, 2 replies; 13+ messages in thread
From: Andy Tai @ 2021-02-23 19:16 UTC (permalink / raw)
  To: 46724

* gnu/packages/image-processing.scm (vtk): Update to 9.0.1
---
 gnu/packages/image-processing.scm | 50 ++++++++++---------------------
 1 file changed, 15 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/image-processing.scm
b/gnu/packages/image-processing.scm
index c3ea8491d9..3af9b3c6c3 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2021 Oleh Malyi <astroclubzp@gmail.com>
+;;; Copyright © 2021 Andy Tai <atai@atai.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -245,7 +246,7 @@ many popular formats.")
 (define-public vtk
   (package
     (name "vtk")
-    (version "8.2.0")
+    (version "9.0.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://vtk.org/files/release/"
@@ -253,44 +254,23 @@ many popular formats.")
                                   "/VTK-" version ".tar.gz"))
               (sha256
                (base32
-                "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  (for-each
-                    (lambda (dir)
-                      (delete-file-recursively
-                        (string-append "ThirdParty/" dir "/vtk" dir)))
-                    ;; ogg, pugixml depended upon unconditionally
-                    '("doubleconversion" "eigen" "expat" "freetype" "gl2ps"
-                      "glew" "hdf5" "jpeg" "jsoncpp" "libproj" "libxml2" "lz4"
-                      "netcdf" "png" "sqlite" "theora" "tiff" "zlib"))
-                  #t))))
+                "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v"))
+              (modules '((guix build utils)))))
     (build-system cmake-build-system)
     (arguments
      '(#:build-type "Release"           ;Build without '-g' to save space.
-       #:configure-flags '(;"-DBUILD_TESTING:BOOL=TRUE"
-
;"-DVTK_MODULE_USE_EXTERNAL_vtkogg:BOOL=TRUE"    ; not honored
-                           "-DVTK_USE_SYSTEM_DOUBLECONVERSION:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_EIGEN:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_EXPAT:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_FREETYPE:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_GL2PS:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_GLEW:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_HDF5:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_JPEG:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_JSONCPP:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_LIBPROJ:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_LIBXML2:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_LZ4:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_NETCDF:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_PNG:BOOL=TRUE"
-                           ;"-DVTK_USE_SYSTEM_PUGIXML:BOOL=TRUE"    ;
breaks IO/CityGML
-                           "-DVTK_USE_SYSTEM_SQLITE:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_THEORA:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_TIFF:BOOL=TRUE"
-                           "-DVTK_USE_SYSTEM_ZLIB:BOOL=TRUE")
+       #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'patch-sources
+             (lambda _
+                 (substitute* "Common/Core/vtkFloatingPointExceptions.cxx"
+                     (("<fenv.h>") "<cfenv>"))
+                 (substitute* "Common/Core/CMakeLists.txt"
+                     (("fenv.h") "cfenv"))
+                 #t)))
        #:tests? #f))        ;XXX: test data not included
+    (native-inputs
+    `(("python", python-wrapper)))
     (inputs
      `(("double-conversion" ,double-conversion)
        ("eigen" ,eigen)
-- 
2.30.1




^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2021-04-02  7:04 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-23 19:16 [bug#46724] [PATCH] gnu: vtk: Update to 9.0.1 Andy Tai
2021-02-23 19:25 ` [bug#46724] helps OpenCV build Andy Tai
2021-03-02 19:23 ` [bug#46724] [PATCH] gnu: vtk: Update to 9.0.1 Ludovic Courtès
2021-03-02 19:37   ` Andy Tai
2021-03-06 10:36     ` Ludovic Courtès
2021-03-07  0:08       ` Andy Tai
2021-03-18  7:59     ` Andy Tai
2021-03-18  9:03       ` Andy Tai
2021-03-19  8:54         ` Ludovic Courtès
2021-03-19 17:43           ` Andy Tai
2021-03-29  6:42             ` Andy Tai
2021-04-02  6:55               ` Ludovic Courtès
2021-04-02  7:03           ` bug#46724: " Ludovic Courtès

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.