From: Kaelyn Takata via Guix-patches via <guix-patches@gnu.org>
To: 62728@debbugs.gnu.org
Cc: Kaelyn Takata <kaelyn.alexi@protonmail.com>
Subject: [bug#62728] [PATCH v2] gnu: openmw-openscenegraph: Update to Nov 2022 commit.
Date: Thu, 27 Apr 2023 15:54:33 +0000 [thread overview]
Message-ID: <d0f705e9297c6a089bec7d30c556ba5ba1e7bdbf.1682610856.git.kaelyn.alexi@protonmail.com> (raw)
In-Reply-To: <cover.1680980546.git.kaelyn.alexi@protonmail.com>
* gnu/packages/graphics.scm (openmw-openscenegraph): Update to Nov 2022 commit.
[arguments]: Sync the plugin flags with the mentioned wiki page.
---
gnu/packages/graphics.scm | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 261fcf9547..a7b1024185 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1448,11 +1448,11 @@ (define-public gr-framework
(define-public openmw-openscenegraph
;; OpenMW prefers its own fork of openscenegraph:
;; https://wiki.openmw.org/index.php?title=Development_Environment_Setup#OpenSceneGraph.
- (let ((commit "36a962845a2c87a6671fd822157e0729d164e940"))
+ (let ((commit "69cfecebfb6dc703b42e8de39eed750a84a87489"))
(hidden-package
(package
(inherit openscenegraph)
- (version (git-version "3.6" "1" commit))
+ (version (git-version "3.6" "2" commit))
(outputs (list "out"))
(source
(origin
@@ -1463,7 +1463,7 @@ (define-public openmw-openscenegraph
(file-name (git-file-name (package-name openscenegraph) version))
(sha256
(base32
- "05yhgq3qm5q277y32n5sf36vx5nv5qd3zlhz4csgd3a6190jrnia"))))
+ "1qayk2gklm8zvss90dcjfxv6717rvcmwmgmgyy1qzkli67a0zbw2"))))
(arguments
(substitute-keyword-arguments (package-arguments openscenegraph)
((#:configure-flags flags)
@@ -1471,14 +1471,14 @@ (define-public openmw-openscenegraph
#~(append
'("-DBUILD_OSG_PLUGINS_BY_DEFAULT=0"
"-DBUILD_OSG_PLUGIN_OSG=1"
+ "-DBUILD_OSG_PLUGIN_DAE=1"
"-DBUILD_OSG_PLUGIN_DDS=1"
"-DBUILD_OSG_PLUGIN_TGA=1"
"-DBUILD_OSG_PLUGIN_BMP=1"
"-DBUILD_OSG_PLUGIN_JPEG=1"
"-DBUILD_OSG_PLUGIN_PNG=1"
- "-DBUILD_OSG_DEPRECATED_SERIALIZERS=0"
- ;; The jpeg plugin requires conversion between integers and booleans
- "-DCMAKE_CXX_FLAGS=-fpermissive")
+ "-DBUILD_OSG_PLUGIN_FREETYPE=1"
+ "-DBUILD_OSG_DEPRECATED_SERIALIZERS=0")
#$flags))
((#:phases phases)
#~(modify-phases #$phases
@@ -2589,4 +2589,3 @@ (define-public gpaint
It features cut-and-paste for irregular regions or polygons.")
(home-page "https://www.gnu.org/software/gpaint/")
(license license:gpl3+)))
-
base-commit: 297805b1f83aa58ba9fc775c203373338aafd5ac
--
2.39.2
next prev parent reply other threads:[~2023-04-27 17:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-08 19:22 [bug#62728] [PATCH 0/2] Update and fix the build of openmw-openscenegraph Kaelyn Takata via Guix-patches via
2023-04-08 19:27 ` [bug#62728] [PATCH 1/2] gnu: openmw-openscenegraph: Fix build Kaelyn Takata via Guix-patches via
2023-04-08 19:27 ` [bug#62728] [PATCH 2/2] gnu: openmw-openscenegraph: Update to Nov 2022 commit Kaelyn Takata via Guix-patches via
2023-04-27 15:54 ` Kaelyn Takata via Guix-patches via [this message]
2023-06-18 21:28 ` bug#62728: [PATCH 0/2] Update and fix the build of openmw-openscenegraph Ludovic Courtès
2023-04-27 16:00 ` [bug#62728] [PATCH v2] gnu: openmw-openscenegraph: Update to Nov 2022 commit Kaelyn via Guix-patches via
2023-04-27 16:02 ` [bug#62728] (No Subject) Kaelyn via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d0f705e9297c6a089bec7d30c556ba5ba1e7bdbf.1682610856.git.kaelyn.alexi@protonmail.com \
--to=guix-patches@gnu.org \
--cc=62728@debbugs.gnu.org \
--cc=kaelyn.alexi@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).