[bug#37486] [PATCH] gnu: Add goattracker

[bug#37486] [PATCH] gnu: Add goattracker

[Mikhail Kirillov]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 2476 bytes --]

* gnu/packages/music.scm: Add goattracker
---
 gnu/packages/music.scm | 43 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 4d1e11f260..5cedb36695 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -23,6 +23,7 @@
 ;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si>
 ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
 ;;; Copyright © 2019 raingloom <raingloom@protonmail.com>
+;;; Copyright © 2019 Mikhail Kirillov <w96k@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4592,3 +4593,45 @@ with error and volume history, and advanced features.")
     ;; Most of the code is under GPL2+, but some abstract or helper classes
     ;; are under LGPL2.1.
     (license (list license:gpl2+ license:lgpl2.1))))
+
+(define-public goattracker
+  (package
+    (name "goattracker")
+    (version "2.75")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://sourceforge/goattracker2/GoatTracker 2/"
+                    version "/GoatTracker_" version ".zip"))
+              (sha256
+               (base32
+                "1km97nl7qvk6qc5l5j69wncbm76hf86j47sgzgr968423g0bxxlk"))))
+    (arguments
+     `(#:tests? #f
+       #:make-flags '("CC=gcc")
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (add-after 'unpack 'prepare
+           (lambda _
+             (chdir "src")
+             (invoke "make" "clean")
+             #t))
+         (replace 'install
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (chdir "../linux")
+             (invoke "ln" "-s" "goattrk2" "goattracker")
+             (copy-recursively "./" (string-append
+                                     (assoc-ref %outputs "out")
+                                     "/bin"))
+             #t)))))
+    (native-inputs
+     `(("sdl" ,sdl)
+       ("unzip" ,unzip)))
+    (build-system gnu-build-system)
+    (synopsis "Crossplatform C64 music tracker")
+    (description "GoatTracker is a cross-platform tracker written by Lasse
+Öörni, producing SID chiptune music for the Commodore 64, and released with
+source code under the GPL.")
+    (home-page "https://goattracker2.sourceforge.io/")
+    (license license:gpl2)))
-- 
2.23.0

[bug#37486] [PATCH] gnu: Add goattracker

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

Hi Mikhail,

Mikhail Kirillov <w96k@member.fsf.org> skribis:

> * gnu/packages/music.scm: Add goattracker

Thanks for the updated patch.

I started looking into it, fixing an issue reported by ‘guix lint’, and
cleaning up the source, leading to the following patch.

However, goattracker no fails to build because of a missing ‘.bin’ file.

Do you know what these ‘.bin’ (and ‘.dat’) files are, what their license
is, and what can be done with them?

Thanks in advance,
Ludo’.


[-- Attachment #2: Type: text/x-patch, Size: 1802 bytes --]

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 7216075c34..84b602ae36 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4598,7 +4598,14 @@ with error and volume history, and advanced features.")
                     version "/GoatTracker_" version ".zip"))
               (sha256
                (base32
-                "1km97nl7qvk6qc5l5j69wncbm76hf86j47sgzgr968423g0bxxlk"))))
+                "1km97nl7qvk6qc5l5j69wncbm76hf86j47sgzgr968423g0bxxlk"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Remove binaries from the source tarball.
+                  (for-each delete-file
+                            (find-files "." "\\.(o|dll|exe|bin)$"))
+                  #t))))
     (arguments
      `(#:tests? #f
        #:make-flags '("CC=gcc")
@@ -4613,7 +4620,7 @@ with error and volume history, and advanced features.")
          (replace 'install
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (chdir "../linux")
-             (invoke "ln" "-s" "goattrk2" "goattracker")
+             (symlink "goattrk2" "goattracker")
              (copy-recursively "./" (string-append
                                      (assoc-ref %outputs "out")
                                      "/bin"))
@@ -4626,5 +4633,5 @@ with error and volume history, and advanced features.")
     (description "GoatTracker is a cross-platform tracker written by Lasse
 Öörni, producing SID chiptune music for the Commodore 64, and released with
 source code under the GPL.")
-    (home-page "https://goattracker2.sourceforge.io/")
-    (license license:gpl2)))
+    (home-page "http://goattracker2.sourceforge.net/")
+    (license license:gpl2+)))

[bug#37486] [PATCH] gnu: Add goattracker

[Ludovic Courtès]

Hi Mikhail,

Did you have a chance to look further into this patch, based on the
comments below?

(See <https://issues.guix.gnu.org/issue/37486>.)

Thanks in advance,
Ludo’.

Ludovic Courtès <ludo@gnu.org> skribis:

> Hi Mikhail,
>
> Mikhail Kirillov <w96k@member.fsf.org> skribis:
>
>> * gnu/packages/music.scm: Add goattracker
>
> Thanks for the updated patch.
>
> I started looking into it, fixing an issue reported by ‘guix lint’, and
> cleaning up the source, leading to the following patch.
>
> However, goattracker no fails to build because of a missing ‘.bin’ file.
>
> Do you know what these ‘.bin’ (and ‘.dat’) files are, what their license
> is, and what can be done with them?
>
> Thanks in advance,
> Ludo’.
>
> diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
> index 7216075c34..84b602ae36 100644
> --- a/gnu/packages/music.scm
> +++ b/gnu/packages/music.scm
> @@ -4598,7 +4598,14 @@ with error and volume history, and advanced features.")
>                      version "/GoatTracker_" version ".zip"))
>                (sha256
>                 (base32
> -                "1km97nl7qvk6qc5l5j69wncbm76hf86j47sgzgr968423g0bxxlk"))))
> +                "1km97nl7qvk6qc5l5j69wncbm76hf86j47sgzgr968423g0bxxlk"))
> +              (modules '((guix build utils)))
> +              (snippet
> +               '(begin
> +                  ;; Remove binaries from the source tarball.
> +                  (for-each delete-file
> +                            (find-files "." "\\.(o|dll|exe|bin)$"))
> +                  #t))))
>      (arguments
>       `(#:tests? #f
>         #:make-flags '("CC=gcc")
> @@ -4613,7 +4620,7 @@ with error and volume history, and advanced features.")
>           (replace 'install
>             (lambda* (#:key inputs outputs #:allow-other-keys)
>               (chdir "../linux")
> -             (invoke "ln" "-s" "goattrk2" "goattracker")
> +             (symlink "goattrk2" "goattracker")
>               (copy-recursively "./" (string-append
>                                       (assoc-ref %outputs "out")
>                                       "/bin"))
> @@ -4626,5 +4633,5 @@ with error and volume history, and advanced features.")
>      (description "GoatTracker is a cross-platform tracker written by Lasse
>  Öörni, producing SID chiptune music for the Commodore 64, and released with
>  source code under the GPL.")
> -    (home-page "https://goattracker2.sourceforge.io/")
> -    (license license:gpl2)))
> +    (home-page "http://goattracker2.sourceforge.net/")
> +    (license license:gpl2+)))