Merge lp:~crimsun/pulseaudio/karmic into lp:~ubuntu-core-dev/pulseaudio/ubuntu

Proposed by Daniel T Chen on 2009-10-23
Status: Merged
Merged at revision: not available
Proposed branch: lp:~crimsun/pulseaudio/karmic
Merge into: lp:~ubuntu-core-dev/pulseaudio/ubuntu
Diff against target: 215 lines
5 files modified
debian/01PulseAudio (+14/-22)
debian/changelog (+9/-0)
debian/patches/0053-fix-sigsegv-module-bluetooth-device.patch (+0/-28)
debian/patches/0055-backport-alsa-bt-position-fixes-b3592a1.patch (+17/-17)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~crimsun/pulseaudio/karmic
Reviewer Review Type Date Requested Status
Luke Yelavich 2009-10-23 Approve on 2009-10-24
Review via email: mp+13830@code.launchpad.net
To post a comment you must log in.
Daniel T Chen (crimsun) wrote :

For Karmic, based on discussions with Lennart, revert the currently applied patch for LP: #437293 until we fix pa_bluetooth_discovery_get_by_address() and pa_bluetooth_discovery_get_by_path().

This merge request also contains a quilt refresh of 0055-backport-alsa-bt-position-fixes-b3592a1.patch that does not alter its effects in any fashion.

Finally, this merge request also fixes bashisms in the pm-utils script pointed out by Jacob Winther in LP: #450461.

lp:~crimsun/pulseaudio/karmic updated on 2009-10-23
214. By Daniel T Chen <crimsun@errno> on 2009-10-23

Make the pm-utils script actually work with sudo -H -u

215. By Daniel T Chen <crimsun@errno> on 2009-10-23

