From patchwork Tue Oct 10 13:17:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 54708 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 5936C27BBEA; Tue, 10 Oct 2023 14:19:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BB25327BBE2 for ; Tue, 10 Oct 2023 14:18:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qqCdG-0001gS-ET; Tue, 10 Oct 2023 09:18:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qqCdF-0001gG-4O for guix-patches@gnu.org; Tue, 10 Oct 2023 09:18:41 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqCdE-0001yf-SR for guix-patches@gnu.org; Tue, 10 Oct 2023 09:18:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qqCda-0003b9-0j for guix-patches@gnu.org; Tue, 10 Oct 2023 09:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66437] [PATCH] gnu: f3d: Update to 2.2.1. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Oct 2023 13:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66437 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66437@debbugs.gnu.org Cc: "Paul A. Patience" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169694391213786 (code B ref -1); Tue, 10 Oct 2023 13:19:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Oct 2023 13:18:32 +0000 Received: from localhost ([127.0.0.1]:34298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqCd5-0003aI-KY for submit@debbugs.gnu.org; Tue, 10 Oct 2023 09:18:32 -0400 Received: from lists.gnu.org ([2001:470:142::17]:51844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qqCd1-0003Zh-IX for submit@debbugs.gnu.org; Tue, 10 Oct 2023 09:18:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qqCcK-0001K4-5l for guix-patches@gnu.org; Tue, 10 Oct 2023 09:17:45 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qqCcC-0001t2-0O for guix-patches@gnu.org; Tue, 10 Oct 2023 09:17:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1696943848; x=1697203048; bh=EPutSJsrVSm1BlH7/2kRWIjZNoCN+rIyzIxWWthBo0s=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=k0fbluAlykjbAMCAu2u4MB0PMDeYY9ZziBKz2zaHJtMkfldCPWixPFC2lrA0Jj3Wc J928BSnKfUdd8zZAQ/k+XcuVUjjCMCTOGr1w/zxN59u28pwLptn2pHNSuIcp1qohGa 07wdtyXvK7ynybWuF9BXHxeXzu2UXQZZWiZ/ZyTys8EmtajyAmykPivNxilpSa3Ml1 pnQFyVugz3FdHo/Qk3PczTNi8otFzr8WRNXvOJ+e0Rt0JHB5wsrgVtPPQm1aXFGwlo lmzo4lQVvj0091RVa9LoUS7+eZhDd/zQfYlDedt3xIIfEu0ICeA/luijuHj4GVhE8W mM+BY7KHSwQ+g== Date: Tue, 10 Oct 2023 13:17:19 +0000 From: "Paul A. Patience" Message-ID: Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.17; envelope-from=paul@apatience.com; helo=mail-4317.proton.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/graphics.scm (f3d): Update to 2.2.1. [snippet]: Update paths to delete and remove substitutions. [arguments]<#:configure-flags>: Remove obsolete options, update renamed options and add -DF3D_EXTERNAL_CXXOPTS, -DF3D_EXTERNAL_NLOHMANN_JSON and -DF3D_MODULE_EXR. [phases]: Add 'fix-cmake-rpath' phase. [inputs]: Add openexr. --- gnu/packages/graphics.scm | 49 +++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 22 deletions(-) base-commit: f4e8baf3806e79d7111d2943859865ae4ee0b59d diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 16254ab494..337dbbd680 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2736,7 +2736,7 @@ (define-public asli (define-public f3d (package (name "f3d") - (version "2.0.0") + (version "2.2.1") (source (origin (method git-fetch) @@ -2745,22 +2745,12 @@ (define-public f3d (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1gcwpdkz3ylaxi133zri1cxkvj6za5s1hbgqqc8fn10q2dkkdd44")) + (base32 "0f076754zsxb4gwk6bxj94iyjj0dfxmmc8w88f55xd6hbm3qdnwd")) (modules '((guix build utils))) (snippet #~(begin - (delete-file "external/cxxopts.hpp") - (delete-file "external/json.hpp") - (substitute* "application/F3DOptionsParser.cxx" - (("^#include \"cxxopts\\.hpp\"") - "#include ") - (("^#include \"json\\.hpp\"") - "#include ") - (("cxxopts::OptionException") - "cxxopts::exceptions::parsing")) - (substitute* "library/src/engine.cxx" - (("^#include ") - "#include ")))))) + (delete-file-recursively "external/cxxopts") + (delete-file-recursively "external/nlohmann_json"))))) (build-system cmake-build-system) ;; The package cannot easily be split into out and lib outputs because ;; VTK's vtkModule.cmake complains, and also the CMake files in @@ -2783,15 +2773,29 @@ (define-public f3d #~(list (string-append "-DCMAKE_INSTALL_DOCDIR=" #$output "/share/doc/" #$name "-" #$version) "-DBUILD_TESTING=OFF" - "-DF3D_GENERATE_MAN=ON" - "-DF3D_INSTALL_DEFAULT_CONFIGURATION_FILE=ON" - "-DF3D_INSTALL_DEFAULT_CONFIGURATION_FILE_IN_PREFIX=ON" - "-DF3D_INSTALL_MIME_TYPES_FILES=ON" - "-DF3D_INSTALL_THUMBNAILER_FILES=ON" - "-DF3D_MODULE_ALEMBIC=ON" - "-DF3D_MODULE_ASSIMP=ON" + "-DF3D_LINUX_GENERATE_MAN=ON" + "-DF3D_USE_EXTERNAL_CXXOPTS=ON" + "-DF3D_USE_EXTERNAL_NLOHMANN_JSON=ON" "-DF3D_MODULE_EXTERNAL_RENDERING=ON" - "-DF3D_MODULE_OCCT=ON"))) + "-DF3D_MODULE_EXR=ON" + "-DF3D_PLUGIN_BUILD_ALEMBIC=ON" + "-DF3D_PLUGIN_BUILD_ASSIMP=ON" + "-DF3D_PLUGIN_BUILD_OCCT=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-cmake-rpath + (lambda _ + ;; Expand $ORIGIN, and add VTK to library RPATH, because it is + ;; not added automatically. + (substitute* "application/CMakeLists.txt" + (("(set_target_properties.*PROPERTIES.*INSTALL_RPATH ).*" + _ prefix) + (string-append prefix "\"" #$output "/lib\")\n"))) + (substitute* "library/CMakeLists.txt" + (("(set_target_properties.*PROPERTIES.*INSTALL_RPATH ).*" + _ prefix) + (string-append prefix "\"" #$output "/lib:" + #$(this-package-input "vtk") "/lib\")\n")))))))) (native-inputs (list cxxopts help2man @@ -2815,6 +2819,7 @@ (define-public f3d lz4 netcdf opencascade-occt + openexr vtk zlib)) (home-page "https://f3d-app.github.io/f3d/")