Correct build and runtime issues with jackd2

Thanks to Adrian Knoth for the patch.

Closes: #561415, #581276

diff --git a/debian/changelog b/debian/changelog
index 961db88..1d5cfe8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ fmit (0.97.7-3) UNRELEASED; urgency=low
   * Upgrade to "3.0 (quilt)" source format
   * Update debhelper compatibility level to 7 and use dh
   * Update Standards-Version to 3.8.4
+  * Correct build and runtime issues with jackd2.  Thanks to Adrian
+    Knoth for the patch. (Closes: #561415, #581276)
 
  -- John Wright <jsw@debian.org>  Fri, 18 Jan 2008 17:12:25 -0700
 

diff --git a/debian/patches/jackd2.patch b/debian/patches/jackd2.patch
new file mode 100644 (file)
index 0000000..ea60374
--- /dev/null
+++ b/debian/patches/jackd2.patch
@@ -0,0 +1,18 @@
+The use of jack_error_callback in current fmit code is... erm, useless,
+as it just says "Use the default", which is also used if nothing is
+specified.
+
+Patch from Adrian Knoth <adi@drcomp.erfurt.thur.de>.
+
+diff --git a/src/CaptureThread.cpp b/src/CaptureThread.cpp
+index 5c6f86b..6eae124 100644
+--- a/src/CaptureThread.cpp
++++ b/src/CaptureThread.cpp
+@@ -877,7 +877,6 @@ void CaptureThreadImplJACK::capture_init()
+ 
+       jack_set_process_callback(m_jack_client, JackProcess, (void*)this);
+       jack_on_shutdown(m_jack_client, JackShutdown, (void*)this);
+-      jack_set_error_function(jack_error_callback);
+       jack_set_sample_rate_callback(m_jack_client, JackSampleRate, (void*)this);
+ 
+       int err=0;

diff --git a/debian/patches/series b/debian/patches/series
index 0b91d7d..3fdfb3a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 include-cstdlib.patch
+jackd2.patch