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

[Kaj Ailomaa]

Fixes Bug #956438

[Martin Pitt (pitti)]

I uploaded this to quantal-proposed review queue, with a proper changelog entry. Thank you!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-08-03 00:16:40 +0000
+++ debian/changelog	2013-03-18 17:02:26 +0000
@@ -1,3 +1,9 @@
+jackd2 (1.9.8~dfsg.4+20120529git007cdc37-2ubuntu2) quantal; urgency=low
+
+  * debian/patches/jackdbus-stop-fix.patch: [fixes LP: #956438]
+
+ -- Kaj Ailomaa <[e-mail]>  Mon, 18 Mar 2013 17:05:45 +0100
+
 jackd2 (1.9.8~dfsg.4+20120529git007cdc37-2ubuntu1) quantal; urgency=low
 
   * Merge from Debian, 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	2013-03-18 17:02:26 +0000
@@ -0,0 +1,109 @@
+## Description: This patch, consisting of two upstream git commits, fixes an issue where jackdbus is left unresponsively, running in the background, when attempting to stop it.
+## Origin/Author: upstream https://github.com/jackaudio/jack2/commit/aa02feeacfa533a07f04e916334637b57eaac5a2, https://github.com/jackaudio/jack2/commit/700489b429b0edb7046b169278e3e6751e3$
+## Bug: https://bugs.launchpad.net/ubuntu/+source/jackd2/+bug/956438
+## Applied-Upstream: 1.9.9
+
+Index: jackd2-quantal/common/JackLibAPI.cpp
+===================================================================
+--- jackd2-quantal.orig/common/JackLibAPI.cpp	2013-03-18 15:59:19.310280000 +0100
++++ jackd2-quantal/common/JackLibAPI.cpp	2013-03-18 17:05:39.902013471 +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-quantal/common/JackLockedEngine.h
+===================================================================
+--- jackd2-quantal.orig/common/JackLockedEngine.h	2013-03-18 15:59:19.310280000 +0100
++++ jackd2-quantal/common/JackLockedEngine.h	2013-03-18 17:05:39.903013471 +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-quantal/common/JackServer.cpp
+===================================================================
+--- jackd2-quantal.orig/common/JackServer.cpp	2013-03-18 15:59:19.310280000 +0100
++++ jackd2-quantal/common/JackServer.cpp	2013-03-18 17:05:39.904013471 +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-quantal/common/JackServerAPI.cpp
+===================================================================
+--- jackd2-quantal.orig/common/JackServerAPI.cpp	2013-03-18 15:59:19.310280000 +0100
++++ jackd2-quantal/common/JackServerAPI.cpp	2013-03-18 17:05:39.904013471 +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-quantal/posix/JackSocketServerChannel.cpp
+===================================================================
+--- jackd2-quantal.orig/posix/JackSocketServerChannel.cpp	2013-03-18 15:59:19.310280000 +0100
++++ jackd2-quantal/posix/JackSocketServerChannel.cpp	2013-03-18 17:05:39.905013471 +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	2013-03-18 17:02:26 +0000
@@ -1,3 +1,4 @@
 no-selfconnect.patch
 jack_control.patch
 fix-as-needed-linking.patch
+jackdbus-stop-fix.patch