From patchwork Thu Mar 18 09:03:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 27960 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 D9B0927BC57; Thu, 18 Mar 2021 09:05:52 +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 4F1DA27BC55 for ; Thu, 18 Mar 2021 09:05:52 +0000 (GMT) Received: from localhost ([::1]:58502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMobH-0006sK-Fs for patchwork@mira.cbaines.net; Thu, 18 Mar 2021 05:05:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMoaU-0006Az-Vf for guix-patches@gnu.org; Thu, 18 Mar 2021 05:05:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33462) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMoaU-0005gk-N2 for guix-patches@gnu.org; Thu, 18 Mar 2021 05:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lMoaU-00038t-HU for guix-patches@gnu.org; Thu, 18 Mar 2021 05:05: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 09:05: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.161605824812009 (code B ref 46724); Thu, 18 Mar 2021 09:05:02 +0000 Received: (at 46724) by debbugs.gnu.org; 18 Mar 2021 09:04:08 +0000 Received: from localhost ([127.0.0.1]:45008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMoZc-00037d-9W for submit@debbugs.gnu.org; Thu, 18 Mar 2021 05:04:08 -0400 Received: from mail-io1-f44.google.com ([209.85.166.44]:35630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMoZY-000377-6P for 46724@debbugs.gnu.org; Thu, 18 Mar 2021 05:04:07 -0400 Received: by mail-io1-f44.google.com with SMTP id v3so1480246ioq.2 for <46724@debbugs.gnu.org>; Thu, 18 Mar 2021 02:04:04 -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=qwNifCfxyTVDQJi+gALfnzJB1Y0XcgGJyQE8Wgb2g4E=; b=gArY8brF7y6LF3FShfMwDzUsaaqCz5eXc/9tRh2UeIvA+aLVkUyTxFewKZfzhprCTI nWxk8fQqhhJgHoxhJJCX1cz6wYw3/Xn/Oh1sxY3DBLuz4epTcw7jsyg/6tyew+UZl8UA Ehpi7/2Tyze6N7kgwPyQ80Y3ry7n+4OzI5DNNJmzAHrxRjus4FQLnTkHRIB9WaQiXont cPA7KWdsCt97mdgJVb3Adc4M56GNiPwJziWW91yPYdEDYOoMcw/QOtn4EhdJaTvnLBm/ vYt7J7RLMUUsGQgh/sFTpn/E7ff1LU1dfgaK+1+l88fvyvSY/OwzeoS73qjeH2Rya5Xl qIAg== 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=qwNifCfxyTVDQJi+gALfnzJB1Y0XcgGJyQE8Wgb2g4E=; b=Xa/+WFZWO+1911sQeIkjmW5ubdNvkIctwrtQB4MA1wKW8JKv/BDDTelu/D5pOdJ9/q yWiuPC8qbxNich00/O2Bx/gv9luMOyWADtUemSklyjbD5kbt84sxWB12y7kWebKy9iMy YMO4ojDSJHvhvPf36CH7Fxj7wPaBtSCr4+bhgZY9ffq6UWASoUSELYcSKn6+srjW60zP SyQ/uEd1EN97FnlOADfvd2vRKXbOf10CU+PgzbNjAfxeOaUhaB/TNj/eaHKejG1Dz5Bz SUoM0bafGt9pAnFenN442GB8aMrR7+bghhHJFO1wZxXOb0DWyCRlKtE+1CzVPob8Tb0X d0Wg== X-Gm-Message-State: AOAM533vQ1z7G7zt8mTAo6hT0hedECM6K+fCCo/MIxel6uyi47TTUrdC 9A0HSf0/CB4nDCKOxSJC6HW+i11zwttYuzjB0HRFm5pIlmw= X-Google-Smtp-Source: ABdhPJwtleTcvOkUK76AQJDSp+3O/AoM8CiAkC9n5Ga8xfE9ETsF5CDgblA/2sowgtZnNwq6C/KotzD2jbsBqKK1bGo= X-Received: by 2002:a05:6638:343:: with SMTP id x3mr6166122jap.44.1616058238487; Thu, 18 Mar 2021 02:03:58 -0700 (PDT) MIME-Version: 1.0 References: <87r1kxuzqa.fsf@gnu.org> In-Reply-To: From: Andy Tai Date: Thu, 18 Mar 2021 02:03:22 -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 a new update: make one more third party package (ogg) use the external copy From 0dee95106b80b8b1186e4720d7c06b3756299fc4 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 | 62 +++++++++++-------- .../vtk-fix-freetypetools-build-failure.patch | 14 ++--- 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 26f6faea8c..1bd0c689e3 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))) @@ -264,35 +264,47 @@ 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=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") + ; ; not honored + "-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_ogg=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) @@ -305,7 +317,7 @@ many popular formats.") ("hdf5" ,hdf5) ("jpeg" ,libjpeg-turbo) ("jsoncpp" ,jsoncpp) - ;("libogg" ,libogg) + ("libogg" ,libogg) ("libtheora" ,libtheora) ("libX11" ,libx11) ("libxml2" ,libxml2) 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