--- Begin Message ---
|
Subject: |
[PATCH] gnu: Add adanaxis-mush and adanaxisgpl. |
|
Date: |
Tue, 19 Mar 2019 15:57:34 -0400 |
* gnu/packages/games.scm (adanaxis-mush, adanaxisgpl): New variables.
---
gnu/packages/games.scm | 74 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 56dc96de8f..67be6b9472 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -165,6 +165,80 @@
#:use-module ((srfi srfi-1) #:hide (zip))
#:use-module (srfi srfi-26))
+;; Data package for adanaxisgpl.
+(define adanaxis-mush
+ (let ((name "adanaxis-mush")
+ (version "1.1.0"))
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://www.mushware.com/files/";
+ name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0mk9ibis5nkdcalcg1lkgnsdxxbw4g5w2i3icjzy667hqirsng03")))))
+
+(define-public adanaxisgpl
+ (package
+ (name "adanaxisgpl")
+ (version "1.2.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://www.mushware.com/files/";
+ name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0jkn637jaabvlhd6hpvzb57vvjph94l6fbf7qxbjlw9zpr19dw1f"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Necessary for building with gcc >=4.7.
+ (substitute* "src/Mushcore/MushcoreSingleton.h"
+ (("SingletonPtrSet\\(new SingletonType\\);")
+ "MushcoreSingleton::SingletonPtrSet(new SingletonType);"))
+ ;; Avoid an "invalid conversion from const char* to char*" error.
+ (substitute* "src/Platform/X11/PlatformMiscUtils.cpp"
+ (("char \\*end, \\*result;")
+ (string-append "const char *end;"
+ "\n"
+ "char *result;")))))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; no check target
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'install-data
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((data (assoc-ref inputs "adanaxis-mush"))
+ (share (string-append (assoc-ref outputs "out")
+ "/share/" ,name "-" ,version)))
+ (mkdir-p share)
+ (invoke "tar" "xvf" data "-C" share)))))))
+ (native-inputs
+ `(("adanaxis-mush" ,adanaxis-mush))) ; game data
+ (inputs
+ `(("expat" ,expat)
+ ("freeglut" ,freeglut)
+ ("glu" ,glu)
+ ("libjpeg" ,libjpeg)
+ ("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)))
+
(define-public armagetronad
(package
(name "armagetronad")
--
2.21.0
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#34921] [PATCH] gnu: Add adanaxis-mush and adanaxisgpl. |
|
Date: |
Tue, 26 Mar 2019 21:02:58 -0400 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) |
Ludovic Courtès <address@hidden> writes:
> Hello,
>
> Kei Kebreau <address@hidden> skribis:
>
>> * gnu/packages/games.scm (adanaxis-mush, adanaxisgpl): New variables.
>
> [...]
>
>> +;; Data package for adanaxisgpl.
>> +(define adanaxis-mush
>> + (let ((name "adanaxis-mush")
>> + (version "1.1.0"))
>> + (origin
>> + (method url-fetch)
>> + (uri (string-append "http://www.mushware.com/files/";
>> + name "-" version ".tar.gz"))
>
> There seems to be a consensus that using ‘name’ to build file names like
> this isn’t great, so I’d suggest not doing it. :-)
>
>> + (uri (string-append "http://www.mushware.com/files/";
>> + name "-" version ".tar.gz"))
>
> Ditto.
>
Noted!
>> + (snippet
>> + '(begin
>> + ;; Necessary for building with gcc >=4.7.
>> + (substitute* "src/Mushcore/MushcoreSingleton.h"
>> + (("SingletonPtrSet\\(new SingletonType\\);")
>> + "MushcoreSingleton::SingletonPtrSet(new SingletonType);"))
>> + ;; Avoid an "invalid conversion from const char* to char*" error.
>> + (substitute* "src/Platform/X11/PlatformMiscUtils.cpp"
>> + (("char \\*end, \\*result;")
>> + (string-append "const char *end;"
>> + "\n"
>> + "char *result;")))))))
>
> Please return #t.
>
Done.
>> + (license license:gpl2)))
>
> If it’s v2-only, go for it!
>
> Thank you,
> Ludo’.
Pushed! Thank you for reviewing!
signature.asc
Description: PGP signature
--- End Message ---