[PATCH 1/2] gnu: lvtk: Build UI library.

[PATCH 1/2] gnu: lvtk: Build UI library.

[Ricardo Wurmus]

* gnu/packages/audio.scm (lvtk)[inputs]: Add gtkmm-2.
[arguments]: Pass "-std=c++11" flag.
---
 gnu/packages/audio.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 5de0681..d7bdc01 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1653,9 +1653,16 @@ software.")
                      (setenv "LDFLAGS"
                              (string-append
                               "-L" (assoc-ref inputs "boost") "/lib "
-                              "-lboost_system")))))))
+                              "-lboost_system"))
+                     ;; Needed for gtkmm
+                     (substitute* '("src/wscript_build"
+                                    "examples/wscript_build")
+                       (("cxxflags.*= \\[" line)
+                        (string-append line "\"-std=c++11\", ")))
+                     #t)))))
     (inputs
      `(("boost" ,boost)
+       ("gtkmm" ,gtkmm-2)
        ("lv2" ,lv2)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-- 
2.10.2

[PATCH 2/2] gnu: Add ams-lv2.

[Ricardo Wurmus]

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

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index febd983..f5322b4 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1697,6 +1697,38 @@ JACK for audio and ALSA sequencer for MIDI as multimedia infrastructures and
 follows a traditional multi-track tape recorder control paradigm.")
     (license license:gpl2+)))
 
+(define-public ams-lv2
+  (package
+    (name "ams-lv2")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/blablack/ams-lv2/"
+                           "archive/" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1392spswkhfd38fggf584wb3m8aqpg7csfrs9zxnzyvhgmp0fgqk"))))
+    (build-system waf-build-system)
+    (arguments `(#:tests? #f)) ; no tests
+    (inputs
+     `(("lv2" ,lv2)
+       ("lvtk" ,lvtk)
+       ("gtkmm" ,gtkmm-2)
+       ("gtk" ,gtk+-2)
+       ("cairo" ,cairo)
+       ("fftw" ,fftw)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "https://objectivewave.wordpress.com/ams-lv2/")
+    (synopsis "Port of Alsa Modular Synth internal modules into LV2")
+    (description "This set of LV2 plugins is a port of the internal modules
+found in Alsa Modular Synth.  These plugins are used to create modular
+synthesizers and contain: VCO, VCF, VCA, LFO, slew limiter, envelopes, sample
+and hold, etc.")
+    (license license:gpl2)))
+
 (define-public gxtuner
   (package
     (name "gxtuner")
-- 
2.10.2

Re: [PATCH 2/2] gnu: Add ams-lv2.

[Marius Bakke]

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

Ricardo Wurmus <rekado@elephly.net> writes:

> * gnu/packages/music.scm (ams-lv2): New variable.
> ---
>  gnu/packages/music.scm | 32 ++++++++++++++++++++++++++++++++
>  1 file changed, 32 insertions(+)
>
> diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
> index febd983..f5322b4 100644
> --- a/gnu/packages/music.scm
> +++ b/gnu/packages/music.scm
> @@ -1697,6 +1697,38 @@ JACK for audio and ALSA sequencer for MIDI as multimedia infrastructures and
>  follows a traditional multi-track tape recorder control paradigm.")
>      (license license:gpl2+)))
>  
> +(define-public ams-lv2
> +  (package
> +    (name "ams-lv2")
> +    (version "1.2.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/blablack/ams-lv2/"
> +                           "archive/" version ".tar.gz"))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "1392spswkhfd38fggf584wb3m8aqpg7csfrs9zxnzyvhgmp0fgqk"))))
> +    (build-system waf-build-system)
> +    (arguments `(#:tests? #f)) ; no tests
> +    (inputs
> +     `(("lv2" ,lv2)
> +       ("lvtk" ,lvtk)
> +       ("gtkmm" ,gtkmm-2)
> +       ("gtk" ,gtk+-2)
> +       ("cairo" ,cairo)
> +       ("fftw" ,fftw)))
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)))
> +    (home-page "https://objectivewave.wordpress.com/ams-lv2/")
> +    (synopsis "Port of Alsa Modular Synth internal modules into LV2")
> +    (description "This set of LV2 plugins is a port of the internal modules
> +found in Alsa Modular Synth.  These plugins are used to create modular
> +synthesizers and contain: VCO, VCF, VCA, LFO, slew limiter, envelopes, sample
> +and hold, etc.")
> +    (license license:gpl2)))

The bundled "waf" script is bsd-3. Perhaps that can be removed, since it
uses waf-build-system? Otherwise this LGTM.

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

Re: [PATCH 2/2] gnu: Add ams-lv2.

[Ricardo Wurmus]

Marius Bakke <mbakke@fastmail.com> writes:

> Ricardo Wurmus <rekado@elephly.net> writes:
>
>> * gnu/packages/music.scm (ams-lv2): New variable.
>> ---
>>  gnu/packages/music.scm | 32 ++++++++++++++++++++++++++++++++
>>  1 file changed, 32 insertions(+)

[…]

> The bundled "waf" script is bsd-3. Perhaps that can be removed, since it
> uses waf-build-system? Otherwise this LGTM.

The waf-build-system doesn’t actually pull in a copy of “waf”.  It
always just uses whatever “waf” comes with the sources.

I think the same applies for “waf” as to “configure” scripts.  We
usually don’t list the license of the generated “configure” script in
the license field.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
http://elephly.net

Re: [PATCH 1/2] gnu: lvtk: Build UI library.

[Marius Bakke]

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

Ricardo Wurmus <rekado@elephly.net> writes:

> * gnu/packages/audio.scm (lvtk)[inputs]: Add gtkmm-2.
> [arguments]: Pass "-std=c++11" flag.
> ---
>  gnu/packages/audio.scm | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
> index 5de0681..d7bdc01 100644
> --- a/gnu/packages/audio.scm
> +++ b/gnu/packages/audio.scm
> @@ -1653,9 +1653,16 @@ software.")
>                       (setenv "LDFLAGS"
>                               (string-append
>                                "-L" (assoc-ref inputs "boost") "/lib "
> -                              "-lboost_system")))))))
> +                              "-lboost_system"))
> +                     ;; Needed for gtkmm
> +                     (substitute* '("src/wscript_build"
> +                                    "examples/wscript_build")
> +                       (("cxxflags.*= \\[" line)
> +                        (string-append line "\"-std=c++11\", ")))
> +                     #t)))))

Is it not possible to pass this through #:make-flags? If not this LGTM,
but would be nice with a comment about why make-flags won't work.

>      (inputs
>       `(("boost" ,boost)
> +       ("gtkmm" ,gtkmm-2)
>         ("lv2" ,lv2)))
>      (native-inputs
>       `(("pkg-config" ,pkg-config)))
> -- 
> 2.10.2

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

Re: [PATCH 1/2] gnu: lvtk: Build UI library.

[Ricardo Wurmus]

Marius Bakke <mbakke@fastmail.com> writes:

> Ricardo Wurmus <rekado@elephly.net> writes:
>
>> * gnu/packages/audio.scm (lvtk)[inputs]: Add gtkmm-2.
>> [arguments]: Pass "-std=c++11" flag.
>> ---
>>  gnu/packages/audio.scm | 9 ++++++++-
>>  1 file changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
>> index 5de0681..d7bdc01 100644
>> --- a/gnu/packages/audio.scm
>> +++ b/gnu/packages/audio.scm
>> @@ -1653,9 +1653,16 @@ software.")
>>                       (setenv "LDFLAGS"
>>                               (string-append
>>                                "-L" (assoc-ref inputs "boost") "/lib "
>> -                              "-lboost_system")))))))
>> +                              "-lboost_system"))
>> +                     ;; Needed for gtkmm
>> +                     (substitute* '("src/wscript_build"
>> +                                    "examples/wscript_build")
>> +                       (("cxxflags.*= \\[" line)
>> +                        (string-append line "\"-std=c++11\", ")))
>> +                     #t)))))
>
> Is it not possible to pass this through #:make-flags? If not this LGTM,
> but would be nice with a comment about why make-flags won't work.

The waf-build-system doesn’t have any support for make-flags.  It flat
out ignores them and only runs “waf build”.  Whenever we want to change
flags in projects using waf we usually need to patch up the wscript(s).

I don’t know if there’s a standard way to amend certain flags.  If there
is we should add it to the waf-build-system.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
http://elephly.net