PulseAudio

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

  1. lucid
  2. Merge into ubuntu
Proposed by Daniel T Chen
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~crimsun/pulseaudio/lucid
Merge into: lp://qastaging/~ubuntu-core-dev/pulseaudio/ubuntu
Diff against target: 465 lines (+122/-249)
11 files modified
debian/changelog (+23/-0)
debian/control (+2/-0)
debian/libpulse0.shlibs (+1/-1)
debian/patches/0002-work-around-suspend-on-idle-source-sink-race.patch (+0/-24)
debian/patches/0052-revert-sse2-optimize.patch (+0/-36)
debian/patches/0054-mute-iec958-optical-raw-for-audigyX.patch (+9/-6)
debian/patches/0055-backport-alsa-bt-position-fixes-b3592a1.patch (+0/-176)
debian/patches/0055-handle-Master-Front.patch (+83/-0)
debian/patches/series (+1/-3)
debian/pulseaudio.shlibs (+1/-1)
debian/rules (+2/-2)
To merge this branch: bzr merge lp://qastaging/~crimsun/pulseaudio/lucid
Reviewer Review Type Date Requested Status
Luke Yelavich (community) Approve
Review via email: mp+14600@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel T Chen (crimsun) wrote :

Put a new snapshot with a bunch of fixes into 10.04/lucid.

lp://qastaging/~crimsun/pulseaudio/lucid updated
215. By Luke Yelavich

