From cd5145875e2741e704611753300f43c3caabdc02 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 4 Sep 2021 11:29:34 +0200 Subject: gnu: allegro: Update to 5.2.7.0. * gnu/packages/game-development.scm (allegro): Update to 5.2.7.0. [inputs]: Use gtk+ instead of gtk+-2. --- 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 40807450ea..bf7cbdf9c1 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -830,7 +830,7 @@ etc.") (define-public allegro (package (name "allegro") - (version "5.2.5.0") + (version "5.2.7.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/liballeg/allegro5/releases" @@ -838,7 +838,7 @@ etc.") version ".tar.gz")) (sha256 (base32 - "06dpkfnac8w3pq36834nn2iij3ajz6prladqd0w92lq39aiqv5jr")))) + "034pmbmbq6jagpp4lhnyjqmf8gcz5fx74d9rknrm7d4wv4cv7qy1")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; there are no tests (inputs @@ -846,7 +846,7 @@ etc.") `(("flac" ,flac) ("freetype" ,freetype) ("glu" ,glu) - ("gtk" ,gtk+-2) + ("gtk" ,gtk+) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtheora" ,libtheora) -- cgit v1.2.3 From bd20d1781fda30a5a870ede521877f1c4f6f0047 Mon Sep 17 00:00:00 2001 From: James Smith Date: Sat, 18 Sep 2021 10:47:12 -0700 Subject: gnu: Add slade. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/game-development.scm (slade): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/game-development.scm | 66 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 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 bf7cbdf9c1..7d185caa0e 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; Copyright © 2021 Dmitry Polyakov +;;; Copyright © 2020-2021 James Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,7 +40,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages game-development) - #:use-module (srfi srfi-1) + #:use-module ((srfi srfi-1) #:hide (zip)) #:use-module (ice-9 match) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -55,6 +56,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages check) @@ -99,6 +101,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) + #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) @@ -447,6 +450,67 @@ GUI toolkit, lighting and physics frameworks and @code{Tiled} TMX format support.") (license license:gpl3+))) +(define-public slade + (package + (name "slade") + (version "3.1.13") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sirjuddington/SLADE") + (commit version))) + (sha256 (base32 "009yc5m6y074wfalvwbrnv2zsmaf9yhbi8hzgs973di0zqnqv011")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags + (list "-DWX_GTK3=ON" "-DNO_WEBVIEW=ON" + (string-append "-DWITH_WXPATH=" + (assoc-ref %build-inputs "wxwidgets") "/bin") + (string-append "-DwxWidgets_LIBRARIES=" + (assoc-ref %build-inputs "wxwidgets") "/lib")) + #:phases + (modify-phases %standard-phases + (add-before 'build 'reset-slade.pk3-timestamps + ;; This is neccessary to make slade reproducible due to + ;; . TODO: Remove on next core update + ;; cycle. + (lambda _ + (invoke "find" "../source/dist/res" "-exec" "touch" + "--no-dereference" "-t" "197001010000.00" "{}" + "+"))) + (add-after 'install 'wrap-with-x11-gdk-backend + ;; Set GDK_BACKEND to x11 to prevent crash on Wayland. + ;; See https://github.com/sirjuddington/SLADE/issues/1097 for details. + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program + (string-append (assoc-ref outputs "out") + "/bin/slade") + '("GDK_BACKEND" = ("x11")))))) + #:tests? #f)) ;; No test suite. + (inputs + `(("bash" ,bash-minimal) + ("curl" ,curl) + ("fluidsynth" ,fluidsynth) + ("freeimage" ,freeimage) + ("ftgl" ,ftgl) + ("glew" ,glew) + ("gtk+" ,gtk+) + ("sfml" ,sfml) + ("wxwidgets" ,wxwidgets-3.1))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("which" ,which) + ("zip" ,zip))) + (home-page "https://slade.mancubus.net") + (synopsis "Doom game data editor") + (description "SLADE3 is a modern editor for Doom-engine based games and +source ports. It has the ability to view, modify, and write many different game- +specific formats, and even convert between some of them, or from/to other generic +formats such as PNG.") + (license license:gpl2+))) + (define-public tiled (package (name "tiled") -- cgit v1.2.3 From 719bbcc15e2216b59bde34f297b92ceb9d349ce0 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 25 Sep 2021 09:27:02 +0200 Subject: Update copyright assignments for Liliana Marie Prikler. * doc/guix.texi: Update copyright name for Liliana Marie Prikler. * gnu/packages/build-tools.scm: Update copyright name and email for Liliana Marie Prikler. * gnu/packages/convmv.scm: Likewise. * gnu/packages/emacs-xyz.scm: Likewise. * gnu/packages/emacs.scm: Likewise. * gnu/packages/esolangs.scm: Likewise. * gnu/packages/game-development.scm: Likewise. * gnu/packages/games.scm: Likewise. * gnu/packages/gnome-xyz.scm: Likewise. * gnu/packages/gnome.scm: Likewise. * gnu/packages/gstreamer.scm: Likewise. * gnu/packages/guile-xyz.scm: Likewise. * gnu/packages/minetest.scm: Likewise. * gnu/packages/music.scm: Likewise. * gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch: Likewise. * gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch: Likewise. * gnu/packages/patches/webkitgtk-bind-all-fonts.patch: Likewise. * gnu/packages/python-xyz.scm: Likewise. * gnu/packages/unicode.scm: Likewise. * gnu/packages/xorg.scm: Likewise. * gnu/services/sound.scm: Likewise. * guix/build-system/renpy.scm: Likewise. * guix/build/emacs-utils.scm: Likewise. * guix/build/renpy-build-system.scm: Likewise. --- doc/guix.texi | 2 +- gnu/packages/build-tools.scm | 2 +- gnu/packages/convmv.scm | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/emacs.scm | 2 +- gnu/packages/esolangs.scm | 2 +- gnu/packages/game-development.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/gnome-xyz.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/gstreamer.scm | 2 +- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/minetest.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch | 2 +- gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch | 4 ++-- gnu/packages/patches/webkitgtk-bind-all-fonts.patch | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/unicode.scm | 2 +- gnu/packages/xorg.scm | 2 +- gnu/services/sound.scm | 2 +- guix/build-system/renpy.scm | 2 +- guix/build/emacs-utils.scm | 2 +- guix/build/renpy-build-system.scm | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/doc/guix.texi b/doc/guix.texi index 9bb91b94fd..4bf14014eb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -70,7 +70,7 @@ Copyright @copyright{} 2019 Jakob L. Kreuze@* Copyright @copyright{} 2019 Kyle Andrews@* Copyright @copyright{} 2019 Alex Griffin@* Copyright @copyright{} 2019, 2020, 2021 Guillaume Le Vaillant@* -Copyright @copyright{} 2020 Leo Prikler@* +Copyright @copyright{} 2020 Liliana Marie Prikler@* Copyright @copyright{} 2019, 2020 Simon Tournier@* Copyright @copyright{} 2020 Wiktor Żelazny@* Copyright @copyright{} 2020 Damien Cassou@* diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index d2fb9e05df..7c44d2b80f 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019, 2020 Brett Gilio ;;; Copyright © 2019 Jonathan Brielmaier -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020 Yuval Kogman ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Efraim Flashner diff --git a/gnu/packages/convmv.scm b/gnu/packages/convmv.scm index 2a9a4ec68c..9e6f141818 100644 --- a/gnu/packages/convmv.scm +++ b/gnu/packages/convmv.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2754ce7049..e390d87253 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -55,7 +55,7 @@ ;;; Copyright © 2019 Jelle Licht ;;; Copyright © 2019 Björn Höfling ;;; Copyright © 2019 Stephen Webber -;;; Copyright © 2019, 2021 Leo Prikler +;;; Copyright © 2019, 2021 Liliana Marie Prikler ;;; Copyright © 2019 David Wilson ;;; Copyright © 2020 Paul Garlick ;;; Copyright © 2020 Robert Smith diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1edbaa463a..6d9950d068 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Jesse John Gildersleve ;;; Copyright © 2019 Valentin Ignatev -;;; Copyright © 2019 Leo Prikler +;;; Copyright © 2019 Liliana Marie Prikler ;;; Copyright © 2019 Amin Bandali ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Morgan Smith diff --git a/gnu/packages/esolangs.scm b/gnu/packages/esolangs.scm index 45feedfa28..753221a5f1 100644 --- a/gnu/packages/esolangs.scm +++ b/gnu/packages/esolangs.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Nikita ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Hendursaga -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 7d185caa0e..039945467b 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017, 2019 Rutger Helling ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2019 Pierre Neidhardt -;;; Copyright © 2019, 2020, 2021 Leo Prikler +;;; Copyright © 2019, 2020, 2021 Liliana Marie Prikler ;;; Copyright © 2019 Jethro Cao ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Timotej Lazar diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index bd1802517b..e59d416905 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -53,7 +53,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Trevor Hass -;;; Copyright © 2020, 2021 Leo Prikler +;;; Copyright © 2020, 2021 Liliana Marie Prikler ;;; Copyright © 2020 Lu hux ;;; Copyright © 2020 Tomás Ortín Fernández ;;; Copyright © 2021 Olivier Rojon diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index b9f7afcaf8..d4a6772254 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019, 2020, 2021 Leo Prikler +;;; Copyright © 2019, 2020, 2021 Liliana Marie Prikler ;;; Copyright © 2019, 2021 Alexandros Theodotou ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2020 Alex Griffin diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7de12fe525..f81e169abb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -44,7 +44,7 @@ ;;; Copyright © 2019 David Wilson ;;; Copyright © 2019, 2020 Raghav Gururajan ;;; Copyright © 2019, 2020 Jonathan Brielmaier -;;; Copyright © 2019, 2020, 2021 Leo Prikler +;;; Copyright © 2019, 2020, 2021 Liliana Marie Prikler ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 raingloom diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 3047773e0f..c734d0c74e 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 Marius Bakke -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 457701a436..7188058b42 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2020, 2021 Masaya Tojo ;;; Copyright © 2020 Jesse Gibbons ;;; Copyright © 2020 Mike Rosset -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020, 2021 pukkamustard ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Xinglu Chen diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index fd1439d4d2..28fa40b410 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2019–2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 Trevor Hass -;;; Copyright © 2020, 2021 Leo Prikler +;;; Copyright © 2020, 2021 Liliana Marie Prikler ;;; Copyright © 2021 Maxime Devos ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ff1330d228..4c77fb7461 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2019 Riku Viitanen ;;; Copyright © 2020 Ryan Prior -;;; Copyright © 2021 Leo Prikler +;;; Copyright © 2021 Liliana Marie Prikler ;;; Copyright © 2021 Vinicius Monego ;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 Bonface Munyoki Kilyungi diff --git a/gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch b/gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch index a74034a2c5..41338e6e6f 100644 --- a/gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch +++ b/gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch @@ -8,7 +8,7 @@ When it exists, Minetest will look there for mods in addition to ~/.minetest/mods/. Mods can still be installed to ~/.minetest/mods/ with the built-in installer. -With thanks to Leo Prikler. +With thanks to Liliana Marie Prikler. --- builtin/mainmenu/pkgmgr.lua | 7 +++---- doc/menu_lua_api.txt | 8 +++++++- diff --git a/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch b/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch index 155ba35efd..3a5ae1a2cd 100644 --- a/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch +++ b/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch @@ -1,9 +1,9 @@ From 942730ce7148cd54a30d4a606ce71a2654c8a2e0 Mon Sep 17 00:00:00 2001 -From: Leo Prikler +From: Liliana Marie Prikler Date: Sat, 5 Jun 2021 22:47:00 -0400 Subject: [PATCH] ppsspp: Remove upgrade code and gold support. -Original patch from Leo Prikler. +Original patch from Liliana Marie Prikler. Rebased on master (commit 69fa20744958aef8da9ca052ba7675fdc1636e46) by Maxim Cournoyer. --- diff --git a/gnu/packages/patches/webkitgtk-bind-all-fonts.patch b/gnu/packages/patches/webkitgtk-bind-all-fonts.patch index 3fe9704727..e7b06cc650 100644 --- a/gnu/packages/patches/webkitgtk-bind-all-fonts.patch +++ b/gnu/packages/patches/webkitgtk-bind-all-fonts.patch @@ -1,7 +1,7 @@ Add fonts from all XDG_DATA_DIRS, not just XDG_DATA_HOME. See . -Author: Leo Prikler +Author: Liliana Marie Prikler Index: webkitgtk-2.28.2/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp =================================================================== --- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 20502ac255..15a35cda17 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -89,7 +89,7 @@ ;;; Copyright © 2020, 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2020 Ekaitz Zarraga ;;; Copyright © 2020 Diego N. Barbato -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2019 Kristian Trandem ;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Morgan Smith diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index 2ecfebd379..806fe05fb6 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b335435614..3b10573635 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2019 nee ;;; Copyright © 2019 Yoshinori Arai ;;; Copyright © 2019 Mathieu Othacehe -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Maxim Cournoyer diff --git a/gnu/services/sound.scm b/gnu/services/sound.scm index bdf819b422..55610f27e0 100644 --- a/gnu/services/sound.scm +++ b/gnu/services/sound.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2020 Oleg Pykhalov -;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Liliana Marie Prikler ;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. diff --git a/guix/build-system/renpy.scm b/guix/build-system/renpy.scm index 35edc0056d..5ed59bf5a5 100644 --- a/guix/build-system/renpy.scm +++ b/guix/build-system/renpy.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2021 Leo Prikler +;;; Copyright © 2021 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index 5f7ba71244..64ef40e25a 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2018 Mark H Weaver ;;; Copyright © 2014 Alex Kost ;;; Copyright © 2018, 2020 Maxim Cournoyer -;;; Copyright © 2019 Leo Prikler +;;; Copyright © 2019 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/build/renpy-build-system.scm b/guix/build/renpy-build-system.scm index 66683971c5..e4a88456be 100644 --- a/guix/build/renpy-build-system.scm +++ b/guix/build/renpy-build-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2021 Leo Prikler +;;; Copyright © 2021 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 8a3bcbec8bd1cbd1faa3eed8154ba48e5cd6a221 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 25 Sep 2021 10:39:56 +0200 Subject: gnu: tiled: Update to 1.7.2. * gnu/packages/game-development.scm (tiled): Update to 1.7.2. --- 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 039945467b..eaa3de3f87 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -514,7 +514,7 @@ formats such as PNG.") (define-public tiled (package (name "tiled") - (version "1.5.0") + (version "1.7.2") (source (origin (method git-fetch) (uri (git-reference @@ -523,7 +523,7 @@ formats such as PNG.") (file-name (git-file-name name version)) (sha256 (base32 - "1prajkx1xpp3csa0xpkrn3c2cnzvmwzxgrqb9d3gqszp3sllr2dg")))) + "1ifxh3sv6gz32gahgi7ba0ivcw5mfgwnrw6iycpav150w9xla43i")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase-5) -- cgit v1.2.3 From 744fe9ee259e1e7635f0ef699dcff2662f6894d1 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 25 Sep 2021 11:14:33 +0200 Subject: gnu: love-nuklear: Update to 2.6.1. * gnu/packages/game-development.scm (love-nuklear): Update to 2.6.1. --- gnu/packages/game-development.scm | 52 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 27 deletions(-) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index eaa3de3f87..41de1fe722 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -822,35 +822,33 @@ programming language.") (license license:zlib))) (define-public love-nuklear - (let ((version "v2.6") - (commit "fef4e00a602efb16c57ae962850b6e7a01f7a29a")) - (package - (name "love-nuklear") - (version (git-version version "1" commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/keharriso/love-nuklear/") - (commit commit) - (recursive? #t))) - ;; NOTE: the HEAD of the Nuklear git-submodule is at commit - ;; "adc52d710fe3c87194b99f540c53e82eb75c2521" of Oct 1 2019 - (file-name (git-file-name name version)) - (sha256 - (base32 - "15qmy8mfwkxy2x9rmxs6f9cyvjvwwj6yf78bs863xmc56dmjzzbn")))) - (build-system cmake-build-system) - (arguments - `(#:build-type "Release" - #:tests? #f)) - (inputs - `(("luajit" ,luajit))) - (synopsis "Lightweight immediate mode GUI for LÖVE games") - (description "LÖVE is a Lua framework for making 2D games. Nuklear + (package + (name "love-nuklear") + (version "2.6.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/keharriso/love-nuklear/") + (commit (string-append "v" version)) + (recursive? #t))) + ;; NOTE: the HEAD of the Nuklear git-submodule is at commit + ;; "adc52d710fe3c87194b99f540c53e82eb75c2521" of Oct 1 2019 + (file-name (git-file-name name version)) + (sha256 + (base32 + "090xp5c975155hd1pa7bdssdlawvygs5s6icdkwbyc8il5kg5kgv")))) + (build-system cmake-build-system) + (arguments + `(#:build-type "Release" + #:tests? #f)) + (inputs + `(("luajit" ,luajit))) + (synopsis "Lightweight immediate mode GUI for LÖVE games") + (description "LÖVE is a Lua framework for making 2D games. Nuklear is a minimal state immediate mode graphical user interface toolkit. This package is the Nuklear bindings for LÖVE created by Kevin Harrison.") - (home-page "https://github.com/keharriso/love-nuklear/") - (license license:expat)))) + (home-page "https://github.com/keharriso/love-nuklear/") + (license license:expat))) (define-public allegro-4 (package -- cgit v1.2.3 From 80aeefd517b1355ccd1accb09f0d998d84436beb Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 25 Sep 2021 11:14:52 +0200 Subject: gnu: love-nuklear: Install to lib/love. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/game-development.scm (love-nuklear)[#:phases]: Add ‘patch-cmake’ phase to change install destination. --- gnu/packages/game-development.scm | 8 +++++++- 1 file changed, 7 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 41de1fe722..06bf4041df 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -840,7 +840,13 @@ programming language.") (build-system cmake-build-system) (arguments `(#:build-type "Release" - #:tests? #f)) + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-cmake + (lambda _ + (substitute* "CMakeLists.txt" + (("DESTINATION .") "DESTINATION lib/love"))))))) (inputs `(("luajit" ,luajit))) (synopsis "Lightweight immediate mode GUI for LÖVE games") -- cgit v1.2.3 From 338dfc928efa271261e7714f58f87e04007b3705 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 9 Oct 2021 11:17:37 +0200 Subject: gnu: guile-chickadee: Update to 0.8.0. * gnu/packages/game-development.scm (guile-chickadee): Update to 0.8.0. [propagated-inputs]: Use guile-sdl2 instead of the deprecated guile3.0-sdl2. [inputs]: Use guile-3.0-latest. Add readline. [native-inputs]: Add guile-3.0-latest. --- gnu/packages/game-development.scm | 15 +++++++++------ 1 file changed, 9 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 06bf4041df..5b598905b3 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -92,6 +92,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages readline) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) #:use-module (gnu packages sphinx) @@ -2031,28 +2032,30 @@ a 2D editor view.") (define-public guile-chickadee (package (name "guile-chickadee") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append "https://files.dthompson.us/chickadee/" "chickadee-" version ".tar.gz")) (sha256 (base32 - "199y4kc28va6klfs19h998sfh7vx9spnrvjw7p92i47q5a7jdcp6")))) + "1k2dml2z57lnc36wrmwhh7avnpczxgxnshlfhpbk174vg6v609n0")))) (build-system gnu-build-system) (arguments '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) (propagated-inputs `(("guile-opengl" ,guile3.0-opengl) - ("guile-sdl2" ,guile3.0-sdl2))) + ("guile-sdl2" ,guile-sdl2))) (inputs `(("freetype" ,freetype) - ("guile" ,guile-3.0) + ("guile" ,guile-3.0-latest) ("libvorbis" ,libvorbis) ("mpg123" ,mpg123) - ("openal" ,openal))) + ("openal" ,openal) + ("readline" ,readline))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("guile" ,guile-3.0-latest) + ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) (home-page "https://dthompson.us/projects/chickadee.html") (synopsis "Game development toolkit for Guile Scheme with SDL2 and OpenGL") -- cgit v1.2.3 From c4595fdedf027b9be6733cac8b2e3ee82cdcb16a Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 10 Oct 2021 15:59:32 +0200 Subject: gnu: tsukundere: Update home-page. * gnu/packages/game-development.scm (tsukundere)[home-page]: Update. --- 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 5b598905b3..4e2605eafa 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -564,7 +564,7 @@ clone.") (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/leoprikler/tsukundere") + (url "https://gitlab.com/lilyp/tsukundere") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -620,7 +620,7 @@ clone.") (inputs `(("guile-sdl2" ,guile3.0-sdl2) ("guile" ,guile-3.0))) - (home-page "https://gitlab.com/leoprikler/tsukundere") + (home-page "https://gitlab.com/lilyp/tsukundere") (synopsis "Visual novel engine") (description "Tsukundere is a game engine geared heavily towards the development of visual novels, written on top of Guile-SDL2. It is still -- cgit v1.2.3 From 5464af0765ea922f9ba4791a3f41552776006ae7 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 10 Oct 2021 17:20:27 +0200 Subject: gnu: tsukundere: Update to 0.4.1. * gnu/packages/game-development.scm (tsukundere): Update to 0.4.1. [#:phases]: Use tsukundere.scm instead of the now missing bin/tsukundere. [inputs]: Add pango and sdl2. [native-inputs]: Add libtool. --- gnu/packages/game-development.scm | 11 +++++++---- 1 file changed, 7 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 4e2605eafa..01db2364df 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -560,7 +560,7 @@ clone.") (define-public tsukundere (package (name "tsukundere") - (version "0.3.2") + (version "0.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -569,7 +569,7 @@ clone.") (file-name (git-file-name name version)) (sha256 (base32 - "05y3nj8vpn40hfr2y29p8pa9hhpzibhbvfzpm0dlphjh9crq3ii4")))) + "11glghnff27rqh2s34g51afg93g3f5ryfz9mkyb7qj35ngl8vw5f")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 match) @@ -599,7 +599,7 @@ clone.") ((label . pkg) (and (string-prefix? "guile-" label) pkg))) inputs)))) - (substitute* "bin/tsukundere" + (substitute* "tsukundere.scm" (("exec guile (.*)" _ args) (string-append (format #f "export GUILE_LOAD_PATH=\"~@?\"~%" @@ -615,11 +615,14 @@ clone.") ("automake" ,automake) ("gettext" ,gettext-minimal) ("guile" ,guile-3.0) + ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) (inputs `(("guile-sdl2" ,guile3.0-sdl2) - ("guile" ,guile-3.0))) + ("guile" ,guile-3.0) + ("pango" ,pango) + ("sdl2" ,sdl2))) (home-page "https://gitlab.com/lilyp/tsukundere") (synopsis "Visual novel engine") (description "Tsukundere is a game engine geared heavily towards the -- cgit v1.2.3 From dd9fa204eb80e98101578ef39d4d5fc3d336ccb8 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 10 Oct 2021 17:26:21 +0200 Subject: gnu: tsukundere: Unset LD_LIBRARY_PATH. As of Guile-SDL2 version 0.7.0, which got committed in 73bb0b64855e07e17e73acbea4616ffa44630250, LD_LIBRARY_PATH is used to determine the location of SDL libraries if set. However, the presence of said environment variable does not always point to relative SDL libraries, thus causing an import of sdl2 modules to fail. * gnu/packages/game-development.scm (tsukundere)[#:phases]: Unset LD_LIBRARY_PATH in tsukundere.scm. --- gnu/packages/game-development.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/game-development.scm') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 01db2364df..a22167e31b 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -602,6 +602,9 @@ clone.") (substitute* "tsukundere.scm" (("exec guile (.*)" _ args) (string-append + ;; XXX: Prevent Guile-SDL2 from blowing up by not knowing + ;; where the SDL2 libaries are. + "unset LD_LIBRARY_PATH\n" (format #f "export GUILE_LOAD_PATH=\"~@?\"~%" "~{~a~^:~}" (map scm pkgs)) (format #f "export GUILE_LOAD_COMPILED_PATH=\"~@?\"~%" -- cgit v1.2.3