[PATCH] Replace jack-2 with jack-1.

[Ricardo Wurmus]

Attached are patches to replace “jack-2” with “jack-1”.

None of the packages actually requires “jack-2”.  Both implement the
same API, but are separate implementations (“jack-2” is not more mature
or more recent than “jack-1”).

“jack-2” *additionally* supports dbus activation, but that’s something
that has no effect on the packages that had “jack-2” listed as an input.
My recommendation is to only use “jack-1” as an input to packages that
have JACK support.  Users can install “jack-2” into their profiles, if
they want dbus support — it will work with packages that are built
with “jack-1”, as there is no API difference.

There’s also one patch to add a ‘file-name’ filed to rsound.

>From dd40b5d3d15df58ac55dafb5652fc2948ba57157 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Thu, 27 Aug 2015 10:07:40 +0200
Subject: [PATCH 1/5] gnu: rsound: Replace "jack-2" with "jack-1".

* gnu/packages/audio.scm (rsound)[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 1537f33..b2db496 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1694,7 +1694,7 @@ synthesizer written in C++.")
     (build-system gnu-build-system)
     (inputs
      `(("alsa-lib" ,alsa-lib)
-       ("jack" ,jack-2)
+       ("jack" ,jack-1)
        ("ao" ,ao)
        ("libsamplerate" ,libsamplerate)
        ("openal" ,openal)
-- 
2.4.3

>From 7b776ce0e0ecfd56619b33f0f4045780eb95f31e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Thu, 27 Aug 2015 10:08:34 +0200
Subject: [PATCH 2/5] gnu: rsound: Add file-name field to source origin.

* gnu/packages/audio.scm (rsound)[source]: Add 'file-name' field.
---
 gnu/packages/audio.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index b2db496..f7a1b26 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1689,6 +1689,7 @@ synthesizer written in C++.")
        (method url-fetch)
        (uri (string-append "https://github.com/Themaister/RSound/archive/v";
                            version ".tar.gz"))
+       (file-name (string-append name "-" version))
        (sha256
         (base32 "1wzs40c0k5zpkmm5ffl6c17xmr399sxli7ys0fbb9ib0fd334knx"))))
     (build-system gnu-build-system)
-- 
2.4.3

>From 5d545788ac821afc7c2ffb4003446d80ee35e591 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Thu, 27 Aug 2015 10:10:06 +0200
Subject: [PATCH 3/5] gnu: audacity: Replace "jack-2" with "jack-1".

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

diff --git a/gnu/packages/audacity.scm b/gnu/packages/audacity.scm
index 4f7bc68..53cc2a4 100644
--- a/gnu/packages/audacity.scm
+++ b/gnu/packages/audacity.scm
@@ -55,7 +55,7 @@
      `(("wxwidgets" ,wxwidgets-2)
        ("gtk" ,gtk+-2)
        ("alsa-lib" ,alsa-lib)
-       ("jack" ,jack-2)
+       ("jack" ,jack-1)
        ("expat" ,expat)
        ("ffmpeg" ,ffmpeg)
        ("lame" ,lame)
-- 
2.4.3

>From ed1b4459fed01bc14055ae050e635261960aef64 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Thu, 27 Aug 2015 10:11:15 +0200
Subject: [PATCH 4/5] gnu: gst-plugins-good: Replace "jack-2" with "jack-1".

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

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 717388b..920da6c 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -203,7 +203,7 @@ for the GStreamer multimedia library.")
        ("flac" ,flac)
        ("gdk-pixbuf" ,gdk-pixbuf)
        ("gst-plugins-base" ,gst-plugins-base)
-       ("jack" ,jack-2)
+       ("jack" ,jack-1)
        ("libavc1394" ,libavc1394)
        ("libcaca" ,libcaca)
        ("libdv" ,libdv)
-- 
2.4.3

>From 8d27263bede46ea4fada9c3870c900a730f185dc Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Thu, 27 Aug 2015 10:13:54 +0200
Subject: [PATCH 5/5] gnu: mpv: Replace "jack-2" with "jack-1".

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

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 79119ef..c1101cb 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -692,7 +692,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
      `(("alsa-lib" ,alsa-lib)
        ("enca" ,enca)
        ("ffmpeg" ,ffmpeg)
-       ("jack" ,jack-2)
+       ("jack" ,jack-1)
        ("ladspa" ,ladspa)
        ("lcms" ,lcms)
        ("libass" ,libass)
-- 
2.4.3