From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:59064) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixsOZ-0001ZI-Oj for guix-patches@gnu.org; Sat, 01 Feb 2020 08:01:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixsOY-0007Pq-N1 for guix-patches@gnu.org; Sat, 01 Feb 2020 08:01:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60673) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ixsOX-0007OP-0D for guix-patches@gnu.org; Sat, 01 Feb 2020 08:01:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ixsOT-0005BO-W3 for guix-patches@gnu.org; Sat, 01 Feb 2020 08:01:01 -0500 Subject: [bug#39381] [PATCH 2/3] gnu: godot: Update to 3.2. Resent-Message-ID: From: Timotej Lazar Date: Sat, 1 Feb 2020 14:00:38 +0100 Message-Id: <20200201130039.9300-2-timotej.lazar@araneo.si> In-Reply-To: <20200201130039.9300-1-timotej.lazar@araneo.si> References: <20200201130039.9300-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: 39381@debbugs.gnu.org Cc: Timotej Lazar * gnu/packages/game-development.scm (godot): Update to 3.2. [source](snippet): Remove obsolete and unbundled (wslay) thirdparty files, and add new ones. [arguments](scons-flags): Disable the builtin wslay. [inputs]: Add wslay. --- gnu/packages/game-development.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index ceec993d04..c9a8b922b4 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -90,6 +90,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages video) + #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) @@ -1505,7 +1506,7 @@ games.") (define-public godot (package (name "godot") - (version "3.1.2") + (version "3.2") (source (origin (method git-fetch) (uri (git-reference @@ -1514,7 +1515,7 @@ games.") (file-name (git-file-name name version)) (sha256 (base32 - "12305wj2i4067jc50l8r0wmb7zjcna24fli8vb8kiaild0jrlip6")) + "0f15izjl4i2xlz1xj5pcslzl9gm3rmr3c21gh256ynpi2zhhkcdd")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -1526,7 +1527,7 @@ games.") (with-directory-excursion "thirdparty" (let* ((preserved-files '("README.md" - "b2d_convexdecomp" + "assimp" "certs" "cvtt" "enet" @@ -1535,7 +1536,6 @@ games.") "glad" "jpeg-compressor" "libsimplewebm" - "libwebsockets" "miniupnpc" "minizip" "misc" @@ -1543,8 +1543,8 @@ games.") "pvrtccompressor" "recastnavigation" "squish" - "thekla_atlas" "tinyexr" + "vhacd" "xatlas"))) (for-each delete-file-recursively (lset-difference string=? @@ -1574,6 +1574,7 @@ games.") "builtin_mbedtls=no" "builtin_opus=no" "builtin_pcre2=no" + "builtin_wslay=no" "builtin_zlib=no" "builtin_zstd=no") #:tests? #f ; There are no tests @@ -1640,6 +1641,7 @@ games.") ("opusfile" ,opusfile) ("pcre2" ,pcre2) ("pulseaudio" ,pulseaudio) + ("wslay" ,wslay) ("zstd" ,zstd "lib"))) (home-page "https://godotengine.org/") (synopsis "Advanced 2D and 3D game engine") -- 2.25.0