DEB akode: Enable building of JACK sink.

PulseAudio sink is already enabled by default.
Remove an outdated home page link.

Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit a9906f4a86b022394a5ae45b372434cc84308ff0)

8 files changed, 34 insertions, 20 deletions

diff --git a/debian/_base/dependencies/akode/debian/control b/debian/_base/dependencies/akode/debian/control
index b411183de..29b55f8f9 100644
--- a/debian/_base/dependencies/akode/debian/control
+++ b/debian/_base/dependencies/akode/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[email protected]>
 Uploaders: Isaac Clerencia <[email protected]>, Christopher Martin <[email protected]>, Adeodato Simó <[email protected]>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, gawk, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, gawk, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev
 Standards-Version: 3.7.3
 
 Package: libakode2
@@ -19,8 +19,6 @@ Description: akode plugin for aRts
  plugins to play a variety of formats: Ogg Vorbis, Musepack (MPC),
  FLAC and Speex. aKode also focuses on performance, and so it means a
  big enhancement for users runing aRts in non-realtime mode.
- .
- Homepage: http://www.carewolf.com/akode
 
 Package: libakode2-mpeg
 Section: libs
@@ -36,8 +34,6 @@ Description: mpeg plugins for akode
  big enhancement for users runing aRts in non-realtime mode.
  .
  This package provides MP3 and other MPEG formats for akode.
- .
- Homepage: http://www.carewolf.com/akode
 
 Package: libakode2-pulse
 Section: libs
@@ -53,8 +49,21 @@ Description: pulseaudio sink for akode
  big enhancement for users runing aRts in non-realtime mode.
  .
  This package provides PulseAudio sink for akode.
+
+Package: libakode2-jack
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: akode
+Replaces: akode
+Enhances: libarts1c2, libarts1c2a-trinity
+Description: jack sink for akode
+ aKode is a new multithreaded audio library that provides aRts with
+ plugins to play a variety of formats: Ogg Vorbis, Musepack (MPC),
+ FLAC and Speex. aKode also focuses on performance, and so it means a
+ big enhancement for users runing aRts in non-realtime mode.
  .
- Homepage: http://www.carewolf.com/akode
+ This package provides JACK sink for akode.
 
 Package: libakode-dev
 Section: libdevel
@@ -68,8 +77,6 @@ Description: development files for akode
  big enhancement for users runing aRts in non-realtime mode.
  .
  This package contains the development files for libakode.
- .
- Homepage: http://www.carewolf.com/akode
 
 Package: akode-dbg
 Section: libdevel
diff --git a/debian/_base/dependencies/akode/debian/libakode-dev.install b/debian/_base/dependencies/akode/debian/libakode-dev.install
index 573b9c451..e61e3b46b 100644
--- a/debian/_base/dependencies/akode/debian/libakode-dev.install
+++ b/debian/_base/dependencies/akode/debian/libakode-dev.install
@@ -2,6 +2,7 @@ debian/tmp/usr/bin/akode-config
 debian/tmp/usr/lib/libakode.so
 debian/tmp/usr/lib/libakode.la
 debian/tmp/usr/lib/libakode_alsa_sink.la
+debian/tmp/usr/lib/libakode_jack_sink.la
 debian/tmp/usr/lib/libakode_mpc_decoder.la
 debian/tmp/usr/lib/libakode_mpeg_decoder.la
 debian/tmp/usr/lib/libakode_oss_sink.la
diff --git a/debian/_base/dependencies/akode/debian/libakode2-jack.install b/debian/_base/dependencies/akode/debian/libakode2-jack.install
new file mode 100644
index 000000000..937eebe69
--- /dev/null
+++ b/debian/_base/dependencies/akode/debian/libakode2-jack.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libakode_jack_sink.so
diff --git a/debian/_base/dependencies/akode/debian/rules b/debian/_base/dependencies/akode/debian/rules
index 929156f0e..a3ea2722b 100755
--- a/debian/_base/dependencies/akode/debian/rules
+++ b/debian/_base/dependencies/akode/debian/rules
@@ -27,8 +27,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DWITH_ALL_OPTIONS="ON" \
  -DWITH_LIBLTDL="OFF" \
- -DWITH_JACK_SINK="OFF" \
- -DWITH_PULSE_SINK="ON" \
  -DWITH_FFMPEG_DECODER="OFF"
 
 common-install-prehook-arch::
diff --git a/ubuntu/_base/dependencies/akode/debian/control b/ubuntu/_base/dependencies/akode/debian/control
index b411183de..29b55f8f9 100644
--- a/ubuntu/_base/dependencies/akode/debian/control
+++ b/ubuntu/_base/dependencies/akode/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[email protected]>
 Uploaders: Isaac Clerencia <[email protected]>, Christopher Martin <[email protected]>, Adeodato Simó <[email protected]>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, gawk, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, gawk, libflac-dev (>= 1.1.1-3), libflac-dev, libmad0-dev, libogg-dev, libvorbis-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsamplerate0-dev, libspeex-dev, libpulse-dev, libjack-dev
 Standards-Version: 3.7.3
 
 Package: libakode2
@@ -19,8 +19,6 @@ Description: akode plugin for aRts
  plugins to play a variety of formats: Ogg Vorbis, Musepack (MPC),
  FLAC and Speex. aKode also focuses on performance, and so it means a
  big enhancement for users runing aRts in non-realtime mode.
- .
- Homepage: http://www.carewolf.com/akode
 
 Package: libakode2-mpeg
 Section: libs
@@ -36,8 +34,6 @@ Description: mpeg plugins for akode
  big enhancement for users runing aRts in non-realtime mode.
  .
  This package provides MP3 and other MPEG formats for akode.
- .
- Homepage: http://www.carewolf.com/akode
 
 Package: libakode2-pulse
 Section: libs
@@ -53,8 +49,21 @@ Description: pulseaudio sink for akode
  big enhancement for users runing aRts in non-realtime mode.
  .
  This package provides PulseAudio sink for akode.
+
+Package: libakode2-jack
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: akode
+Replaces: akode
+Enhances: libarts1c2, libarts1c2a-trinity
+Description: jack sink for akode
+ aKode is a new multithreaded audio library that provides aRts with
+ plugins to play a variety of formats: Ogg Vorbis, Musepack (MPC),
+ FLAC and Speex. aKode also focuses on performance, and so it means a
+ big enhancement for users runing aRts in non-realtime mode.
  .
- Homepage: http://www.carewolf.com/akode
+ This package provides JACK sink for akode.
 
 Package: libakode-dev
 Section: libdevel
@@ -68,8 +77,6 @@ Description: development files for akode
  big enhancement for users runing aRts in non-realtime mode.
  .
  This package contains the development files for libakode.
- .
- Homepage: http://www.carewolf.com/akode
 
 Package: akode-dbg
 Section: libdevel
diff --git a/ubuntu/_base/dependencies/akode/debian/libakode-dev.install b/ubuntu/_base/dependencies/akode/debian/libakode-dev.install
index 573b9c451..e61e3b46b 100644
--- a/ubuntu/_base/dependencies/akode/debian/libakode-dev.install
+++ b/ubuntu/_base/dependencies/akode/debian/libakode-dev.install
@@ -2,6 +2,7 @@ debian/tmp/usr/bin/akode-config
 debian/tmp/usr/lib/libakode.so
 debian/tmp/usr/lib/libakode.la
 debian/tmp/usr/lib/libakode_alsa_sink.la
+debian/tmp/usr/lib/libakode_jack_sink.la
 debian/tmp/usr/lib/libakode_mpc_decoder.la
 debian/tmp/usr/lib/libakode_mpeg_decoder.la
 debian/tmp/usr/lib/libakode_oss_sink.la
diff --git a/ubuntu/_base/dependencies/akode/debian/libakode2-jack.install b/ubuntu/_base/dependencies/akode/debian/libakode2-jack.install
new file mode 100644
index 000000000..937eebe69
--- /dev/null
+++ b/ubuntu/_base/dependencies/akode/debian/libakode2-jack.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libakode_jack_sink.so
diff --git a/ubuntu/_base/dependencies/akode/debian/rules b/ubuntu/_base/dependencies/akode/debian/rules
index 929156f0e..a3ea2722b 100755
--- a/ubuntu/_base/dependencies/akode/debian/rules
+++ b/ubuntu/_base/dependencies/akode/debian/rules
@@ -27,8 +27,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DWITH_ALL_OPTIONS="ON" \
  -DWITH_LIBLTDL="OFF" \
- -DWITH_JACK_SINK="OFF" \
- -DWITH_PULSE_SINK="ON" \
  -DWITH_FFMPEG_DECODER="OFF"
 
 common-install-prehook-arch::