Ubuntu

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

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

Description of the Change

To post a comment you must log in.
Marc Deslauriers (mdeslaur) wrote :

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!

review: Needs Fixing
17. By Kaj Ailomaa on 2013-03-19

cleaned, by removing .orig files from the jackdbus-stop-fix.patch

Martin Pitt (pitti) wrote :

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

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes: