From patchwork Thu Mar 18 07:59:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 27959 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D295127BC57; Thu, 18 Mar 2021 08:00:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 51A3527BC55 for ; Thu, 18 Mar 2021 08:00:20 +0000 (GMT) Received: from localhost ([::1]:45446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMnZr-0001ib-Cn for patchwork@mira.cbaines.net; Thu, 18 Mar 2021 04:00:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMnZb-0001h7-5B for guix-patches@gnu.org; Thu, 18 Mar 2021 04:00:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33370) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMnZa-0001VI-S6 for guix-patches@gnu.org; Thu, 18 Mar 2021 04:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lMnZa-0001X9-PS for guix-patches@gnu.org; Thu, 18 Mar 2021 04:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#46724] [PATCH] gnu: vtk: Update to 9.0.1 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Mar 2021 08:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46724 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 46724@debbugs.gnu.org Received: via spool by 46724-submit@debbugs.gnu.org id=B46724.16160543985856 (code B ref 46724); Thu, 18 Mar 2021 08:00:02 +0000 Received: (at 46724) by debbugs.gnu.org; 18 Mar 2021 07:59:58 +0000 Received: from localhost ([127.0.0.1]:44916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMnZV-0001WO-Ia for submit@debbugs.gnu.org; Thu, 18 Mar 2021 03:59:57 -0400 Received: from mail-il1-f170.google.com ([209.85.166.170]:38806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMnZQ-0001W5-CF for 46724@debbugs.gnu.org; Thu, 18 Mar 2021 03:59:56 -0400 Received: by mail-il1-f170.google.com with SMTP id t7so4039373ilq.5 for <46724@debbugs.gnu.org>; Thu, 18 Mar 2021 00:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atai-org.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=szrj7DV/s38BjFZJ5qAVS/cUqTaLXZ/xG+iynv6owg8=; b=euyzPTwlj0GOkrAG8F3XE3oZ2KIGWJYwnpJ6VxTuW/9P0ZJqZW5AlNGGLpatrfA8jR Gb1zlrOBkcLRatGlk3rm7fwqX4y8jBnS8NG/RlipYGaHEBXLJbdPBbV3EL/TYVvs3PVe d/d0IgN/8Ujib2XoiZpz3WKEZGw9IBReu8VPP5ZbEtQnucq3ippnZmyXwSsbXctrC0j2 VzfsqMHyvplBRAYK2ld5afWhPDn7pVux1qE45E7ysBpoEYJQSN6/q4/Fb1CF+E0MSpX1 cxZRyEYNFspspArG1czSwhloxgPbWWtK+LEFqEw4sDPmMgcb5V2vLPC3Av3ww3zs03UC 9rCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=szrj7DV/s38BjFZJ5qAVS/cUqTaLXZ/xG+iynv6owg8=; b=coJfk7laf0MHpt5ao+MrdMbuLHcr80WItvdHFc7OTpwt6sAqBuCOj9LdxUGEaGpQoK GCO3KODJsUcGgcEICSmbfSKhHRaViFdxHDb9Z/YE4UB8xOVq6brxR9rLFQfDnrP4Tm+b FoVKq6xpP+gi1n4pKanVtMF3YOcQdJVff5A3DjjBMx1wOemJ8miq2KVw2p9hzRnYnuN8 YkrNIXwRXipgPi/LSBkPkfWTkqFQV78GIV47/5rbKUPEpKK4ne4GHw6mb81w6C7NEJUR u/lL1moXonjAk6DIGRIL7lCysocn/dwOtupW1fJNMxf3uzYfviVVAwTQDXbnWt2jqFJ2 dvQQ== X-Gm-Message-State: AOAM530muxhkqhBXuyRwiNhj1U7NGm07v1wGQvyPCvX1PtatUXIDlWQV QXgsl2eFVwTpH5mEd2rmjK9RBFG56xC6A4VG/3rA/L8cYP0= X-Google-Smtp-Source: ABdhPJwL8hAUbrtrkic8jlI69OnaQbQuOD/WhsEyn0nBTFhMqp0zNXF9JzPWw99qWj5a6nbPsL+QO7LeHtvZRfEDms4= X-Received: by 2002:a05:6e02:c7:: with SMTP id r7mr10264036ilq.288.1616054386209; Thu, 18 Mar 2021 00:59:46 -0700 (PDT) MIME-Version: 1.0 References: <87r1kxuzqa.fsf@gnu.org> In-Reply-To: From: Andy Tai Date: Thu, 18 Mar 2021 00:59:10 -0700 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 From b587bf39a81eb739f98da4e316ee1d777113fc9d 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 * 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" + (("") "")) + (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