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

[Kaj Ailomaa]

Fixes Bug #956438

[Marc Deslauriers (mdeslaur)]

NACK on the merge request. Your patch included a bunch of unwanted changes, such as adding "JackLibAPI.cpp.orig", "JackLockedEngine.h.orig", etc.

Please correct the patch, and submit again. Thanks!

[Martin Pitt (pitti)]

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

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-10 18:50:04 +0000
+++ debian/changelog	2013-03-19 13:31:27 +0000
@@ -1,3 +1,10 @@
+jackd2 (1.9.8~dfsg.1-1ubuntu2) precise; urgency=low
+
+  * debian/patches/jackdbus-stop-fix.patch: [fixes LP: #956438]
+  * cleaned, by removing .orig files from the jackdbus-stop-fix.patch
+
+ -- Kaj Ailomaa <[e-mail]>  Mon, 18 Mar 2013 16:25:32 +0100
+
 jackd2 (1.9.8~dfsg.1-1ubuntu1) precise; urgency=low
 
   * Merge from debian unstable (LP: #911342), 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-19 13:31:27 +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-precise/common/JackLibAPI.cpp
+===================================================================
+--- jackd2-precise.orig/common/JackLibAPI.cpp	2013-03-19 13:42:35.260148000 +0100
++++ jackd2-precise/common/JackLibAPI.cpp	2013-03-19 13:45:41.940247408 +0100
+@@ -178,7 +178,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-precise/common/JackLockedEngine.h
+===================================================================
+--- jackd2-precise.orig/common/JackLockedEngine.h	2013-03-19 13:42:35.260148000 +0100
++++ jackd2-precise/common/JackLockedEngine.h	2013-03-19 13:45:41.941247408 +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...");             \
+@@ -319,8 +319,8 @@
+ 
+         void NotifyQuit()
+         {
++            // No lock needed
+             TRY_CALL
+-            JackLock lock(&fEngine);
+             return fEngine.NotifyQuit();
+             CATCH_EXCEPTION
+         }
+Index: jackd2-precise/common/JackServer.cpp
+===================================================================
+--- jackd2-precise.orig/common/JackServer.cpp	2013-03-19 13:42:35.260148000 +0100
++++ jackd2-precise/common/JackServer.cpp	2013-03-19 13:45:41.942247408 +0100
+@@ -132,7 +132,6 @@
+ int JackServer::Close()
+ {
+     jack_log("JackServer::Close");
+-    fEngine->NotifyQuit();
+     fChannel.Close();
+     fAudioDriver->Detach();
+     fAudioDriver->Close();
+@@ -187,6 +186,7 @@
+ int JackServer::Stop()
+ {
+     jack_log("JackServer::Stop");
++    fEngine->NotifyQuit();
+     fChannel.Stop();
+ 
+     if (fFreewheel) {
+Index: jackd2-precise/common/JackServerAPI.cpp
+===================================================================
+--- jackd2-precise.orig/common/JackServerAPI.cpp	2013-03-19 13:42:35.260148000 +0100
++++ jackd2-precise/common/JackServerAPI.cpp	2013-03-19 13:45:41.943247408 +0100
+@@ -167,7 +167,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-precise/posix/JackSocketServerChannel.cpp
+===================================================================
+--- jackd2-precise.orig/posix/JackSocketServerChannel.cpp	2013-03-19 13:42:35.260148000 +0100
++++ jackd2-precise/posix/JackSocketServerChannel.cpp	2013-03-19 13:45:41.944247408 +0100
+@@ -91,7 +91,7 @@
+ 
+ void JackSocketServerChannel::Stop()
+ {
+-    fThread.Kill();
++    fThread.Stop();
+ }
+ 
+ void JackSocketServerChannel::ClientCreate()

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-02-10 18:50:04 +0000
+++ debian/patches/series	2013-03-19 13:31:27 +0000
@@ -2,3 +2,4 @@
 hurd.patch
 no-selfconnect.patch
 netjack-kfreebsd.patch
+jackdbus-stop-fix.patch