From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:49551) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iv0VA-0005gc-5D for guix-patches@gnu.org; Fri, 24 Jan 2020 10:04:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iv0V8-00070S-Tk for guix-patches@gnu.org; Fri, 24 Jan 2020 10:04:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48620) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iv0V8-00070O-Qc for guix-patches@gnu.org; Fri, 24 Jan 2020 10:04:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iv0V8-0003WL-NX for guix-patches@gnu.org; Fri, 24 Jan 2020 10:04:02 -0500 Subject: [bug#39263] [PATCH 2/2] gnu: godot: Unbundle some dependencies. Resent-Message-ID: From: Timotej Lazar Date: Fri, 24 Jan 2020 16:02:26 +0100 Message-Id: <20200124150226.27294-2-timotej.lazar@araneo.si> In-Reply-To: <20200124150226.27294-1-timotej.lazar@araneo.si> References: <20200124150226.27294-1-timotej.lazar@araneo.si> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39263@debbugs.gnu.org Cc: Timotej Lazar * 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