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

Proposed by Daniel T Chen
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 (community) Approve
Review via email: mp+13830@code.launchpad.net
To post a comment you must log in.
Revision history for this message
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
214. By Daniel T Chen <crimsun@errno>

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

215. By Daniel T Chen <crimsun@errno>

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

Revision history for this message
Luke Yelavich (themuso) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/01PulseAudio'
--- debian/01PulseAudio 2009-08-20 02:25:00 +0000
+++ debian/01PulseAudio 2009-10-23 22:43:09 +0000
@@ -6,35 +6,27 @@
6 ps -C pulseaudio -o uid= | tr -d ' '6 ps -C pulseaudio -o uid= | tr -d ' '
7}7}
88
9get_pulse_sinks() {
10 echo list-sinks | pacmd | awk '/\* index:/ {print $3}'
11}
12
13get_pulse_sources() {
14 echo list-sources | pacmd | awk '/\* index:/ {print $3}'
15}
16
17suspend_pulse() {9suspend_pulse() {
18 for i in $(get_pulse_users); do10 for i in $(get_pulse_users); do
19 for j in $(get_pulse_sinks); do11 for j in $(echo list-sinks | sudo -H -u \#$i pacmd | awk '/\* index:/ {print $3}'); do
20 echo set-sink-mute $j true | sudo -H -u \#$i pacmd &> /dev/null12 echo set-sink-mute $j true | sudo -H -u \#$i pacmd > /dev/null 2>&1
21 done13 done
22 for j in $(get_pulse_sources); do14 for j in $(echo list-sources | sudo -H -u \#$i pacmd | awk '/\* index:/ {print $3}'); do
23 echo set-source-mute $j true | sudo -H -u \#$i pacmd &> /dev/null15 echo set-source-mute $j true | sudo -H -u \#$i pacmd > /dev/null 2>&1
24 done16 done
25 echo suspend true | sudo -H -u \#$i pacmd &> /dev/null17 echo suspend true | sudo -H -u \#$i pacmd > /dev/null 2>&1
26 done18 done
27}19}
2820
29resume_pulse() {21resume_pulse() {
30 for i in $(get_pulse_users); do22 for i in $(get_pulse_users); do
31 for j in $(get_pulse_sinks); do23 for j in $(echo list-sinks | sudo -H -u \#$i pacmd | awk '/\* index:/ {print $3}'); do
32 echo set-sink-mute $j false | sudo -H -u \#$i pacmd &> /dev/null24 echo set-sink-mute $j false | sudo -H -u \#$i pacmd > /dev/null 2>&1
33 done25 done
34 for j in $(get_pulse_sources); do26 for j in $(echo list-sources | sudo -H -u \#$i pacmd | awk '/\* index:/ {print $3}'); do
35 echo set-source-mute $j false | sudo -H -u \#$i pacmd &> /dev/null27 echo set-source-mute $j false | sudo -H -u \#$i pacmd > /dev/null 2>&1
36 done28 done
37 echo suspend false | sudo -H -u \#$i pacmd &> /dev/null29 echo suspend false | sudo -H -u \#$i pacmd > /dev/null 2>&1
38 done30 done
39}31}
4032
4133
=== modified file 'debian/changelog'
--- debian/changelog 2009-10-15 23:14:00 +0000
+++ debian/changelog 2009-10-23 22:43:09 +0000
@@ -1,3 +1,12 @@
1pulseaudio (1:0.9.19-0ubuntu4) UNRELEASED; urgency=low
2
3 * Remove 0053-fix-sigsegv-module-bluetooth-device.patch, as it did
4 more harm than good (reopens LP #437293).
5 * debian/01PulseAudio: Fix bashisms, and make suspend/resume actually
6 work with sudo -H -u (LP: #432096, #450461).
7
8 -- Daniel T Chen <crimsun@ubuntu.com> Tue, 20 Oct 2009 10:29:04 -0400
9
1pulseaudio (1:0.9.19-0ubuntu3) karmic; urgency=low10pulseaudio (1:0.9.19-0ubuntu3) karmic; urgency=low
211
3 [ Tony Espy ]12 [ Tony Espy ]
413
=== removed file 'debian/patches/0053-fix-sigsegv-module-bluetooth-device.patch'
--- debian/patches/0053-fix-sigsegv-module-bluetooth-device.patch 2009-09-29 04:04:22 +0000
+++ debian/patches/0053-fix-sigsegv-module-bluetooth-device.patch 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
1Index: pulseaudio-0.9.18/src/modules/bluetooth/module-bluetooth-device.c
2===================================================================
3--- pulseaudio-0.9.18.orig/src/modules/bluetooth/module-bluetooth-device.c 2009-09-28 23:34:55.000000000 -0400
4+++ pulseaudio-0.9.18/src/modules/bluetooth/module-bluetooth-device.c 2009-09-28 23:58:25.000000000 -0400
5@@ -2265,6 +2265,7 @@
6
7 /* Run from main thread */
8 static const pa_bluetooth_device* find_device(struct userdata *u, const char *address, const char *path) {
9+ char *t = NULL;
10 const pa_bluetooth_device *d = NULL;
11
12 pa_assert(u);
13@@ -2280,10 +2281,13 @@
14 return NULL;
15 }
16
17- if (address && !(pa_streq(d->address, address))) {
18- pa_log_error("Passed path %s and address %s don't match.", path, address);
19+ t = pa_sprintf_malloc("%s", address);
20+ if (t && !(pa_streq(d->address, t))) {
21+ pa_log_error("Passed path %s and address %s don't match.", path, t);
22+ pa_xfree(t);
23 return NULL;
24 }
25+ pa_xfree(t);
26
27 } else {
28 if (!(d = pa_bluetooth_discovery_get_by_address(u->discovery, address))) {
290
=== modified file 'debian/patches/0055-backport-alsa-bt-position-fixes-b3592a1.patch'
--- debian/patches/0055-backport-alsa-bt-position-fixes-b3592a1.patch 2009-10-06 22:41:20 +0000
+++ debian/patches/0055-backport-alsa-bt-position-fixes-b3592a1.patch 2009-10-23 22:43:09 +0000
@@ -1,7 +1,7 @@
1Index: pulseaudio-0.9.19/src/modules/alsa/alsa-sink.c1Index: pulseaudio-0.9.19/src/modules/alsa/alsa-sink.c
2===================================================================2===================================================================
3--- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-sink.c 2009-10-06 18:09:54.000000000 -04003--- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-sink.c 2009-10-20 10:10:07.000000000 -0400
4+++ pulseaudio-0.9.19/src/modules/alsa/alsa-sink.c 2009-10-06 18:36:10.000000000 -04004+++ pulseaudio-0.9.19/src/modules/alsa/alsa-sink.c 2009-10-20 10:10:15.000000000 -0400
5@@ -927,7 +927,7 @@5@@ -927,7 +927,7 @@
6 6
7 pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);7 pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);
@@ -13,8 +13,8 @@
13 }13 }
14Index: pulseaudio-0.9.19/src/modules/alsa/alsa-source.c14Index: pulseaudio-0.9.19/src/modules/alsa/alsa-source.c
15===================================================================15===================================================================
16--- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-source.c 2009-10-06 18:09:54.000000000 -040016--- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-source.c 2009-10-20 10:10:07.000000000 -0400
17+++ pulseaudio-0.9.19/src/modules/alsa/alsa-source.c 2009-10-06 18:36:10.000000000 -040017+++ pulseaudio-0.9.19/src/modules/alsa/alsa-source.c 2009-10-20 10:10:15.000000000 -0400
18@@ -877,7 +877,7 @@18@@ -877,7 +877,7 @@
19 19
20 pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);20 pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);
@@ -26,8 +26,8 @@
26 }26 }
27Index: pulseaudio-0.9.19/src/modules/alsa/alsa-util.c27Index: pulseaudio-0.9.19/src/modules/alsa/alsa-util.c
28===================================================================28===================================================================
29--- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-util.c 2009-10-06 18:09:54.000000000 -040029--- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-util.c 2009-10-20 10:10:07.000000000 -0400
30+++ pulseaudio-0.9.19/src/modules/alsa/alsa-util.c 2009-10-06 18:36:10.000000000 -040030+++ pulseaudio-0.9.19/src/modules/alsa/alsa-util.c 2009-10-20 10:10:15.000000000 -0400
31@@ -403,7 +403,7 @@31@@ -403,7 +403,7 @@
32 return ret;32 return ret;
33 }33 }
@@ -48,8 +48,8 @@
48 }48 }
49Index: pulseaudio-0.9.19/src/modules/alsa/alsa-util.h49Index: pulseaudio-0.9.19/src/modules/alsa/alsa-util.h
50===================================================================50===================================================================
51--- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-util.h 2009-10-06 18:09:54.000000000 -040051--- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-util.h 2009-10-20 10:10:07.000000000 -0400
52+++ pulseaudio-0.9.19/src/modules/alsa/alsa-util.h 2009-10-06 18:36:10.000000000 -040052+++ pulseaudio-0.9.19/src/modules/alsa/alsa-util.h 2009-10-20 10:10:15.000000000 -0400
53@@ -51,7 +51,8 @@53@@ -51,7 +51,8 @@
54 54
55 int pa_alsa_set_sw_params(55 int pa_alsa_set_sw_params(
@@ -62,8 +62,8 @@
62 snd_pcm_t *pa_alsa_open_by_device_id_auto(62 snd_pcm_t *pa_alsa_open_by_device_id_auto(
63Index: pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-device.c63Index: pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-device.c
64===================================================================64===================================================================
65--- pulseaudio-0.9.19.orig/src/modules/bluetooth/module-bluetooth-device.c 2009-10-06 18:36:10.000000000 -040065--- pulseaudio-0.9.19.orig/src/modules/bluetooth/module-bluetooth-device.c 2009-10-20 10:10:07.000000000 -0400
66+++ pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-device.c 2009-10-06 18:36:10.000000000 -040066+++ pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-device.c 2009-10-20 10:10:15.000000000 -0400
67@@ -74,7 +74,8 @@67@@ -74,7 +74,8 @@
68 "profile=<a2dp|hsp> "68 "profile=<a2dp|hsp> "
69 "rate=<sample rate> "69 "rate=<sample rate> "
@@ -99,7 +99,7 @@
99 99
100 if (service_send(u, &msg.getcaps_req.h) < 0)100 if (service_send(u, &msg.getcaps_req.h) < 0)
101 return -1;101 return -1;
102@@ -2367,6 +2370,12 @@102@@ -2363,6 +2366,12 @@
103 goto fail;103 goto fail;
104 }104 }
105 105
@@ -114,8 +114,8 @@
114 channels <= 0 || channels > PA_CHANNELS_MAX) {114 channels <= 0 || channels > PA_CHANNELS_MAX) {
115Index: pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-discover.c115Index: pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-discover.c
116===================================================================116===================================================================
117--- pulseaudio-0.9.19.orig/src/modules/bluetooth/module-bluetooth-discover.c 2009-10-06 18:09:54.000000000 -0400117--- pulseaudio-0.9.19.orig/src/modules/bluetooth/module-bluetooth-discover.c 2009-10-20 10:10:07.000000000 -0400
118+++ pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-discover.c 2009-10-06 18:36:10.000000000 -0400118+++ pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-discover.c 2009-10-20 10:10:15.000000000 -0400
119@@ -117,7 +117,7 @@119@@ -117,7 +117,7 @@
120 #endif120 #endif
121 121
@@ -127,8 +127,8 @@
127 m = pa_module_load(u->module->core, "module-bluetooth-device", args);127 m = pa_module_load(u->module->core, "module-bluetooth-device", args);
128Index: pulseaudio-0.9.19/src/modules/module-loopback.c128Index: pulseaudio-0.9.19/src/modules/module-loopback.c
129===================================================================129===================================================================
130--- pulseaudio-0.9.19.orig/src/modules/module-loopback.c 2009-10-06 18:09:54.000000000 -0400130--- pulseaudio-0.9.19.orig/src/modules/module-loopback.c 2009-10-20 10:10:07.000000000 -0400
131+++ pulseaudio-0.9.19/src/modules/module-loopback.c 2009-10-06 18:36:10.000000000 -0400131+++ pulseaudio-0.9.19/src/modules/module-loopback.c 2009-10-20 10:10:15.000000000 -0400
132@@ -102,7 +102,7 @@132@@ -102,7 +102,7 @@
133 static const char* const valid_modargs[] = {133 static const char* const valid_modargs[] = {
134 "source",134 "source",
@@ -140,8 +140,8 @@
140 "channels",140 "channels",
141Index: pulseaudio-0.9.19/src/modules/module-position-event-sounds.c141Index: pulseaudio-0.9.19/src/modules/module-position-event-sounds.c
142===================================================================142===================================================================
143--- pulseaudio-0.9.19.orig/src/modules/module-position-event-sounds.c 2009-10-06 18:38:07.000000000 -0400143--- pulseaudio-0.9.19.orig/src/modules/module-position-event-sounds.c 2009-10-20 10:10:07.000000000 -0400
144+++ pulseaudio-0.9.19/src/modules/module-position-event-sounds.c 2009-10-06 18:38:17.000000000 -0400144+++ pulseaudio-0.9.19/src/modules/module-position-event-sounds.c 2009-10-20 10:10:15.000000000 -0400
145@@ -74,7 +74,7 @@145@@ -74,7 +74,7 @@
146 }146 }
147 147
148148
=== modified file 'debian/patches/series'
--- debian/patches/series 2009-10-15 22:47:46 +0000
+++ debian/patches/series 2009-10-23 22:43:09 +0000
@@ -10,7 +10,6 @@
100054-mute-iec958-optical-raw-for-audigyX.patch100054-mute-iec958-optical-raw-for-audigyX.patch
110090-disable-flat-volumes.patch110090-disable-flat-volumes.patch
120052-revert-sse2-optimize.patch120052-revert-sse2-optimize.patch
130053-fix-sigsegv-module-bluetooth-device.patch
140091-dont-load-cork-music-on-phone.patch130091-dont-load-cork-music-on-phone.patch
150055-backport-alsa-bt-position-fixes-b3592a1.patch140055-backport-alsa-bt-position-fixes-b3592a1.patch
160056-ignore-sound-class-modem.patch150056-ignore-sound-class-modem.patch

Subscribers

People subscribed via source and target branches

to all changes: