[PATCH] Add Yoshimi.

[PATCH] Add Yoshimi.

[Ricardo Wurmus]

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

Hi Guix,

Yoshimi is a fork of ZynAddSubFX, but I decided against letting
“yoshimi” inherit from “zynaddsubfx” because not only the source,
homepage, and description differ, but also the list of inputs and even
the build phases.  I expect the two programmes to diverge more in the
future; using “(inherit "zynaddsubfx")” felt a bit pointless.

~~ Ricardo


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

From b6480d0d5bb763bc506bfa99c770d59ad487a375 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 23 Dec 2015 08:45:56 +0100
Subject: [PATCH] gnu: Add Yoshimi.

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

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 67a29dc..6675f5c 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -905,3 +905,60 @@ instrument or MIDI file player.")
 three synthesizer engines, multitimbral and polyphonic synths, microtonal
 capabilities, custom envelopes, effects, etc.")
     (license license:gpl2)))
+
+(define-public yoshimi
+  (package
+    (name "yoshimi")
+    (version "1.3.7.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/yoshimi/"
+                                  (version-major+minor version)
+                                  "/yoshimi-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "13xc1x8jrr2rn26jx4dini692ww3771d5j5xf7f56ixqr7mmdhvz"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f ; there are no tests
+       #:configure-flags
+       (list (string-append "-DCMAKE_INSTALL_DATAROOTDIR="
+                            (assoc-ref %outputs "out") "/share"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'enter-dir
+           (lambda _ (chdir "src") #t))
+         ;; Move SSE compiler optimization flags from generic target to
+         ;; athlon64 and core2 targets, because otherwise the build would fail
+         ;; on non-Intel machines.
+         (add-after 'unpack 'remove-sse-flags-from-generic-target
+          (lambda _
+            (substitute* "src/CMakeLists.txt"
+              (("-msse -msse2 -mfpmath=sse") "")
+              (("-march=(athlon64|core2)" flag)
+               (string-append flag " -msse -msse2 -mfpmath=sse")))
+            #t)))))
+    (inputs
+     `(("boost" ,boost)
+       ("fftwf" ,fftwf)
+       ("alsa-lib" ,alsa-lib)
+       ("jack" ,jack-1)
+       ("fontconfig" ,fontconfig)
+       ("minixml" ,minixml)
+       ("mesa" ,mesa)
+       ("fltk" ,fltk)
+       ("lv2" ,lv2)
+       ("readline" ,readline)
+       ("ncurses" ,ncurses)
+       ("cairo" ,cairo)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://yoshimi.sourceforge.net/")
+    (synopsis "Software synthesizer")
+    (description
+     "Yoshimi is a fork of ZynAddSubFX, a feature heavy realtime software
+synthesizer.  It offers three synthesizer engines, multitimbral and polyphonic
+synths, microtonal capabilities, custom envelopes, effects, etc.  Yoshimi
+improves on support for JACK features, such as JACK MIDI.")
+    (license license:gpl2)))
-- 
2.5.0

Re: [PATCH] Add Yoshimi.

[Leo Famulari]

On Wed, Dec 23, 2015 at 08:49:15AM +0100, Ricardo Wurmus wrote:
> Hi Guix,
> 
> Yoshimi is a fork of ZynAddSubFX, but I decided against letting
> “yoshimi” inherit from “zynaddsubfx” because not only the source,
> homepage, and description differ, but also the list of inputs and even
> the build phases.  I expect the two programmes to diverge more in the
> future; using “(inherit "zynaddsubfx")” felt a bit pointless.
> 

Cool :) I'm really glad that Guix has a champion for music software.

> +    (arguments
> +     `(#:tests? #f ; there are no tests
> +       #:configure-flags
> +       (list (string-append "-DCMAKE_INSTALL_DATAROOTDIR="
> +                            (assoc-ref %outputs "out") "/share"))
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before 'configure 'enter-dir
> +           (lambda _ (chdir "src") #t))
> +         ;; Move SSE compiler optimization flags from generic target to
> +         ;; athlon64 and core2 targets, because otherwise the build would fail
> +         ;; on non-Intel machines.
> +         (add-after 'unpack 'remove-sse-flags-from-generic-target
> +          (lambda _
> +            (substitute* "src/CMakeLists.txt"
> +              (("-msse -msse2 -mfpmath=sse") "")
> +              (("-march=(athlon64|core2)" flag)
> +               (string-append flag " -msse -msse2 -mfpmath=sse")))
> +            #t)))))

Thanks for figuring that out!

> +    (inputs
> +     `(("boost" ,boost)
> +       ("fftwf" ,fftwf)
> +       ("alsa-lib" ,alsa-lib)
> +       ("jack" ,jack-1)
> +       ("fontconfig" ,fontconfig)
> +       ("minixml" ,minixml)
> +       ("mesa" ,mesa)
> +       ("fltk" ,fltk)
> +       ("lv2" ,lv2)
> +       ("readline" ,readline)

The readline module is not imported by music.scm on current master.
Maybe you have a WIP patch that imports it in your tree? Anyways, the
"readline" variable is currently unbound.

It builds fine for me otherwise.

> +       ("ncurses" ,ncurses)
> +       ("cairo" ,cairo)
> +       ("zlib" ,zlib)))
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)))
> +    (home-page "http://yoshimi.sourceforge.net/")
> +    (synopsis "Software synthesizer")

Have you considered describing the "type" of synthesis here in the
synopsis? For example, it could be additive, subtractive, frequency
modulating, etc. Each synthesizer variable could have a synopsis like
"Additive software synthesizer", etc. That would be a nice affordance
for synth geeks :) 

In this case, it looks like the synthesis type is "multi-paradigm".

> +    (description
> +     "Yoshimi is a fork of ZynAddSubFX, a feature heavy realtime software
> +synthesizer.  It offers three synthesizer engines, multitimbral and polyphonic
> +synths, microtonal capabilities, custom envelopes, effects, etc.  Yoshimi
> +improves on support for JACK features, such as JACK MIDI.")
> +    (license license:gpl2)))
> -- 
> 2.5.0
> 

Re: [PATCH] Add Yoshimi.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> The readline module is not imported by music.scm on current master.
> Maybe you have a WIP patch that imports it in your tree? Anyways, the
> "readline" variable is currently unbound.
>
> It builds fine for me otherwise.

You’re right, I forgot to add it to the patch.

>> +       ("ncurses" ,ncurses)
>> +       ("cairo" ,cairo)
>> +       ("zlib" ,zlib)))
>> +    (native-inputs
>> +     `(("pkg-config" ,pkg-config)))
>> +    (home-page "http://yoshimi.sourceforge.net/")
>> +    (synopsis "Software synthesizer")
>
> Have you considered describing the "type" of synthesis here in the
> synopsis? For example, it could be additive, subtractive, frequency
> modulating, etc. Each synthesizer variable could have a synopsis like
> "Additive software synthesizer", etc. That would be a nice affordance
> for synth geeks :) 
>
> In this case, it looks like the synthesis type is "multi-paradigm".

I updated the synopsis to read “Multi-paradigm software synthesizer”.
Thanks for the suggestion and the review!

~~ Ricardo