* [bug#68199] [PATCH 1/3] gnu: taisei: Reformat with guix style.
2024-01-02 1:04 [bug#68199] [PATCH 0/3] gnu: taisei: Update to 1.4 gemmaro
@ 2024-01-02 1:07 ` gemmaro
2024-01-02 21:02 ` Liliana Marie Prikler
2024-01-02 1:07 ` [bug#68199] [PATCH 2/3] gnu: taisei: Use gexps gemmaro
` (3 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: gemmaro @ 2024-01-02 1:07 UTC (permalink / raw)
To: 68199; +Cc: gemmaro, Liliana Marie Prikler, 宋文武
* gnu/packages/games.scm (taisei): Reformat with guix style.
Change-Id: If542566f43e581968f73537e90101a18d3b1bca1
---
gnu/packages/games.scm | 56 ++++++++++++++++++++----------------------
1 file changed, 27 insertions(+), 29 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c7813790a1..c26b9ef2c9 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -78,7 +78,7 @@
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
-;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3390,46 +3390,44 @@ (define-public taisei
(origin
(method url-fetch)
(uri (string-append "https://github.com/taisei-project/"
- "taisei/releases/download/v" version
- "/taisei-v" version ".tar.xz"))
+ "taisei/releases/download/v"
+ version
+ "/taisei-v"
+ version
+ ".tar.xz"))
(sha256
(base32 "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"))))
(build-system meson-build-system)
(arguments
- `(#:build-type "release" ;comment out for bug-reporting (and cheats)
- #:configure-flags
- (list "-Dr_default=gles30"
- "-Dr_gles20=true"
- "-Dr_gles30=true"
- "-Dshader_transpiler=true")))
- (native-inputs
- (list pkg-config python python-docutils python-pygments))
- (inputs
- (list cglm
- freetype
- libpng
- libwebp
- libzip
- mesa
- openssl
- opusfile
- sdl2
- sdl2-mixer
- shaderc
- spirv-cross
- zlib))
+ `(#:build-type "release" ;comment out for bug-reporting (and cheats)
+ #:configure-flags (list "-Dr_default=gles30" "-Dr_gles20=true"
+ "-Dr_gles30=true" "-Dshader_transpiler=true")))
+ (native-inputs (list pkg-config python python-docutils python-pygments))
+ (inputs (list cglm
+ freetype
+ libpng
+ libwebp
+ libzip
+ mesa
+ openssl
+ opusfile
+ sdl2
+ sdl2-mixer
+ shaderc
+ spirv-cross
+ zlib))
(home-page "https://taisei-project.org/")
(synopsis "Shoot'em up fangame and libre clone of Touhou Project")
(description
"The player controls a character (one of three: Good, Bad, and Dead),
dodges the missiles (lots of it cover the screen, but the character's hitbox
is very small), and shoot at the adversaries that keep appear on the screen.")
- (license (list ;;game
+ (license (list ;game
license:expat
- ;;resources/00-taisei.pkgdir/bgm/
- ;;atlas/portraits/
+ ;; resources/00-taisei.pkgdir/bgm/
+ ;; atlas/portraits/
license:cc-by4.0
- ;;miscellaneous
+ ;; miscellaneous
license:cc0
license:public-domain))))
--
2.41.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#68199] [PATCH 1/3] gnu: taisei: Reformat with guix style.
2024-01-02 1:07 ` [bug#68199] [PATCH 1/3] gnu: taisei: Reformat with guix style gemmaro
@ 2024-01-02 21:02 ` Liliana Marie Prikler
0 siblings, 0 replies; 12+ messages in thread
From: Liliana Marie Prikler @ 2024-01-02 21:02 UTC (permalink / raw)
To: gemmaro, 68199; +Cc: 宋文武
Am Dienstag, dem 02.01.2024 um 10:07 +0900 schrieb gemmaro:
> * gnu/packages/games.scm (taisei): Reformat with guix style.
>
> Change-Id: If542566f43e581968f73537e90101a18d3b1bca1
> ---
> gnu/packages/games.scm | 56 ++++++++++++++++++++--------------------
> --
> 1 file changed, 27 insertions(+), 29 deletions(-)
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index c7813790a1..c26b9ef2c9 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -78,7 +78,7 @@
> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
> ;;; Copyright © 2023 Florian Pelz <pelzflorian@pelzflorian.de>
> ;;; Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
> -;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
> +;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev@gmail.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -3390,46 +3390,44 @@ (define-public taisei
> (origin
> (method url-fetch)
> (uri (string-append "https://github.com/taisei-project/"
> - "taisei/releases/download/v" version
> - "/taisei-v" version ".tar.xz"))
> + "taisei/releases/download/v"
> + version
> + "/taisei-v"
> + version
> + ".tar.xz"))
> (sha256
> (base32
> "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"))))
> (build-system meson-build-system)
> (arguments
> - `(#:build-type "release" ;comment out for bug-reporting
> (and cheats)
> - #:configure-flags
> - (list "-Dr_default=gles30"
> - "-Dr_gles20=true"
> - "-Dr_gles30=true"
> - "-Dshader_transpiler=true")))
> - (native-inputs
> - (list pkg-config python python-docutils python-pygments))
> - (inputs
> - (list cglm
> - freetype
> - libpng
> - libwebp
> - libzip
> - mesa
> - openssl
> - opusfile
> - sdl2
> - sdl2-mixer
> - shaderc
> - spirv-cross
> - zlib))
> + `(#:build-type "release" ;comment out for bug-reporting (and
> cheats)
> + #:configure-flags (list "-Dr_default=gles30" "-
> Dr_gles20=true"
> + "-Dr_gles30=true" "-
> Dshader_transpiler=true")))
> + (native-inputs (list pkg-config python python-docutils python-
> pygments))
> + (inputs (list cglm
> + freetype
> + libpng
> + libwebp
> + libzip
> + mesa
> + openssl
> + opusfile
> + sdl2
> + sdl2-mixer
> + shaderc
> + spirv-cross
> + zlib))
> (home-page "https://taisei-project.org/")
> (synopsis "Shoot'em up fangame and libre clone of Touhou
> Project")
> (description
> "The player controls a character (one of three: Good, Bad, and
> Dead),
> dodges the missiles (lots of it cover the screen, but the
> character's hitbox
> is very small), and shoot at the adversaries that keep appear on the
> screen.")
> - (license (list ;;game
> + (license (list ;game
This comment looks out of place.
> license:expat
> - ;;resources/00-taisei.pkgdir/bgm/
> - ;;atlas/portraits/
> + ;; resources/00-taisei.pkgdir/bgm/
> + ;; atlas/portraits/
> license:cc-by4.0
> - ;;miscellaneous
> + ;; miscellaneous
> license:cc0
> license:public-domain))))
>
Other than that LGTM.
^ permalink raw reply [flat|nested] 12+ messages in thread
* [bug#68199] [PATCH 2/3] gnu: taisei: Use gexps.
2024-01-02 1:04 [bug#68199] [PATCH 0/3] gnu: taisei: Update to 1.4 gemmaro
2024-01-02 1:07 ` [bug#68199] [PATCH 1/3] gnu: taisei: Reformat with guix style gemmaro
@ 2024-01-02 1:07 ` gemmaro
2024-01-02 21:02 ` Liliana Marie Prikler
2024-01-02 1:07 ` [bug#68199] [PATCH 3/3] gnu: taisei: Update to 1.4 gemmaro
` (2 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: gemmaro @ 2024-01-02 1:07 UTC (permalink / raw)
To: 68199; +Cc: gemmaro, Liliana Marie Prikler, 宋文武
* gnu/packages/games.scm (taisei)[arguments]: Use gexps.
Change-Id: I0732c0ecca482e5ab2c553b3c2d75e8003a9d781
---
gnu/packages/games.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c26b9ef2c9..1bfa8e19b8 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3399,9 +3399,10 @@ (define-public taisei
(base32 "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"))))
(build-system meson-build-system)
(arguments
- `(#:build-type "release" ;comment out for bug-reporting (and cheats)
- #:configure-flags (list "-Dr_default=gles30" "-Dr_gles20=true"
- "-Dr_gles30=true" "-Dshader_transpiler=true")))
+ (list
+ #:build-type "release" ;comment out for bug-reporting (and cheats)
+ #:configure-flags #~(list "-Dr_default=gles30" "-Dr_gles20=true"
+ "-Dr_gles30=true" "-Dshader_transpiler=true")))
(native-inputs (list pkg-config python python-docutils python-pygments))
(inputs (list cglm
freetype
--
2.41.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#68199] [PATCH 2/3] gnu: taisei: Use gexps.
2024-01-02 1:07 ` [bug#68199] [PATCH 2/3] gnu: taisei: Use gexps gemmaro
@ 2024-01-02 21:02 ` Liliana Marie Prikler
0 siblings, 0 replies; 12+ messages in thread
From: Liliana Marie Prikler @ 2024-01-02 21:02 UTC (permalink / raw)
To: gemmaro, 68199; +Cc: 宋文武
Am Dienstag, dem 02.01.2024 um 10:07 +0900 schrieb gemmaro:
> * gnu/packages/games.scm (taisei)[arguments]: Use gexps.
>
> Change-Id: I0732c0ecca482e5ab2c553b3c2d75e8003a9d781
> ---
> gnu/packages/games.scm | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index c26b9ef2c9..1bfa8e19b8 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -3399,9 +3399,10 @@ (define-public taisei
> (base32
> "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"))))
> (build-system meson-build-system)
> (arguments
> - `(#:build-type "release" ;comment out for bug-reporting (and
> cheats)
> - #:configure-flags (list "-Dr_default=gles30" "-
> Dr_gles20=true"
> - "-Dr_gles30=true" "-
> Dshader_transpiler=true")))
> + (list
> + #:build-type "release" ;comment out for bug-reporting (and
> cheats)
> + #:configure-flags #~(list "-Dr_default=gles30" "-
> Dr_gles20=true"
> + "-Dr_gles30=true" "-
> Dshader_transpiler=true")))
> (native-inputs (list pkg-config python python-docutils python-
> pygments))
> (inputs (list cglm
> freetype
You can (and I argue should) squash this onto the previous restyling
commit.
Cheers
^ permalink raw reply [flat|nested] 12+ messages in thread
* [bug#68199] [PATCH 3/3] gnu: taisei: Update to 1.4.
2024-01-02 1:04 [bug#68199] [PATCH 0/3] gnu: taisei: Update to 1.4 gemmaro
2024-01-02 1:07 ` [bug#68199] [PATCH 1/3] gnu: taisei: Reformat with guix style gemmaro
2024-01-02 1:07 ` [bug#68199] [PATCH 2/3] gnu: taisei: Use gexps gemmaro
@ 2024-01-02 1:07 ` gemmaro
2024-01-02 23:59 ` [bug#68199] [PATCH v2 1/2] gnu: taisei: Use gexps gemmaro
2024-01-06 2:20 ` [bug#68199] [PATCH v3 " gemmaro
4 siblings, 0 replies; 12+ messages in thread
From: gemmaro @ 2024-01-02 1:07 UTC (permalink / raw)
To: 68199; +Cc: gemmaro, Liliana Marie Prikler, 宋文武
* gnu/packages/games.scm (taisei): Update to 1.4.
Change-Id: Ic83c4b9f77affe7782b62812be86f3c376c7ef28
---
gnu/packages/games.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 1bfa8e19b8..87e4b1c6ad 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -193,6 +193,7 @@ (define-module (gnu packages games)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-compression)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
@@ -3385,12 +3386,12 @@ (define-public talkfilters
(define-public taisei
(package
(name "taisei")
- (version "1.3.2")
+ (version "1.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/taisei-project/"
- "taisei/releases/download/v"
+ "taisei/releases/download/"
version
"/taisei-v"
version
@@ -3416,7 +3417,8 @@ (define-public taisei
sdl2-mixer
shaderc
spirv-cross
- zlib))
+ zlib
+ (list zstd "lib")))
(home-page "https://taisei-project.org/")
(synopsis "Shoot'em up fangame and libre clone of Touhou Project")
(description
--
2.41.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#68199] [PATCH v2 1/2] gnu: taisei: Use gexps.
2024-01-02 1:04 [bug#68199] [PATCH 0/3] gnu: taisei: Update to 1.4 gemmaro
` (2 preceding siblings ...)
2024-01-02 1:07 ` [bug#68199] [PATCH 3/3] gnu: taisei: Update to 1.4 gemmaro
@ 2024-01-02 23:59 ` gemmaro
2024-01-02 23:59 ` [bug#68199] [PATCH v2 2/2] gnu: taisei: Update to 1.4 gemmaro
2024-01-05 17:52 ` [bug#68199] [PATCH v2 1/2] gnu: taisei: Use gexps Liliana Marie Prikler
2024-01-06 2:20 ` [bug#68199] [PATCH v3 " gemmaro
4 siblings, 2 replies; 12+ messages in thread
From: gemmaro @ 2024-01-02 23:59 UTC (permalink / raw)
To: 68199; +Cc: gemmaro, Liliana Marie Prikler, 宋文武
* gnu/packages/games.scm (taisei): Reformat with guix style.
[arguments]: Use gexps.
Change-Id: If542566f43e581968f73537e90101a18d3b1bca1
---
gnu/packages/games.scm | 66 +++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c7813790a1..4bbe97c3f9 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -78,7 +78,7 @@
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
-;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3390,48 +3390,48 @@ (define-public taisei
(origin
(method url-fetch)
(uri (string-append "https://github.com/taisei-project/"
- "taisei/releases/download/v" version
- "/taisei-v" version ".tar.xz"))
+ "taisei/releases/download/v"
+ version
+ "/taisei-v"
+ version
+ ".tar.xz"))
(sha256
(base32 "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"))))
(build-system meson-build-system)
(arguments
- `(#:build-type "release" ;comment out for bug-reporting (and cheats)
- #:configure-flags
- (list "-Dr_default=gles30"
- "-Dr_gles20=true"
- "-Dr_gles30=true"
- "-Dshader_transpiler=true")))
- (native-inputs
- (list pkg-config python python-docutils python-pygments))
- (inputs
- (list cglm
- freetype
- libpng
- libwebp
- libzip
- mesa
- openssl
- opusfile
- sdl2
- sdl2-mixer
- shaderc
- spirv-cross
- zlib))
+ (list
+ #:build-type "release" ;comment out for bug-reporting (and cheats)
+ #:configure-flags #~(list "-Dr_default=gles30" "-Dr_gles20=true"
+ "-Dr_gles30=true" "-Dshader_transpiler=true")))
+ (native-inputs (list pkg-config python python-docutils python-pygments))
+ (inputs (list cglm
+ freetype
+ libpng
+ libwebp
+ libzip
+ mesa
+ openssl
+ opusfile
+ sdl2
+ sdl2-mixer
+ shaderc
+ spirv-cross
+ zlib))
(home-page "https://taisei-project.org/")
(synopsis "Shoot'em up fangame and libre clone of Touhou Project")
(description
"The player controls a character (one of three: Good, Bad, and Dead),
dodges the missiles (lots of it cover the screen, but the character's hitbox
is very small), and shoot at the adversaries that keep appear on the screen.")
- (license (list ;;game
- license:expat
- ;;resources/00-taisei.pkgdir/bgm/
- ;;atlas/portraits/
- license:cc-by4.0
- ;;miscellaneous
- license:cc0
- license:public-domain))))
+ (license (list
+ ;; game
+ license:expat
+ ;; resources/00-taisei.pkgdir/bgm/
+ ;; atlas/portraits/
+ license:cc-by4.0
+ ;; miscellaneous
+ license:cc0
+ license:public-domain))))
(define-public cmatrix
(package
base-commit: 86b5fa100992527c434616482ba9cfd92b636d12
--
2.41.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#68199] [PATCH v2 2/2] gnu: taisei: Update to 1.4.
2024-01-02 23:59 ` [bug#68199] [PATCH v2 1/2] gnu: taisei: Use gexps gemmaro
@ 2024-01-02 23:59 ` gemmaro
2024-01-05 17:52 ` [bug#68199] [PATCH v2 1/2] gnu: taisei: Use gexps Liliana Marie Prikler
1 sibling, 0 replies; 12+ messages in thread
From: gemmaro @ 2024-01-02 23:59 UTC (permalink / raw)
To: 68199; +Cc: gemmaro, Liliana Marie Prikler, 宋文武
* gnu/packages/games.scm (taisei): Update to 1.4.
Change-Id: Ic83c4b9f77affe7782b62812be86f3c376c7ef28
---
gnu/packages/games.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 4bbe97c3f9..84aa17b3be 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -193,6 +193,7 @@ (define-module (gnu packages games)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-compression)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
@@ -3385,12 +3386,12 @@ (define-public talkfilters
(define-public taisei
(package
(name "taisei")
- (version "1.3.2")
+ (version "1.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/taisei-project/"
- "taisei/releases/download/v"
+ "taisei/releases/download/"
version
"/taisei-v"
version
@@ -3416,7 +3417,8 @@ (define-public taisei
sdl2-mixer
shaderc
spirv-cross
- zlib))
+ zlib
+ (list zstd "lib")))
(home-page "https://taisei-project.org/")
(synopsis "Shoot'em up fangame and libre clone of Touhou Project")
(description
--
2.41.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#68199] [PATCH v2 1/2] gnu: taisei: Use gexps.
2024-01-02 23:59 ` [bug#68199] [PATCH v2 1/2] gnu: taisei: Use gexps gemmaro
2024-01-02 23:59 ` [bug#68199] [PATCH v2 2/2] gnu: taisei: Update to 1.4 gemmaro
@ 2024-01-05 17:52 ` Liliana Marie Prikler
1 sibling, 0 replies; 12+ messages in thread
From: Liliana Marie Prikler @ 2024-01-05 17:52 UTC (permalink / raw)
To: gemmaro, 68199; +Cc: 宋文武
Am Mittwoch, dem 03.01.2024 um 08:59 +0900 schrieb gemmaro:
> * gnu/packages/games.scm (taisei): Reformat with guix style.
> [arguments]: Use gexps.
>
> Change-Id: If542566f43e581968f73537e90101a18d3b1bca1
> ---
> gnu/packages/games.scm | 66 +++++++++++++++++++++-------------------
> --
> 1 file changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index c7813790a1..4bbe97c3f9 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -78,7 +78,7 @@
> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
> ;;; Copyright © 2023 Florian Pelz <pelzflorian@pelzflorian.de>
> ;;; Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
> -;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
> +;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev@gmail.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -3390,48 +3390,48 @@ (define-public taisei
> (origin
> (method url-fetch)
> (uri (string-append "https://github.com/taisei-project/"
> - "taisei/releases/download/v" version
> - "/taisei-v" version ".tar.xz"))
> + "taisei/releases/download/v"
> + version
> + "/taisei-v"
> + version
> + ".tar.xz"))
That's a false positive in guix style, keep it as-is.
> (sha256
> (base32
> "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"))))
> (build-system meson-build-system)
> (arguments
> - `(#:build-type "release" ;comment out for bug-reporting
> (and cheats)
> - #:configure-flags
> - (list "-Dr_default=gles30"
> - "-Dr_gles20=true"
> - "-Dr_gles30=true"
> - "-Dshader_transpiler=true")))
> - (native-inputs
> - (list pkg-config python python-docutils python-pygments))
> - (inputs
> - (list cglm
> - freetype
> - libpng
> - libwebp
> - libzip
> - mesa
> - openssl
> - opusfile
> - sdl2
> - sdl2-mixer
> - shaderc
> - spirv-cross
> - zlib))
> + (list
> + #:build-type "release" ;comment out for bug-reporting (and
> cheats)
> + #:configure-flags #~(list "-Dr_default=gles30" "-
> Dr_gles20=true"
> + "-Dr_gles30=true" "-
> Dshader_transpiler=true")))
Here, having one flag per line actually helps, so split it.
> + (native-inputs (list pkg-config python python-docutils python-
> pygments))
> + (inputs (list cglm
> + freetype
> + libpng
> + libwebp
> + libzip
> + mesa
> + openssl
> + opusfile
> + sdl2
> + sdl2-mixer
> + shaderc
> + spirv-cross
> + zlib))
The same-line/next-line list is not too big of a deal, it can go either
way.
> (home-page "https://taisei-project.org/")
> (synopsis "Shoot'em up fangame and libre clone of Touhou
> Project")
> (description
> "The player controls a character (one of three: Good, Bad, and
> Dead),
> dodges the missiles (lots of it cover the screen, but the
> character's hitbox
> is very small), and shoot at the adversaries that keep appear on the
> screen.")
> - (license (list ;;game
> - license:expat
> - ;;resources/00-taisei.pkgdir/bgm/
> - ;;atlas/portraits/
> - license:cc-by4.0
> - ;;miscellaneous
> - license:cc0
> - license:public-domain))))
> + (license (list
> + ;; game
> + license:expat
> + ;; resources/00-taisei.pkgdir/bgm/
> + ;; atlas/portraits/
> + license:cc-by4.0
> + ;; miscellaneous
> + license:cc0
> + license:public-domain))))
This hunk LGTM.
Cheers
^ permalink raw reply [flat|nested] 12+ messages in thread
* [bug#68199] [PATCH v3 1/2] gnu: taisei: Use gexps.
2024-01-02 1:04 [bug#68199] [PATCH 0/3] gnu: taisei: Update to 1.4 gemmaro
` (3 preceding siblings ...)
2024-01-02 23:59 ` [bug#68199] [PATCH v2 1/2] gnu: taisei: Use gexps gemmaro
@ 2024-01-06 2:20 ` gemmaro
2024-01-06 2:20 ` [bug#68199] [PATCH v3 2/2] gnu: taisei: Update to 1.4 gemmaro
4 siblings, 1 reply; 12+ messages in thread
From: gemmaro @ 2024-01-06 2:20 UTC (permalink / raw)
To: 68199; +Cc: gemmaro, Liliana Marie Prikler, 宋文武
* gnu/packages/games.scm (taisei)[arguments]: Use gexps.
[license]: Reformat with guix style.
Change-Id: I717a7e408f5ae274c5aafa0f3e20bb7bca377b3a
---
gnu/packages/games.scm | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8117886583..07f1b8552d 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -78,7 +78,7 @@
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
-;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3396,12 +3396,12 @@ (define-public taisei
(base32 "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"))))
(build-system meson-build-system)
(arguments
- `(#:build-type "release" ;comment out for bug-reporting (and cheats)
- #:configure-flags
- (list "-Dr_default=gles30"
- "-Dr_gles20=true"
- "-Dr_gles30=true"
- "-Dshader_transpiler=true")))
+ (list
+ #:build-type "release" ;comment out for bug-reporting (and cheats)
+ #:configure-flags #~(list "-Dr_default=gles30"
+ "-Dr_gles20=true"
+ "-Dr_gles30=true"
+ "-Dshader_transpiler=true")))
(native-inputs
(list pkg-config python python-docutils python-pygments))
(inputs
@@ -3424,14 +3424,15 @@ (define-public taisei
"The player controls a character (one of three: Good, Bad, and Dead),
dodges the missiles (lots of it cover the screen, but the character's hitbox
is very small), and shoot at the adversaries that keep appear on the screen.")
- (license (list ;;game
- license:expat
- ;;resources/00-taisei.pkgdir/bgm/
- ;;atlas/portraits/
- license:cc-by4.0
- ;;miscellaneous
- license:cc0
- license:public-domain))))
+ (license (list
+ ;; game
+ license:expat
+ ;; resources/00-taisei.pkgdir/bgm/
+ ;; atlas/portraits/
+ license:cc-by4.0
+ ;; miscellaneous
+ license:cc0
+ license:public-domain))))
(define-public cmatrix
(package
base-commit: c0e21e523d93081153a2ffc91e5a9f06afe62b91
--
2.41.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#68199] [PATCH v3 2/2] gnu: taisei: Update to 1.4.
2024-01-06 2:20 ` [bug#68199] [PATCH v3 " gemmaro
@ 2024-01-06 2:20 ` gemmaro
2024-01-07 9:30 ` bug#68199: " Liliana Marie Prikler
0 siblings, 1 reply; 12+ messages in thread
From: gemmaro @ 2024-01-06 2:20 UTC (permalink / raw)
To: 68199; +Cc: gemmaro, Liliana Marie Prikler, 宋文武
* gnu/packages/games.scm (taisei): Update to 1.4.
Change-Id: Ic83c4b9f77affe7782b62812be86f3c376c7ef28
---
gnu/packages/games.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 07f1b8552d..26df49fb40 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -193,6 +193,7 @@ (define-module (gnu packages games)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-compression)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
@@ -3385,12 +3386,12 @@ (define-public talkfilters
(define-public taisei
(package
(name "taisei")
- (version "1.3.2")
+ (version "1.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/taisei-project/"
- "taisei/releases/download/v" version
+ "taisei/releases/download/" version
"/taisei-v" version ".tar.xz"))
(sha256
(base32 "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"))))
@@ -3417,7 +3418,8 @@ (define-public taisei
sdl2-mixer
shaderc
spirv-cross
- zlib))
+ zlib
+ (list zstd "lib")))
(home-page "https://taisei-project.org/")
(synopsis "Shoot'em up fangame and libre clone of Touhou Project")
(description
--
2.41.0
^ permalink raw reply related [flat|nested] 12+ messages in thread