[bug#35288] [PATCH 1/3] gnu: Add dumb.

[bug#35288] [PATCH 1/3] gnu: Add dumb.

[Kei Kebreau]

* gnu/packages/music.scm (dumb): New variable.
---
 gnu/packages/music.scm | 65 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 10a23c919f..522bad2528 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
 ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2016, 2017 Kei Kebreau <kkebreau@posteo.net>
+;;; Copyright © 2016, 2017, 2019 Kei Kebreau <kkebreau@posteo.net>
 ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2017 ng0 <ng0@n0.is>
@@ -81,6 +81,7 @@
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages game-development)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gettext)
@@ -446,6 +447,34 @@ background while you work.")
     (home-page "http://www.denemo.org")
     (license license:gpl3+)))
 
+(define-public dumb
+  (package
+    (name "dumb")
+    (version "2.0.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/kode54/dumb.git")
+             (commit version)))
+       (sha256
+        (base32 "1cnq6rb14d4yllr0yi32p9jmcig8avs3f43bvdjrx4r1mpawspi6"))
+       (file-name (git-file-name name version))))
+    (build-system cmake-build-system)
+    (arguments
+     '(#:tests? #f ; no check target
+       #:configure-flags
+       (list "-DBUILD_SHARED_LIBS=ON"
+             "-DBUILD_EXAMPLES=OFF")))
+    (home-page "https://github.com/kode54/dumb")
+    (synopsis "Module audio renderer library")
+    (description
+     "DUMB is a tracker library with support for IT, XM, S3M and MOD files.  It
+targets maximum accuracy to the original formats, with low-pass resonant filters
+for the IT files, accurate timing and pitching, and three resampling quality
+settings (aliasing, linear interpolation and cubic interpolation).")
+    (license (license:fsf-free "file://LICENSE"))))
+
 (define-public hydrogen
   (package
     (name "hydrogen")
@@ -1061,6 +1090,40 @@ be used alone or in concert with Non Mixer and Non Sequencer to form a
 complete studio.")
     (license license:gpl2+)))
 
