Merge lp:~zequence/ubuntu/raring/jackd2/fix-for-956438 into lp:ubuntu/raring/jackd2

[Kaj Ailomaa]

Patch included in this commit fixes (LP: #956438).

[Daniel Holbach (dholbach)]

Good work. We might be able to drop the patch when we merge from Debian experimental.

review: Approve

[Daniel Holbach (dholbach)]

I took the liberty to extend the changelog entry a bit.

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-29 17:09:40 +0000
+++ debian/changelog	2012-11-17 13:07:22 +0000
@@ -1,3 +1,9 @@
+jackd2 (1.9.8~dfsg.4+20120529git007cdc37-4.1ubuntu2) raring; urgency=low
+
+  * debian/patches/jackdbus_stop-fix.patch: (LP: #956438)
+
+ -- Kaj Ailomaa <[e-mail]>  Thu, 15 Nov 2012 12:41:09 +0100
+
 jackd2 (1.9.8~dfsg.4+20120529git007cdc37-4.1ubuntu1) raring; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:

=== added file 'debian/patches/jackdbus_stop-fix.patch'
--- debian/patches/jackdbus_stop-fix.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/jackdbus_stop-fix.patch	2012-11-17 13:07:22 +0000
@@ -0,0 +1,109 @@
+## Description: This patch, consisting of two upstream commits, fixes an issue where jackdbus is left unresponsively running in the background when stopped.
+## Origin/Author: upstream https://github.com/jackaudio/jack2/commit/aa02feeacfa533a07f04e916334637b57eaac5a2, https://github.com/jackaudio/jack2/commit/700489b429b0edb7046b169278e3e6751e3e59fc
+## Bug: https://bugs.launchpad.net/ubuntu/+source/jackd2/+bug/956438
+## Applied-Upstream: 1.9.9
+
+Index: jackd2/common/JackLibAPI.cpp
+===================================================================
+--- jackd2.orig/common/JackLibAPI.cpp	2012-11-15 12:39:49.422086000 +0100
++++ jackd2/common/JackLibAPI.cpp	2012-11-15 12:40:43.278938432 +0100
+@@ -177,7 +177,7 @@
+         va_end(ap);
+         JackGlobals::fOpenMutex->Unlock();
+         return res;
+-    } catch(std::bad_alloc& e) {
++    } catch (std::bad_alloc& e) {
+         jack_error("Memory allocation error...");
+         return NULL;
+     } catch (...) {
+Index: jackd2/common/JackLockedEngine.h
+===================================================================
+--- jackd2.orig/common/JackLockedEngine.h	2012-11-15 12:39:49.422086000 +0100
++++ jackd2/common/JackLockedEngine.h	2012-11-15 12:40:47.583938485 +0100
+@@ -41,7 +41,7 @@
+ */
+ 
+ #define CATCH_EXCEPTION_RETURN                      \
+-    } catch(std::bad_alloc& e) {                    \
++    } catch (std::bad_alloc& e) {                    \
+         jack_error("Memory allocation error...");   \
+         return -1;                                  \
+     } catch (...) {                                 \
+@@ -50,10 +50,10 @@
+     }                                               \
+ 
+ #define CATCH_CLOSE_EXCEPTION_RETURN                      \
+-    } catch(std::bad_alloc& e) {                    \
++    } catch (std::bad_alloc& e) {                    \
+         jack_error("Memory allocation error...");   \
+         return -1;                                  \
+-    } catch(JackTemporaryException& e) {                       \
++    } catch (JackTemporaryException& e) {                       \
+         jack_error("JackTemporaryException : now quits...");   \
+         JackTools::KillServer();                     \
+         return 0;                                   \
+@@ -63,7 +63,7 @@
+     }
+ 
+ #define CATCH_EXCEPTION                      \
+-    } catch(std::bad_alloc& e) {                    \
++    } catch (std::bad_alloc& e) {                    \
+         jack_error("Memory allocation error...");   \
+     } catch (...) {                                 \
+         jack_error("Unknown error...");             \
+@@ -327,8 +327,8 @@
+ 
+         void NotifyQuit()
+         {
++            // No lock needed
+             TRY_CALL
+-            JackLock lock(&fEngine);
+             return fEngine.NotifyQuit();
+             CATCH_EXCEPTION
+         }
+Index: jackd2/common/JackServer.cpp
+===================================================================
+--- jackd2.orig/common/JackServer.cpp	2012-11-15 12:39:49.422086000 +0100
++++ jackd2/common/JackServer.cpp	2012-11-15 12:40:43.281938432 +0100
+@@ -134,7 +134,6 @@
+ int JackServer::Close()
+ {
+     jack_log("JackServer::Close");
+-    fEngine->NotifyQuit();
+     fChannel.Close();
+     fAudioDriver->Detach();
+     fAudioDriver->Close();
+@@ -190,6 +189,7 @@
+ int JackServer::Stop()
+ {
+     jack_log("JackServer::Stop");
++    fEngine->NotifyQuit();
+     fChannel.Stop();
+     
+     fEngine->ShutDown();
+Index: jackd2/common/JackServerAPI.cpp
+===================================================================
+--- jackd2.orig/common/JackServerAPI.cpp	2012-11-15 12:39:49.422086000 +0100
++++ jackd2/common/JackServerAPI.cpp	2012-11-15 12:40:43.281938432 +0100
+@@ -162,7 +162,7 @@
+         va_end(ap);
+         JackGlobals::fOpenMutex->Unlock();
+         return res;
+-    } catch(std::bad_alloc& e) {
++    } catch (std::bad_alloc& e) {
+         jack_error("Memory allocation error...");
+         return NULL;
+     } catch (...) {
+Index: jackd2/posix/JackSocketServerChannel.cpp
+===================================================================
+--- jackd2.orig/posix/JackSocketServerChannel.cpp	2012-11-15 12:39:49.422086000 +0100
++++ jackd2/posix/JackSocketServerChannel.cpp	2012-11-15 12:40:43.282938432 +0100
+@@ -97,7 +97,7 @@
+ 
+ void JackSocketServerChannel::Stop()
+ {
+-    fThread.Kill();
++    fThread.Stop();
+ }
+ 
+ void JackSocketServerChannel::ClientCreate()

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-08-03 00:16:40 +0000
+++ debian/patches/series	2012-11-17 13:07:22 +0000
@@ -1,3 +1,4 @@
 no-selfconnect.patch
 jack_control.patch
 fix-as-needed-linking.patch
+jackdbus_stop-fix.patch