Ubuntu

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

Proposed by Kaj Ailomaa on 2013-03-18
Status: Merged
Approved by: Martin Pitt on 2013-03-25
Approved revision: 19
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~zequence/ubuntu/quantal/jackd2/fix-for-956438
Merge into: lp:ubuntu/quantal/jackd2
Diff against target: 136 lines (+116/-0) 3 files modified
To merge this branch: bzr merge lp:~zequence/ubuntu/quantal/jackd2/fix-for-956438
Reviewer Review Type Date Requested Status
Martin Pitt 2013-03-18 Approve on 2013-03-25
Review via email: mp+153871@code.launchpad.net

Description of the Change

To post a comment you must log in.
Martin Pitt (pitti) wrote :

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

review: Approve

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2012-08-03 00:16:40 +0000
3+++ debian/changelog 2013-03-18 17:02:26 +0000
4@@ -1,3 +1,9 @@
5+jackd2 (1.9.8~dfsg.4+20120529git007cdc37-2ubuntu2) quantal; urgency=low
6+
7+ * debian/patches/jackdbus-stop-fix.patch: [fixes LP: #956438]
8+
9+ -- Kaj Ailomaa <zequence@mousike.me> Mon, 18 Mar 2013 17:05:45 +0100
10+
11 jackd2 (1.9.8~dfsg.4+20120529git007cdc37-2ubuntu1) quantal; urgency=low
12
13 * Merge from Debian, remaining changes:
14
15=== added file 'debian/patches/jackdbus-stop-fix.patch'
16--- debian/patches/jackdbus-stop-fix.patch 1970-01-01 00:00:00 +0000
17+++ debian/patches/jackdbus-stop-fix.patch 2013-03-18 17:02:26 +0000
18@@ -0,0 +1,109 @@
19+## 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.
20+## Origin/Author: upstream https://github.com/jackaudio/jack2/commit/aa02feeacfa533a07f04e916334637b57eaac5a2, https://github.com/jackaudio/jack2/commit/700489b429b0edb7046b169278e3e6751e3$
21+## Bug: https://bugs.launchpad.net/ubuntu/+source/jackd2/+bug/956438
22+## Applied-Upstream: 1.9.9
23+
24+Index: jackd2-quantal/common/JackLibAPI.cpp
25+===================================================================
26+--- jackd2-quantal.orig/common/JackLibAPI.cpp 2013-03-18 15:59:19.310280000 +0100
27++++ jackd2-quantal/common/JackLibAPI.cpp 2013-03-18 17:05:39.902013471 +0100
28+@@ -177,7 +177,7 @@
29+ va_end(ap);
30+ JackGlobals::fOpenMutex->Unlock();
31+ return res;
32+- } catch(std::bad_alloc& e) {
33++ } catch (std::bad_alloc& e) {
34+ jack_error("Memory allocation error...");
35+ return NULL;
36+ } catch (...) {
37+Index: jackd2-quantal/common/JackLockedEngine.h
38+===================================================================
39+--- jackd2-quantal.orig/common/JackLockedEngine.h 2013-03-18 15:59:19.310280000 +0100
40++++ jackd2-quantal/common/JackLockedEngine.h 2013-03-18 17:05:39.903013471 +0100
41+@@ -41,7 +41,7 @@
42+ */
43+
44+ #define CATCH_EXCEPTION_RETURN \
45+- } catch(std::bad_alloc& e) { \
46++ } catch (std::bad_alloc& e) { \
47+ jack_error("Memory allocation error..."); \
48+ return -1; \
49+ } catch (...) { \
50+@@ -50,10 +50,10 @@
51+ } \
52+
53+ #define CATCH_CLOSE_EXCEPTION_RETURN \
54+- } catch(std::bad_alloc& e) { \
55++ } catch (std::bad_alloc& e) { \
56+ jack_error("Memory allocation error..."); \
57+ return -1; \
58+- } catch(JackTemporaryException& e) { \
59++ } catch (JackTemporaryException& e) { \
60+ jack_error("JackTemporaryException : now quits..."); \
61+ JackTools::KillServer(); \
62+ return 0; \
63+@@ -63,7 +63,7 @@
64+ }
65+
66+ #define CATCH_EXCEPTION \
67+- } catch(std::bad_alloc& e) { \
68++ } catch (std::bad_alloc& e) { \
69+ jack_error("Memory allocation error..."); \
70+ } catch (...) { \
71+ jack_error("Unknown error..."); \
72+@@ -327,8 +327,8 @@
73+
74+ void NotifyQuit()
75+ {
76++ // No lock needed
77+ TRY_CALL
78+- JackLock lock(&fEngine);
79+ return fEngine.NotifyQuit();
80+ CATCH_EXCEPTION
81+ }
82+Index: jackd2-quantal/common/JackServer.cpp
83+===================================================================
84+--- jackd2-quantal.orig/common/JackServer.cpp 2013-03-18 15:59:19.310280000 +0100
85++++ jackd2-quantal/common/JackServer.cpp 2013-03-18 17:05:39.904013471 +0100
86+@@ -134,7 +134,6 @@
87+ int JackServer::Close()
88+ {
89+ jack_log("JackServer::Close");
90+- fEngine->NotifyQuit();
91+ fChannel.Close();
92+ fAudioDriver->Detach();
93+ fAudioDriver->Close();
94+@@ -190,6 +189,7 @@
95+ int JackServer::Stop()
96+ {
97+ jack_log("JackServer::Stop");
98++ fEngine->NotifyQuit();
99+ fChannel.Stop();
100+
101+ fEngine->ShutDown();
102+Index: jackd2-quantal/common/JackServerAPI.cpp
103+===================================================================
104+--- jackd2-quantal.orig/common/JackServerAPI.cpp 2013-03-18 15:59:19.310280000 +0100
105++++ jackd2-quantal/common/JackServerAPI.cpp 2013-03-18 17:05:39.904013471 +0100
106+@@ -162,7 +162,7 @@
107+ va_end(ap);
108+ JackGlobals::fOpenMutex->Unlock();
109+ return res;
110+- } catch(std::bad_alloc& e) {
111++ } catch (std::bad_alloc& e) {
112+ jack_error("Memory allocation error...");
113+ return NULL;
114+ } catch (...) {
115+Index: jackd2-quantal/posix/JackSocketServerChannel.cpp
116+===================================================================
117+--- jackd2-quantal.orig/posix/JackSocketServerChannel.cpp 2013-03-18 15:59:19.310280000 +0100
118++++ jackd2-quantal/posix/JackSocketServerChannel.cpp 2013-03-18 17:05:39.905013471 +0100
119+@@ -97,7 +97,7 @@
120+
121+ void JackSocketServerChannel::Stop()
122+ {
123+- fThread.Kill();
124++ fThread.Stop();
125+ }
126+
127+ void JackSocketServerChannel::ClientCreate()
128
129=== modified file 'debian/patches/series'
130--- debian/patches/series 2012-08-03 00:16:40 +0000
131+++ debian/patches/series 2013-03-18 17:02:26 +0000
132@@ -1,3 +1,4 @@
133 no-selfconnect.patch
134 jack_control.patch
135 fix-as-needed-linking.patch
136+jackdbus-stop-fix.patch

Subscribers

People subscribed via source and target branches

to all changes: