From: Andy Tai <atai@atai.org>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 46724@debbugs.gnu.org
Subject: [bug#46724] [PATCH] gnu: vtk: Update to 9.0.1
Date: Thu, 18 Mar 2021 00:59:10 -0700 [thread overview]
Message-ID: <CAJsg1E-VHPNuhcXF9_7HKjyedyryWJDujx+kZoULN4g1BOb8zw@mail.gmail.com> (raw)
In-Reply-To: <CAJsg1E-Ak2HZa4RAvv_9mCaHLHq3z7r500xNVnq7mCha8e=YVQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
the updated patch builds vtk successfully and allows using external
copies of the same third party packages as the current vtk in guix
updated patch as attached
[-- Attachment #2: 0001-gnu-vtk-Update-to-9.0.1.patch --]
[-- Type: text/x-patch, Size: 6228 bytes --]
From b587bf39a81eb739f98da4e316ee1d777113fc9d Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 18 Mar 2021 00:46:45 -0700
Subject: [PATCH] gnu: vtk: Update to 9.0.1
* gnu/packages/image-processing.scm (vtk): Update to 9.0.1
* gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch: Update
---
gnu/packages/image-processing.scm | 53 +++++++++++--------
.../vtk-fix-freetypetools-build-failure.patch | 14 ++---
2 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 26f6faea8c..4184b35db8 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -246,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/"
@@ -254,7 +254,7 @@ many popular formats.")
"/VTK-" version ".tar.gz"))
(sha256
(base32
- "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"))
+ "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v"))
(patches
(search-patches "vtk-fix-freetypetools-build-failure.patch"))
(modules '((guix build utils)))
@@ -274,25 +274,36 @@ many popular formats.")
'(#: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")
+ "-DVTK_USE_EXTERNAL=OFF" ;; default
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON"
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON"
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON"
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON"
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=ON"
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_glew=ON"
+ "-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_libproj=ON"
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON"
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_lz4=ON"
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON"
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_png=ON"
+ ;"-DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=ON" ; breaks IO/CityGML
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_sqlite=ON"
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_theora=ON"
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON"
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON"
+ )
+ #: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
(inputs
`(("double-conversion" ,double-conversion)
diff --git a/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch b/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch
index 6988e65872..23f651b5eb 100644
--- a/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch
+++ b/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch
@@ -17,20 +17,16 @@ diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFre
index c54289dc60..03b899c4da 100644
--- a/Rendering/FreeType/vtkFreeTypeTools.cxx
+++ b/Rendering/FreeType/vtkFreeTypeTools.cxx
-@@ -387,11 +387,8 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache()
+@@ -378,8 +378,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache()
}
-
+
//----------------------------------------------------------------------------
-FT_CALLBACK_DEF(FT_Error)
--vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id,
-- FT_Library lib,
-- FT_Pointer request_data,
-- FT_Face* face)
+-vtkFreeTypeToolsFaceRequester(
+static FT_Error vtkFreeTypeToolsFaceRequester(
-+ FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face)
+ FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face)
{
#if VTK_FTFC_DEBUG_CD
- printf("vtkFreeTypeToolsFaceRequester()\n");
---
+--
2.30.1
--
2.30.2
next prev parent reply other threads:[~2021-03-18 8:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAJsg1E-VHPNuhcXF9_7HKjyedyryWJDujx+kZoULN4g1BOb8zw@mail.gmail.com \
--to=atai@atai.org \
--cc=46724@debbugs.gnu.org \
--cc=ludo@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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).