[PATCH] Add setBfree.

[PATCH] Add setBfree.

[Ricardo Wurmus]

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

Attached is a patch for an organ emulation.  As I built it I noticed
that ftgl should propagate its input “freetype” as its pkg-config file
contains this line:

    Requires.private: freetype2


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-ftgl-Propagate-freetype.patch --]
[-- Type: text/x-patch, Size: 968 bytes --]

From 00bd892e00e2f8d1261f4fffaf2a9ba31d5961e8 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Thu, 18 Jun 2015 17:36:12 +0200
Subject: [PATCH 1/2] gnu: ftgl: Propagate "freetype".

* gnu/packages/gl.scm (ftgl)[inputs,propagated-inputs]: Move "freetype" from
  "inputs" to "propagated-inputs".
---
 gnu/packages/gl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index d1503e1..a0f12c5 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -120,8 +120,8 @@ the X-Consortium license.")
 	     (sha256
 	      (base32 "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l"))))
     (build-system gnu-build-system)
-    (inputs `(("freetype" ,freetype)
-	      ("libx11" ,libx11)
+    (propagated-inputs `(("freetype" ,freetype)))
+    (inputs `(("libx11" ,libx11)
 	      ("mesa" ,mesa)
 	      ("glu" ,glu)))
     (home-page "http://ftgl.sourceforge.net")
-- 
2.2.1


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

From 0110a38d7c1fcf47ffc5691f97966addd379f50c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Thu, 18 Jun 2015 17:37:47 +0200
Subject: [PATCH 2/2] gnu: Add setBfree.

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

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index b539e59..4360dc1 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -40,7 +40,9 @@
   #:use-module (gnu packages databases)
   #:use-module (gnu packages file)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages fonts)
   #:use-module (gnu packages gettext)
+  #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages gnome)
@@ -48,6 +50,7 @@
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages man)
   #:use-module (gnu packages mp3) ;taglib
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -1200,6 +1203,51 @@ classes) that provide a common cross-platform API for realtime MIDI
 input/output.")
     (license license:expat)))
 
+(define-public setbfree
+  (package
+    (name "setbfree")
+    (version "0.8.0")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append
+                "https://github.com/pantherb/setBfree/releases/download/v"
+                version "/setbfree-" version ".tar.gz"))
+              (sha256
+               (base32
+                "045bgp7qsigpbrhk7qvgvliwiy26sajifwn7f2jvk90ckfqnlw4b"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; no "check" target
+       #:make-flags
+       (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+             (string-append "FONTFILE="
+                            (assoc-ref %build-inputs "font-bitstream-vera")
+                            "/share/fonts/truetype/VeraBd.ttf"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'set-CC-variable
+                     (lambda _ (setenv "CC" "gcc") #t))
+         (delete 'configure))))
+    (inputs
+     `(("jack" ,jack-1)
+       ("lv2" ,lv2)
+       ("zita-convolver" ,zita-convolver)
+       ("glu" ,glu)
+       ("ftgl" ,ftgl)
+       ("font-bitstream-vera" ,font-bitstream-vera)))
+    (native-inputs
+     `(("help2man" ,help2man)
+       ("pkg-config" ,pkg-config)))
+    (home-page "http://setbfree.org")
+    (synopsis "Tonewheel organ")
+    (description
+     "setBfree is a MIDI-controlled, software synthesizer designed to imitate
+the sound and properties of the electromechanical organs and sound
+modification devices that brought world-wide fame to the names and products of
+Laurens Hammond and Don Leslie.")
+    (license license:gpl2+)))
+
 (define-public sratom
   (package
     (name "sratom")
-- 
2.2.1

Re: [PATCH] Add setBfree.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> From 00bd892e00e2f8d1261f4fffaf2a9ba31d5961e8 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> Date: Thu, 18 Jun 2015 17:36:12 +0200
> Subject: [PATCH 1/2] gnu: ftgl: Propagate "freetype".
>
> * gnu/packages/gl.scm (ftgl)[inputs,propagated-inputs]: Move "freetype" from
>   "inputs" to "propagated-inputs".

[...]

> +    (propagated-inputs `(("freetype" ,freetype)))

Please explain the reason (Requires.private) in a comment above.

OK with this change.

> From 0110a38d7c1fcf47ffc5691f97966addd379f50c Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> Date: Thu, 18 Jun 2015 17:37:47 +0200
> Subject: [PATCH 2/2] gnu: Add setBfree.
>
> * gnu/packages/audio.scm (setbfree): New variable.

LGTM!

Perhaps it would be more appropriate to have it in music.scm, no?

Thanks,
Ludo’.

Re: [PATCH] Add setBfree.

[Ricardo Wurmus]

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

>> +    (propagated-inputs `(("freetype" ,freetype)))
>
> Please explain the reason (Requires.private) in a comment above.

Oh, right.

>> From 0110a38d7c1fcf47ffc5691f97966addd379f50c Mon Sep 17 00:00:00 2001
>> From: Ricardo Wurmus <rekado@elephly.net>
>> Date: Thu, 18 Jun 2015 17:37:47 +0200
>> Subject: [PATCH 2/2] gnu: Add setBfree.
>>
>> * gnu/packages/audio.scm (setbfree): New variable.
>
> LGTM!
>
> Perhaps it would be more appropriate to have it in music.scm, no?

I agree.  I’ll perform these changes and then push.

Thanks!

~~ Ricardo