GNU bug report logs - #69610
[PATCH 0/3] gnu: Add superfluous-returnz.

Previous Next

To reply to this bug, email your comments to 69610 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Adam Faiz <adam.faiz <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: [PATCH 0/3] gnu: Add superfluous-returnz.
Date: Thu, 7 Mar 2024 20:37:10 +0800

From cf5541cbb52ca199872223178399d955e862ece3 Mon Sep 17 00:00:00 2001
Message-ID: <cover.1709814572.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Thu, 7 Mar 2024 20:29:32 +0800
Subject: [PATCH 0/3] gnu: Add superfluous-returnz.

This patch series adds Superfluous Returnz, a point and click adventure game.

AwesomeAdam54321 (3):
  gnu: Add sdl2-mixer-x.
  gnu: Add superfluous-returnz-data.
  gnu: Add superfluous-returnz.

 gnu/packages/games.scm | 65 ++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/sdl.scm   | 19 ++++++++++++
 2 files changed, 84 insertions(+)


base-commit: f18d13b5f89c161c6ee88d15ecdaa8d973ee4503
-- 
2.41.0

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Adam Faiz <adam.faiz <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: [PATCH 1/3] gnu: Add sdl2-mixer-x.
Date: Thu, 7 Mar 2024 20:39:47 +0800

From d48e05d0d7c25d080a72e37debd4a72ec5077375 Mon Sep 17 00:00:00 2001
Message-ID: <d48e05d0d7c25d080a72e37debd4a72ec5077375.1709814572.git.adam.faiz <at> disroot.org>
In-Reply-To: <cover.1709814572.git.adam.faiz <at> disroot.org>
References: <cover.1709814572.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Thu, 7 Mar 2024 14:07:15 +0800
Subject: [PATCH 1/3] gnu: Add sdl2-mixer-x.

* gnu/packages/sdl.scm (sdl2-mixer-x): New variable.
---
 gnu/packages/sdl.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 3a4aafcaa7..35351c70a2 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -528,6 +528,25 @@ (define-public sdl2-mixer
        (append flac fluidsynth libmodplug libvorbis mpg123 opusfile)))
     (properties '((upstream-name . "SDL2_mixer")))))
 
+(define-public sdl2-mixer-x
+  (package (inherit sdl2-mixer)
+    (name "sdl2-mixer-x")
+    (version "2.6.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/WohlSoft/SDL-Mixer-X")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "17l0l89q4az6lmmvpqpymjgs64nc52r140301dcf54vsh76mzd2c"))))
+    (arguments
+     (list #:tests? #f                     ;no tests
+           #:configure-flags
+           #~(list "-DBUILD_SHARED_LIBS=ON")))
+    (build-system cmake-build-system)))
+
 (define-public sdl2-net
   (package (inherit sdl-net)
     (name "sdl2-net")
-- 
2.41.0

Message #11 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Adam Faiz <adam.faiz <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: [PATCH 2/3] gnu: Add superfluous-returnz-data.
Date: Thu, 7 Mar 2024 20:43:39 +0800

From eaec6a2d6835ac8512cb961d68ff8e817f7b6117 Mon Sep 17 00:00:00 2001
Message-ID: <eaec6a2d6835ac8512cb961d68ff8e817f7b6117.1709814572.git.adam.faiz <at> disroot.org>
In-Reply-To: <cover.1709814572.git.adam.faiz <at> disroot.org>
References: <cover.1709814572.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Thu, 7 Mar 2024 12:51:12 +0800
Subject: [PATCH 2/3] gnu: Add superfluous-returnz-data.

* gnu/packages/games.scm (superfluous-returnz-data): New variable.
---
 gnu/packages/games.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 72ac122d74..2ebd858ad6 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2909,6 +2909,31 @@ (define-public solarus-quest-editor
      "Solarus Quest Editor is a graphical user interface to create and
 modify quests for the Solarus engine.")))
 
+(define-public superfluous-returnz-data
+  (package
+    (name "superfluous-returnz-data")
+    (version "13")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://download.ptilouk.net/superfluous-returnz-d"
+                                  version "-data-only"
+                                  ".zip"))
+              (sha256
+               (base32
+                "005p1kdm8g5vzf1isvxwiarpw0vciplxdcv9wl4bb47b1gxsh13k"))))
+    (build-system copy-build-system)
+    (native-inputs
+     (list unzip))
+    (arguments
+     (list #:install-plan
+           #~'(("." "."))))
+    (synopsis "Superfluous Returnz game data")
+    (description
+     "This package provides the game data, images, and music of the game
+Superfluous Returnz.")
+    (home-page "https://studios.ptilouk.net/superfluous-returnz/floss/")
+    (license license:cc-by-sa4.0)))
+
 (define-public superstarfighter
   (package
     (name "superstarfighter")
-- 
2.41.0

Message #14 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Adam Faiz <adam.faiz <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: [PATCH 3/3] gnu: Add superfluous-returnz.
Date: Thu, 7 Mar 2024 20:44:58 +0800

From cf5541cbb52ca199872223178399d955e862ece3 Mon Sep 17 00:00:00 2001
Message-ID: <cf5541cbb52ca199872223178399d955e862ece3.1709814572.git.adam.faiz <at> disroot.org>
In-Reply-To: <cover.1709814572.git.adam.faiz <at> disroot.org>
References: <cover.1709814572.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Thu, 7 Mar 2024 12:59:28 +0800
Subject: [PATCH 3/3] gnu: Add superfluous-returnz.

* gnu/packages/games.scm (superfluous-returnz): New variable.
---
 gnu/packages/games.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2ebd858ad6..c922029427 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2934,6 +2934,46 @@ (define-public superfluous-returnz-data
     (home-page "https://studios.ptilouk.net/superfluous-returnz/floss/")
     (license license:cc-by-sa4.0)))
 
+(define-public superfluous-returnz
+  (package
+    (name "superfluous-returnz")
+    (version "1.6.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://framagit.org/Gee/sosage")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0xgk3r18aj9xvrrqr9qdrr6800hkv6lhfcnmm5z21g8kbfh9x4jm"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:tests? #f ; no tests
+           #:configure-flags
+           #~(list
+              (string-append "-DSOSAGE_DATA_FOLDER="
+                             #$(this-package-input "superfluous-returnz-data")))))
+    (inputs
+     (list libyaml
+           lz4
+           sdl2
+           sdl2-mixer-x
+           sdl2-ttf
+           superfluous-returnz-data))
+    (synopsis "Superfluous Returnz")
+    (description
+     "The action takes place in Fochougny, a very quiet French village
+where the billionaire Harpagon Lonion lives.
+He regularly dresses up as Superfluous, a very useless superhero in such a
+peaceful countryside...
+
+Helped by his assistant Sophie, who tries to somehow temper the enthusiasm
+of her employer, he will try to put his hands on the mysterious apple thief
+who terrorizes the orchards of Fochougny...")
+    (home-page "https://studios.ptilouk.net/superfluous-returnz/floss/")
+    (license license:expat)))
+
 (define-public superstarfighter
   (package
     (name "superstarfighter")
-- 
2.41.0

Message #17 received at 69610 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Adam Faiz <adam.faiz <at> disroot.org>, 69610 <at> debbugs.gnu.org
Subject: Re: [PATCH 1/3] gnu: Add sdl2-mixer-x.
Date: Thu, 07 Mar 2024 19:01:31 +0100

Am Donnerstag, dem 07.03.2024 um 20:39 +0800 schrieb Adam Faiz:
> From d48e05d0d7c25d080a72e37debd4a72ec5077375 Mon Sep 17 00:00:00
> 2001
> Message-ID:
> <d48e05d0d7c25d080a72e37debd4a72ec5077375.1709814572.git.adam.faiz <at> di
> sroot.org>
> In-Reply-To: <cover.1709814572.git.adam.faiz <at> disroot.org>
> References: <cover.1709814572.git.adam.faiz <at> disroot.org>
> From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
> Date: Thu, 7 Mar 2024 14:07:15 +0800
> Subject: [PATCH 1/3] gnu: Add sdl2-mixer-x.
> 
> * gnu/packages/sdl.scm (sdl2-mixer-x): New variable.
> ---
>  gnu/packages/sdl.scm | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
> 
> diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
> index 3a4aafcaa7..35351c70a2 100644
> --- a/gnu/packages/sdl.scm
> +++ b/gnu/packages/sdl.scm
> @@ -528,6 +528,25 @@ (define-public sdl2-mixer
>         (append flac fluidsynth libmodplug libvorbis mpg123
> opusfile)))
>      (properties '((upstream-name . "SDL2_mixer")))))
>  
> +(define-public sdl2-mixer-x
> +  (package (inherit sdl2-mixer)
> +    (name "sdl2-mixer-x")
> +    (version "2.6.0")
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://github.com/WohlSoft/SDL-Mixer-X")
> +                    (commit version)))
> +              (file-name (git-file-name name version))
> +              (sha256
> +               (base32
> +               
> "17l0l89q4az6lmmvpqpymjgs64nc52r140301dcf54vsh76mzd2c"))))
> +    (arguments
> +     (list #:tests? #f                     ;no tests
> +           #:configure-flags
> +           #~(list "-DBUILD_SHARED_LIBS=ON")))
> +    (build-system cmake-build-system)))
> +
Build system ought to go before arguments.

I know sdl is kinda weirdly formatted, but put the (inherit …) on a
separate line.

Cheers

Message #20 received at 69610 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Adam Faiz <adam.faiz <at> disroot.org>, 69610 <at> debbugs.gnu.org
Subject: Re: [PATCH 3/3] gnu: Add superfluous-returnz.
Date: Thu, 07 Mar 2024 19:23:13 +0100

Am Donnerstag, dem 07.03.2024 um 20:44 +0800 schrieb Adam Faiz:
> From cf5541cbb52ca199872223178399d955e862ece3 Mon Sep 17 00:00:00
> 2001
> Message-ID:
> <cf5541cbb52ca199872223178399d955e862ece3.1709814572.git.adam.faiz <at> di
> sroot.org>
> In-Reply-To: <cover.1709814572.git.adam.faiz <at> disroot.org>
> References: <cover.1709814572.git.adam.faiz <at> disroot.org>
> From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
> Date: Thu, 7 Mar 2024 12:59:28 +0800
> Subject: [PATCH 3/3] gnu: Add superfluous-returnz.
> 
> * gnu/packages/games.scm (superfluous-returnz): New variable.
> ---
>  gnu/packages/games.scm | 40 ++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 40 insertions(+)
> 
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 2ebd858ad6..c922029427 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -2934,6 +2934,46 @@ (define-public superfluous-returnz-data
>      (home-page
> "https://studios.ptilouk.net/superfluous-returnz/floss/")
>      (license license:cc-by-sa4.0)))
>  
> +(define-public superfluous-returnz
> +  (package
> +    (name "superfluous-returnz")
The name does not appear to match up with the project name given below.
Now this might be excuses because despite claiming to be a game
"engine", it refuses to compile without the assets – a very interesting
design choice indeed – but it still looks weird.
> +    (version "1.6.0")
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://framagit.org/Gee/sosage")
> +             (commit (string-append "v" version))))
> +       (file-name (git-file-name name version))
> +       (sha256
> +        (base32
> "0xgk3r18aj9xvrrqr9qdrr6800hkv6lhfcnmm5z21g8kbfh9x4jm"))))
Note that the source contains bundled sources you might want to get rid
off.
> +    (build-system cmake-build-system)
> +    (arguments
> +     (list #:tests? #f ; no tests
> +           #:configure-flags
> +           #~(list
> +              (string-append "-DSOSAGE_DATA_FOLDER="
> +                             #$(this-package-input "superfluous-
> returnz-data")))))
Consider placing this in a location where (search-input-directory …) is
useful. 
> +    (inputs
> +     (list libyaml
> +           lz4
> +           sdl2
> +           sdl2-mixer-x
> +           sdl2-ttf
> +           superfluous-returnz-data))
> +    (synopsis "Superfluous Returnz")
> +    (description
> +     "The action takes place in Fochougny, a very quiet French
> village
> +where the billionaire Harpagon Lonion lives.
> +He regularly dresses up as Superfluous, a very useless superhero in
> such a
> +peaceful countryside...
> +
> +Helped by his assistant Sophie, who tries to somehow temper the
> enthusiasm
> +of her employer, he will try to put his hands on the mysterious
> apple thief
> +who terrorizes the orchards of Fochougny...")
I'd personally avoid ellipses here and possibly shorten this a bit.
> +    (home-page
> "https://studios.ptilouk.net/superfluous-returnz/floss/")
I think it's fair to drop the /floss.
> +    (license license:expat)))
> +
Cheers

Message #23 received at 69610 <at> debbugs.gnu.org (full text, mbox):

From: Adam Faiz <adam.faiz <at> disroot.org>
To: 69610 <at> debbugs.gnu.org
Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: [PATCH v2 1/3] gnu: Add sdl2-mixer-x.
Date: Fri, 8 Mar 2024 10:12:55 +0800

From d136acd202005516594e5576d5a88118e76f47bf Mon Sep 17 00:00:00 2001
Message-ID: <d136acd202005516594e5576d5a88118e76f47bf.1709863861.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Thu, 7 Mar 2024 14:07:15 +0800
Subject: [PATCH v2 1/3] gnu: Add sdl2-mixer-x.

* gnu/packages/sdl.scm (sdl2-mixer-x): New variable.
---
 gnu/packages/sdl.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 3a4aafcaa7..c7721aa379 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -43,6 +43,7 @@ (define-module (gnu packages sdl)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix utils)
+  #:use-module (guix build-system cmake)
   #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
@@ -528,6 +529,26 @@ (define-public sdl2-mixer
        (append flac fluidsynth libmodplug libvorbis mpg123 opusfile)))
     (properties '((upstream-name . "SDL2_mixer")))))
 
+(define-public sdl2-mixer-x
+  (package
+    (inherit sdl2-mixer)
+    (name "sdl2-mixer-x")
+    (version "2.6.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/WohlSoft/SDL-Mixer-X")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "17l0l89q4az6lmmvpqpymjgs64nc52r140301dcf54vsh76mzd2c"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:tests? #f                     ;no tests
+           #:configure-flags
+           #~(list "-DBUILD_SHARED_LIBS=ON")))))
+
 (define-public sdl2-net
   (package (inherit sdl-net)
     (name "sdl2-net")

base-commit: f18d13b5f89c161c6ee88d15ecdaa8d973ee4503
-- 
2.41.0

Message #26 received at 69610 <at> debbugs.gnu.org (full text, mbox):

From: Adam Faiz <adam.faiz <at> disroot.org>
To: 69610 <at> debbugs.gnu.org
Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: [PATCH v2 2/3] gnu: Add superfluous-returnz-data.
Date: Fri, 8 Mar 2024 10:14:21 +0800

From 921337ea8b3b72e1bcc0e629f9de072510ad731a Mon Sep 17 00:00:00 2001
Message-ID: <921337ea8b3b72e1bcc0e629f9de072510ad731a.1709863861.git.adam.faiz <at> disroot.org>
In-Reply-To: <d136acd202005516594e5576d5a88118e76f47bf.1709863861.git.adam.faiz <at> disroot.org>
References: <d136acd202005516594e5576d5a88118e76f47bf.1709863861.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Thu, 7 Mar 2024 12:51:12 +0800
Subject: [PATCH v2 2/3] gnu: Add superfluous-returnz-data.

* gnu/packages/games.scm (superfluous-returnz-data): New variable.
---
 gnu/packages/games.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 72ac122d74..78e37c7e9c 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2909,6 +2909,31 @@ (define-public solarus-quest-editor
      "Solarus Quest Editor is a graphical user interface to create and
 modify quests for the Solarus engine.")))
 
+(define-public superfluous-returnz-data
+  (package
+    (name "superfluous-returnz-data")
+    (version "13")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://download.ptilouk.net/superfluous-returnz-d"
+                                  version "-data-only"
+                                  ".zip"))
+              (sha256
+               (base32
+                "005p1kdm8g5vzf1isvxwiarpw0vciplxdcv9wl4bb47b1gxsh13k"))))
+    (build-system copy-build-system)
+    (native-inputs
+     (list unzip))
+    (arguments
+     (list #:install-plan
+           #~'(("." "."))))
+    (synopsis "Superfluous Returnz game data")
+    (description
+     "This package provides the game data, images, and music of the game
+Superfluous Returnz.")
+    (home-page "https://studios.ptilouk.net/superfluous-returnz/")
+    (license license:cc-by-sa4.0)))
+
 (define-public superstarfighter
   (package
     (name "superstarfighter")
-- 
2.41.0

Message #29 received at 69610 <at> debbugs.gnu.org (full text, mbox):

From: Adam Faiz <adam.faiz <at> disroot.org>
To: 69610 <at> debbugs.gnu.org
Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: [PATCH v2 3/3] gnu: Add sosage.
Date: Fri, 8 Mar 2024 10:16:13 +0800

From a31cfb8a5b86d1d7b0d639928ba8d4cf96edbf8a Mon Sep 17 00:00:00 2001
Message-ID: <a31cfb8a5b86d1d7b0d639928ba8d4cf96edbf8a.1709863861.git.adam.faiz <at> disroot.org>
In-Reply-To: <d136acd202005516594e5576d5a88118e76f47bf.1709863861.git.adam.faiz <at> disroot.org>
References: <d136acd202005516594e5576d5a88118e76f47bf.1709863861.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Thu, 7 Mar 2024 12:59:28 +0800
Subject: [PATCH v2 3/3] gnu: Add sosage.

* gnu/packages/games.scm (sosage): New variable.
---
 gnu/packages/games.scm | 57 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 78e37c7e9c..26d1c8ea02 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2934,6 +2934,63 @@ (define-public superfluous-returnz-data
     (home-page "https://studios.ptilouk.net/superfluous-returnz/")
     (license license:cc-by-sa4.0)))
 
+(define-public sosage
+  (package
+    (name "sosage")
+    (version "1.6.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://framagit.org/Gee/sosage")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0xgk3r18aj9xvrrqr9qdrr6800hkv6lhfcnmm5z21g8kbfh9x4jm"))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin
+            (for-each delete-file (find-files "." "\\.jar$"))
+
+            ;; The files in 'Third_party' aren't actually bundled libraries,
+            ;; but are wrappers around the system libraries.
+            ;; Move them to the 'Utils' directory, to make that clear.
+            (for-each (lambda (file)
+                        (install-file file "include/Sosage/Utils"))
+                      (find-files "include/Sosage/Third_party" "\\.h$"))
+            (for-each (lambda (file)
+                        (install-file file "src/Sosage/Utils"))
+                      (find-files "src/Sosage/Third_party" "\\.cpp$"))
+            (for-each delete-file-recursively '("include/Sosage/Third_party"
+                                                "src/Sosage/Third_party"))
+            (substitute* (find-files ".")
+              (("Third_party") "Utils"))))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:tests? #f ; no tests
+           #:configure-flags
+           #~(list
+              (string-append "-DSOSAGE_DATA_FOLDER="
+                             #$(this-package-input "superfluous-returnz-data")))))
+    (inputs
+     (list libyaml
+           lz4
+           sdl2
+           sdl2-mixer-x
+           sdl2-ttf
+           superfluous-returnz-data))
+    (synopsis "Superfluous Returnz")
+    (description
+     "The action takes place in Fochougny, a very quiet French village
+where the billionaire Harpagon Lonion lives.
+He regularly dresses up as Superfluous, a very useless superhero in such a
+peaceful countryside.
+
+Helped by his assistant Sophie, he will try to put his hands on the mysterious
+apple thief who terrorizes the orchards of Fochougny.")
+    (home-page "https://studios.ptilouk.net/superfluous-returnz/")
+    (license license:expat)))
+
 (define-public superstarfighter
   (package
     (name "superstarfighter")
-- 
2.41.0

Message #32 received at 69610 <at> debbugs.gnu.org (full text, mbox):

From: Adam Faiz <adam.faiz <at> disroot.org>
To: 69610 <at> debbugs.gnu.org
Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 宋文武 <iyzsong <at> envs.net>
Subject: [PATCH v3 1/3] gnu: Add sdl2-mixer-x.
Date: Fri, 14 Feb 2025 16:23:31 +0800

From 2d8957a642d759536cceeea5dff7a41405328e0f Mon Sep 17 00:00:00 2001
Message-ID: <2d8957a642d759536cceeea5dff7a41405328e0f.1739521278.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Thu, 7 Mar 2024 14:07:15 +0800
Subject: [PATCH v3 1/3] gnu: Add sdl2-mixer-x.

* gnu/packages/sdl.scm (sdl2-mixer-x): New variable.
---
 gnu/packages/sdl.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 42fcf35d40..3e9abd9dad 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -600,6 +600,26 @@ (define-public sdl2-mixer
        (append flac fluidsynth libmodplug libvorbis mpg123 opusfile)))
     (properties '((upstream-name . "SDL2_mixer")))))
 
+(define-public sdl2-mixer-x
+  (package
+    (inherit sdl2-mixer)
+    (name "sdl2-mixer-x")
+    (version "2.6.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/WohlSoft/SDL-Mixer-X")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "17l0l89q4az6lmmvpqpymjgs64nc52r140301dcf54vsh76mzd2c"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:tests? #f                     ;no tests
+           #:configure-flags
+           #~(list "-DBUILD_SHARED_LIBS=ON")))))
+
 (define-public sdl2-net
   (package (inherit sdl-net)
     (name "sdl2-net")

base-commit: 4b5f0408e66392ab745dc0f7830732217d88f17d
-- 
2.46.0

Message #35 received at 69610 <at> debbugs.gnu.org (full text, mbox):

From: Adam Faiz <adam.faiz <at> disroot.org>
To: 69610 <at> debbugs.gnu.org
Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 宋文武 <iyzsong <at> envs.net>
Subject: [PATCH v3 2/3] gnu: Add superfluous-returnz-data.
Date: Fri, 14 Feb 2025 16:26:40 +0800

From 04fde3d67b998c6105407255ffe198cbb3408287 Mon Sep 17 00:00:00 2001
Message-ID: <04fde3d67b998c6105407255ffe198cbb3408287.1739521278.git.adam.faiz <at> disroot.org>
In-Reply-To: <2d8957a642d759536cceeea5dff7a41405328e0f.1739521278.git.adam.faiz <at> disroot.org>
References: <2d8957a642d759536cceeea5dff7a41405328e0f.1739521278.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Thu, 7 Mar 2024 12:51:12 +0800
Subject: [PATCH v3 2/3] gnu: Add superfluous-returnz-data.

* gnu/packages/games.scm (superfluous-returnz-data): New variable.
---
 gnu/packages/games.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 5b7a337011..144168fc1c 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3258,6 +3258,31 @@ (define-public solarus-quest-editor
      "Solarus Quest Editor is a graphical user interface to create and
 modify quests for the Solarus engine.")))
 
+(define-public superfluous-returnz-data
+  (package
+    (name "superfluous-returnz-data")
+    (version "13")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://download.ptilouk.net/superfluous-returnz-d"
+                                  version "-data-only"
+                                  ".zip"))
+              (sha256
+               (base32
+                "005p1kdm8g5vzf1isvxwiarpw0vciplxdcv9wl4bb47b1gxsh13k"))))
+    (build-system copy-build-system)
+    (native-inputs
+     (list unzip))
+    (arguments
+     (list #:install-plan
+           #~'(("." "."))))
+    (synopsis "Superfluous Returnz game data")
+    (description
+     "This package provides the game data, images, and music of the game
+Superfluous Returnz.")
+    (home-page "https://studios.ptilouk.net/superfluous-returnz/")
+    (license license:cc-by-sa4.0)))
+
 (define-public superstarfighter
   (package
     (name "superstarfighter")
-- 
2.46.0

Message #38 received at 69610 <at> debbugs.gnu.org (full text, mbox):

From: Adam Faiz <adam.faiz <at> disroot.org>
To: 69610 <at> debbugs.gnu.org
Cc: Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 宋文武 <iyzsong <at> envs.net>
Subject: [PATCH v3 3/3] gnu: Add sosage.
Date: Fri, 14 Feb 2025 16:27:33 +0800

From 6bc9e728c3dea4618baf1a247dbe0018f4949d6c Mon Sep 17 00:00:00 2001
Message-ID: <6bc9e728c3dea4618baf1a247dbe0018f4949d6c.1739521278.git.adam.faiz <at> disroot.org>
In-Reply-To: <2d8957a642d759536cceeea5dff7a41405328e0f.1739521278.git.adam.faiz <at> disroot.org>
References: <2d8957a642d759536cceeea5dff7a41405328e0f.1739521278.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Thu, 7 Mar 2024 12:59:28 +0800
Subject: [PATCH v3 3/3] gnu: Add sosage.

* gnu/packages/games.scm (sosage): New variable.
---
 gnu/packages/games.scm | 57 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 144168fc1c..231aa12133 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3283,6 +3283,63 @@ (define-public superfluous-returnz-data
     (home-page "https://studios.ptilouk.net/superfluous-returnz/")
     (license license:cc-by-sa4.0)))
 
+(define-public sosage
+  (package
+    (name "sosage")
+    (version "1.6.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://framagit.org/Gee/sosage")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0xgk3r18aj9xvrrqr9qdrr6800hkv6lhfcnmm5z21g8kbfh9x4jm"))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin
+            (for-each delete-file (find-files "." "\\.jar$"))
+
+            ;; The files in 'Third_party' aren't actually bundled libraries,
+            ;; but are wrappers around the system libraries.
+            ;; Move them to the 'Utils' directory, to make that clear.
+            (for-each (lambda (file)
+                        (install-file file "include/Sosage/Utils"))
+                      (find-files "include/Sosage/Third_party" "\\.h$"))
+            (for-each (lambda (file)
+                        (install-file file "src/Sosage/Utils"))
+                      (find-files "src/Sosage/Third_party" "\\.cpp$"))
+            (for-each delete-file-recursively '("include/Sosage/Third_party"
+                                                "src/Sosage/Third_party"))
+            (substitute* (find-files ".")
+              (("Third_party") "Utils"))))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:tests? #f ; no tests
+           #:configure-flags
+           #~(list
+              (string-append "-DSOSAGE_DATA_FOLDER="
+                             #$(this-package-input "superfluous-returnz-data")))))
+    (inputs
+     (list libyaml
+           lz4
+           sdl2
+           sdl2-mixer-x
+           sdl2-ttf
+           superfluous-returnz-data))
+    (synopsis "Superfluous Returnz")
+    (description
+     "The action takes place in Fochougny, a very quiet French village
+where the billionaire Harpagon Lonion lives.
+He regularly dresses up as Superfluous, a very useless superhero in such a
+peaceful countryside.
+
+Helped by his assistant Sophie, he will try to put his hands on the mysterious
+apple thief who terrorizes the orchards of Fochougny.")
+    (home-page "https://studios.ptilouk.net/superfluous-returnz/")
+    (license license:expat)))
+
 (define-public superstarfighter
   (package
     (name "superstarfighter")
-- 
2.46.0

Message #45 received at 69610-done <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: Sharlatan Hellseher <sharlatanus <at> gmail.com>
Cc: Steve George <steve <at> futurile.net>, 73756-done <at> debbugs.gnu.org,
 76640-done <at> debbugs.gnu.org, 70896-done <at> debbugs.gnu.org,
 69610-done <at> debbugs.gnu.org, 58403-done <at> debbugs.gnu.org
Subject: Re: Request for merging "games-updates" branch
Date: Fri, 23 May 2025 08:45:11 +0200

Hello,

I have just pushed the games-updates branch to master.
Closing all the contained issues.

Andreas

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.