[PATCH]: jack: propagate libuuid

[PATCH]: jack: propagate libuuid

[Ricardo Wurmus]

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

Attached is a patch to move libuuid (provided by "util-linux") from the
regular inputs of jack-1 to the propagated-inputs, as uuid.h is included
from the JACK headers.

The patch also removes "util-linux" from those inputs depending on
jack-1.  I recompiled all of them and they still built as expected.

~~ Ricardo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-jack-propagate-input-util-linux.patch --]
[-- Type: text/x-patch, Size: 2406 bytes --]

From 4729906c5156a7aeec917cbe1408d08a47369d59 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Tue, 17 Feb 2015 09:45:16 +0100
Subject: [PATCH] gnu: jack: propagate input "util-linux"

* gnu/packages/audio.scm (jack-1): Move input "util-linux" to
  `propagated-inputs'.
* gnu/packages/audio.scm (aubio, ardour, azr3, lash, patchage): Remove
  "util-linux" from `inputs'.
---
 gnu/packages/audio.scm | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index bc62aac..e410eab 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -68,7 +68,6 @@
        #:python ,python-2))
     (inputs
      `(("jack" ,jack-1)
-       ("libuuid" ,util-linux)
        ("libsndfile" ,libsndfile)
        ("libsamplerate" ,libsamplerate)
        ("fftwf" ,fftwf)))
@@ -130,7 +129,6 @@ namespace ARDOUR { const char* revision = \"3.5-403-gec2cb31\" ; }"))))
        ("lv2" ,lv2)
        ("vamp" ,vamp)
        ("curl" ,curl)
-       ("libuuid" ,util-linux)
        ("fftw" ,fftw)
        ("fftwf" ,fftwf)
        ("jack" ,jack-1)
@@ -179,8 +177,7 @@ engineers, musicians, soundtrack editors and composers.")
      `(("gtkmm" ,gtkmm-2)
        ("lvtk" ,lvtk)
        ("jack" ,jack-1)
-       ("lash" ,lash)
-       ("libuuid" ,util-linux)))
+       ("lash" ,lash)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "http://ll-plugins.nongnu.org/azr3/")
@@ -210,8 +207,9 @@ plugins are provided.")
     (inputs
      `(("alsa-lib" ,alsa-lib)
        ("bdb" ,bdb)
-       ("readline" ,readline)
-       ("libuuid" ,util-linux)))
+       ("readline" ,readline)))
+    (propagated-inputs
+     `(("libuuid" ,util-linux)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "http://jackaudio.org/")
@@ -315,7 +313,6 @@ to be plugged into a wide range of audio synthesis and recording packages.")
      `(("bdb" ,bdb)
        ("gtk" ,gtk+-2)
        ("jack" ,jack-1)
-       ("libuuid" ,util-linux)
        ("readline" ,readline)
        ("python" ,python-2)))
     ;; According to pkg-config, packages depending on lash also need to have
@@ -517,7 +514,6 @@ lv2-c++-tools.")
      `(("alsa-lib" ,alsa-lib)
        ("boost" ,boost)
        ("jack" ,jack-1)
-       ("libuuid" ,util-linux)
        ("ganv" ,ganv)
        ("glib" ,glib)
        ("glibmm" ,glibmm)
-- 
2.1.0

Re: [PATCH]: jack: propagate libuuid

[Mark H Weaver]

Ricardo Wurmus <rekado@elephly.net> writes:

> Attached is a patch to move libuuid (provided by "util-linux") from the
> regular inputs of jack-1 to the propagated-inputs, as uuid.h is included
> from the JACK headers.
>
> The patch also removes "util-linux" from those inputs depending on
> jack-1.  I recompiled all of them and they still built as expected.
>
> ~~ Ricardo
>
> From 4729906c5156a7aeec917cbe1408d08a47369d59 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> Date: Tue, 17 Feb 2015 09:45:16 +0100
> Subject: [PATCH] gnu: jack: propagate input "util-linux"
>
> * gnu/packages/audio.scm (jack-1): Move input "util-linux" to
>   `propagated-inputs'.
> * gnu/packages/audio.scm (aubio, ardour, azr3, lash, patchage): Remove
>   "util-linux" from `inputs'.

Can you please split this up into two commits?  The first commit should
just move 'util-linux' into jack-1's propagated-inputs (with a comment
added in the source code explaining why its needed), and the second
commit should remove 'util-linux' from the inputs of the packages that
use jack-1.

Okay to push with these changes.

     Thanks!
       Mark