GNU bug report logs - #39263
[PATCH 0/2] Update Godot

Previous Next

Full log

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

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 39263 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 2/2] gnu: godot: Unbundle some dependencies.
Date: Fri, 24 Jan 2020 16:02:26 +0100

* gnu/packages/game-development.scm (godot)[inputs]: Add bullet, pcre2, zstd.
[arguments](configure-flags): Use system libraries for the above.
[source](snippet): Remove bundled copies.
---
 gnu/packages/game-development.scm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 79e3f6dc6c..9ded71375f 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -78,6 +78,7 @@
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages music)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
@@ -1521,7 +1522,8 @@ games.")
                   ;; of these may be modified; see "thirdparty/README.md".
                   (with-directory-excursion "thirdparty"
                     (for-each delete-file-recursively
-                              '("freetype"
+                              '("bullet"
+                                "freetype"
                                 "libogg"
                                 "libpng"
                                 "libtheora"
@@ -1529,7 +1531,9 @@ games.")
                                 "libvpx"
                                 "libwebp"
                                 "opus"
-                                "zlib"))
+                                "pcre2"
+                                "zlib"
+                                "zstd"))
                     #t)))))
     (build-system scons-build-system)
     (arguments
@@ -1541,6 +1545,7 @@ games.")
                                '())
                            ;; Avoid using many of the bundled libs.
                            ;; Note: These options can be found in the SConstruct file.
+                           "builtin_bullet=no"
                            "builtin_freetype=no"
                            "builtin_glew=no"
                            "builtin_libmpdec=no"
@@ -1551,7 +1556,9 @@ games.")
                            "builtin_libvpx=no"
                            "builtin_libwebp=no"
                            "builtin_opus=no"
-                           "builtin_zlib=no")
+                           "builtin_pcre2=no"
+                           "builtin_zlib=no"
+                           "builtin_zstd=no")
        #:tests? #f ; There are no tests
        #:phases
        (modify-phases %standard-phases
@@ -1598,6 +1605,7 @@ games.")
                #t))))))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (inputs `(("alsa-lib" ,alsa-lib)
+              ("bullet" ,bullet)
               ("freetype" ,freetype)
               ("glew" ,glew)
               ("glu" ,glu)
@@ -1612,7 +1620,9 @@ games.")
               ("libxrandr" ,libxrandr)
               ("mesa" ,mesa)
               ("opusfile" ,opusfile)
-              ("pulseaudio" ,pulseaudio)))
+              ("pcre2" ,pcre2)
+              ("pulseaudio" ,pulseaudio)
+              ("zstd" ,zstd "lib")))
     (home-page "https://godotengine.org/")
     (synopsis "Advanced 2D and 3D game engine")
     (description
-- 
2.25.0

Previous Next

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