all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / 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; 4+ 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	[flat|nested] 4+ messages in thread

* [bug#46724] helps OpenCV build
  2021-02-23 19:16 [bug#46724] [PATCH] gnu: vtk: Update to 9.0.1 Andy Tai
@ 2021-02-23 19:25 ` Andy Tai
  2021-03-02 19:23 ` [bug#46724] [PATCH] gnu: vtk: Update to 9.0.1 Ludovic Courtès
  1 sibling, 0 replies; 4+ messages in thread
From: Andy Tai @ 2021-02-23 19:25 UTC (permalink / raw)
  To: 46724

This patch also allows OpenCV 3.4.3 (in guix repo) to build




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

* [bug#46724] [PATCH] gnu: vtk: Update to 9.0.1
  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 ` Ludovic Courtès
  2021-03-02 19:37   ` Andy Tai
  1 sibling, 1 reply; 4+ messages in thread
From: Ludovic Courtès @ 2021-03-02 19:23 UTC (permalink / raw)
  To: Andy Tai; +Cc: 46724

Hi,

Andy Tai <atai@atai.org> skribis:

> * gnu/packages/image-processing.scm (vtk): Update to 9.0.1

[...]

> -              (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"))

[...]

> -                           "-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")

Could you confirm that there’s no bundled software left?  That’d be
great news but also quite surprising.

TIA!

Ludo’.




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

* [bug#46724] [PATCH] gnu: vtk: Update to 9.0.1
  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
  0 siblings, 0 replies; 4+ messages in thread
From: Andy Tai @ 2021-03-02 19:37 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 46724

[-- Attachment #1: Type: text/plain, Size: 2914 bytes --]

err.... the bundles are still there.   Actually I tried to build with some
bundled components configured out (instead using what is in Guix) and
things don't compile... I am not sure if the external copies can be used at
all.  so I am not sure the best route to go... the patch as is does compile
and build, at least

On Tue, Mar 2, 2021 at 11:23 AM Ludovic Courtès <ludo@gnu.org> wrote:

> Hi,
>
> Andy Tai <atai@atai.org> skribis:
>
> > * gnu/packages/image-processing.scm (vtk): Update to 9.0.1
>
> [...]
>
> > -              (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"))
>
> [...]
>
> > -                           "-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")
>
> Could you confirm that there’s no bundled software left?  That’d be
> great news but also quite surprising.
>
> TIA!
>
> Ludo’.
>


-- 
Andy Tai, atai@atai.org, Skype: licheng.tai, Line: andy_tai, WeChat:
andytai1010
Year 2021 民國110年
自動的精神力是信仰與覺悟
自動的行為力是勞動與技能

[-- Attachment #2: Type: text/html, Size: 4648 bytes --]

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

end of thread, other threads:[~2021-03-02 19:39 UTC | newest]

Thread overview: 4+ 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

all messages for Guix-related lists mirrored at yhetil.org

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix

Example config snippet for mirrors.


AGPL code for this site: git clone http://ou63pmih66umazou.onion/public-inbox.git