From patchwork Wed Sep 7 13:33:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 42270 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 271C527BBE9; Wed, 7 Sep 2022 14:38:07 +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=unavailable 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 177E927BBEA for ; Wed, 7 Sep 2022 14:38:06 +0100 (BST) Received: from localhost ([::1]:43210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVvFl-0000vO-79 for patchwork@mira.cbaines.net; Wed, 07 Sep 2022 09:38:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVvCo-0005m2-Mp for guix-patches@gnu.org; Wed, 07 Sep 2022 09:35:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37155) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oVvCo-0006YZ-BV for guix-patches@gnu.org; Wed, 07 Sep 2022 09:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oVvCo-0008AP-4W for guix-patches@gnu.org; Wed, 07 Sep 2022 09:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57645] [PATCH] gnu: f3d: Update to 1.3.1. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Sep 2022 13:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57645 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57645@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.166255765731334 (code B ref -1); Wed, 07 Sep 2022 13:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Sep 2022 13:34:17 +0000 Received: from localhost ([127.0.0.1]:54087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVvBu-00089A-Ie for submit@debbugs.gnu.org; Wed, 07 Sep 2022 09:34:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:58976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oVvBs-000891-Jj for submit@debbugs.gnu.org; Wed, 07 Sep 2022 09:34:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVvBr-0004RM-0k for guix-patches@gnu.org; Wed, 07 Sep 2022 09:34:04 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:45771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVvBk-0006Si-7z for guix-patches@gnu.org; Wed, 07 Sep 2022 09:33:59 -0400 Date: Wed, 07 Sep 2022 13:33:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1662557632; x=1662816832; bh=1xGawPzKdN5DBwsfa8iBx4oQaWyCxflGDwA+QC/LZqw=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:Feedback-ID:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID; b=meiUIe+J6Mo8MJRHS2+EZGYcv2w6cwnQ5bc5cVXDVz9mt98IpxfuaZ9KCb/ZpFiD5 rU5xxgMexnJYyXI8DxJzoZBgiDzal/ptJbcL8xuYTsbkIwNQqsHSAH57LMeWAO8a7E KQem7pMjfqkrVqfxmzekEQ/+pW2vh/Qd7pMShlcWpWCMnOqKSnX1bbtJEU7207Hli1 jlOKDe1GhKkQ6wUF6NAE6rgRvRmFVkhvC0wMbjvmLBqlLpsZK4vF1aPCkv2KcFZLfC r/2jTQ7quzrK/pXSfmLuBS6MEV587CHFXXUNsExIxqHbcrNEq1JT810cPzx5ASPEQj 6YSZMaWuo5WSg== From: "Paul A. Patience" Message-ID: <20220907133337.10821-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.18; envelope-from=paul@apatience.com; helo=mail-4018.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/graphics.scm (f3d): Update to 1.3.1. [snippet]: Use G-expression. [arguments]<#:configure-flags>: Update option name to F3D_INSTALL_MIME_TYPES_FILES. --- gnu/packages/graphics.scm | 180 ++++++++++++++++++-------------------- 1 file changed, 86 insertions(+), 94 deletions(-) -- 2.37.3 diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 7adab4a9bf..fe38e7d03f 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2306,97 +2306,89 @@ (define-public mmg (license license:lgpl3+))) (define-public f3d - ;; There have been many improvements since the last tagged version (1.2.1, - ;; released in December 2021), including support for the Alembic file - ;; format. - (let ((commit "46df21fe9409349917af5e6f7d1cb931f4c68e59") - (revision "0")) - (package - (name "f3d") - ;; F3D has not actually been tagged as 1.3.0-pre, but upstream commit - ;; 401d4d27b2094568378c07f400fbad48b7af3168 updated the version string - ;; to 1.3.0. - (version (git-version "1.3.0-pre" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/f3d-app/f3d") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0x0jw9vqf1b8pxh84xpr47hzcjynk07dp8q7r2xihh9cd00kglp1")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file "application/cxxopts.hpp") - (delete-file "application/json.hpp") - (substitute* "application/F3DOptionsParser.cxx" - (("^#include \"cxxopts\\.hpp\"") - "#include ") - (("^#include \"json\\.hpp\"") - "#include ")))))) - (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 - ;; /lib/cmake/f3d expect the f3d executable and library to be available, - ;; as they set up targets for both of them. - (arguments - (list - ;; Many tests require files supplied by git-lfs. - ;; Also, some tests segfault (after an exception?) but the tested - ;; behavior, i.e., when the program is run manually, does not (for - ;; example, TestNonExistentConfigFile and TestInvalidConfigFile). - ;; Upstream is aware of occasionally flaky tests [1], but the tests - ;; run in CI seem to be passing. - ;; Anyway, the program runs and is able to open at least STL files - ;; without issue. - ;; - ;; [1]: https://github.com/f3d-app/f3d/issues/92 - #:tests? #f - #:configure-flags - #~(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_FILE=ON" - "-DF3D_INSTALL_THUMBNAILER_FILES=ON" - "-DF3D_MODULE_ALEMBIC=ON" - "-DF3D_MODULE_ASSIMP=ON" - "-DF3D_MODULE_EXTERNAL_RENDERING=ON" - "-DF3D_MODULE_OCCT=ON"))) - (native-inputs - (list cxxopts - help2man - json-modern-cxx)) - (inputs - (list alembic - assimp - double-conversion - eigen - expat - fontconfig - freetype - glew - hdf5 - imath - jsoncpp - libjpeg-turbo - libpng - libtiff - libx11 - lz4 - netcdf - opencascade-occt - vtk - zlib)) - (home-page "https://f3d-app.github.io/f3d/") - (synopsis "VTK-based 3D viewer") - (description "F3D (pronounced @samp{/fɛd/}) is a VTK-based 3D viewer -with simple interaction mechanisms and which is fully controllable using -arguments on the command line. It supports a range of file formats (including -animated glTF, STL, STEP, PLY, OBJ, FBX), and provides numerous rendering and -texturing options.") - (license license:bsd-3)))) + (package + (name "f3d") + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/f3d-app/f3d") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hdfgwf5d24ykab634xg4vv9r09nh96ss7hhnqnh5nmw4abhxzg7")) + (modules '((guix build utils))) + (snippet + #~(begin + (delete-file "application/cxxopts.hpp") + (delete-file "application/json.hpp") + (substitute* "application/F3DOptionsParser.cxx" + (("^#include \"cxxopts\\.hpp\"") + "#include ") + (("^#include \"json\\.hpp\"") + "#include ")))))) + (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 + ;; /lib/cmake/f3d expect the f3d executable and library to be available, + ;; as they set up targets for both of them. + (arguments + (list + ;; Many tests require files supplied by git-lfs. + ;; Also, some tests segfault (after an exception?) but the tested + ;; behavior, i.e., when the program is run manually, does not (for + ;; example, TestNonExistentConfigFile and TestInvalidConfigFile). + ;; Upstream is aware of occasionally flaky tests [1], but the tests + ;; run in CI seem to be passing. + ;; Anyway, the program runs and is able to open at least STL files + ;; without issue. + ;; + ;; [1]: https://github.com/f3d-app/f3d/issues/92 + #:tests? #f + #:configure-flags + #~(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_MODULE_EXTERNAL_RENDERING=ON" + "-DF3D_MODULE_OCCT=ON"))) + (native-inputs + (list cxxopts + help2man + json-modern-cxx)) + (inputs + (list alembic + assimp + double-conversion + eigen + expat + fontconfig + freetype + glew + hdf5 + imath + jsoncpp + libjpeg-turbo + libpng + libtiff + libx11 + lz4 + netcdf + opencascade-occt + vtk + zlib)) + (home-page "https://f3d-app.github.io/f3d/") + (synopsis "VTK-based 3D viewer") + (description "F3D (pronounced @samp{/fɛd/}) is a VTK-based 3D viewer with +simple interaction mechanisms and which is fully controllable using arguments +on the command line. It supports a range of file formats (including animated +glTF, STL, STEP, PLY, OBJ, FBX), and provides numerous rendering and texturing +options.") + (license license:bsd-3)))