diff mbox series

[bug#69705] gnu: freegish: Update to 0-3.caf58a2f9.

Message ID cf82ae7033ab2eebb5b1341153c39d066df6ada7.1710059360.git.iyzsong@member.fsf.org
State New
Headers show
Series [bug#69705] gnu: freegish: Update to 0-3.caf58a2f9. | expand

Commit Message

vasilii.smirnov--- via Guix-patches" via March 10, 2024, 8:29 a.m. UTC 
From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/games.scm (freegish): Update to 0-3.caf58a2f9.
[inputs]: Replace sdl-union with sdl2.  Remove zlib.
[arguments]: Adjust configure-flags, remove unneeded phases.

Change-Id: I43883bd3de985dc337e244a810214ea5ae6aabd1
---
 gnu/packages/games.scm | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)


base-commit: 7758e63f7a89f53fbb7c7a265ae472af0a8dfab0
diff mbox series

Patch

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 9ff08e5e74..0fb7f5889e 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -6654,8 +6654,8 @@  (define-public megaglest
     (license license:gpl2+)))
 
 (define-public freegish
-  (let ((commit "21977ee5fc2008231b35160df00efe954c508b16")
-        (revision "2"))
+  (let ((commit "caf58a2f990a939230bab82226e29cd79732f366")
+        (revision "3"))
     (package
       (name "freegish")
       (version (string-append "0-" revision "." (string-take commit 9)))
@@ -6667,7 +6667,7 @@  (define-public freegish
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1qh0gcnbyxyzmb13jifwba4xrzj94m4w9whdvl0gnds6ricmwply"))
+                  "0980ad8xg0bzm6507bq9sbgw03i7jj33g0f955g0q8jvpb22r65v"))
                 (modules '((guix build utils)))
                 ;; The audio files in the "music" directory are licensed under
                 ;; CC-BY-NC, so we delete them.
@@ -6679,25 +6679,14 @@  (define-public freegish
       (arguments
        `(#:tests? #f ; no tests included
          #:configure-flags
-         (list "-DCMAKE_INSTALL_FHS=ON")
-         #:phases
-         (modify-phases %standard-phases
-           (add-after 'unpack 'set-DATAPATH
-             (lambda* (#:key outputs #:allow-other-keys)
-               (substitute* "CMakeLists.txt"
-                 (("^option\\(INSTALL_FHS" line)
-                  (string-append "add_definitions(-DDATAPATH=\""
-                                 (assoc-ref outputs "out") "/share/freegish\")\n"
-                                 line)))
-               #t)))))
+         (list "-DINSTALL_FHS=ON")))
       (inputs
-       (list (sdl-union (list sdl sdl-mixer))
+       (list sdl2
              openal
              libvorbis
              libogg
              mesa
-             libpng
-             zlib))
+             libpng))
       (home-page "https://github.com/freegish/freegish")
       (synopsis "Side-scrolling physics platformer with a ball of tar")
       (description "In FreeGish you control Gish, a ball of tar who lives