GNU bug report logs - #57550
[PATCH] gnu: f3d: Update to 1.3.0-pre-0.46df21f.

Previous Next

Package: guix-patches;

Reported by: "Paul A. Patience" <paul <at> apatience.com>

Date: Fri, 2 Sep 2022 19:04:02 UTC

Severity: normal

Tags: patch

Done: Christopher Baines <mail <at> cbaines.net>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 57550 in the body.
You can then email your comments to 57550 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#57550; Package guix-patches. (Fri, 02 Sep 2022 19:04:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to "Paul A. Patience" <paul <at> apatience.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Fri, 02 Sep 2022 19:04:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "Paul A. Patience" <paul <at> apatience.com>
To: guix-patches <at> gnu.org
Cc: "Paul A. Patience" <paul <at> apatience.com>
Subject: [PATCH] gnu: f3d: Update to 1.3.0-pre-0.46df21f.
Date: Fri, 02 Sep 2022 19:03:12 +0000
* 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(-)

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 <cxxopts.hpp>")
+               (("^#include \"json\\.hpp\"")
+                "#include <nlohmann/json.hpp>"))))))
       (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))))
--
2.37.2






Reply sent to Christopher Baines <mail <at> cbaines.net>:
You have taken responsibility. (Sun, 04 Sep 2022 18:03:01 GMT) Full text and rfc822 format available.

Notification sent to "Paul A. Patience" <paul <at> apatience.com>:
bug acknowledged by developer. (Sun, 04 Sep 2022 18:03:02 GMT) Full text and rfc822 format available.

Message #10 received at 57550-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: "Paul A. Patience" <paul <at> apatience.com>
Cc: 57550-done <at> debbugs.gnu.org
Subject: Re: [bug#57550] [PATCH] gnu: f3d: Update to 1.3.0-pre-0.46df21f.
Date: Sun, 04 Sep 2022 19:01:29 +0100
[Message part 1 (text/plain, inline)]
"Paul A. Patience" <paul <at> apatience.com> writes:

> * 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(-)

Thanks, I've pushed this to master as
75febb00a57b69d41e989af0487446105fae32a5.

Chris
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Mon, 03 Oct 2022 11:24:09 GMT) Full text and rfc822 format available.

This bug report was last modified 1 year and 178 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.