Comment 2 for bug 62855

Hi Matt, Colin,

Recently I was made aware of ticket #1000 [0] in which quite a few
6.06.1 users of AC'97 codecs are not able to record audible stereo
microphone input. A bug report has been filed [1] to track the
resolution of this issue for 6.06.1. A straightforward fix [2] is
available in a newer upstream version of alsa-lib (1.0.11, so 6.10 is
not affected, nor are earlier Ubuntu versions).

Attached please find a SRU debdiff against 6.06.1's alsa-lib source package.

$ debdiff alsa-lib_1.0.10-2ubuntu4.dsc alsa-lib_1.0.10-2ubuntu4.1.dsc
|diffstat
 alsa-lib-1.0.10/debian/changelog | 11 ++++++++++
 alsa-lib-1.0.10/debian/patches/00list | 1
 debian/patches/25_fix_stereo_line_capture.dpatch | 24
+++++++++++++++++++++++
 3 files changed, 36 insertions(+)

[0] https://launchpad.net/distros/ubuntu/+ticket/1000
[1] https://launchpad.net/distros/ubuntu/+source/alsa-lib/+bug/62855
[2]
http://hg-mirror.alsa-project.org/alsa-lib?cmd=changeset;node=71eb744cd5be42cd7ebd14edf5f3f2e2da6ba35d;style=gitweb

Thanks,
--
Daniel T. Chen <email address hidden>
GPG key: 0xC88ABDA3

diff -u alsa-lib-1.0.10/debian/changelog alsa-lib-1.0.10/debian/changelog
--- alsa-lib-1.0.10/debian/changelog
+++ alsa-lib-1.0.10/debian/changelog
@@ -1,3 +1,14 @@
+alsa-lib (1.0.10-2ubuntu4.1) dapper-proposed; urgency=low
+
+ * Add debian/patches/25_fix_stereo_line_capture.dpatch that fixes
+ inaudible recording of stereo microphone input. Patch backported
+ from 1.0.11 referenced at
+ http://hg-mirror.alsa-project.org/alsa-lib?cmd=changeset;node=71eb744cd5be42cd7ebd14edf5f3f2e2da6ba35d;style=raw
+ (Closes Ubuntu ticket #1000, bug #62855). Thanks, Jeff Meininger
+ and others.
+
+ -- Daniel T Chen <email address hidden> Thu, 28 Sep 2006 17:34:12 -0400
+
 alsa-lib (1.0.10-2ubuntu4) dapper; urgency=low

   * debian/patches: Add:
diff -u alsa-lib-1.0.10/debian/patches/00list alsa-lib-1.0.10/debian/patches/00list
--- alsa-lib-1.0.10/debian/patches/00list
+++ alsa-lib-1.0.10/debian/patches/00list
@@ -16,0 +17 @@
+25_fix_stereo_line_capture
only in patch2:
unchanged:
--- alsa-lib-1.0.10.orig/debian/patches/25_fix_stereo_line_capture.dpatch
+++ alsa-lib-1.0.10/debian/patches/25_fix_stereo_line_capture.dpatch
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 25_fix_stereo_line_capture.dpatch by <email address hidden>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes stereo line capture bug in simple mixer API:
+## DP: http://hg-mirror.alsa-project.org/alsa-lib?cmd=changeset;node=71eb744cd5
+## DP: be42cd7ebd14edf5f3f2e2da6ba35d;style=gitweb
+
+@DPATCH@
+
+diff -ru alsa-lib-1.0.10.orig/src/mixer/simple_none.c alsa-lib-1.0.10/src/mixer/simple_none.c
+--- alsa-lib-1.0.10.orig/src/mixer/simple_none.c 2005-08-24 05:41:16.000000000 -0500
++++ alsa-lib-1.0.10/src/mixer/simple_none.c 2005-12-02 07:39:24.000000000 -0600
+@@ -768,7 +768,9 @@
+ if (cchannels > 1) {
+ if (simple->ctls[CTL_CAPTURE_ROUTE].elem ||
+ (simple->ctls[CTL_CAPTURE_SWITCH].elem &&
+- simple->ctls[CTL_CAPTURE_SWITCH].values > 1)) {
++ simple->ctls[CTL_CAPTURE_SWITCH].values > 1) ||
++ (simple->ctls[CTL_CAPTURE_SOURCE].elem &&
++ simple->ctls[CTL_CAPTURE_SOURCE].values > 1)) {
+ caps &= ~SM_CAP_CSWITCH_JOIN;
+ }
+ if (simple->ctls[CTL_CAPTURE_VOLUME].elem &&