From fcfa0490a5e89545a928e3a3beccc9206b2ef112 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 10 Jan 2021 14:44:35 +0100 Subject: gnu: augustus: Update to 2.0.1. * gnu/packages/games.scm (augustus): Update to 2.0.1. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d53583168e..c5d2ff6048 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1360,7 +1360,7 @@ does not include game data.") (package (inherit julius) (name "augustus") - (version "1.4.1a") + (version "2.0.1") (source (origin (method git-fetch) @@ -1369,7 +1369,7 @@ does not include game data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1xqv8j8jh3f13fjhyf7hk1anrn799cwwsvsd75kpl9n5yh5s1j5y")) + (base32 "0czazw8mc3fbvdazs2nzvgxd1dpzjc8z5fwiv89vv4nd7laz3jkj")) ;; Remove unused bundled libraries. (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 872aa117d29896757a7075128059bb2dcb5b2ab3 Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Wed, 13 Jan 2021 18:28:40 -0500 Subject: gnu: crawl: Update to 0.26.0. * gnu/packages/games.scm (crawl): Update to 0.26.0. Remove no-longer-needed snippet. --- gnu/packages/games.scm | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c5d2ff6048..b8f93505b3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6196,31 +6196,15 @@ fish. The whole game is accompanied by quiet, comforting music.") (define-public crawl (package (name "crawl") - (version "0.25.0") + (version "0.26.0") (source (origin (method url-fetch) - (uri (list - ;; Older releases get moved into a versioned directory - (string-append "http://crawl.develz.org/release/" - (version-major+minor version) "/stone_soup-" - version "-nodeps.tar.xz") - ;; Only the latest release is in this directory - (string-append "http://crawl.develz.org/release/stone_soup-" - version "-nodeps.tar.xz"))) + (uri (string-append "https://github.com/crawl/crawl/releases/download/" + version "/stone_soup-" version "-nodeps.tar.xz")) (sha256 - (base32 "0rn1wjxdqw33caiwisfypm1j8cid3c9pz01ahicl17144zs29z3d")) - (patches (search-patches "crawl-upgrade-saves.patch")) - ;; The 0.25.0 -nodeps.tar.xz was built from an OSX machine; normally - ;; apparently it's built from a Debian machine before the Debian - ;; packages are made. These ._* files are binary and have the string - ;; "Mac OS X" in them... removing these seems to result in compilation - ;; again. - (modules '((guix build utils))) - (snippet - '(begin - (for-each delete-file (find-files "." "^\\._")) - #t)))) + (base32 "1m81x1sp6p2ka5w2nib3pcw5w5iv58z41c8aqn0dayi1lb3yslfb")) + (patches (search-patches "crawl-upgrade-saves.patch")))) (build-system gnu-build-system) (inputs `(("lua51" ,lua-5.1) -- cgit v1.2.3 From f866d591153242ab1859bdf9b968c1a9a5cc6569 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 20 Jan 2021 18:36:45 +0100 Subject: gnu: Add solarus. * gnu/packages/games.scm (solarus): New variable. --- gnu/packages/games.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b8f93505b3..edfa725cf1 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou +;;; Copyright © 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou ;;; Copyright © 2018 okapi ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Madalin Ionel-Patrascu @@ -2237,6 +2237,64 @@ and defeat them with your bubbles!") ;; GPL2+ is for code, CC0 is for art. (license (list license:gpl2+ license:cc0)))) +(define-public solarus + (package + (name "solarus") + (version "1.6.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/solarus-games/solarus.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n6l91yyqjx0pz4w1lp3yybpq0fs2yjswfcm8c1wjfkxwiznbdxi")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + ;; The following tests fail reporting a missing "/dev/dri" + ;; file. + (lambda _ + (substitute* "tests/cmake/AddTestMaps.cmake" + ((".*1200_create_shader_from_source.*" all) + (string-append "#" all)) + ((".*1210_shader_scaling_factor.*" all) + (string-append "#" all))) + #t)) + (add-before 'check 'set-home + ;; Tests fail without setting the following environment + ;; variables. + (lambda _ + (setenv "HOME" (getcwd)) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) + (inputs + `(("glm" ,glm) + ("libmodplug" ,libmodplug) + ("libogg" ,libogg) + ("libvorbis" ,libvorbis) + ("luajit" ,luajit) + ("openal" ,openal) + ("physfs" ,physfs) + ("qtbase" ,qtbase) + ("sdl2" ,(sdl-union (list sdl2 sdl2-image sdl2-ttf))))) + (home-page "https://www.solarus-games.org/") + (synopsis "Lightweight game engine for Action-RPGs") + (description + "Solarus is a 2D game engine written in C++, that can run games +scripted in Lua. It has been designed with 16-bit classic Action-RPGs +in mind.") + ;; The source code is licensed under the terms of GPL-3.0. + ;; Resources are licensed under the terms of CC-BY-SA-3.0 and + ;; CC-BY-SA 4.0. + (license (list license:gpl3 license:cc-by-sa3.0 license:cc-by-sa4.0)))) + (define-public superstarfighter (package (name "superstarfighter") -- cgit v1.2.3 From 60f0ab5fced2fc5e75892cdebca17f70684472fd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 20 Jan 2021 18:39:03 +0100 Subject: gnu: solarus: Remove ".git" suffix from URL. * gnu/packages/games.scm (solarus)[source]: Remove ".git" suffix from URL. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index edfa725cf1..01580f75ff 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2245,7 +2245,7 @@ and defeat them with your bubbles!") (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/solarus-games/solarus.git") + (url "https://gitlab.com/solarus-games/solarus") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 -- cgit v1.2.3 From 2ec30608b2b9ffc0ca4d33c231052e0d73899837 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 20 Jan 2021 19:14:31 +0100 Subject: gnu: Add solarus-quest-editor. * gnu/packages/games.scm (solarus-quest-editor): New variable. (solarus): Add a comment about linked updates. --- gnu/packages/games.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 01580f75ff..ee1571e624 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2240,6 +2240,8 @@ and defeat them with your bubbles!") (define-public solarus (package (name "solarus") + ;; XXX: When updating this package, please also update hash in + ;; `solarus-quest-editor' below. (version "1.6.4") (source (origin @@ -2295,6 +2297,40 @@ in mind.") ;; CC-BY-SA 4.0. (license (list license:gpl3 license:cc-by-sa3.0 license:cc-by-sa4.0)))) +(define-public solarus-quest-editor + (package + (inherit solarus) + (name "solarus-quest-editor") + (version (package-version solarus)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/solarus-games/solarus-quest-editor") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn")))) + (arguments + `(#:tests? #false ;no test + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-qt-build + ;; XXX: Fix build with Qt 5.15. It has been applied upstream as + ;; 81d5c7f1 and can be removed at next upgrade. + (lambda _ + (substitute* "src/entities/jumper.cpp" + (("#include " all) + (string-append all "\n" "#include \n"))) + #t))))) + (inputs + `(("solarus" ,solarus) + ,@(package-inputs solarus))) + (synopsis "Create and modify quests for the Solarus engine") + (description + "Solarus Quest Editor is a graphical user interface to create and +modify quests for the Solarus engine."))) + (define-public superstarfighter (package (name "superstarfighter") -- cgit v1.2.3 From 7ee917d0cf22752d48df1ffaff0e03c72208ae25 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sat, 23 Jan 2021 16:40:47 -0600 Subject: gnu: Add Trigger Rally. * gnu/packages/games.scm (trigger-rally): New variable. --- gnu/packages/games.scm | 89 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ee1571e624..37fa926368 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 John Darrington ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2016 David Thompson -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Eric Bavier ;;; Copyright © 2014 Cyrill Schenkel ;;; Copyright © 2014 Sylvain Beucler ;;; Copyright © 2014, 2015, 2018, 2019 Ludovic Courtès @@ -2459,6 +2459,93 @@ available, as well as a single-player mode with AI-controlled ships.") "$(call ZIP) -X")) #t)))) +(define-public trigger-rally + (package + (name "trigger-rally") + (version "0.6.6.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/trigger-rally/" + "trigger-" version "/" + "trigger-rally-" version ".tar.gz")) + (sha256 + (base32 + "016bc2hczqscfmngacim870hjcsmwl8r3aq8x03vpf22s49nw23z")))) + (build-system gnu-build-system) + (inputs + `(("freealut" ,freealut) + ("glew" ,glew) + ("glu" ,glu) + ("mesa" ,mesa) + ("openal" ,openal) + ("physfs" ,physfs) + ("sdl" ,(sdl-union (list sdl2 sdl2-image))) + ("tinyxml2" ,tinyxml2))) + (arguments + `(#:make-flags (list (string-append "prefix=" %output) + "bindir=$(prefix)/bin" + "datadir=$(datarootdir)" + "OPTIMS=-Ofast") + #:tests? #f ; No tests present + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'cd-src + (lambda _ (chdir "src"))) + (add-before 'build 'remove-timestamps + (lambda _ + (substitute* (list "Trigger/menu.cpp" + "PEngine/app.cpp") + ((".*__DATE__.*") "")))) + (add-before 'build 'make-verbose + (lambda _ + (substitute* "GNUmakefile" + (("@\\$\\(CXX\\)") "$(CXX)")))) + (add-after 'build 'set-data-path + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "../bin/trigger-rally.config.defs" + ((" Date: Sat, 23 Jan 2021 16:48:11 -0600 Subject: gnu: trigger-rally: Fix license field. * gnu/packages/games.scm (trigger-rally)[license]: Use list. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 37fa926368..be7a3cc181 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2543,8 +2543,8 @@ through the maps in often tight time limits and can further improve by beating the recorded high scores. All attached single races must be finished in time in order to win an event, unlocking additional events and cars. Most maps are equipped with spoken co-driver notes and co-driver icons.") - (license license:cc0 ;textures and audio in data.zip - license:gpl2+))) + (license (list license:cc0 ;textures and audio in data.zip + license:gpl2+)))) (define-public ufo2map (package -- cgit v1.2.3 From d6f79bc64d5bf51e9bfaaebfaf2aac5bf591acee Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 30 Jan 2021 13:53:05 +0100 Subject: gnu: teeworlds: Fix audio. * gnu/packages/games.scm (teeworlds)[source]: Enable recursive cloning. [build-system]: Switch to cmake-build-system. [arguments]: Remove custom phases build and install. [inputs]: Add openssl. [native-inputs]: Remove bam. [license]: Add map/language data license. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 65 ++++++++------------------------------------------ 1 file changed, 10 insertions(+), 55 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index be7a3cc181..e3e18bf09e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6104,11 +6104,13 @@ small robot living in the nano world, repair its maker.") (method git-fetch) (uri (git-reference (url "https://github.com/teeworlds/teeworlds") - (commit version))) + (commit version) + ;; There are two submodules in datasrc/{languages,maps} + (recursive? #t))) (file-name (git-file-name name version)) (sha256 (base32 - "169dl83q08zl4h813az8hjs4rs3dms9yjn6bnsld4fjcj0imvvc6")) + "1l19ksmimg6b8zzjy0skyhh7z11ql7n5gvilkv7ay5x2b9ndbqwz")) (modules '((guix build utils) (ice-9 ftw) (ice-9 regex) @@ -6121,15 +6123,12 @@ small robot living in the nano world, repair its maker.") (remove (cut string-match "(^.)|(^md5$)" <>) (scandir base-dir))) #t)))) - (build-system gnu-build-system) + (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests included - #:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-26)) #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'unpack 'patch-paths (lambda* (#:key outputs #:allow-other-keys) ;; Embed path to assets. (substitute* "src/engine/shared/storage.cpp" @@ -6138,51 +6137,7 @@ small robot living in the nano world, repair its maker.") (assoc-ref outputs "out") "/share/teeworlds/data" "\""))) - - ;; Bam expects all files to have a recent time stamp. - (for-each (cut utime <> 1 1) - (find-files ".")) - - ;; Do not use bundled libraries. - (substitute* "bam.lua" - (("local json = Compile.+$") - "local json = nil -settings.link.libs:Add(\"jsonparser\")") - (("local png = Compile.+$") - "local png = nil -settings.link.libs:Add(\"pnglite\")") - (("local wavpack = Compile.+$") - "local wavpack = nil -settings.link.libs:Add(\"wavpack\")") - (("if config\\.zlib\\.value == 1") - "if config.zlib.value")) - (substitute* "src/engine/client/graphics_threaded.cpp" - (("engine/external/pnglite/pnglite\\.h") - "pnglite.h")) - (substitute* "src/engine/client/sound.cpp" - (("engine/external/wavpack/wavpack\\.h") - "wavpack/wavpack.h")) - #t)) - (replace 'build - (lambda _ - (invoke "bam" "-a" "-v" "conf=release"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((arch ,(system->linux-architecture - (or (%current-target-system) - (%current-system)))) - (build (string-append "build/" (if (string=? arch "i386") - "x86" arch) - "/release/")) - (data-built (string-append build "data/")) - (out (assoc-ref outputs "out")) - (bin (string-append out "/bin/")) - (data (string-append out "/share/teeworlds/data/"))) - (for-each (cut install-file <> bin) - (map (cut string-append build <>) - '("teeworlds" "teeworlds_srv"))) - (copy-recursively data-built data) - #t)))))) + #t))))) (inputs `(("freetype" ,freetype) ("glu" ,glu) @@ -6193,17 +6148,17 @@ settings.link.libs:Add(\"wavpack\")") ("sdl2-image" ,sdl2-image) ("sdl2-mixer" ,sdl2-mixer) ("wavpack" ,wavpack) + ("openssl" ,openssl) ("zlib" ,zlib))) (native-inputs - `(("bam" ,bam) - ("python" ,python-wrapper) + `(("python" ,python-wrapper) ("pkg-config" ,pkg-config))) (home-page "https://www.teeworlds.com") (synopsis "2D retro multiplayer shooter game") (description "Teeworlds is an online multiplayer game. Battle with up to 16 players in a variety of game modes, including Team Deathmatch and Capture The Flag. You can even design your own maps!") - (license license:bsd-3))) + (license (list license:bsd-3 license:cc-by-sa3.0)))) ; game+maps&languages (define-public enigma (package -- cgit v1.2.3