+(define-public vcvrack
+  (package
+    (name "vcvrack")
+    (version "0.6.2b")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/VCVRack/Rack.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0mn33aiafvqvds4hf9hywsr6f6y8y25g9vnjksf3cavxvnszy47y"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:make-flags '("CC=gcc")
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)))) ; no configure phase
+    (inputs
+     `(("curl" ,curl)
+       ("glew" ,glew)
+       ("jansson" ,jansson)
+       ("libzip" ,libzip)
+       ("rtmidi" ,rtmidi)
+       ("speexdsp" ,speexdsp)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "https://vcvrack.com/")
+    (synopsis "Virtual modular synthesizer")
+    (description
+     "VCV Rack is a virtual modular synthesizer.")
+    (license license:bsd-3)))
+
 (define-public solfege
   (package
     (name "solfege")
-- 
2.21.0

[bug#35288] [PATCH 2/3] gnu: Add dumb-allegro4.

[Kei Kebreau]

* gnu/packages/music.scm (dumb-allegro4): New variable.
---
 gnu/packages/music.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 522bad2528..e1bf2d2b15 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -475,6 +475,17 @@ for the IT files, accurate timing and pitching, and three resampling quality
 settings (aliasing, linear interpolation and cubic interpolation).")
     (license (license:fsf-free "file://LICENSE"))))
 
+(define-public dumb-allegro4
+  (package
+    (inherit dumb)
+    (name "dumb-allegro4")
+    (arguments
+     (substitute-keyword-arguments (package-arguments dumb)
+       ((#:configure-flags flags)
+        `(cons "-DBUILD_ALLEGRO4=ON" ,flags))))
+    (inputs
+     `(("allegro" ,allegro-4)))))
+
 (define-public hydrogen
   (package
     (name "hydrogen")
-- 
2.21.0

[bug#35288] [PATCH 3/3] gnu: Add alex4.

[Kei Kebreau]

* gnu/packages/games.scm (alex4): New variable.
---
 gnu/packages/games.scm | 50 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 0b93409c76..ee8be07efe 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -237,6 +237,56 @@ enemy, ally, weapon and mission types.  Features include simulated 4D texturing,
 mouse and joystick control, and original music.")
     (license license:gpl2)))
 
+(define-public alex4
+  (package
+    (name "alex4")
+    (version "1.2-alpha")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/carstene1ns/alex4/archive/"
+                           version ".tar.gz"))
+       (sha256
+        (base32 "0jj1g3v1a6lyfwp5g2ly0n9z65ryqck8jxvzr01kaqjj3lsfkrhg"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; no check target
+       #:make-flags
+       (list "-Csrc"
+             "CC=gcc"
+             "CFLAGS=-D_FILE_OFFSET_BITS=64"
+             (string-append "DATADIR=" (assoc-ref %outputs "out")
+                            "/share/" ,name)
+             (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda _
+             (substitute* '("src/main.c"
+                            "src/shooter.c")
+               (("fcos") "fixcos")
+               (("fmul") "fixmul")
+               (("fsin") "fixsin"))
+             #t))
+         (add-after 'install 'install-data
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((share (string-append (assoc-ref outputs "out")
+                                         "/share/" ,name)))
+               (install-file "alex4.ini" share)
+               #t))))))
+    (inputs
+     `(("allegro" ,allegro-4)
+       ("dumb" ,dumb-allegro4)))
+    (home-page "http://allegator.sourceforge.net/")
+    (synopsis "Retro platform game")
+    (description
+     "Guide Alex the Allegator through the jungle in order to save his
+girlfriend Lola from evil humans who want to make a pair of shoes out of her.
+Plenty of classic platforming in four nice colors guaranteed!
+
+The game includes a built-in editor so you can design and share your own maps.")
+    (license license:gpl2+)))
+
 (define-public armagetron-advanced
   (package
     (name "armagetron-advanced")
-- 
2.21.0

[bug#35288] [PATCH 1/3] gnu: Add dumb.

[Ludovic Courtès]

Hello,

Kei Kebreau <kkebreau@posteo.net> skribis:

> * gnu/packages/music.scm (dumb): New variable.

[...]

> +    (home-page "https://github.com/kode54/dumb")
> +    (synopsis "Module audio renderer library")
> +    (description
> +     "DUMB is a tracker library with support for IT, XM, S3M and MOD files.  It
> +targets maximum accuracy to the original formats, with low-pass resonant filters
> +for the IT files, accurate timing and pitching, and three resampling quality
> +settings (aliasing, linear interpolation and cubic interpolation).")
> +    (license (license:fsf-free "file://LICENSE"))))

This looks good, but the license deserves close reading (which I haven’t
done).  What’s your interpretation of it?  It would be nice to put a
comment above to summarize our findings.

> +(define-public vcvrack
> +  (package
> +    (name "vcvrack")
> +    (version "0.6.2b")

What’s this doin’ here?  :-)

Thanks,
Ludo’.

[bug#35288] [PATCH 1/3] gnu: Add dumb.

[Kei Kebreau]

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

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

> Hello,
>
> Kei Kebreau <kkebreau@posteo.net> skribis:
>
>> * gnu/packages/music.scm (dumb): New variable.
>
> [...]
>
>> +    (home-page "https://github.com/kode54/dumb")
>> +    (synopsis "Module audio renderer library")
>> +    (description
>> + "DUMB is a tracker library with support for IT, XM, S3M and MOD
>> files.  It
>> +targets maximum accuracy to the original formats, with low-pass
>> resonant filters
>> +for the IT files, accurate timing and pitching, and three resampling quality
>> +settings (aliasing, linear interpolation and cubic interpolation).")
>> +    (license (license:fsf-free "file://LICENSE"))))
>
> This looks good, but the license deserves close reading (which I haven’t
> done).  What’s your interpretation of it?  It would be nice to put a
> comment above to summarize our findings.
>

I've added the comment below in the patch summarizing my interpretation
of the DUMB license:

;; The DUMB license is a bit peculiar.
;; Clause 8 states that clauses 4, 5 and 6 are null and void, leaving only
;; the first three clauses for genuine consideration.
;; Clauses 1, 2 and 3 are analogous to clauses 1, 2 and 3 of the zlib
;; license, a known free software license.
;; Therefore, the DUMB license may be considered a free software license.

What do you think?

>> +(define-public vcvrack
>> +  (package
>> +    (name "vcvrack")
>> +    (version "0.6.2b")
>
> What’s this doin’ here?  :-)
>

Very basic packaging work on some other software, whoops!

> Thanks,
> Ludo’.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#35288] [PATCH 1/3] gnu: Add dumb.

[Ludovic Courtès]

Hello Kei,

Kei Kebreau <kkebreau@posteo.net> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Hello,
>>
>> Kei Kebreau <kkebreau@posteo.net> skribis:
>>
>>> * gnu/packages/music.scm (dumb): New variable.
>>
>> [...]
>>
>>> +    (home-page "https://github.com/kode54/dumb")
>>> +    (synopsis "Module audio renderer library")
>>> +    (description
>>> + "DUMB is a tracker library with support for IT, XM, S3M and MOD
>>> files.  It
>>> +targets maximum accuracy to the original formats, with low-pass
>>> resonant filters
>>> +for the IT files, accurate timing and pitching, and three resampling quality
>>> +settings (aliasing, linear interpolation and cubic interpolation).")
>>> +    (license (license:fsf-free "file://LICENSE"))))
>>
>> This looks good, but the license deserves close reading (which I haven’t
>> done).  What’s your interpretation of it?  It would be nice to put a
>> comment above to summarize our findings.
>>
>
> I've added the comment below in the patch summarizing my interpretation
> of the DUMB license:
>
> ;; The DUMB license is a bit peculiar.
> ;; Clause 8 states that clauses 4, 5 and 6 are null and void, leaving only
> ;; the first three clauses for genuine consideration.
> ;; Clauses 1, 2 and 3 are analogous to clauses 1, 2 and 3 of the zlib
> ;; license, a known free software license.
> ;; Therefore, the DUMB license may be considered a free software license.
>
> What do you think?

Sounds good!  (It’s available in Debian too, which is a good sign:
<https://packages.debian.org/sid/libdumb1>.)

>>> +(define-public vcvrack
>>> +  (package
>>> +    (name "vcvrack")
>>> +    (version "0.6.2b")
>>
>> What’s this doin’ here?  :-)
>>
>
> Very basic packaging work on some other software, whoops!

Heheh.  :-)

OK with these changes!

Thank you,
Ludo’.

bug#35288: [PATCH 1/3] gnu: Add dumb.

[Kei Kebreau]

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

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

> Hello Kei,
>
> Kei Kebreau <kkebreau@posteo.net> skribis:
>
>> Ludovic Courtès <ludo@gnu.org> writes:
>>
>>> Hello,
>>>
>>> Kei Kebreau <kkebreau@posteo.net> skribis:
>>>
>>>> * gnu/packages/music.scm (dumb): New variable.
>>>
>>> [...]
>>>
>>>> +    (home-page "https://github.com/kode54/dumb")
>>>> +    (synopsis "Module audio renderer library")
>>>> +    (description
>>>> + "DUMB is a tracker library with support for IT, XM, S3M and MOD
>>>> files.  It
>>>> +targets maximum accuracy to the original formats, with low-pass
>>>> resonant filters
>>>> +for the IT files, accurate timing and pitching, and three
>>>> resampling quality
>>>> +settings (aliasing, linear interpolation and cubic interpolation).")
>>>> +    (license (license:fsf-free "file://LICENSE"))))
>>>
>>> This looks good, but the license deserves close reading (which I haven’t
>>> done).  What’s your interpretation of it?  It would be nice to put a
>>> comment above to summarize our findings.
>>>
>>
>> I've added the comment below in the patch summarizing my interpretation
>> of the DUMB license:
>>
>> ;; The DUMB license is a bit peculiar.
>> ;; Clause 8 states that clauses 4, 5 and 6 are null and void, leaving only
>> ;; the first three clauses for genuine consideration.
>> ;; Clauses 1, 2 and 3 are analogous to clauses 1, 2 and 3 of the zlib
>> ;; license, a known free software license.
>> ;; Therefore, the DUMB license may be considered a free software license.
>>
>> What do you think?
>
> Sounds good!  (It’s available in Debian too, which is a good sign:
> <https://packages.debian.org/sid/libdumb1>.)
>
>>>> +(define-public vcvrack
>>>> +  (package
>>>> +    (name "vcvrack")
>>>> +    (version "0.6.2b")
>>>
>>> What’s this doin’ here?  :-)
>>>
>>
>> Very basic packaging work on some other software, whoops!
>
> Heheh.  :-)
>
> OK with these changes!
>
> Thank you,
> Ludo’.

Pushed to master, thanks again!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]