From: Timotej Lazar <timotej.lazar@araneo.si>
To: 39263@debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar@araneo.si>
Subject: [bug#39263] [PATCH 2/2] gnu: godot: Unbundle some dependencies.
Date: Fri, 24 Jan 2020 16:02:26 +0100 [thread overview]
Message-ID: <20200124150226.27294-2-timotej.lazar@araneo.si> (raw)
In-Reply-To: <20200124150226.27294-1-timotej.lazar@araneo.si>
* 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
next prev parent reply other threads:[~2020-01-24 15:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 14:50 [bug#39263] [PATCH 0/2] Update Godot Timotej Lazar
2020-01-24 15:02 ` [bug#39263] [PATCH 1/2] gnu: godot: Update to 3.1.2 Timotej Lazar
2020-01-24 15:02 ` Timotej Lazar [this message]
2020-01-25 9:18 ` [bug#39263] [PATCH 2/2] gnu: godot: Unbundle some dependencies Christopher Baines
2020-01-28 18:18 ` Timotej Lazar
2020-01-29 8:00 ` bug#39263: " Christopher Baines
2020-01-25 9:16 ` [bug#39263] [PATCH 1/2] gnu: godot: Update to 3.1.2 Christopher Baines
2020-01-28 18:25 ` [bug#39263] [PATCH v2 1/3] " Timotej Lazar
2020-01-28 18:25 ` [bug#39263] [PATCH v2 2/3] gnu: godot: Unbundle some dependencies Timotej Lazar
2020-01-28 18:25 ` [bug#39263] [PATCH v2 3/3] gnu: godot: List which third party files to keep Timotej Lazar
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=20200124150226.27294-2-timotej.lazar@araneo.si \
--to=timotej.lazar@araneo.si \
--cc=39263@debbugs.gnu.org \
/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).