* debian/control:
  + Promote pulseaudio-utils to Depends for pulseaudio so that the
    pm-utils script is present (LP: #478182)
  - Drop obsolete Depends on pulseaudio-module-udev for pulseaudio
    (LP: #477382)
* debian/01PulseAudio: Don't fail suspend/resume when system-wide
  daemon is running (LP: #476505)

216. By Luke Yelavich

releasing version 1:0.9.19-2ubuntu2

217. By Daniel T Chen <crimsun@errno>

* debian/control:
  + pulseaudio Provides pulseaudio-module-hal, pulseaudio-module-udev,
    and pulseaudio-module-rygel-media-server for upgrades

218. By Daniel T Chen <crimsun@errno>

* New upstream release
    and pulseaudio-module-rygel-media-server for upgrades (really
    fixes LP #477382)
* debian/patches/:
  - 0002-work-around-suspend-on-idle-source-sink-race.patch:
  - 0052-revert-sse2-optimize.patch:
  - 0055-backport-alsa-bt-position-fixes-b3592a1.patch:
    Remove; applied upstream
  + 0054-mute-iec958-optical-raw-for-audigyX.patch: Refresh
  + 0055-handle-Master-Front.patch: For new VIA-based HDA, handle
    this mixer control until we've fixed it in linux (LP: #478868)

219. By Daniel T Chen <crimsun@errno>

Fix BT validation (LP: #437293)

220. By Daniel T Chen <crimsun@errno>

* New upstream bugfix release
* Bump for 0.9.20:
  + debian/libpulse0.shlibs
  + debian/pulseaudio.shlibs
  + debian/rules

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
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-11-09 02:49:29 +0000
3+++ debian/changelog 2009-11-13 00:59:09 +0000
4@@ -1,3 +1,26 @@
5+pulseaudio (1:0.9.20-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * New upstream bugfix release
8+ + Fix BT validation (LP: #437293)
9+ * debian/control:
10+ + pulseaudio Provides pulseaudio-module-hal, pulseaudio-module-udev,
11+ and pulseaudio-module-rygel-media-server for upgrades (really
12+ fixes LP #477382)
13+ * debian/patches/:
14+ - 0002-work-around-suspend-on-idle-source-sink-race.patch:
15+ - 0052-revert-sse2-optimize.patch:
16+ - 0055-backport-alsa-bt-position-fixes-b3592a1.patch:
17+ Remove; applied upstream
18+ + 0054-mute-iec958-optical-raw-for-audigyX.patch: Refresh
19+ + 0055-handle-Master-Front.patch: For new VIA-based HDA, handle
20+ this mixer control until we've fixed it in linux (LP: #478868)
21+ * Bump for 0.9.20:
22+ + debian/libpulse0.shlibs
23+ + debian/pulseaudio.shlibs
24+ + debian/rules
25+
26+ -- Daniel T Chen <crimsun@ubuntu.com> Thu, 12 Nov 2009 19:19:21 -0500
27+
28 pulseaudio (1:0.9.19-2ubuntu2) lucid; urgency=low
29
30 * debian/control:
31
32=== modified file 'debian/control'
33--- debian/control 2009-11-09 02:26:01 +0000
34+++ debian/control 2009-11-13 00:59:09 +0000
35@@ -28,6 +28,8 @@
36 pulseaudio-module-rygel-media-server (<< ${binary:Version})
37 Replaces: pulseaudio-module-hal, pulseaudio-module-udev (<< ${binary:Version}),
38 pulseaudio-module-rygel-media-server (<< ${binary:Version})
39+Provides: pulseaudio-module-hal, pulseaudio-module-udev,
40+ pulseaudio-module-rygel-media-server
41 Recommends: pulseaudio-module-x11, gstreamer0.10-pulseaudio, pulseaudio-esound-compat, rtkit
42 Suggests: pavumeter, paman, paprefs
43 Description: PulseAudio sound server
44
45=== modified file 'debian/libpulse0.shlibs'
46--- debian/libpulse0.shlibs 2009-11-06 02:49:43 +0000
47+++ debian/libpulse0.shlibs 2009-11-13 00:59:09 +0000
48@@ -1,3 +1,3 @@
49 libpulse 0 libpulse0 (>= 0.9.16)
50 libpulse-simple 0 libpulse0
51-libpulsecommon 0.9.19 libpulse0
52+libpulsecommon 0.9.20 libpulse0
53
54=== removed file 'debian/patches/0002-work-around-suspend-on-idle-source-sink-race.patch'
55--- debian/patches/0002-work-around-suspend-on-idle-source-sink-race.patch 2009-08-20 02:25:00 +0000
56+++ debian/patches/0002-work-around-suspend-on-idle-source-sink-race.patch 1970-01-01 00:00:00 +0000
57@@ -1,24 +0,0 @@
58-Index: pulseaudio-0.9.16~test4/src/daemon/default.pa.in
59-===================================================================
60---- pulseaudio-0.9.16~test4.orig/src/daemon/default.pa.in 2009-08-18 22:58:15.000000000 -0400
61-+++ pulseaudio-0.9.16~test4/src/daemon/default.pa.in 2009-08-18 22:58:49.000000000 -0400
62-@@ -29,6 +29,9 @@
63-
64- .fail
65-
66-+### Automatically suspend sinks/sources that become idle for too long
67-+load-module module-suspend-on-idle
68-+
69- ### Automatically restore the volume of streams and devices
70- load-module module-device-restore
71- load-module module-stream-restore
72-@@ -103,9 +106,6 @@
73- ### Honour intended role device property
74- load-module module-intended-roles
75-
76--### Automatically suspend sinks/sources that become idle for too long
77--load-module module-suspend-on-idle
78--
79- ### If autoexit on idle is enabled we want to make sure we only quit
80- ### when no local session needs us anymore.
81- load-module module-console-kit
82
83=== removed file 'debian/patches/0052-revert-sse2-optimize.patch'
84--- debian/patches/0052-revert-sse2-optimize.patch 2009-09-23 02:23:59 +0000
85+++ debian/patches/0052-revert-sse2-optimize.patch 1970-01-01 00:00:00 +0000
86@@ -1,36 +0,0 @@
87-Index: pulseaudio-0.9.18/src/pulsecore/svolume_mmx.c
88-===================================================================
89---- pulseaudio-0.9.18.orig/src/pulsecore/svolume_mmx.c 2009-09-22 22:17:02.000000000 -0400
90-+++ pulseaudio-0.9.18/src/pulsecore/svolume_mmx.c 2009-09-22 22:17:53.000000000 -0400
91-@@ -57,12 +57,14 @@
92- " punpcklwd %%mm4, "#s" \n\t" /* .. | 0 | p0 | */ \
93- " pcmpgtw "#v", %%mm4 \n\t" /* .. | 0 | s(vl) | */ \
94- " pand "#s", %%mm4 \n\t" /* .. | 0 | (p0) | (vl >> 15) & p */ \
95-- " movq "#s", %%mm5 \n\t" \
96-- " pmulhw "#v", "#s" \n\t" /* .. | 0 | vl*p0 | */ \
97-- " paddw %%mm4, "#s" \n\t" /* .. | 0 | vl*p0 | + sign correct */ \
98-- " psrld $16, "#v" \n\t" /* .. | 0 | vh | */ \
99-- " pmaddwd %%mm5, "#v" \n\t" /* .. | p0 * vh | */ \
100-- " paddd "#s", "#v" \n\t" /* .. | p0 * v0 | */ \
101-+ " movq %%mm6, %%mm5 \n\t" /* .. | ffff | 0 | */ \
102-+ " pand "#v", %%mm5 \n\t" /* .. | vh | 0 | */ \
103-+ " por %%mm5, %%mm4 \n\t" /* .. | vh | (p0) | */ \
104-+ " pmulhw "#s", "#v" \n\t" /* .. | 0 | vl*p0 | */ \
105-+ " paddw %%mm4, "#v" \n\t" /* .. | vh | vl*p0 | vh + sign correct */ \
106-+ " pslld $16, "#s" \n\t" /* .. | p0 | 0 | */ \
107-+ " por %%mm7, "#s" \n\t" /* .. | p0 | 1 | */ \
108-+ " pmaddwd "#s", "#v" \n\t" /* .. | p0 * v0 | */ \
109- " packssdw "#v", "#v" \n\t" /* .. | p1*v1 | p0*v0 | */
110-
111- /* approximately advances %3 = (%3 + a) % b. This function requires that
112-@@ -103,6 +105,10 @@
113- __asm__ __volatile__ (
114- " xor %3, %3 \n\t"
115- " sar $1, %2 \n\t" /* length /= sizeof (int16_t) */
116-+ " pcmpeqw %%mm6, %%mm6 \n\t" /* .. | ffff | ffff | */
117-+ " pcmpeqw %%mm7, %%mm7 \n\t" /* .. | ffff | ffff | */
118-+ " pslld $16, %%mm6 \n\t" /* .. | ffff | 0 | */
119-+ " psrld $31, %%mm7 \n\t" /* .. | 0 | 1 | */
120-
121- " test $1, %2 \n\t" /* check for odd samples */
122- " je 2f \n\t"
123
124=== modified file 'debian/patches/0054-mute-iec958-optical-raw-for-audigyX.patch'
125--- debian/patches/0054-mute-iec958-optical-raw-for-audigyX.patch 2009-09-18 00:01:54 +0000
126+++ debian/patches/0054-mute-iec958-optical-raw-for-audigyX.patch 2009-11-13 00:59:09 +0000
127@@ -1,11 +1,14 @@
128-Index: pulseaudio-0.9.17/src/modules/alsa/mixer/paths/analog-output.conf.common
129+Index: pulseaudio-0.9.19-237-g721e/src/modules/alsa/mixer/paths/analog-output.conf.common
130 ===================================================================
131---- pulseaudio-0.9.17.orig/src/modules/alsa/mixer/paths/analog-output.conf.common 2009-09-17 19:52:12.000000000 -0400
132-+++ pulseaudio-0.9.17/src/modules/alsa/mixer/paths/analog-output.conf.common 2009-09-17 19:55:41.000000000 -0400
133-@@ -109,3 +109,6 @@
134- [Option External Amplifier:off]
135+--- pulseaudio-0.9.19-237-g721e.orig/src/modules/alsa/mixer/paths/analog-output.conf.common 2009-11-06 19:20:10.000000000 -0500
136++++ pulseaudio-0.9.19-237-g721e/src/modules/alsa/mixer/paths/analog-output.conf.common 2009-11-06 19:22:01.000000000 -0500
137+@@ -110,6 +110,9 @@
138 name = output-amplifier-off
139 priority = 0
140-+
141+
142 +[Element IEC958 Optical Raw]
143 +switch = off
144++
145+ ;;; 'Analog Output'
146+
147+ [Element Analog Output]
148
149=== removed file 'debian/patches/0055-backport-alsa-bt-position-fixes-b3592a1.patch'
150--- debian/patches/0055-backport-alsa-bt-position-fixes-b3592a1.patch 2009-10-20 14:36:31 +0000
151+++ debian/patches/0055-backport-alsa-bt-position-fixes-b3592a1.patch 1970-01-01 00:00:00 +0000
152@@ -1,176 +0,0 @@
153-Index: pulseaudio-0.9.19/src/modules/alsa/alsa-sink.c
154-===================================================================
155---- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-sink.c 2009-10-20 10:10:07.000000000 -0400
156-+++ pulseaudio-0.9.19/src/modules/alsa/alsa-sink.c 2009-10-20 10:10:15.000000000 -0400
157-@@ -927,7 +927,7 @@
158-
159- pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);
160-
161-- if ((err = pa_alsa_set_sw_params(u->pcm_handle, avail_min)) < 0) {
162-+ if ((err = pa_alsa_set_sw_params(u->pcm_handle, avail_min, !u->use_tsched)) < 0) {
163- pa_log("Failed to set software parameters: %s", pa_alsa_strerror(err));
164- return err;
165- }
166-Index: pulseaudio-0.9.19/src/modules/alsa/alsa-source.c
167-===================================================================
168---- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-source.c 2009-10-20 10:10:07.000000000 -0400
169-+++ pulseaudio-0.9.19/src/modules/alsa/alsa-source.c 2009-10-20 10:10:15.000000000 -0400
170-@@ -877,7 +877,7 @@
171-
172- pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);
173-
174-- if ((err = pa_alsa_set_sw_params(u->pcm_handle, avail_min)) < 0) {
175-+ if ((err = pa_alsa_set_sw_params(u->pcm_handle, avail_min, !u->use_tsched)) < 0) {
176- pa_log("Failed to set software parameters: %s", pa_alsa_strerror(err));
177- return err;
178- }
179-Index: pulseaudio-0.9.19/src/modules/alsa/alsa-util.c
180-===================================================================
181---- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-util.c 2009-10-20 10:10:07.000000000 -0400
182-+++ pulseaudio-0.9.19/src/modules/alsa/alsa-util.c 2009-10-20 10:10:15.000000000 -0400
183-@@ -403,7 +403,7 @@
184- return ret;
185- }
186-
187--int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min) {
188-+int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min, pa_bool_t period_event) {
189- snd_pcm_sw_params_t *swparams;
190- snd_pcm_uframes_t boundary;
191- int err;
192-@@ -417,7 +417,7 @@
193- return err;
194- }
195-
196-- if ((err = snd_pcm_sw_params_set_period_event(pcm, swparams, 0)) < 0) {
197-+ if ((err = snd_pcm_sw_params_set_period_event(pcm, swparams, period_event)) < 0) {
198- pa_log_warn("Unable to disable period event: %s\n", pa_alsa_strerror(err));
199- return err;
200- }
201-Index: pulseaudio-0.9.19/src/modules/alsa/alsa-util.h
202-===================================================================
203---- pulseaudio-0.9.19.orig/src/modules/alsa/alsa-util.h 2009-10-20 10:10:07.000000000 -0400
204-+++ pulseaudio-0.9.19/src/modules/alsa/alsa-util.h 2009-10-20 10:10:15.000000000 -0400
205-@@ -51,7 +51,8 @@
206-
207- int pa_alsa_set_sw_params(
208- snd_pcm_t *pcm,
209-- snd_pcm_uframes_t avail_min);
210-+ snd_pcm_uframes_t avail_min,
211-+ pa_bool_t period_event);
212-
213- /* Picks a working mapping from the profile set based on the specified ss/map */
214- snd_pcm_t *pa_alsa_open_by_device_id_auto(
215-Index: pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-device.c
216-===================================================================
217---- pulseaudio-0.9.19.orig/src/modules/bluetooth/module-bluetooth-device.c 2009-10-20 10:10:07.000000000 -0400
218-+++ pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-device.c 2009-10-20 10:10:15.000000000 -0400
219-@@ -74,7 +74,8 @@
220- "profile=<a2dp|hsp> "
221- "rate=<sample rate> "
222- "channels=<number of channels> "
223-- "path=<device object path>");
224-+ "path=<device object path> "
225-+ "auto_connect=<automatically connect?>");
226-
227- /*
228- #ifdef NOKIA
229-@@ -98,6 +99,7 @@
230- "rate",
231- "channels",
232- "path",
233-+ "auto_connect",
234- #ifdef NOKIA
235- "sco_sink",
236- "sco_source",
237-@@ -141,6 +143,7 @@
238- char *address;
239- char *path;
240- pa_bluetooth_discovery *discovery;
241-+ pa_bool_t auto_connect;
242-
243- pa_dbus_connection *connection;
244-
245-@@ -399,7 +402,7 @@
246- pa_assert(u->profile == PROFILE_HSP);
247- msg.getcaps_req.transport = BT_CAPABILITIES_TRANSPORT_SCO;
248- }
249-- msg.getcaps_req.flags = BT_FLAG_AUTOCONNECT;
250-+ msg.getcaps_req.flags = u->auto_connect ? BT_FLAG_AUTOCONNECT : 0;
251-
252- if (service_send(u, &msg.getcaps_req.h) < 0)
253- return -1;
254-@@ -2363,6 +2366,12 @@
255- goto fail;
256- }
257-
258-+ u->auto_connect = TRUE;
259-+ if (pa_modargs_get_value_boolean(ma, "auto_connect", &u->auto_connect)) {
260-+ pa_log("Failed to parse auto_connect= argument");
261-+ goto fail;
262-+ }
263-+
264- channels = u->sample_spec.channels;
265- if (pa_modargs_get_value_u32(ma, "channels", &channels) < 0 ||
266- channels <= 0 || channels > PA_CHANNELS_MAX) {
267-Index: pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-discover.c
268-===================================================================
269---- pulseaudio-0.9.19.orig/src/modules/bluetooth/module-bluetooth-discover.c 2009-10-20 10:10:07.000000000 -0400
270-+++ pulseaudio-0.9.19/src/modules/bluetooth/module-bluetooth-discover.c 2009-10-20 10:10:15.000000000 -0400
271-@@ -117,7 +117,7 @@
272- #endif
273-
274- if (d->audio_source_state >= PA_BT_AUDIO_STATE_CONNECTED)
275-- args = pa_sprintf_malloc("%s profile=\"a2dp_source\"", args);
276-+ args = pa_sprintf_malloc("%s profile=\"a2dp_source\" auto_connect=no", args);
277-
278- pa_log_debug("Loading module-bluetooth-device %s", args);
279- m = pa_module_load(u->module->core, "module-bluetooth-device", args);
280-Index: pulseaudio-0.9.19/src/modules/module-loopback.c
281-===================================================================
282---- pulseaudio-0.9.19.orig/src/modules/module-loopback.c 2009-10-20 10:10:07.000000000 -0400
283-+++ pulseaudio-0.9.19/src/modules/module-loopback.c 2009-10-20 10:10:15.000000000 -0400
284-@@ -102,7 +102,7 @@
285- static const char* const valid_modargs[] = {
286- "source",
287- "sink",
288-- "latency",
289-+ "latency_msec",
290- "format",
291- "rate",
292- "channels",
293-Index: pulseaudio-0.9.19/src/modules/module-position-event-sounds.c
294-===================================================================
295---- pulseaudio-0.9.19.orig/src/modules/module-position-event-sounds.c 2009-10-20 10:10:07.000000000 -0400
296-+++ pulseaudio-0.9.19/src/modules/module-position-event-sounds.c 2009-10-20 10:10:15.000000000 -0400
297-@@ -74,7 +74,7 @@
298- }
299-
300- static pa_hook_result_t sink_input_fixate_hook_callback(pa_core *core, pa_sink_input_new_data *data, struct userdata *u) {
301-- const char *hpos, *vpos, *role;
302-+ const char *hpos, *vpos, *role, *id;
303- double f;
304- char t[PA_CVOLUME_SNPRINT_MAX];
305- pa_cvolume v;
306-@@ -87,6 +87,22 @@
307- if (!pa_streq(role, "event"))
308- return PA_HOOK_OK;
309-
310-+ if ((id = pa_proplist_gets(data->proplist, PA_PROP_EVENT_ID))) {
311-+
312-+ /* The test sounds should never be positioned in space, since
313-+ * they might be trigered themselves to configure the speakers
314-+ * in space, which we don't want to mess up. */
315-+
316-+ if (pa_startswith(id, "audio-channel-"))
317-+ return PA_HOOK_OK;
318-+
319-+ if (pa_streq(id, "audio-volume-change"))
320-+ return PA_HOOK_OK;
321-+
322-+ if (pa_streq(id, "audio-test-signal"))
323-+ return PA_HOOK_OK;
324-+ }
325-+
326- if (!(hpos = pa_proplist_gets(data->proplist, PA_PROP_EVENT_MOUSE_HPOS)))
327- hpos = pa_proplist_gets(data->proplist, PA_PROP_WINDOW_HPOS);
328-
329
330=== added file 'debian/patches/0055-handle-Master-Front.patch'
331--- debian/patches/0055-handle-Master-Front.patch 1970-01-01 00:00:00 +0000
332+++ debian/patches/0055-handle-Master-Front.patch 2009-11-13 00:59:09 +0000
333@@ -0,0 +1,83 @@
334+Index: pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
335+===================================================================
336+--- pulseaudio-0.9.20.orig/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf 2009-11-12 19:26:22.000000000 -0500
337++++ pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf 2009-11-12 19:26:38.000000000 -0500
338+@@ -33,6 +33,12 @@
339+ override-map.1 = all
340+ override-map.2 = all-left,all-right
341+
342++[Element Master Front]
343++switch = mute
344++volume = merge
345++override-map.1 = all
346++override-map.2 = all-left,all-right
347++
348+ [Element Master Mono]
349+ switch = off
350+ volume = off
351+Index: pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-headphones.conf
352+===================================================================
353+--- pulseaudio-0.9.20.orig/src/modules/alsa/mixer/paths/analog-output-headphones.conf 2009-11-12 19:26:22.000000000 -0500
354++++ pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-headphones.conf 2009-11-12 19:26:38.000000000 -0500
355+@@ -33,6 +33,12 @@
356+ override-map.1 = all
357+ override-map.2 = all-left,all-right
358+
359++[Element Master Front]
360++switch = mute
361++volume = merge
362++override-map.1 = all
363++override-map.2 = all-left,all-right
364++
365+ [Element Master Mono]
366+ switch = off
367+ volume = off
368+Index: pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-mono.conf
369+===================================================================
370+--- pulseaudio-0.9.20.orig/src/modules/alsa/mixer/paths/analog-output-mono.conf 2009-11-12 19:26:22.000000000 -0500
371++++ pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-mono.conf 2009-11-12 19:26:38.000000000 -0500
372+@@ -31,6 +31,10 @@
373+ switch = off
374+ volume = off
375+
376++[Element Master Front]
377++switch = off
378++volume = off
379++
380+ [Element Master Mono]
381+ required = any
382+ switch = mute
383+Index: pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-speaker.conf
384+===================================================================
385+--- pulseaudio-0.9.20.orig/src/modules/alsa/mixer/paths/analog-output-speaker.conf 2009-11-12 19:26:22.000000000 -0500
386++++ pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output-speaker.conf 2009-11-12 19:26:38.000000000 -0500
387+@@ -33,6 +33,12 @@
388+ override-map.1 = all
389+ override-map.2 = all-left,all-right
390+
391++[Element Master Front]
392++switch = mute
393++volume = merge
394++override-map.1 = all
395++override-map.2 = all-left,all-right
396++
397+ [Element Master Mono]
398+ switch = off
399+ volume = off
400+Index: pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output.conf
401+===================================================================
402+--- pulseaudio-0.9.20.orig/src/modules/alsa/mixer/paths/analog-output.conf 2009-11-12 19:26:22.000000000 -0500
403++++ pulseaudio-0.9.20/src/modules/alsa/mixer/paths/analog-output.conf 2009-11-12 19:26:38.000000000 -0500
404+@@ -34,6 +34,12 @@
405+ override-map.1 = all
406+ override-map.2 = all-left,all-right
407+
408++[Element Master Front]
409++switch = mute
410++volume = merge
411++override-map.1 = all
412++override-map.2 = all-left,all-right
413++
414+ [Element Master Mono]
415+ switch = off
416+ volume = off
417
418=== modified file 'debian/patches/series'
419--- debian/patches/series 2009-11-06 02:51:21 +0000
420+++ debian/patches/series 2009-11-13 00:59:09 +0000
421@@ -1,6 +1,5 @@
422 0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
423 0001-change-resample-and-buffering.patch
424-#0002-work-around-suspend-on-idle-source-sink-race.patch
425 0003-add-padsp-wrapper-check.patch
426 0005-load-sample-dir-lazy.patch
427 0006-a11y-special-case-disable.patch
428@@ -10,8 +9,7 @@
429 0051-fix-sigfpe-mcalign.patch
430 0054-mute-iec958-optical-raw-for-audigyX.patch
431 0090-disable-flat-volumes.patch
432-0052-revert-sse2-optimize.patch
433 0091-dont-load-cork-music-on-phone.patch
434-0055-backport-alsa-bt-position-fixes-b3592a1.patch
435 0056-ignore-sound-class-modem.patch
436 0057-load-module-x11-bell.patch
437+0055-handle-Master-Front.patch
438
439=== modified file 'debian/pulseaudio.shlibs'
440--- debian/pulseaudio.shlibs 2009-09-30 03:12:12 +0000
441+++ debian/pulseaudio.shlibs 2009-11-13 00:59:09 +0000
442@@ -1,1 +1,1 @@
443-libpulsecore 0.9.19 pulseaudio
444+libpulsecore 0.9.20 pulseaudio
445
446=== modified file 'debian/rules'
447--- debian/rules 2009-11-06 02:49:43 +0000
448+++ debian/rules 2009-11-13 00:59:09 +0000
449@@ -26,7 +26,7 @@
450
451 common-configure-arch::
452 ifneq (,$(findstring $(DEB_HOST_ARCH), "arm armel"))
453- make -C src libpulsecore_0.9.19_la-svolume_arm.lo CFLAGS+=-march=armv6
454+ make -C src libpulsecore_0.9.20_la-svolume_arm.lo CFLAGS+=-march=armv6
455 endif
456
457 pulseaudio-install-arch::
458@@ -52,6 +52,6 @@
459
460 DEB_OPT_FLAG = -O3
461 DEB_CONFIGURE_EXTRA_FLAGS = --enable-static
462-DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-0.9.19/modules
463+DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-0.9.20/modules
464 DEB_DH_INSTALL_ARGS = --sourcedir=$(CURDIR)/debian/tmp
465 DEB_UPDATE_RCD_PARAMS = start 50 2 3 4 5 . stop 15 1 .

Subscribers

People subscribed via source and target branches

to all changes: