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

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

[Adam Faiz via Guix-patches via]

From cf5541cbb52ca199872223178399d955e862ece3 Mon Sep 17 00:00:00 2001
Message-ID: <cover.1709814572.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@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

[bug#69610] [PATCH 1/3] gnu: Add sdl2-mixer-x.

[Adam Faiz via Guix-patches via]

From d48e05d0d7c25d080a72e37debd4a72ec5077375 Mon Sep 17 00:00:00 2001
Message-ID: <d48e05d0d7c25d080a72e37debd4a72ec5077375.1709814572.git.adam.faiz@disroot.org>
In-Reply-To: <cover.1709814572.git.adam.faiz@disroot.org>
References: <cover.1709814572.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@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

[bug#69610] [PATCH 1/3] gnu: Add sdl2-mixer-x.

[Liliana Marie Prikler]

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@di
> sroot.org>
> In-Reply-To: <cover.1709814572.git.adam.faiz@disroot.org>
> References: <cover.1709814572.git.adam.faiz@disroot.org>
> From: AwesomeAdam54321 <adam.faiz@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

[bug#69610] [PATCH 2/3] gnu: Add superfluous-returnz-data.

[Adam Faiz via Guix-patches via]

From eaec6a2d6835ac8512cb961d68ff8e817f7b6117 Mon Sep 17 00:00:00 2001
Message-ID: <eaec6a2d6835ac8512cb961d68ff8e817f7b6117.1709814572.git.adam.faiz@disroot.org>
In-Reply-To: <cover.1709814572.git.adam.faiz@disroot.org>
References: <cover.1709814572.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@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

[bug#69610] [PATCH 3/3] gnu: Add superfluous-returnz.

[Adam Faiz via Guix-patches via]

From cf5541cbb52ca199872223178399d955e862ece3 Mon Sep 17 00:00:00 2001
Message-ID: <cf5541cbb52ca199872223178399d955e862ece3.1709814572.git.adam.faiz@disroot.org>
In-Reply-To: <cover.1709814572.git.adam.faiz@disroot.org>
References: <cover.1709814572.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@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

[bug#69610] [PATCH 3/3] gnu: Add superfluous-returnz.

[Liliana Marie Prikler]

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@di
> sroot.org>
> In-Reply-To: <cover.1709814572.git.adam.faiz@disroot.org>
> References: <cover.1709814572.git.adam.faiz@disroot.org>
> From: AwesomeAdam54321 <adam.faiz@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

[bug#69610] [PATCH v2 1/3] gnu: Add sdl2-mixer-x.

[Adam Faiz via Guix-patches via]

From d136acd202005516594e5576d5a88118e76f47bf Mon Sep 17 00:00:00 2001
Message-ID: <d136acd202005516594e5576d5a88118e76f47bf.1709863861.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@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

[bug#69610] [PATCH v2 2/3] gnu: Add superfluous-returnz-data.

[Adam Faiz via Guix-patches via]

From 921337ea8b3b72e1bcc0e629f9de072510ad731a Mon Sep 17 00:00:00 2001
Message-ID: <921337ea8b3b72e1bcc0e629f9de072510ad731a.1709863861.git.adam.faiz@disroot.org>
In-Reply-To: <d136acd202005516594e5576d5a88118e76f47bf.1709863861.git.adam.faiz@disroot.org>
References: <d136acd202005516594e5576d5a88118e76f47bf.1709863861.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@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

[bug#69610] [PATCH v2 3/3] gnu: Add sosage.

[Adam Faiz via Guix-patches via]

From a31cfb8a5b86d1d7b0d639928ba8d4cf96edbf8a Mon Sep 17 00:00:00 2001
Message-ID: <a31cfb8a5b86d1d7b0d639928ba8d4cf96edbf8a.1709863861.git.adam.faiz@disroot.org>
In-Reply-To: <d136acd202005516594e5576d5a88118e76f47bf.1709863861.git.adam.faiz@disroot.org>
References: <d136acd202005516594e5576d5a88118e76f47bf.1709863861.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@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