[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/13: gnu: f3d: Update to 2.2.1.
From: |
guix-commits |
Subject: |
04/13: gnu: f3d: Update to 2.2.1. |
Date: |
Sat, 14 Oct 2023 16:49:26 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit a4c838ca1ebdb4519f51a5e8b6f7c1de5e12f016
Author: Paul A. Patience <paul@apatience.com>
AuthorDate: Tue Oct 10 13:17:19 2023 +0000
gnu: f3d: Update to 2.2.1.
* 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.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/graphics.scm | 49 ++++++++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 22 deletions(-)
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 @@ desired local properties.")
(define-public f3d
(package
(name "f3d")
- (version "2.0.0")
+ (version "2.2.1")
(source
(origin
(method git-fetch)
@@ -2745,22 +2745,12 @@ desired local properties.")
(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 <cxxopts.hpp>")
- (("^#include \"json\\.hpp\"")
- "#include <nlohmann/json.hpp>")
- (("cxxopts::OptionException")
- "cxxopts::exceptions::parsing"))
- (substitute* "library/src/engine.cxx"
- (("^#include <json\\.hpp>")
- "#include <nlohmann/json.hpp>"))))))
+ (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 @@ desired local properties.")
#~(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 @@ desired local properties.")
lz4
netcdf
opencascade-occt
+ openexr
vtk
zlib))
(home-page "https://f3d-app.github.io/f3d/")
- branch master updated (7ce925fbe2 -> 08c55c03bf), guix-commits, 2023/10/14
- 03/13: services: dhcp-client-service-type: Support DDNS., guix-commits, 2023/10/14
- 02/13: gnu: Add dexy-color-sddm-theme., guix-commits, 2023/10/14
- 08/13: gnu: Add vim-rainbow, guix-commits, 2023/10/14
- 11/13: gnu: Add taskflow., guix-commits, 2023/10/14
- 07/13: gnu: icewm: Update to 3.4.3, guix-commits, 2023/10/14
- 01/13: gnu: Add abstractdark-sddm-theme., guix-commits, 2023/10/14
- 09/13: doc: Use herd for cerbot deploy hook example., guix-commits, 2023/10/14
- 04/13: gnu: f3d: Update to 2.2.1.,
guix-commits <=
- 05/13: gnu: xpra: Update to 5.0.3, guix-commits, 2023/10/14
- 06/13: gnu: xnedit: Update to 1.5.2, guix-commits, 2023/10/14
- 10/13: gnu: sbcl-trivial-clipboard: Update to 0.0.0-7.aee67d6., guix-commits, 2023/10/14
- 12/13: gnu: Add kokkos., guix-commits, 2023/10/14
- 13/13: gnu: dealii: Update to 9.5.1., guix-commits, 2023/10/14