[PATCH] Propagate input for JACK; fix portaudio JACK-support

[Ricardo Wurmus <rekado@elephly.net>]

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

Hi Guix,

while packaging Extempora I noticed that the portaudio does not seem to
work with JACK.  Extempora uses portaudio and it would not create a JACK
port.

After I rebuilt portaudio with “jack-1” rather than “jack-2” Extempora
would create a JACK port via portaudio successfully.  “jack-1” had to be
modified to propagate “bdb” because the libjack headers include it.

Attached are these two patches.

In general I would suggest only to use “jack-1” as an input.  “jack-2”
is a different implementation, but it does not replace “jack-1”.
For a user it may make sense to install “jack-2” because of DBus
support, but for libraries it should not be needed.

~~ Ricardo


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

From 579dcf04e35a093ca6bb97efff5aaec19053c080 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 18 Jul 2015 22:07:45 +0200
Subject: [PATCH 1/2] gnu: jack-1: Propagate "bdb".

* gnu/packages/audio.scm (jack-1)[inputs]: Move "bdb" from here...
   [propagated-inputs]: ...to here.
---
 gnu/packages/audio.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index ff6fb46..0fa506b 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -667,11 +667,12 @@ especially for creating reverb effects.  It supports impulse responses with 1,
     (build-system gnu-build-system)
     (inputs
      `(("alsa-lib" ,alsa-lib)
-       ("bdb" ,bdb)
        ("readline" ,readline)))
     ;; uuid.h is included in the JACK type headers
+    ;; db.h is included in the libjack metadata headers
     (propagated-inputs
-     `(("libuuid" ,util-linux)))
+     `(("libuuid" ,util-linux)
+       ("bdb" ,bdb)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "http://jackaudio.org/")
-- 
2.4.3


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-portaudio-Build-with-jack-1.patch --]
[-- Type: text/x-patch, Size: 778 bytes --]

From 4238c7742fef8e7786569beefe79ca9188b50e8e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sat, 18 Jul 2015 22:09:13 +0200
Subject: [PATCH 2/2] gnu: portaudio: Build with jack-1.

* gnu/packages/audio.scm (portaudio)[inputs]: Replace "jack-2" with "jack-1".
---
 gnu/packages/audio.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 0fa506b..c8fcab1 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1583,7 +1583,7 @@ portions of LAME.")
     (inputs
      ;; TODO: Add ASIHPI.
      `(("alsa-lib" ,alsa-lib)
-       ("jack" ,jack-2)))
+       ("jack" ,jack-1)))
     (native-inputs
      `(("autoconf" ,autoconf)
        ("automake" ,automake)
-- 
2.4.3