From 049bdae52795f01030cb99d6fb271dc4b4ce9a7d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 24 Jan 2020 22:47:22 +0100 Subject: gnu: ode: Disable tests. * gnu/packages/game-development.scm (ode): Tests are failing or other systems than x86_64, so we disable them. --- gnu/packages/game-development.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index ee8dea23b5..72637a7929 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1998,7 +1998,8 @@ (define-public ode #t)))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DODE_WITH_LIBCCD_SYSTEM=ON") + `(#:tests? #f ;tests fail on all systems but x86_64 + #:configure-flags '("-DODE_WITH_LIBCCD_SYSTEM=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'unbundle-libccd -- cgit v1.2.3 From 5b7fdc8289ce0adf85e881bc23d3537121b41193 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 25 Jan 2020 19:33:57 +0100 Subject: gnu: ode: Selectively disable tests. * gnu/packages/game-development.scm (ode)[arguments]: Run tests only on x86_64. --- gnu/packages/game-development.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 72637a7929..13006f3509 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1998,7 +1998,10 @@ (define-public ode #t)))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;tests fail on all systems but x86_64 + ;; Tests fail on all systems but x86_64. + `(#:tests? ,(string=? "x86_64-linux" + (or (%current-target-system) + (%current-system))) #:configure-flags '("-DODE_WITH_LIBCCD_SYSTEM=ON") #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 4968ea2c9279389d3b2f427dec29d07f1031784c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Jan 2020 22:18:29 +0100 Subject: Use HTTPS for liballeg.org. * gnu/packages/game-development.scm (allegro-4, allegro)[home-page]: Use HTTPS. * guix/licenses.scm (giftware): Likewise. --- gnu/packages/game-development.scm | 4 ++-- guix/licenses.scm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 13006f3509..5160bcf2ea 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -723,7 +723,7 @@ (define-public allegro-4 multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc.") - (home-page "http://liballeg.org") + (home-page "https://liballeg.org") (license license:giftware))) (define-public allegro @@ -764,7 +764,7 @@ (define-public allegro multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc.") - (home-page "http://liballeg.org") + (home-page "https://liballeg.org") (license license:bsd-3))) (define-public allegro-5.0 diff --git a/guix/licenses.scm b/guix/licenses.scm index 41d4fefad2..a44a5bac0d 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -286,7 +286,7 @@ (define freetype (define giftware (license "Giftware" - "http://liballeg.org/license.html" + "https://liballeg.org/license.html" "The Allegro 4 license")) (define gpl1 -- cgit v1.2.3 From 07a7cccbac59dd8265fffdd4b87616cd0419a2c7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 28 Jan 2020 20:23:41 +0100 Subject: gnu: ode: Properly disable tests when cross-compiling. * gnu/packages/game-development.scm (ode): Properly disable tests when using (%current-target-system). --- gnu/packages/game-development.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 5160bcf2ea..2498f6f39d 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1999,9 +1999,9 @@ (define-public ode (build-system cmake-build-system) (arguments ;; Tests fail on all systems but x86_64. - `(#:tests? ,(string=? "x86_64-linux" - (or (%current-target-system) - (%current-system))) + `(#:tests? ,(string-prefix? "x86_64-" + (or (%current-target-system) + (%current-system))) #:configure-flags '("-DODE_WITH_LIBCCD_SYSTEM=ON") #:phases (modify-phases %standard-phases -- cgit v1.2.3 From d868261533c4f315dd4812c86f174c3d1a1b08b2 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 28 Jan 2020 19:25:38 +0100 Subject: gnu: godot: Update to 3.1.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/game-development.scm (godot): Update to 3.1.2. [inputs]: Remove openssl, replaced by a bundled copy of mbedtls. [arguments](configure-flags): Remove builtin_openssl flag. [source]: Don’t try to remove the (now nonexistent) bundled openssl directory. Signed-off-by: Christopher Baines --- gnu/packages/game-development.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 2498f6f39d..bbc9cbc0bd 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2019, 2020 Leo Prikler ;;; Copyright © 2019 Jethro Cao ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020 Timotej Lazar ;;; ;;; This file is part of GNU Guix. ;;; @@ -1503,7 +1504,7 @@ (define-public openmw (define-public godot (package (name "godot") - (version "3.0.6") + (version "3.1.2") (source (origin (method git-fetch) (uri (git-reference @@ -1512,7 +1513,7 @@ (define-public godot (file-name (git-file-name name version)) (sha256 (base32 - "0g64h0x8dlv6aa9ggfcidk2mknkfl5li7z1phcav8aqp9srj8avf")) + "12305wj2i4067jc50l8r0wmb7zjcna24fli8vb8kiaild0jrlip6")) (modules '((guix build utils))) (snippet '(begin @@ -1527,7 +1528,6 @@ (define-public godot "libvorbis" "libvpx" "libwebp" - "openssl" "opus" "zlib")) #t))))) @@ -1550,7 +1550,6 @@ (define-public godot "builtin_libvorbis=no" "builtin_libvpx=no" "builtin_libwebp=no" - "builtin_openssl=no" "builtin_opus=no" "builtin_zlib=no") #:tests? #f ; There are no tests @@ -1612,7 +1611,6 @@ (define-public godot ("libxinerama" ,libxinerama) ("libxrandr" ,libxrandr) ("mesa" ,mesa) - ("openssl" ,openssl) ("opusfile" ,opusfile) ("pulseaudio" ,pulseaudio))) (home-page "https://godotengine.org/") -- cgit v1.2.3 From c1bc92c0aa02d8967107efe45dbb27fe824f17a4 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 28 Jan 2020 19:25:39 +0100 Subject: gnu: godot: Unbundle some dependencies. * gnu/packages/game-development.scm (godot)[inputs]: Add bullet, mbedtls-apache, pcre2 and zstd. [arguments](configure-flags): Use system libraries for the above. [source](snippet): Remove bundled copies. Signed-off-by: Christopher Baines --- gnu/packages/game-development.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index bbc9cbc0bd..47fc9a72a7 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -78,6 +78,7 @@ (define-module (gnu packages game-development) #: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,15 +1522,19 @@ (define-public godot ;; of these may be modified; see "thirdparty/README.md". (with-directory-excursion "thirdparty" (for-each delete-file-recursively - '("freetype" + '("bullet" + "freetype" "libogg" "libpng" "libtheora" "libvorbis" "libvpx" "libwebp" + "mbedtls" "opus" - "zlib")) + "pcre2" + "zlib" + "zstd")) #t))))) (build-system scons-build-system) (arguments @@ -1541,6 +1546,7 @@ (define-public godot '()) ;; 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" @@ -1550,8 +1556,11 @@ (define-public godot "builtin_libvorbis=no" "builtin_libvpx=no" "builtin_libwebp=no" + "builtin_mbedtls=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 +1607,7 @@ (define-public godot #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) + ("bullet" ,bullet) ("freetype" ,freetype) ("glew" ,glew) ("glu" ,glu) @@ -1610,9 +1620,12 @@ (define-public godot ("libxi" ,libxi) ("libxinerama" ,libxinerama) ("libxrandr" ,libxrandr) + ("mbedtls" ,mbedtls-apache) ("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 -- cgit v1.2.3 From 18f8e935e85a99d5c284c0a6b719351a402ada21 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 28 Jan 2020 19:25:40 +0100 Subject: gnu: godot: List which third party files to keep. Remove everything else to catch added dependencies in new versions. * gnu/packages/game-development.scm (godot)[source](snippet): Instead of removing (only) the unbundled libs, remove everything except the listed files. Signed-off-by: Christopher Baines --- gnu/packages/game-development.scm | 51 +++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 18 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 47fc9a72a7..ceec993d04 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1515,27 +1515,42 @@ (define-public godot (sha256 (base32 "12305wj2i4067jc50l8r0wmb7zjcna24fli8vb8kiaild0jrlip6")) - (modules '((guix build utils))) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) (snippet '(begin - ;; Drop libraries that we take from Guix. Note that some - ;; of these may be modified; see "thirdparty/README.md". + ;; Keep only those bundled files we have not (yet) replaced + ;; with Guix versions. Note that some of these may be + ;; modified; see "thirdparty/README.md". (with-directory-excursion "thirdparty" - (for-each delete-file-recursively - '("bullet" - "freetype" - "libogg" - "libpng" - "libtheora" - "libvorbis" - "libvpx" - "libwebp" - "mbedtls" - "opus" - "pcre2" - "zlib" - "zstd")) - #t))))) + (let* ((preserved-files + '("README.md" + "b2d_convexdecomp" + "certs" + "cvtt" + "enet" + "etc2comp" + "fonts" + "glad" + "jpeg-compressor" + "libsimplewebm" + "libwebsockets" + "miniupnpc" + "minizip" + "misc" + "nanosvg" + "pvrtccompressor" + "recastnavigation" + "squish" + "thekla_atlas" + "tinyexr" + "xatlas"))) + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." preserved-files))))) + #t)))) (build-system scons-build-system) (arguments `(#:scons ,scons-python2 -- cgit v1.2.3 From 451e1075f0aaca1a8234d34efc017284406fe375 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 1 Feb 2020 14:00:38 +0100 Subject: gnu: godot: Update to 3.2. * 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. Signed-off-by: Leo Famulari --- gnu/packages/game-development.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages/game-development.scm') 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 @@ (define-module (gnu packages game-development) #: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 @@ (define-public openmw (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 @@ (define-public godot (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 @@ (define-public godot (with-directory-excursion "thirdparty" (let* ((preserved-files '("README.md" - "b2d_convexdecomp" + "assimp" "certs" "cvtt" "enet" @@ -1535,7 +1536,6 @@ (define-public godot "glad" "jpeg-compressor" "libsimplewebm" - "libwebsockets" "miniupnpc" "minizip" "misc" @@ -1543,8 +1543,8 @@ (define-public godot "pvrtccompressor" "recastnavigation" "squish" - "thekla_atlas" "tinyexr" + "vhacd" "xatlas"))) (for-each delete-file-recursively (lset-difference string=? @@ -1574,6 +1574,7 @@ (define-public godot "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 @@ (define-public godot ("opusfile" ,opusfile) ("pcre2" ,pcre2) ("pulseaudio" ,pulseaudio) + ("wslay" ,wslay) ("zstd" ,zstd "lib"))) (home-page "https://godotengine.org/") (synopsis "Advanced 2D and 3D game engine") -- cgit v1.2.3 From 7b2ba609c3663b77ede10199c9d49855ee1ab0b4 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 1 Feb 2020 14:00:39 +0100 Subject: gnu: godot: Add zenity for showing alerts. * gnu/packages/game-development.scm (godot)[inputs]: Add zenity. [arguments]: Wrap godot to look for it in the store. Signed-off-by: Leo Famulari --- gnu/packages/game-development.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index c9a8b922b4..6fa4fed74f 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1599,6 +1599,10 @@ (define-public godot (rename-file "godot.x11.tools.64" "godot") (rename-file "godot.x11.tools.32" "godot")) (install-file "godot" bin)) + ;; Tell Godot where to find zenity for OS.alert(). + (wrap-program (string-append bin "/godot") + `("PATH" ":" prefix + (,(string-append (assoc-ref %build-inputs "zenity") "/bin")))) #t))) (add-after 'install 'install-godot-desktop (lambda* (#:key outputs #:allow-other-keys) @@ -1642,6 +1646,7 @@ (define-public godot ("pcre2" ,pcre2) ("pulseaudio" ,pulseaudio) ("wslay" ,wslay) + ("zenity" ,zenity) ("zstd" ,zstd "lib"))) (home-page "https://godotengine.org/") (synopsis "Advanced 2D and 3D game engine") -- cgit v1.2.3