From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 19 04:54:31 2021 Received: (at 46724) by debbugs.gnu.org; 19 Mar 2021 08:54:31 +0000 Received: from localhost ([127.0.0.1]:48791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNAtm-0002He-V7 for submit@debbugs.gnu.org; Fri, 19 Mar 2021 04:54:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNAtk-0002HQ-Jj for 46724@debbugs.gnu.org; Fri, 19 Mar 2021 04:54:25 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:46663) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNAtf-0003I3-9n; Fri, 19 Mar 2021 04:54:19 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57432 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lNAte-0004yT-8B; Fri, 19 Mar 2021 04:54:18 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Andy Tai Subject: Re: bug#46724: [PATCH] gnu: vtk: Update to 9.0.1 References: <87r1kxuzqa.fsf@gnu.org> Date: Fri, 19 Mar 2021 09:54:15 +0100 In-Reply-To: (Andy Tai's message of "Thu, 18 Mar 2021 02:03:22 -0700") Message-ID: <877dm3jzgo.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 46724 Cc: 46724@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Andy, Thanks for the update! I spent some time checking whether dependents, as returned by =E2=80=98guix refresh -l vtk=E2=80=99, would still build. It turns out tha =E2=80=98mia=E2=80=99 no longer builds after this update b= ecause the =E2=80=98VTK_INCLUDE_DIRS=E2=80=99 CMake variable remains empty. I=E2=80= =99m not familiar (or averse to?) CMake, and I couldn=E2=80=99t figure out why that = is the case. Could you take a look? As a last resort, we could preserve VTK=C2=A08.2 and use it in MIA. Attached is my variant of the patch, which propagates libogg, as was needed for some dependents, but really we could/should propagate libtheora, lz4, and double-conversion for the same reasons it seems. Let me know what you think! Thanks, Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-vtk-Update-to-9.0.1.patch Content-Transfer-Encoding: quoted-printable Content-Description: the patch From e91dde40896ab156e35ec31533a77c33672460d7 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Thu, 18 Mar 2021 00:46:45 -0700 Subject: [PATCH] gnu: vtk: Update to 9.0.1. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image-processing.scm (vtk): Update to 9.0.1. [source](snippet): Remove bundled "ogg" directory as well. [arguments]: Adjust #:configure-flags. Add #:phases. [inputs]: Add LIBOGG. * gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch: Update. Co-authored-by: Ludovic Court=C3=A8s --- gnu/packages/image-processing.scm | 65 ++++++++++++------- .../vtk-fix-freetypetools-build-failure.patch | 14 ++-- 2 files changed, 45 insertions(+), 34 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-process= ing.scm index 26f6faea8c..605fc1aeb5 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -14,6 +14,7 @@ ;;; Copyright =C2=A9 2020 Brendan Tildesley ;;; Copyright =C2=A9 2021 Oleh Malyi ;;; Copyright =C2=A9 2021 Felix Gruber +;;; Copyright =C2=A9 2021 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -246,7 +247,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 +255,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))) @@ -264,35 +265,46 @@ many popular formats.") (lambda (dir) (delete-file-recursively (string-append "ThirdParty/" dir "/vtk" dir))) - ;; ogg, pugixml depended upon unconditionally + ;; pugixml depended upon unconditionally '("doubleconversion" "eigen" "expat" "freetype" "gl2ps" "glew" "hdf5" "jpeg" "jsoncpp" "libproj" "libxml2" "= lz4" - "netcdf" "png" "sqlite" "theora" "tiff" "zlib")) + "netcdf" "ogg" "png" "sqlite" "theora" "tiff" "zlib"= )) #t)))) (build-system cmake-build-system) (arguments '(#:build-type "Release" ;Build without '-g' to save space. #:configure-flags '(;"-DBUILD_TESTING:BOOL=3DTRUE" - ;"-DVTK_MODULE_USE_EXTERNAL_vtkogg:BOOL=3DTRUE"= ; not honored - "-DVTK_USE_SYSTEM_DOUBLECONVERSION:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_EIGEN:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_EXPAT:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_FREETYPE:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_GL2PS:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_GLEW:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_HDF5:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_JPEG:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_JSONCPP:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_LIBPROJ:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_LIBXML2:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_LZ4:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_NETCDF:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_PNG:BOOL=3DTRUE" - ;"-DVTK_USE_SYSTEM_PUGIXML:BOOL=3DTRUE" ; br= eaks IO/CityGML - "-DVTK_USE_SYSTEM_SQLITE:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_THEORA:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_TIFF:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_ZLIB:BOOL=3DTRUE") + ; ; not honored + "-DVTK_USE_EXTERNAL=3DOFF" ;; default + "-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion= =3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_expat=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_freetype=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_glew=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_lz4=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_ogg=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_png=3DON" + ;"-DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=3DON" = ; breaks IO/CityGML + "-DVTK_MODULE_USE_EXTERNAL_VTK_sqlite=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_theora=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=3DON" + ) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda _ + (substitute* "Common/Core/vtkFloatingPointExceptions.cxx" + (("") "")) + (substitute* "Common/Core/CMakeLists.txt" + (("fenv.h") "cfenv"))))) #:tests? #f)) ;XXX: test data not included (inputs `(("double-conversion" ,double-conversion) @@ -305,7 +317,6 @@ many popular formats.") ("hdf5" ,hdf5) ("jpeg" ,libjpeg-turbo) ("jsoncpp" ,jsoncpp) - ;("libogg" ,libogg) ("libtheora" ,libtheora) ("libX11" ,libx11) ("libxml2" ,libxml2) @@ -320,6 +331,10 @@ many popular formats.") ("tiff" ,libtiff) ("xorgproto" ,xorgproto) ("zlib" ,zlib))) + (propagated-inputs + ;; VTK's 'VTK-vtk-module-find-packages.cmake' calls + ;; 'find_package(THEORA)', which in turns looks for libogg. + `(("libogg" ,libogg))) (home-page "https://vtk.org/") (synopsis "Libraries for 3D computer graphics") (description 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() } -=20 + //-----------------------------------------------------------------------= ----- -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* f= ace) + FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* f= ace) { #if VTK_FTFC_DEBUG_CD - printf("vtkFreeTypeToolsFaceRequester()\n"); ---=20 +-- 2.30.1 =20 --=20 2.31.0 --=-=-=--