debian/01PulseAudio: Fix bashisms, and make suspend/resume actually
work with sudo -H -u (LP: #432096, #450461).

Luke Yelavich (themuso) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/01PulseAudio'
2--- debian/01PulseAudio 2009-08-20 02:25:00 +0000
3+++ debian/01PulseAudio 2009-10-23 22:43:09 +0000
4@@ -6,35 +6,27 @@
5 ps -C pulseaudio -o uid= | tr -d ' '
6 }
7
8-get_pulse_sinks() {
9- echo list-sinks | pacmd | awk '/\* index:/ {print $3}'
10-}
11-
12-get_pulse_sources() {
13- echo list-sources | pacmd | awk '/\* index:/ {print $3}'
14-}
15-
16 suspend_pulse() {
17 for i in $(get_pulse_users); do
18- for j in $(get_pulse_sinks); do
19- echo set-sink-mute $j true | sudo -H -u \#$i pacmd &> /dev/null
20- done
21- for j in $(get_pulse_sources); do
22- echo set-source-mute $j true | sudo -H -u \#$i pacmd &> /dev/null
23- done
24- echo suspend true | sudo -H -u \#$i pacmd &> /dev/null
25+ for j in $(echo list-sinks | sudo -H -u \#$i pacmd | awk '/\* index:/ {print $3}'); do
26+ echo set-sink-mute $j true | sudo -H -u \#$i pacmd > /dev/null 2>&1
27+ done
28+ for j in $(echo list-sources | sudo -H -u \#$i pacmd | awk '/\* index:/ {print $3}'); do
29+ echo set-source-mute $j true | sudo -H -u \#$i pacmd > /dev/null 2>&1
30+ done
31+ echo suspend true | sudo -H -u \#$i pacmd > /dev/null 2>&1
32 done
33 }
34
35 resume_pulse() {
36 for i in $(get_pulse_users); do
37- for j in $(get_pulse_sinks); do
38- echo set-sink-mute $j false | sudo -H -u \#$i pacmd &> /dev/null
39- done
40- for j in $(get_pulse_sources); do
41- echo set-source-mute $j false | sudo -H -u \#$i pacmd &> /dev/null
42- done
43- echo suspend false | sudo -H -u \#$i pacmd &> /dev/null
44+ for j in $(echo list-sinks | sudo -H -u \#$i pacmd | awk '/\* index:/ {print $3}'); do
45+ echo set-sink-mute $j false | sudo -H -u \#$i pacmd > /dev/null 2>&1
46+ done
47+ for j in $(echo list-sources | sudo -H -u \#$i pacmd | awk '/\* index:/ {print $3}'); do
48+ echo set-source-mute $j false | sudo -H -u \#$i pacmd > /dev/null 2>&1
49+ done
50+ echo suspend false | sudo -H -u \#$i pacmd > /dev/null 2>&1
51 done
52 }
53
54
55=== modified file 'debian/changelog'
56--- debian/changelog 2009-10-15 23:14:00 +0000
57+++ debian/changelog 2009-10-23 22:43:09 +0000
58@@ -1,3 +1,12 @@
59+pulseaudio (1:0.9.19-0ubuntu4) UNRELEASED; urgency=low
60+
61+ * Remove 0053-fix-sigsegv-module-bluetooth-device.patch, as it did
62+ more harm than good (reopens LP #437293).
63+ * debian/01PulseAudio: Fix bashisms, and make suspend/resume actually
64+ work with sudo -H -u (LP: #432096, #450461).
65+
66+ -- Daniel T Chen <crimsun@ubuntu.com> Tue, 20 Oct 2009 10:29:04 -0400
67+
68 pulseaudio (1:0.9.19-0ubuntu3) karmic; urgency=low
69
70 [ Tony Espy ]
71
72=== removed file 'debian/patches/0053-fix-sigsegv-module-bluetooth-device.patch'
73--- debian/patches/0053-fix-sigsegv-module-bluetooth-device.patch 2009-09-29 04:04:22 +0000
74+++ debian/patches/0053-fix-sigsegv-module-bluetooth-device.patch 1970-01-01 00:00:00 +0000
75@@ -1,28 +0,0 @@
76-Index: pulseaudio-0.9.18/src/modules/bluetooth/module-bluetooth-device.c
77-===================================================================
78---- pulseaudio-0.9.18.orig/src/modules/bluetooth/module-bluetooth-device.c 2009-09-28 23:34:55.000000000 -0400
79-+++ pulseaudio-0.9.18/src/modules/bluetooth/module-bluetooth-device.c 2009-09-28 23:58:25.000000000 -0400
80-@@ -2265,6 +2265,7 @@
81-
82- /* Run from main thread */
83- static const pa_bluetooth_device* find_device(struct userdata *u, const char *address, const char *path) {
84-+ char *t = NULL;
85- const pa_bluetooth_device *d = NULL;
86-
87- pa_assert(u);
88-@@ -2280,10 +2281,13 @@
89- return NULL;
90- }
91-
92-- if (address && !(pa_streq(d->address, address))) {
93-- pa_log_error("Passed path %s and address %s don't match.", path, address);
94-+ t = pa_sprintf_malloc("%s", address);
95-+ if (t && !(pa_streq(d->address, t))) {
96-+ pa_log_error("Passed path %s and address %s don't match.", path, t);
97-+ pa_xfree(t);
98- return NULL;
99- }
100-+ pa_xfree(t);
101-
102- } else {
103- if (!(d = pa_bluetooth_discovery_get_by_address(u->discovery, address))) {
104
105=== modified file 'debian/patches/0055-backport-alsa-bt-position-fixes-b3592a1.patch'
106--- debian/patches/0055-backport-alsa-bt-position-fixes-b3592a1.patch 2009-10-06 22:41:20 +0000
107+++ debian/patches/0055-backport-alsa-bt-position-fixes-b3592a1.patch 2009-10-23 22:43:09 +0000
108@@ -1,7 +1,7 @@
109 Index: pulseaudio-0.9.19/src/modules/alsa/alsa-sink.c
110 ===================================================================
111---- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-sink.c 2009-10-06 18:09:54.000000000 -0400
112-+++ pulseaudio-0.9.19/src/modules/alsa/alsa-sink.c 2009-10-06 18:36:10.000000000 -0400
113+--- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-sink.c 2009-10-20 10:10:07.000000000 -0400
114++++ pulseaudio-0.9.19/src/modules/alsa/alsa-sink.c 2009-10-20 10:10:15.000000000 -0400
115 @@ -927,7 +927,7 @@
116
117 pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);
118@@ -13,8 +13,8 @@
119 }
120 Index: pulseaudio-0.9.19/src/modules/alsa/alsa-source.c
121 ===================================================================
122---- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-source.c 2009-10-06 18:09:54.000000000 -0400
123-+++ pulseaudio-0.9.19/src/modules/alsa/alsa-source.c 2009-10-06 18:36:10.000000000 -0400
124+--- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-source.c 2009-10-20 10:10:07.000000000 -0400
125++++ pulseaudio-0.9.19/src/modules/alsa/alsa-source.c 2009-10-20 10:10:15.000000000 -0400
126 @@ -877,7 +877,7 @@
127
128 pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);
129@@ -26,8 +26,8 @@
130 }
131 Index: pulseaudio-0.9.19/src/modules/alsa/alsa-util.c
132 ===================================================================
133---- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-util.c 2009-10-06 18:09:54.000000000 -0400
134-+++ pulseaudio-0.9.19/src/modules/alsa/alsa-util.c 2009-10-06 18:36:10.000000000 -0400
135+--- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-util.c 2009-10-20 10:10:07.000000000 -0400
136++++ pulseaudio-0.9.19/src/modules/alsa/alsa-util.c 2009-10-20 10:10:15.000000000 -0400
137 @@ -403,7 +403,7 @@
138 return ret;
139 }
140@@ -48,8 +48,8 @@
141 }
142 Index: pulseaudio-0.9.19/src/modules/alsa/alsa-util.h
143 ===================================================================
144---- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-util.h 2009-10-06 18:09:54.000000000 -0400
145-+++ pulseaudio-0.9.19/src/modules/alsa/alsa-util.h 2009-10-06 18:36:10.000000000 -0400
146+--- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-util.h 2009-10-20 10:10:07.000000000 -0400
147++++ pulseaudio-0.9.19/src/modules/alsa/alsa-util.h 2009-10-20 10:10:15.000000000 -0400
148 @@ -51,7 +51,8 @@
149
150 int pa_alsa_set_sw_params(
151@@ -62,8 +62,8 @@
152 snd_pcm_t *pa_alsa_open_by_device_id_auto(
153 Index: pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-device.c
154 ===================================================================
155---- pulseaudio-0.9.19.orig/src/modules/bluetooth/module-bluetooth-device.c 2009-10-06 18:36:10.000000000 -0400
156-+++ pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-device.c 2009-10-06 18:36:10.000000000 -0400
157+--- pulseaudio-0.9.19.orig/src/modules/bluetooth/module-bluetooth-device.c 2009-10-20 10:10:07.000000000 -0400
158++++ pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-device.c 2009-10-20 10:10:15.000000000 -0400
159 @@ -74,7 +74,8 @@
160 "profile=<a2dp|hsp> "
161 "rate=<sample rate> "
162@@ -99,7 +99,7 @@
163
164 if (service_send(u, &msg.getcaps_req.h) < 0)
165 return -1;
166-@@ -2367,6 +2370,12 @@
167+@@ -2363,6 +2366,12 @@
168 goto fail;
169 }
170
171@@ -114,8 +114,8 @@
172 channels <= 0 || channels > PA_CHANNELS_MAX) {
173 Index: pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-discover.c
174 ===================================================================
175---- pulseaudio-0.9.19.orig/src/modules/bluetooth/module-bluetooth-discover.c 2009-10-06 18:09:54.000000000 -0400
176-+++ pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-discover.c 2009-10-06 18:36:10.000000000 -0400
177+--- pulseaudio-0.9.19.orig/src/modules/bluetooth/module-bluetooth-discover.c 2009-10-20 10:10:07.000000000 -0400
178++++ pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-discover.c 2009-10-20 10:10:15.000000000 -0400
179 @@ -117,7 +117,7 @@
180 #endif
181
182@@ -127,8 +127,8 @@
183 m = pa_module_load(u->module->core, "module-bluetooth-device", args);
184 Index: pulseaudio-0.9.19/src/modules/module-loopback.c
185 ===================================================================
186---- pulseaudio-0.9.19.orig/src/modules/module-loopback.c 2009-10-06 18:09:54.000000000 -0400
187-+++ pulseaudio-0.9.19/src/modules/module-loopback.c 2009-10-06 18:36:10.000000000 -0400
188+--- pulseaudio-0.9.19.orig/src/modules/module-loopback.c 2009-10-20 10:10:07.000000000 -0400
189++++ pulseaudio-0.9.19/src/modules/module-loopback.c 2009-10-20 10:10:15.000000000 -0400
190 @@ -102,7 +102,7 @@
191 static const char* const valid_modargs[] = {
192 "source",
193@@ -140,8 +140,8 @@
194 "channels",
195 Index: pulseaudio-0.9.19/src/modules/module-position-event-sounds.c
196 ===================================================================
197---- pulseaudio-0.9.19.orig/src/modules/module-position-event-sounds.c 2009-10-06 18:38:07.000000000 -0400
198-+++ pulseaudio-0.9.19/src/modules/module-position-event-sounds.c 2009-10-06 18:38:17.000000000 -0400
199+--- pulseaudio-0.9.19.orig/src/modules/module-position-event-sounds.c 2009-10-20 10:10:07.000000000 -0400
200++++ pulseaudio-0.9.19/src/modules/module-position-event-sounds.c 2009-10-20 10:10:15.000000000 -0400
201 @@ -74,7 +74,7 @@
202 }
203
204
205=== modified file 'debian/patches/series'
206--- debian/patches/series 2009-10-15 22:47:46 +0000
207+++ debian/patches/series 2009-10-23 22:43:09 +0000
208@@ -10,7 +10,6 @@
209 0054-mute-iec958-optical-raw-for-audigyX.patch
210 0090-disable-flat-volumes.patch
211 0052-revert-sse2-optimize.patch
212-0053-fix-sigsegv-module-bluetooth-device.patch
213 0091-dont-load-cork-music-on-phone.patch
214 0055-backport-alsa-bt-position-fixes-b3592a1.patch
215 0056-ignore-sound-class-modem.patch

Subscribers

People subscribed via source and target branches

to all changes: