[PATCH] Add Faust and Guitarix.

[PATCH] Add Faust and Guitarix.

[Ricardo Wurmus]

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

From 7d0f4d6702cf6ed370e534862244fb65c414f46d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sun, 14 Jun 2015 15:00:37 +0200
Subject: [PATCH 1/3] gnu: Add Faust.

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

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 87745a6..a7a111c 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -480,6 +480,37 @@ also play midifiles using a Soundfont.")
 PS, and DAB+.")
     (license license:gpl2)))
 
+(define-public faust
+  (package
+    (name "faust")
+    (version "0.9.67")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://sourceforge/faudiostream/faust-" version ".zip"))
+              (sha256
+               (base32
+                "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")))
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after
+          'unpack 'remove-prebuilt-library
+          (lambda _
+            (delete-file "architecture/android/libs/armeabi-v7a/libfaust_dsp.so")
+            #t))
+         (delete 'configure))))
+    (native-inputs
+     `(("unzip" ,unzip)))
+    (home-page "http://faust.grame.fr/")
+    (synopsis "Signal processing language")
+    (description
+     "Faust is a programming language for realtime audio signal processing.")
+    (license license:gpl2+)))
+
 (define-public freepats
   (package
     (name "freepats")
-- 
2.2.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-Add-zita-resampler.patch --]
[-- Type: text/x-patch, Size: 2434 bytes --]

From 790dba434e51ded7e5fe791b7577886f011b00a9 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sun, 14 Jun 2015 15:01:08 +0200
Subject: [PATCH 2/3] gnu: Add zita-resampler.

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

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index a7a111c..8de22bd 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1651,6 +1651,49 @@ with a much different focus than most other audio daemons.")
 engine.")
     (license license:gpl3+)))
 
+(define-public zita-resampler
+  (package
+    (name "zita-resampler")
+    (version "1.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://kokkinizita.linuxaudio.org"
+                    "/linuxaudio/downloads/zita-resampler-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "0r9ary5sc3y8vba5pad581ha7mgsrlyai83w7w4x2fmhfy64q0wq"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; no "check" target
+       #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after
+          'unpack 'patch-makefile-and-enter-directory
+          (lambda _
+            (substitute* "libs/Makefile"
+              (("ldconfig") "true")
+              (("^LIBDIR =.*") "LIBDIR = lib\n"))
+            (chdir "libs")
+            #t))
+         (add-after
+          'install 'install-symlink
+          (lambda _
+            (symlink "libzita-resampler.so"
+                     (string-append (assoc-ref %outputs "out")
+                                    "/lib/libzita-resampler.so.1"))))
+         ;; no configure script
+         (delete 'configure))))
+    (home-page "http://kokkinizita.linuxaudio.org/linuxaudio/zita-resampler/resampler.html")
+    (synopsis "C++ library for resampling audio signals")
+    (description
+     "Libzita-resampler is a C++ library for resampling audio signals.  It is
+designed to be used within a real-time processing context, to be fast, and to
+provide high-quality sample rate conversion.")
+    (license license:gpl3+)))
+
 (define-public zita-alsa-pcmi
   (package
     (name "zita-alsa-pcmi")
-- 
2.2.1


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

From eecb83dd2a9ad9faf5016a6381c7fb2072b51aa1 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sun, 14 Jun 2015 17:15:08 +0200
Subject: [PATCH 3/3] gnu: Add Guitarix.

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

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 8de22bd..451138b 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages avahi)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
@@ -43,6 +44,7 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gperf)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages linux)
@@ -550,6 +552,59 @@ 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 guitarix
+  (package
+    (name "guitarix")
+    (version "0.32.3")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append
+                   "mirror://sourceforge/guitarix/guitarix2-"
+                   version ".tar.bz2"))
+             (sha256
+              (base32
+               "1ybc5jk7fj6n8qh9ajzl1f6fzdmzab4nwjrh4fsylm94dn1jv0if"))))
+    (build-system waf-build-system)
+    (arguments
+     `(#:tests? #f ; no "check" target
+       #:python ,python-2
+       #:configure-flags
+       (list
+        ;; dsp2cc fails for src/faust/tonestack_engl.dsp, so we use the
+        ;; generated C++ files rather than compiling them from Faust sources.
+        "--no-faust"
+        ;; Add the output lib directory to the RUNPATH.
+        (string-append "--ldflags=-Wl,-rpath=" %output "/lib"))))
+    (inputs
+     `(("libsndfile" ,libsndfile)
+       ("boost" ,boost)
+       ("avahi" ,avahi)
+       ("eigen" ,eigen)
+       ("lv2" ,lv2)
+       ("lilv" ,lilv)
+       ("ladspa" ,ladspa)
+       ("jack" ,jack-1)
+       ("gtkmm" ,gtkmm-2)
+       ("gtk+" ,gtk+-2)
+       ("fftwf" ,fftwf)
+       ("lrdf" ,lrdf)
+       ("zita-resampler" ,zita-resampler)
+       ("zita-convolver" ,zita-convolver)))
+    (native-inputs
+     `(("gperf" ,gperf)
+       ;;("faust" ,faust) ; dsp2cc fails for src/faust/tonestack_engl.dsp
+       ("intltool" ,intltool)
+       ("gettext" ,gnu-gettext)
+       ("pkg-config" ,pkg-config)))
+    (native-search-paths
+     (list (search-path-specification
+            (variable "LV2_PATH")
+            (files '("lib/lv2")))))
+    (home-page "http://guitarix.org/")
+    (synopsis "Virtual guitar amplifier")
+    (description "Guitarix is a virtual guitar amplifier running JACK.")
+    (license license:gpl2+)))
+
 (define-public ir
   (package
     (name "ir")
-- 
2.2.1

Re: [PATCH] Add Faust and Guitarix.

[Alex Kost]

Ricardo Wurmus (2015-06-14 19:32 +0300) wrote:

[...]
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")))

I think it is clearer to use just '%output':

        `(#:make-flags (list (string-append "prefix=" %output)))

-- 
Alex

Re: [PATCH] Add Faust and Guitarix.

[Mark H Weaver]

Alex Kost <alezost@gmail.com> writes:

> Ricardo Wurmus (2015-06-14 19:32 +0300) wrote:
>
> [...]
>> +    (build-system gnu-build-system)
>> +    (arguments
>> +     `(#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")))
>
> I think it is clearer to use just '%output':
>
>         `(#:make-flags (list (string-append "prefix=" %output)))

I've been wondering about this as well.  It seems that Ludovic often
(usually?) writes (assoc-ref %outputs "out"), and I wonder why.  One
possible reason is that it makes it obvious how to get the filename of
other outputs.

Ludovic, what are your thoughts on this?

    Thanks,
      Mark

Re: [PATCH] Add Faust and Guitarix.

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> Alex Kost <alezost@gmail.com> writes:
>
>> Ricardo Wurmus (2015-06-14 19:32 +0300) wrote:
>>
>> [...]
>>> +    (build-system gnu-build-system)
>>> +    (arguments
>>> +     `(#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")))
>>
>> I think it is clearer to use just '%output':
>>
>>         `(#:make-flags (list (string-append "prefix=" %output)))
>
> I've been wondering about this as well.  It seems that Ludovic often
> (usually?) writes (assoc-ref %outputs "out"), and I wonder why.  One
> possible reason is that it makes it obvious how to get the filename of
> other outputs.

Right, I usually avoid %output (singular) because it’s a special case of
%outputs, so I prefer using %outputs.

Ludo’.

Re: [PATCH] Add Faust and Guitarix.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> From 7d0f4d6702cf6ed370e534862244fb65c414f46d Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> Date: Sun, 14 Jun 2015 15:00:37 +0200
> Subject: [PATCH 1/3] gnu: Add Faust.
>
> * gnu/packages/audio.scm (faust): New variable.

[...]

> +          'unpack 'remove-prebuilt-library
> +          (lambda _
> +            (delete-file "architecture/android/libs/armeabi-v7a/libfaust_dsp.so")

This should go in a snippet IMO.

Otherwise OK.

> From 790dba434e51ded7e5fe791b7577886f011b00a9 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> Date: Sun, 14 Jun 2015 15:01:08 +0200
> Subject: [PATCH 2/3] gnu: Add zita-resampler.
>
> * gnu/packages/audio.scm (zita-resampler): New variable.

OK.

> From eecb83dd2a9ad9faf5016a6381c7fb2072b51aa1 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> Date: Sun, 14 Jun 2015 17:15:08 +0200
> Subject: [PATCH 3/3] gnu: Add Guitarix.
>
> * gnu/packages/audio.scm (guitarix): New variable.

[...]

> +        ;; dsp2cc fails for src/faust/tonestack_engl.dsp, so we use the
> +        ;; generated C++ files rather than compiling them from Faust sources.
> +        "--no-faust"

I think it deserves a FIXME.  (It’s OK for now, but the eventual goal
should be to build those from source as well.)

> +    (native-search-paths
> +     (list (search-path-specification
> +            (variable "LV2_PATH")
> +            (files '("lib/lv2")))))

Shouldn’t it be in LV2 itself instead?

> +    (home-page "http://guitarix.org/")
> +    (synopsis "Virtual guitar amplifier")
> +    (description "Guitarix is a virtual guitar amplifier running JACK.")

Could you expound a bit, for instance using the second paragraph on the
web page?

(And then make sure to have the GuixSD logo listed next to Debian et
al. in their “Install” section.  ;-))

Thank you, and happy guitar playing!  :-)

Ludo’.

Re: [PATCH] Add Faust and Guitarix.

[Ricardo Wurmus]

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


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

>> Subject: [PATCH 1/3] gnu: Add Faust.
>>
>> * gnu/packages/audio.scm (faust): New variable.
>
> [...]
>
>> +          'unpack 'remove-prebuilt-library
>> +          (lambda _
>> +            (delete-file "architecture/android/libs/armeabi-v7a/libfaust_dsp.so")
>
> This should go in a snippet IMO.

Okay.

>> Subject: [PATCH 3/3] gnu: Add Guitarix.
>>
>> * gnu/packages/audio.scm (guitarix): New variable.
>
> [...]
>
>> +        ;; dsp2cc fails for src/faust/tonestack_engl.dsp, so we use the
>> +        ;; generated C++ files rather than compiling them from Faust sources.
>> +        "--no-faust"
>
> I think it deserves a FIXME.  (It’s OK for now, but the eventual goal
> should be to build those from source as well.)

Guitarix sources mention two specific versions of Faust with which the
DSP sources should be buildable.  I think the DSP sources should be
fixed in Guitarix rather than package the specific minor version of
Faust to generate the C++ code.  I added a “FIXME” note.

>> +    (native-search-paths
>> +     (list (search-path-specification
>> +            (variable "LV2_PATH")
>> +            (files '("lib/lv2")))))
>
> Shouldn’t it be in LV2 itself instead?

I don’t know.  LV2_PATH is used by LV2 hosts for the discovery of
plugins.  The “lv2” package itself does not provide any plugins; a host
like Ardour has “lv2” as one of its inputs but does not provide any LV2
plugins.  Currently, we only use (native-search-paths ...) suggesting
“LV2_PATH” to be set for LV2 plugin packages.  I would not mind moving
this expression to the “lv2” package instead.

Should I prepare another patch where this is removed from all package
definitions and added to the “lv2” package instead?

>> +    (home-page "http://guitarix.org/")
>> +    (synopsis "Virtual guitar amplifier")
>> +    (description "Guitarix is a virtual guitar amplifier running JACK.")
>
> Could you expound a bit, for instance using the second paragraph on the
> web page?

Done.  Attached is a new patch.

Thanks!

~~ Ricardo


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

From 444196dc501dad2ee793d5b1a20116fee799fb2f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sun, 14 Jun 2015 17:15:08 +0200
Subject: [PATCH] gnu: Add Guitarix.

* gnu/packages/audio.scm (guitarix): New variable.
---
 gnu/packages/audio.scm | 72 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 66 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 50d96a2..25c0c4e 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages avahi)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
@@ -43,6 +44,7 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gperf)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages linux)
@@ -490,18 +492,17 @@ PS, and DAB+.")
                     "mirror://sourceforge/faudiostream/faust-" version ".zip"))
               (sha256
                (base32
-                "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1"))))
+                "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1"))
+              (snippet
+               ;; Remove prebuilt library
+               '(delete-file "architecture/android/libs/armeabi-v7a/libfaust_dsp.so"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")))
        #:tests? #f
        #:phases
        (modify-phases %standard-phases
-         (add-after
-          'unpack 'remove-prebuilt-library
-          (lambda _
-            (delete-file "architecture/android/libs/armeabi-v7a/libfaust_dsp.so")
-            #t))
+         ;; no "configure" script
          (delete 'configure))))
     (native-inputs
      `(("unzip" ,unzip)))
@@ -550,6 +551,65 @@ 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 guitarix
+  (package
+    (name "guitarix")
+    (version "0.32.3")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append
+                   "mirror://sourceforge/guitarix/guitarix2-"
+                   version ".tar.bz2"))
+             (sha256
+              (base32
+               "1ybc5jk7fj6n8qh9ajzl1f6fzdmzab4nwjrh4fsylm94dn1jv0if"))))
+    (build-system waf-build-system)
+    (arguments
+     `(#:tests? #f ; no "check" target
+       #:python ,python-2
+       #:configure-flags
+       (list
+        ;; FIXME: dsp2cc fails for src/faust/tonestack_engl.dsp, so we use the
+        ;; generated C++ files rather than compiling them from Faust sources.
+        "--no-faust"
+        ;; Add the output lib directory to the RUNPATH.
+        (string-append "--ldflags=-Wl,-rpath=" %output "/lib"))))
+    (inputs
+     `(("libsndfile" ,libsndfile)
+       ("boost" ,boost)
+       ("avahi" ,avahi)
+       ("eigen" ,eigen)
+       ("lv2" ,lv2)
+       ("lilv" ,lilv)
+       ("ladspa" ,ladspa)
+       ("jack" ,jack-1)
+       ("gtkmm" ,gtkmm-2)
+       ("gtk+" ,gtk+-2)
+       ("fftwf" ,fftwf)
+       ("lrdf" ,lrdf)
+       ("zita-resampler" ,zita-resampler)
+       ("zita-convolver" ,zita-convolver)))
+    (native-inputs
+     `(("gperf" ,gperf)
+       ;;("faust" ,faust) ; dsp2cc fails for src/faust/tonestack_engl.dsp
+       ("intltool" ,intltool)
+       ("gettext" ,gnu-gettext)
+       ("pkg-config" ,pkg-config)))
+    (native-search-paths
+     (list (search-path-specification
+            (variable "LV2_PATH")
+            (files '("lib/lv2")))))
+    (home-page "http://guitarix.org/")
+    (synopsis "Virtual guitar amplifier")
+    (description "Guitarix is a virtual guitar amplifier running JACK.
+Guitarix takes the signal from your guitar as a mono-signal from your sound
+card.  The input is processed by a main amp and a rack-section.  Both can be
+routed separately and deliver a processed stereo-signal via JACK.  You may
+fill the rack with effects from more than 25 built-in modules including stuff
+from a simple noise gate to modulation effects like flanger, phaser or
+auto-wah.")
+    (license license:gpl2+)))
+
 (define-public ir
   (package
     (name "ir")
-- 
2.2.1

Re: [PATCH] Add Faust and Guitarix.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

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

[...]

>>> +    (native-search-paths
>>> +     (list (search-path-specification
>>> +            (variable "LV2_PATH")
>>> +            (files '("lib/lv2")))))
>>
>> Shouldn’t it be in LV2 itself instead?
>
> I don’t know.  LV2_PATH is used by LV2 hosts for the discovery of
> plugins.  The “lv2” package itself does not provide any plugins; a host
> like Ardour has “lv2” as one of its inputs but does not provide any LV2
> plugins.

What matters is not whether ‘lv2’ provides plug-ins, but whether it is
the piece of code that honors $LV2_PATH (similar to GCC and $CPATH,
etc.)

> Currently, we only use (native-search-paths ...) suggesting “LV2_PATH”
> to be set for LV2 plugin packages.  I would not mind moving this
> expression to the “lv2” package instead.
>
> Should I prepare another patch where this is removed from all package
> definitions and added to the “lv2” package instead?

That would be nice, yes.  :-)

> From 444196dc501dad2ee793d5b1a20116fee799fb2f Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> Date: Sun, 14 Jun 2015 17:15:08 +0200
> Subject: [PATCH] gnu: Add Guitarix.
>
> * gnu/packages/audio.scm (guitarix): New variable.

[...]

> @@ -490,18 +492,17 @@ PS, and DAB+.")
>                      "mirror://sourceforge/faudiostream/faust-" version ".zip"))
>                (sha256
>                 (base32
> -                "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1"))))
> +                "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1"))
> +              (snippet
> +               ;; Remove prebuilt library
> +               '(delete-file "architecture/android/libs/armeabi-v7a/libfaust_dsp.so"))))
>      (build-system gnu-build-system)
>      (arguments
>       `(#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")))
>         #:tests? #f
>         #:phases
>         (modify-phases %standard-phases
> -         (add-after
> -          'unpack 'remove-prebuilt-library
> -          (lambda _
> -            (delete-file "architecture/android/libs/armeabi-v7a/libfaust_dsp.so")
> -            #t))
> +         ;; no "configure" script
>           (delete 'configure))))
>      (native-inputs
>       `(("unzip" ,unzip)))

I guess this hunk should be in a separate patch.

OK for the rest.

Thank you!

Ludo’.