[PATCH]: add freepats and timidity

[PATCH]: add freepats and timidity

[Ricardo Wurmus]

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

Hi Guix,

attached are two patches: one for freepats and another for the MIDI
player TiMidity++.  TiMidity++ comes with a simple configuration file
referencing the freepats configuration, so it's usable out of the box.

~~ Ricardo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-Freepats.patch --]
[-- Type: text/x-patch, Size: 2961 bytes --]

From b9e2401e7447f5c777e50cf00a360e2f7795df92 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Thu, 19 Feb 2015 16:56:39 +0100
Subject: [PATCH 1/2] gnu: Add Freepats.

* gnu/packages/audio.scm (freepats): New variable.
---
 gnu/packages/audio.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 7d77a37..4bfc92e 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -23,9 +23,12 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system waf)
+  #:use-module (guix build-system trivial)
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages glib)
@@ -190,6 +193,45 @@ bass section with five drawbars.  A standalone JACK application and LV2
 plugins are provided.")
     (license license:gpl2)))
 
+(define-public freepats
+  (package
+    (name "freepats")
+    (version "20060219")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://freepats.zenvoid.org/freepats-"
+                                  version ".tar.bz2"))
+              (sha256
+               (base32
+                "12iw36rd94zirll96cd5k0va7p5hxmf2shvjlhzihcmjaw8flq82"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder (begin
+                   (use-modules (guix build utils))
+                   (let ((out (string-append %output "/share")))
+                     (setenv "PATH" (string-append
+                                     (assoc-ref %build-inputs "bzip2") "/bin:"
+                                     (assoc-ref %build-inputs "tar") "/bin"))
+                     (system* "tar" "xvf" (assoc-ref %build-inputs "source"))
+                     (chdir "freepats")
+                     ;; Use absolute pattern references
+                     (substitute* "freepats.cfg"
+                       (("Tone_000") (string-append out "/Tone_000"))
+                       (("Drum_000") (string-append out "/Drum_000")))
+                     (mkdir-p out)
+                     (copy-recursively "." out)))))
+    (native-inputs
+     `(("tar" ,tar)
+       ("bzip2" ,bzip2)))
+    (home-page "http://freepats.zenvoid.org")
+    (synopsis "GUS compatible patches for MIDI players")
+    (description
+     "FreePats is a project to create a free and open set of GUS compatible
+patches that can be used with softsynths such as Timidity and WildMidi.")
+    ;; GPLv2+ with exception for compositions using these patches.
+    (license license:gpl2+)))
+
 (define-public jack-1
   (package
     (name "jack")
-- 
2.1.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-Add-TiMidity.patch --]
[-- Type: text/x-patch, Size: 2967 bytes --]

From 0aaf1401098e78d656fd8836246ce894acdf4784 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Thu, 19 Feb 2015 16:57:33 +0100
Subject: [PATCH 2/2] gnu: Add TiMidity++.

* gnu/packages/audio.scm (timidity++): New variable.
---
 gnu/packages/audio.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 4bfc92e..40969ce 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -35,6 +35,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages tcl)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages mp3) ;taglib
   #:use-module (gnu packages perl)
@@ -654,6 +655,56 @@ that toolkit will work in all hosts that use Suil automatically.
 Suil currently supports every combination of Gtk 2, Qt 4, and X11.")
     (license license:isc)))
 
+(define-public timidity++
+  (package
+    (name "timidity++")
+    (version "2.14.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://sourceforge/timidity/TiMidity++-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "0xk41w4qbk23z1fvqdyfblbz10mmxsllw0svxzjw5sa9y11vczzr"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags '("--enable-audio=alsa,flac,jack,ao,vorbis,speex")
+       #:phases
+       (alist-cons-after
+        'install 'install-config
+        (lambda _
+          (let ((out (string-append (assoc-ref %outputs "out")
+                                    "/share/timidity")))
+            (mkdir-p out)
+            (call-with-output-file
+                (string-append out "/timidity.cfg")
+              (lambda (port)
+                (format port (string-append "source "
+                                            (assoc-ref %build-inputs "freepats")
+                                            "/share/freepats.cfg"))))))
+        %standard-phases)))
+    (inputs
+     `(("alsa-lib" ,alsa-lib)
+       ("ao" ,ao)
+       ("flac" ,flac)
+       ("jack" ,jack-1)
+       ("libogg" ,libogg)
+       ("speex" ,speex)
+       ("tk" ,tk)
+       ("freepats" ,freepats)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://timidity.sourceforge.net/")
+    (synopsis "Software synthesizer for playing MIDI files")
+    (description
+     "TiMidity++ is a software synthesizer.  It can play MIDI files by
+converting them into PCM waveform data; give it a MIDI data along with digital
+instrument data files, then it synthesizes them in real-time, and plays.  It
+can not only play sounds, but also can save the generated waveforms into hard
+disks as various audio file formats.")
+    (license license:gpl2+)))
+
 (define-public vamp
   (package
     (name "vamp")
-- 
2.1.0

Re: [PATCH]: add freepats and timidity

[Andreas Enge]

Hello,

On Thu, Feb 19, 2015 at 07:33:59PM +0100, Ricardo Wurmus wrote:
> +                     (copy-recursively "." out)))))

I think this is a bit too much, as it also copies COPYING and README.
I would suggest to only copy the patch folders Drum_000 and Tone_000 and
freepats.cfg.

Andreas

Re: [PATCH]: add freepats and timidity

[Andreas Enge]

Hi again,

thanks a lot for the two packages, they work for me. Nevertheless two
comments.

On Thu, Feb 19, 2015 at 07:33:59PM +0100, Ricardo Wurmus wrote:
> +(define-public timidity++
> +  (package
> +    (name "timidity++")

Back to names... I would call this "timidity". The package guidelines only
state that underscores are replaced by "-", but the general idea would be
to replace special characters with dashes, and to rather drop them at the end
(or beginning) of a package name.

> +          (let ((out (string-append (assoc-ref %outputs "out")
> +                                    "/share/timidity")))
> +            (mkdir-p out)
> +            (call-with-output-file
> +                (string-append out "/timidity.cfg")

It is a bit strange to have config files in /share and not in /etc, but that
is indeed where by default timidity looks for its config file. Nevertheless,
I would use
  (string-append (assoc-ref %outputs "out") "/etc/timidity")
and then add the configure flag
  (string-append "--with-default-path=" (assoc-ref %outputs "out") "/etc/timidity")

Andreas

Re: [PATCH]: add freepats and timidity

[Ricardo Wurmus]

Andreas Enge writes:
> On Thu, Feb 19, 2015 at 07:33:59PM +0100, Ricardo Wurmus wrote:
>> +                     (copy-recursively "." out)))))
>
> I think this is a bit too much, as it also copies COPYING and README.
> I would suggest to only copy the patch folders Drum_000 and Tone_000 and
> freepats.cfg.

Is copying the license and the readme file a problem?  In my teensy
store I count 382 readme files alone.  It doesn't seem unusual to
include the readme.

Re: [PATCH]: add freepats and timidity

[Ricardo Wurmus]

Andreas Enge writes:

> On Thu, Feb 19, 2015 at 07:33:59PM +0100, Ricardo Wurmus wrote:
>> +(define-public timidity++
>> +  (package
>> +    (name "timidity++")
>
> Back to names... I would call this "timidity". The package guidelines only
> state that underscores are replaced by "-", but the general idea would be
> to replace special characters with dashes, and to rather drop them at the end
> (or beginning) of a package name.

The homepage of TiMidity++ says

    TiMidity++ is based on TiMidity 0.2i, written by Tuukka Toivonen
    <tt@cgs.fi>*1, released on 1995. No new version of this original
    project is developed since then. Development has been continued by
    Masanao Izumo et al. in the new project named TiMidity++. ++ is to
    show the difference from original project.

I'd rather not change the name.  For reference, Fedora calls the package
"timidity++" as well.

>> +          (let ((out (string-append (assoc-ref %outputs "out")
>> +                                    "/share/timidity")))
>> +            (mkdir-p out)
>> +            (call-with-output-file
>> +                (string-append out "/timidity.cfg")
>
> It is a bit strange to have config files in /share and not in /etc, but that
> is indeed where by default timidity looks for its config file. Nevertheless,
> I would use
>   (string-append (assoc-ref %outputs "out") "/etc/timidity")
> and then add the configure flag
>   (string-append "--with-default-path=" (assoc-ref %outputs "out") "/etc/timidity")

I don't mind either way, but I do agree that coercing TiMidity++ to look
in a more traditional location for the configuration file sounds like a
good idea.

~~ Ricardo

Re: [PATCH]: add freepats and timidity

[Andreas Enge]

On Thu, Feb 19, 2015 at 09:03:34PM +0100, Ricardo Wurmus wrote:
> Is copying the license and the readme file a problem?  In my teensy
> store I count 382 readme files alone.  It doesn't seem unusual to
> include the readme.

I think it is not good style. And it can create collisions if several packages
are installed. If someone installs the package, he will end up with
share/README and share/COPYING in his profile.

Andreas

Re: [PATCH]: add freepats and timidity

[Ricardo Wurmus]

Andreas Enge writes:

> On Thu, Feb 19, 2015 at 09:03:34PM +0100, Ricardo Wurmus wrote:
>> Is copying the license and the readme file a problem?  In my teensy
>> store I count 382 readme files alone.  It doesn't seem unusual to
>> include the readme.
>
> I think it is not good style. And it can create collisions if several packages
> are installed. If someone installs the package, he will end up with
> share/README and share/COPYING in his profile.

I see.  Wouldn't it be better to place the README in
share/doc/{timidity,freepats}/README rather than removing it?

~~ Ricardo

Re: [PATCH]: add freepats and timidity

[Andreas Enge]

On Thu, Feb 19, 2015 at 10:09:38PM +0100, Ricardo Wurmus wrote:
> I see.  Wouldn't it be better to place the README in
> share/doc/{timidity,freepats}/README rather than removing it?

I think it is unusual, but could be done for freepats, which has no other
documentation (apart from "guix -s freepats", that is, so one can find the
information inside the system). Timidity installs its man pages, so nothing
needs to be done there.

Andreas

Re: [PATCH]: add freepats and timidity

[Ricardo Wurmus]

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


Attached are two new patches for Freepats and TiMidity++.

The contents of the Freepats tarball are now unpacked to
$out/share/freepats/, so there should be no conflicts anymore.

In TiMidity++ I removed the Tcl/Tk interface and added the ncurses
interface instead (the Tcl interface didn't actually work but the
ncurses interface does).  I also enabled the server mode to be built.
The default path to the configuration file is now set to
$out/etc/timidity/timidity.cfg.

If you insist I can rename both package and variable from "timidity++"
to "timidity".

What do you think?

~~ Ricardo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-Freepats.patch --]
[-- Type: text/x-patch, Size: 2970 bytes --]

From 79cce5f61e55dda39b04844773e757e63f3b73ce Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Thu, 19 Feb 2015 16:56:39 +0100
Subject: [PATCH 1/2] gnu: Add Freepats.

* gnu/packages/audio.scm (freepats): New variable.
---
 gnu/packages/audio.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index c668211..f4a98a7 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -23,9 +23,12 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system waf)
+  #:use-module (guix build-system trivial)
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages glib)
@@ -190,6 +193,45 @@ bass section with five drawbars.  A standalone JACK application and LV2
 plugins are provided.")
     (license license:gpl2)))
 
+(define-public freepats
+  (package
+    (name "freepats")
+    (version "20060219")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://freepats.zenvoid.org/freepats-"
+                                  version ".tar.bz2"))
+              (sha256
+               (base32
+                "12iw36rd94zirll96cd5k0va7p5hxmf2shvjlhzihcmjaw8flq82"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder (begin
+                   (use-modules (guix build utils))
+                   (let ((out (string-append %output "/share/freepats")))
+                     (setenv "PATH" (string-append
+                                     (assoc-ref %build-inputs "bzip2") "/bin:"
+                                     (assoc-ref %build-inputs "tar") "/bin"))
+                     (system* "tar" "xvf" (assoc-ref %build-inputs "source"))
+                     (chdir "freepats")
+                     ;; Use absolute pattern references
+                     (substitute* "freepats.cfg"
+                       (("Tone_000") (string-append out "/Tone_000"))
+                       (("Drum_000") (string-append out "/Drum_000")))
+                     (mkdir-p out)
+                     (copy-recursively "." out)))))
+    (native-inputs
+     `(("tar" ,tar)
+       ("bzip2" ,bzip2)))
+    (home-page "http://freepats.zenvoid.org")
+    (synopsis "GUS compatible patches for MIDI players")
+    (description
+     "FreePats is a project to create a free and open set of GUS compatible
+patches that can be used with softsynths such as Timidity and WildMidi.")
+    ;; GPLv2+ with exception for compositions using these patches.
+    (license license:gpl2+)))
+
 (define-public jack-1
   (package
     (name "jack")
-- 
2.1.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-Add-TiMidity.patch --]
[-- Type: text/x-patch, Size: 3223 bytes --]

From 5ea972bfa27bdc0348a94867e41953e515889a39 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Thu, 19 Feb 2015 16:57:33 +0100
Subject: [PATCH 2/2] gnu: Add TiMidity++.

* gnu/packages/audio.scm (timidity++): New variable.
---
 gnu/packages/audio.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index f4a98a7..acc73b1 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -34,6 +34,7 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages mp3) ;taglib
@@ -691,6 +692,62 @@ that toolkit will work in all hosts that use Suil automatically.
 Suil currently supports every combination of Gtk 2, Qt 4, and X11.")
     (license license:isc)))
 
+(define-public timidity++
+  (package
+    (name "timidity++")
+    (version "2.14.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://sourceforge/timidity/TiMidity++-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "0xk41w4qbk23z1fvqdyfblbz10mmxsllw0svxzjw5sa9y11vczzr"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags
+       (list "--enable-audio=alsa,flac,jack,ao,vorbis,speex"
+             "--enable-ncurses"
+             "--enable-server"
+             "--enable-alsaseq"
+             (string-append "--with-default-path="
+                            (assoc-ref %outputs "out") "/etc/timidity"))
+       #:phases
+       (alist-cons-after
+        'install 'install-config
+        (lambda _
+          (let ((out (string-append (assoc-ref %outputs "out")
+                                    "/etc/timidity")))
+            (mkdir-p out)
+            (call-with-output-file
+                (string-append out "/timidity.cfg")
+              (lambda (port)
+                (format port (string-append "source "
+                                            (assoc-ref %build-inputs "freepats")
+                                            "/share/freepats/freepats.cfg"))))))
+        %standard-phases)))
+    (inputs
+     `(("alsa-lib" ,alsa-lib)
+       ("ao" ,ao)
+       ("flac" ,flac)
+       ("jack" ,jack-1)
+       ("libogg" ,libogg)
+       ("speex" ,speex)
+       ("ncurses" ,ncurses)
+       ("freepats" ,freepats)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://timidity.sourceforge.net/")
+    (synopsis "Software synthesizer for playing MIDI files")
+    (description
+     "TiMidity++ is a software synthesizer.  It can play MIDI files by
+converting them into PCM waveform data; give it a MIDI data along with digital
+instrument data files, then it synthesizes them in real-time, and plays.  It
+can not only play sounds, but also can save the generated waveforms into hard
+disks as various audio file formats.")
+    (license license:gpl2+)))
+
 (define-public vamp
   (package
     (name "vamp")
-- 
2.1.0

Re: [PATCH]: add freepats and timidity

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> On Thu, Feb 19, 2015 at 07:33:59PM +0100, Ricardo Wurmus wrote:
>> +(define-public timidity++
>> +  (package
>> +    (name "timidity++")
>
> Back to names... I would call this "timidity". The package guidelines only
> state that underscores are replaced by "-", but the general idea would be
> to replace special characters with dashes, and to rather drop them at the end
> (or beginning) of a package name.

I’m fine with ‘timidity++’.

>> +          (let ((out (string-append (assoc-ref %outputs "out")
>> +                                    "/share/timidity")))
>> +            (mkdir-p out)
>> +            (call-with-output-file
>> +                (string-append out "/timidity.cfg")
>
> It is a bit strange to have config files in /share and not in /etc, but that
> is indeed where by default timidity looks for its config file. Nevertheless,
> I would use
>   (string-append (assoc-ref %outputs "out") "/etc/timidity")
> and then add the configure flag
>   (string-append "--with-default-path=" (assoc-ref %outputs "out") "/etc/timidity")

Agreed, using $out/etc seems best.

Thanks,
Ludo’.