From a1205efe1130d4084c6205a89108f1b1743ba3d5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Jul 2018 23:37:56 +0200 Subject: gnu: godot: Update to 3.0.4. * gnu/packages/game-development.scm (godot): Update to 3.0.4. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index b428fa77f..7eba03ea7 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1062,7 +1062,7 @@ games.") (define-public godot (package (name "godot") - (version "3.0.2") + (version "3.0.4") (source (origin (method url-fetch) (uri @@ -1071,7 +1071,7 @@ games.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ldnk3j4w2kh454mzclmq8nk7zqrn758yrqq85i4kzljpkf93g0m")) + "0khnj9rf24g56imwl78a89f2agxi6arbh804zrv54k79rm71dlpb")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.3 From 39f516cb839af6be3420ea02705c3f914308b90b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Jul 2018 23:51:21 +0200 Subject: gnu: godot: Don't use unstable tarball. * gnu/packages/game-development.scm (godot)[source]: Use GIT-FETCH. --- gnu/packages/game-development.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 7eba03ea7..a715c958c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1064,14 +1064,14 @@ games.") (name "godot") (version "3.0.4") (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/godotengine/godot/archive/" - version "-stable.tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/godotengine/godot") + (commit (string-append version "-stable")))) + (file-name (git-file-name name version)) (sha256 (base32 - "0khnj9rf24g56imwl78a89f2agxi6arbh804zrv54k79rm71dlpb")) + "0i4ssfb6igga9zwvsmahrnasx9cyqrsd6mlmssjgc482fy9q2kz4")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.3 From df0fd7bfe0ba6b059136125b064e511b12a0f5af Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 5 Jul 2018 02:26:11 +0200 Subject: gnu: nml: Use HTTPS home page. * gnu/packages/game-development.scm (nml)[home-page]: Use HTTPS. --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index a715c958c..53d77bcb1 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -278,7 +278,7 @@ provide connectivity for client applications written in any language.") (propagated-inputs `(("python-pillow" ,python-pillow) ("python-ply" ,python-ply))) - (home-page "http://dev.openttdcoop.org/projects/nml") + (home-page "https://dev.openttdcoop.org/projects/nml") (synopsis "NML compiler") (description "@dfn{NewGRF Meta Language} (NML) is a python-based compiler, capable of -- cgit v1.3 From 41770337d05ef5a023eb87dd437524a27c1ecfe7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 5 Jul 2018 02:25:41 +0200 Subject: gnu: nml: Update to 0.4.5. * gnu/packages/game-development.scm (nml): Update to 0.4.5. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 53d77bcb1..96b15b565 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -265,7 +265,7 @@ provide connectivity for client applications written in any language.") (define-public nml (package (name "nml") - (version "0.4.4") + (version "0.4.5") (source (origin (method url-fetch) @@ -273,7 +273,7 @@ provide connectivity for client applications written in any language.") version "/nml-" version ".tar.gz")) (sha256 (base32 - "0wk9ls5qyjwkra54rkj1gg94xbwzi7b84a5fh1ma1q7pbimi8rmg")))) + "1pmvvm3sgnpngfa7884mqhq3fwdjh9sr0ca07ypnidcg0y341w53")))) (build-system python-build-system) (propagated-inputs `(("python-pillow" ,python-pillow) -- cgit v1.3 From a6dec13b5de7d8411755df0eb304381726371d6a Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Thu, 5 Jul 2018 21:47:24 +0300 Subject: gnu: openmw: Update to a checkout version. * gnu/packages/game-development.scm (openmw): Update to the latest commit to fix the build. --- gnu/packages/game-development.scm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 96b15b565..4131c130f 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 Tomáš Čech ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2018 Ludovic Courtès -;;; Copyright © 2015 Alex Kost +;;; Copyright © 2015, 2018 Alex Kost ;;; Copyright © 2015, 2016, 2017 David Thompson ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Kei Kebreau @@ -1019,18 +1019,23 @@ of use.") (license license:expat))) (define-public openmw + ;; XXX The current version does not support qt 5.11, but the upcoming + ;; version (0.44) will do. + (let ((commit "5bc073603e8c7887e015a0ef41b4cefd6e688aaf") + (revision "1")) (package (name "openmw") - (version "0.43.0") + (version (git-version "0.43" revision commit)) (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/OpenMW/openmw/archive/" - name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/OpenMW/openmw.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "11phjx7b3mv4n295xgq25lkcwq0mgr35i5k05hf1h77y6n6jbw64")))) + "1sp4n3f1syvv0iz7n72wh226fyc0jh98cg8bvs574jvvqx6qn851")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target @@ -1057,7 +1062,7 @@ the 2002 open-world RPG Morrowind. The engine comes with its own editor, called OpenMW-CS which allows the user to edit or create their own original games.") (home-page "https://openmw.org") - (license license:gpl3))) + (license license:gpl3)))) (define-public godot (package -- cgit v1.3 From cd6ae1cee95644b9aa712a7192bc9677a04c146b Mon Sep 17 00:00:00 2001 From: Julian Graham Date: Thu, 5 Jul 2018 11:06:02 -0400 Subject: gnu: gzochi: Update to 0.12. * gnu/packages/game-development.scm (gzochi): Update to 0.12. --- 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 4131c130f..afabeb0c6 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2016, 2018 Ricardo Wurmus -;;; Copyright © 2016, 2017 Julian Graham +;;; Copyright © 2016, 2017, 2018 Julian Graham ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017 Peter Mikkelsen @@ -225,14 +225,14 @@ PCM data.") (define-public gzochi (package (name "gzochi") - (version "0.11.1") + (version "0.12") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/gzochi/gzochi-" version ".tar.gz")) (sha256 (base32 - "13j1m92zhxwkaaja3lg5x0h0b28mrrawdzk9d3hd19031akfxwb3")))) + "0h8yvk7154kd8zdfa9nqy73blrjq2x19kv305jcnwlmm09vvss59")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.3 From 08e977d291a5426be15f0ddb204a3a7004bd9e92 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Jul 2018 12:47:32 +0200 Subject: gnu: physfs: Update to 3.0.1. * gnu/packages/game-development.scm (physfs): Update to 3.0.1. [arguments]: Add phase to ensure RUNPATH is set. --- gnu/packages/game-development.scm | 14 +++++++++++--- 1 file changed, 11 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 afabeb0c6..fde139c0b 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -518,7 +518,7 @@ sounds from presets such as \"explosion\" or \"powerup\".") (define-public physfs (package (name "physfs") - (version "2.0.3") + (version "3.0.1") (source (origin (method url-fetch) (uri (string-append @@ -527,10 +527,18 @@ sounds from presets such as \"explosion\" or \"powerup\".") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na")))) + "1wgj2zqpnfbnyyi1i7bq5pshcc9n5cvwlpzp8im67nb8662ryyxp")))) (build-system cmake-build-system) (arguments - '(#:tests? #f)) ; no check target + '(#:tests? #f ; no check target + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-CMakeLists.txt + (lambda _ + (substitute* "CMakeLists.txt" + ;; XXX: For some reason CMakeLists.txt disables + ;; RUNPATH manipulation when the compiler is GCC. + (("CMAKE_COMPILER_IS_GNUCC") "FALSE")) + #t))))) (inputs `(("zlib" ,zlib))) (native-inputs -- cgit v1.3 From 0bc272480019a5c2ff34dd13bd4c8f3450970f8d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Jul 2018 15:08:12 +0200 Subject: gnu: sfml: Update to 2.5.0. * gnu/packages/game-development.scm (sfml): Update to 2.5.0. [arguments]: Specify pkg-config dir in #:configure-flags. [native-inputs]: Add PKG-CONFIG. [inputs]: Move FLAC, FREETYPE, LIBVORBIS and OPENAL ... [propagated-inputs]: ... here. New field. --- gnu/packages/game-development.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index fde139c0b..4610e389b 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -440,7 +440,7 @@ clone.") (define-public sfml (package (name "sfml") - (version "2.3.2") + (version "2.5.0") (source (origin (method url-fetch) ;; Do not fetch the archives from @@ -451,24 +451,29 @@ clone.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0k2fl5xk3ni2q8bsxl0551inx26ww3w6cp6hssvww0wfjdjcirsm")))) + "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab")))) (build-system cmake-build-system) (arguments '(#:configure-flags - (list "-DSFML_INSTALL_PKGCONFIG_FILES=TRUE") + (list "-DSFML_INSTALL_PKGCONFIG_FILES=TRUE" + "-DSFML_OS_PKGCONFIG_DIR=lib/pkgconfig") #:tests? #f)) ; no tests + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs `(("mesa" ,mesa) ("glew" ,glew) - ("flac" ,flac) - ("libvorbis" ,libvorbis) ("libx11" ,libx11) ("xcb-util-image" ,xcb-util-image) ("libxrandr" ,libxrandr) ("eudev" ,eudev) - ("freetype" ,freetype) ("libjpeg" ,libjpeg) - ("libsndfile" ,libsndfile) + ("libsndfile" ,libsndfile))) + (propagated-inputs + ;; In Requires.private of pkg-config files. + `(("flac" ,flac) + ("freetype" ,freetype) + ("libvorbis" ,libvorbis) ("openal" ,openal))) (home-page "https://www.sfml-dev.org") (synopsis "Simple and Fast Multimedia Library") -- cgit v1.3 From 67c127c9cbef57d43f1aa73c50a87f0b1a1e17de Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Jul 2018 15:19:07 +0200 Subject: gnu: sfml: Remove all bundled dependencies. * gnu/packages/game-development.scm (sfml)[source](snippet): New field. [inputs]: Add STB-IMAGE and STB-IMAGE-WRITE. --- gnu/packages/game-development.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 4610e389b..33e2b4a16 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) + #:use-module (gnu packages stb) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages video) @@ -451,7 +452,13 @@ clone.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab")))) + "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Ensure system libraries are used. + (delete-file-recursively "extlibs") + #t)))) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -468,7 +475,9 @@ clone.") ("libxrandr" ,libxrandr) ("eudev" ,eudev) ("libjpeg" ,libjpeg) - ("libsndfile" ,libsndfile))) + ("libsndfile" ,libsndfile) + ("stb-image" ,stb-image) + ("stb-image-write" ,stb-image-write))) (propagated-inputs ;; In Requires.private of pkg-config files. `(("flac" ,flac) -- cgit v1.3