guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: gnu: openmw: Use OpenMW's fork of openscenegraph.


From: guix-commits
Subject: 02/02: gnu: openmw: Use OpenMW's fork of openscenegraph.
Date: Tue, 24 Sep 2019 13:23:10 -0400 (EDT)

ambrevar pushed a commit to branch master
in repository guix.

commit f95ec65be394538c9ec848e502a37f1c3ec21157
Author: Pierre Neidhardt <address@hidden>
Date:   Tue Sep 24 19:21:59 2019 +0200

    gnu: openmw: Use OpenMW's fork of openscenegraph.
    
    * gnu/packages/game-development.scm (openmw)[inputs]: Replace openscenegraph
      with openmw-openscenegraph.
---
 gnu/packages/game-development.scm | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/game-development.scm 
b/gnu/packages/game-development.scm
index bb4c1d2..ee9e63e 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1109,6 +1109,40 @@ of use.")
                '("ogre"))))
     (synopsis "Fast, flexible and simple GUI (OpenGL backend)")))
 
+(define openmw-openscenegraph
+  ;; OpenMW prefers its own fork of openscenegraph:
+  ;; 
https://wiki.openmw.org/index.php?title=Development_Environment_Setup#OpenSceneGraph.
+  (let ((commit "36a962845a2c87a6671fd822157e0729d164e940"))
+    (package
+      (inherit openscenegraph)
+      (version (git-version "3.6" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/OpenMW/osg/";)
+               (commit commit)))
+         (file-name (git-file-name (package-name openscenegraph) version))
+         (sha256
+          (base32
+           "05yhgq3qm5q277y32n5sf36vx5nv5qd3zlhz4csgd3a6190jrnia"))))
+      (arguments
+       (substitute-keyword-arguments (package-arguments openscenegraph)
+         ((#:configure-flags flags)
+          ;; As per the above wiki link, the following plugins are enough:
+          `(append
+            '("-DBUILD_OSG_PLUGINS_BY_DEFAULT=0"
+              "-DBUILD_OSG_PLUGIN_OSG=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")
+            ,flags)))))))
+
 (define-public openmw
   (package
     (name "openmw")
@@ -1137,7 +1171,7 @@ of use.")
        ("libxt" ,libxt)
        ("mygui" ,mygui-gl)              ; OpenMW does not need Ogre.
        ("openal" ,openal)
-       ("openscenegraph" ,openscenegraph)
+       ("openscenegraph" ,openmw-openscenegraph)
        ("qtbase" ,qtbase)
        ("sdl" ,sdl2)
        ("unshield" ,unshield)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]