From patchwork Fri Sep 2 19:03:12 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: 42158 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 5DC5427BBEA; Fri, 2 Sep 2022 20:04:59 +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 A322127BBE9 for ; Fri, 2 Sep 2022 20:04:58 +0100 (BST) Received: from localhost ([::1]:41394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oUByL-0007vR-SO for patchwork@mira.cbaines.net; Fri, 02 Sep 2022 15:04:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUBxT-0007vF-E1 for guix-patches@gnu.org; Fri, 02 Sep 2022 15:04:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51727) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oUBxS-0003yk-U0 for guix-patches@gnu.org; Fri, 02 Sep 2022 15:04:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oUBxS-0001Pj-Ko for guix-patches@gnu.org; Fri, 02 Sep 2022 15:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57550] [PATCH] gnu: f3d: Update to 1.3.0-pre-0.46df21f. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Sep 2022 19:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57550@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.16621454255408 (code B ref -1); Fri, 02 Sep 2022 19:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Sep 2022 19:03:45 +0000 Received: from localhost ([127.0.0.1]:40426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oUBx0-0001Oz-VO for submit@debbugs.gnu.org; Fri, 02 Sep 2022 15:03:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:35406) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oUBwx-0001Or-O4 for submit@debbugs.gnu.org; Fri, 02 Sep 2022 15:03:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUBwx-0007tP-B0 for guix-patches@gnu.org; Fri, 02 Sep 2022 15:03:31 -0400 Received: from mail-40136.proton.ch ([185.70.40.136]:63593) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oUBwt-0002lM-Bp for guix-patches@gnu.org; Fri, 02 Sep 2022 15:03:30 -0400 Date: Fri, 02 Sep 2022 19:03:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1662145397; x=1662404597; bh=BpIhDVH3wPXREdUU5x+gTsOM9a/EmawvOs8460FLaHw=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:Feedback-ID:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID; b=GQJ6lNDGEGW08MxBUIXr+WIipJLRTqEdKVWsL6XQBoNsFpR/S+JmS1FChbHmzvXhX NwdeAohNWDYpfKfSewMFpnc1sP74PBZHf16aKtLZ+e1AscQjqk/JblcAgAW8CuA1ua qqnJJo98hLKThLzMFp+NaLlJtnArr/q1AzkB2IGkSl9QpxIOnhXceKwiyR2/L4hnYY qK3MPHYaDq/DJsBHOIwx9+sKlvw2BwlR+ccv8izZp3c+V11/tRPtkL1x7+CqISHCaJ 7yLD89SbF/BduSf8/pNqidFYYOmCCf25bkiUpcIVAxmI6DHJYJfNHZAAcRcz21pQoy 9uTZcIdmYT3Vg== From: "Paul A. Patience" Message-ID: <20220902190300.6498-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.136; envelope-from=paul@apatience.com; helo=mail-40136.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.0-pre-0.46df21f. [source](modules, snippet): New fields. [arguments]<#:configure-flags>: Generate manual page, install various resource files, and enable the now-optional external rendering feature. [native-inputs]: New field. [synopsis]: Add hyphen. [description]: Reword. --- gnu/packages/graphics.scm | 64 ++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 18 deletions(-) -- 2.37.2 diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index fdc72d5a8d..5908bb76c0 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -61,6 +61,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages cdrom) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages datastructures) #:use-module (gnu packages documentation) @@ -88,6 +89,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages logging) #:use-module (gnu packages llvm) #:use-module (gnu packages lua) + #:use-module (gnu packages man) #:use-module (gnu packages maths) #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) @@ -2299,11 +2301,14 @@ (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 "9cc79b65ed750b178f58012dbba091aa24722dab") + (let ((commit "46df21fe9409349917af5e6f7d1cb931f4c68e59") (revision "0")) (package (name "f3d") - (version (git-version "1.2.1" revision commit)) + ;; 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) @@ -2312,29 +2317,52 @@ (define-public f3d (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "041gqi2wfny2br4j68vhifg0bd18kbl0qsaallkz7yywk47njxfi")))) + (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 (see - ;; https://github.com/f3d-app/f3d/issues/92) but the tests run in CI - ;; seem to be passing. + ;; 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 "-DBUILD_TESTING=OFF" + #~(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_OCCT=ON" - ;; Prefer Guix's versioned documentation directory to F3D's - ;; unversioned one. - (string-append "-DCMAKE_INSTALL_DOCDIR=" #$output - "/share/doc/" #$name "-" #$version)))) + "-DF3D_MODULE_EXTERNAL_RENDERING=ON" + "-DF3D_MODULE_OCCT=ON"))) + (native-inputs + (list cxxopts + help2man + json-modern-cxx)) (inputs (list alembic assimp @@ -2357,10 +2385,10 @@ (define-public f3d 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, it -has simple interaction mechanisms and 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.") + (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))))