gnu: adanaxisgpl: Build from Git.

* gnu/packages/games.scm (adanaxisgpl-mush): Remove variable.
(adanaxisgpl)[source]: Fetch from Git.  In the snippet, create missing
directories, arrange to create missing files, and don't explicitly
return #t.
[arguments]: Add an 'unpack-inputs phase, replace the default
'bootstrap, and remove 'install-data.
[native-inputs]: Remove adanaxis-mush.  Add adanaxis-data,
adanaxis-mushruby, autoconf, automake, and perl.

gnu/packages/games.scm

@@ -24,7 +24,7 @@
 ;;; Copyright © 2016 Steve Webber <webber.sl@gmail.com>
 ;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@hyperbola.info>
 ;;; Copyright © 2017, 2018, 2020 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2023 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017, 2019 nee <nee-git@hidamari.blue>
 ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
@@ -303,79 +303,102 @@ platform-jumping, key-collecting, ancient pyramid exploring game, vaguely in
 the style of similar games for the Commodore+4.")
     (license license:gpl2+)))
 
-;; Data package for adanaxisgpl.
-(define adanaxis-mush
-  (let ((version "1.1.0"))
-    (origin
-      (method url-fetch)
-      (uri (string-append "http://www.mushware.com/files/adanaxis-mush-"
-                          version ".tar.gz"))
-      (sha256
-       (base32 "0mk9ibis5nkdcalcg1lkgnsdxxbw4g5w2i3icjzy667hqirsng03")))))
-
 (define-public adanaxisgpl
-  (package
+  (let* ((version "1.2.5")
-    (name "adanaxisgpl")
+         (commit (string-append "ADANAXIS_"
-    (version "1.2.5")
+                                (string-join (string-split version #\.) "_")
-    (source
+                                "_RELEASE_X11")))
-     (origin
+    (package
-       (method url-fetch)
+      (name "adanaxisgpl")
-       (uri (string-append "http://www.mushware.com/files/adanaxisgpl-"
+      (version version)
-                           version ".tar.gz"))
+      (source
-       (sha256
+       (origin
-        (base32 "0jkn637jaabvlhd6hpvzb57vvjph94l6fbf7qxbjlw9zpr19dw1f"))
+         (method git-fetch)
-       (modules '((guix build utils)))
+         (uri (git-reference
-       (snippet
+               (url "https://github.com/mushware/adanaxis")
-        '(begin
+               (commit commit)))
-           ;; Necessary for building with gcc >=4.7.
+         (file-name (git-file-name name version))
-           (substitute* "src/Mushcore/MushcoreSingleton.h"
+         (sha256
-             (("SingletonPtrSet\\(new SingletonType\\);")
+          (base32 "1vbg17lzbm0xl9yy9qymd1vgpz6f7fbr2hffl2ap0nm4zg0mnafm"))
-              "MushcoreSingleton::SingletonPtrSet(new SingletonType);"))
+         (modules '((guix build utils)))
-           ;; Avoid an "invalid conversion from const char* to char*" error.
+         (snippet
-           (substitute* "src/Platform/X11/PlatformMiscUtils.cpp"
+          '(begin
-             (("char \\*end, \\*result;")
+             ;; Necessary for building with gcc >=4.7.
-              (string-append "const char *end;"
+             (substitute* "src/Mushcore/MushcoreSingleton.h"
-                             "\n"
+               (("SingletonPtrSet\\(new SingletonType\\);")
-                             "char *result;")))
+                "MushcoreSingleton::SingletonPtrSet(new SingletonType);"))
-           #t))))
+             ;; Avoid an "invalid conversion from const char* to char*" error.
-    (build-system gnu-build-system)
+             (substitute* "src/Platform/X11/PlatformMiscUtils.cpp"
-    (arguments
+               (("char \\*end, \\*result;")
-     `(#:tests? #f ; no check target
+                (string-append "const char *end;\n"
-       #:phases
+                               "char *result;")))
-       (modify-phases %standard-phases
+             ;; autogen.pl will throw misleading errors if these don't exist.
-         (add-after 'install 'install-data
+             (for-each mkdir-p '("src/MushSecret" "data-adanaxis"))
-           (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; Create these missing files at the right later moment.
-             (let ((data (assoc-ref inputs "adanaxis-mush"))
+             (substitute* "autogen.pl"
-                   (share (string-append (assoc-ref outputs "out")
+               (("automake")
-                                         "/share/" ,name "-" ,version)))
+                "automake --add-missing"))))))
-               (mkdir-p share)
+      (build-system gnu-build-system)
-               (invoke "tar" "xvf" data "-C" share)))))))
+      (arguments
-    (native-inputs
+       `(#:tests? #f                    ; no check target
-     `(("adanaxis-mush" ,adanaxis-mush))) ; game data
+         #:phases
-    (inputs
+         (modify-phases %standard-phases
-     `(("expat" ,expat)
+           (add-after 'unpack 'unpack-inputs
-       ("freeglut" ,freeglut)
+             (lambda* (#:key inputs #:allow-other-keys)
-       ("glu" ,glu)
+               (copy-recursively (assoc-ref inputs "adanaxis-data")
-       ("libjpeg" ,libjpeg-turbo)
+                                 "data-adanaxis")
-       ("libogg" ,libogg)
+               (copy-recursively (assoc-ref inputs "adanaxis-mushruby")
-       ("libtiff" ,libtiff)
+                                 "data-adanaxis/mushruby")))
-       ("libvorbis" ,libvorbis)
+           (replace 'bootstrap
-       ("libx11" ,libx11)
+             (lambda _
-       ("libxext" ,libxext)
+               (invoke "perl" "autogen.pl" "adanaxis"
-       ("pcre" ,pcre)
+                       "--type=gpl" "--dist=debian"))))))
-       ("sdl" ,sdl)
+      (native-inputs
-       ("sdl-mixer" ,sdl-mixer)))
+       `(("adanaxis-data"
-    (home-page "https://www.mushware.com")
+          ,(origin
-    (synopsis "Action game in four spatial dimensions")
+             (method git-fetch)
-    (description
+             (uri (git-reference
-     "Adanaxis is a fast-moving first person shooter set in deep space, where
+                   (url "https://github.com/mushware/adanaxis-data")
+                   (commit commit)))
+             (file-name (git-file-name "adanaxis-data" version))
+             (sha256
+              (base32 "1xkn0ap5kfqd306ac072406ajihwwllaczc2v2hxiadlxd191dgx"))))
+         ("adanaxis-mushruby"
+          ,(origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/mushware/adanaxis-mushruby")
+                   (commit commit)))
+             (file-name (git-file-name "adanaxis-mushruby" version))
+             (sha256
+              (base32 "0pzcvchysjj37420rpvarky580gi5d6pfv93kwa91rg6m5r1zwks"))))
+         ("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("perl" ,perl)))
+      (inputs
+       `(("expat" ,expat)
+         ("freeglut" ,freeglut)
+         ("glu" ,glu)
+         ("libjpeg" ,libjpeg-turbo)
+         ("libogg" ,libogg)
+         ("libtiff" ,libtiff)
+         ("libvorbis" ,libvorbis)
+         ("libx11" ,libx11)
+         ("libxext" ,libxext)
+         ("pcre" ,pcre)
+         ("sdl" ,sdl)
+         ("sdl-mixer" ,sdl-mixer)))
+      (home-page "https://www.mushware.com")
+      (synopsis "Action game in four spatial dimensions")
+      (description
+       "Adanaxis is a fast-moving first person shooter set in deep space, where
 the fundamentals of space itself are changed.  By adding another dimension to
 space this game provides an environment with movement in four directions and
 six planes of rotation.  Initially the game explains the 4D control system via
 a graphical sequence, before moving on to 30 levels of gameplay with numerous
 enemy, ally, weapon and mission types.  Features include simulated 4D texturing,
 mouse and joystick control, and original music.")
-    (license license:gpl2)))
+      (license license:gpl2))))
 
 (define-public alex4
   (package