diff options
| author | Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> | 2014-03-10 12:12:33 -0300 |
|---|---|---|
| committer | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2014-05-06 23:36:17 +0000 |
| commit | 78995954b8edf8719d8cdafeca647046ef378f04 (patch) | |
| tree | cb336997c886f0c6aa48bf9efd9c276e0ec82696 | |
| parent | c58ab02d08b12b7d61c0020e72ea02d5a1452888 (diff) | |
Imported Debian patch 1.0.27.2-3ubuntu7debian/1.0.27.2-3ubuntu7ubuntu
| -rw-r--r-- | debian/changelog | 1232 | ||||
| -rw-r--r-- | debian/control | 9 | ||||
| -rw-r--r-- | debian/patches/0001-Add-UCM-configuration-for-Nexus-4-Mako.patch | 485 | ||||
| -rw-r--r-- | debian/patches/0002-Add-UCM-config-file-for-Galaxy-Nexus-maguro.patch | 681 | ||||
| -rw-r--r-- | debian/patches/0003-Add-UCM-files-for-Nexus-7.patch | 166 | ||||
| -rw-r--r-- | debian/patches/0004-Add-UCM-config-files-for-Nexus-10.patch | 317 | ||||
| -rw-r--r-- | debian/patches/0005-Add-UCM-config-files-for-Nexus-5.patch | 404 | ||||
| -rw-r--r-- | debian/patches/Fix-access-of-freed-memory-in-namehints.patch | 116 | ||||
| -rw-r--r-- | debian/patches/add-tegra-alc5632.patch | 40 | ||||
| -rw-r--r-- | debian/patches/lp652035-use-extended-namehints.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 8 | ||||
| -rw-r--r-- | debian/tests/build_seq | 26 | ||||
| -rw-r--r-- | debian/tests/control | 2 |
13 files changed, 3500 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 9bc1d298..f00f52d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,61 @@ +alsa-lib (1.0.27.2-3ubuntu7) trusty; urgency=medium + + * 0001-Add-UCM-configuration-for-Nexus-4-Mako.patch: only setting up + up volume when doing a voice call (fix delay when enabling/disabling + speaker mode) LP: #1277765 + + -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> Mon, 10 Mar 2014 12:12:33 -0300 + +alsa-lib (1.0.27.2-3ubuntu6) trusty; urgency=medium + + * 0001-Add-UCM-configuration-for-Nexus-4-Mako.patch: setting up mixer for + earpiece and speaker, not done automatically anymore with AOSP 4.4.2 + LP: #1286322 + + -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> Mon, 03 Mar 2014 19:19:35 -0300 + +alsa-lib (1.0.27.2-3ubuntu5) trusty; urgency=medium + + * debian/tests/build_seq: If there is no /dev/snd there will be an error + message on stderr. Re-route to stdout to avoid autopkgtest failure. + + -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 26 Feb 2014 11:40:49 +0100 + +alsa-lib (1.0.27.2-3ubuntu4) trusty; urgency=medium + + * debian/tests/build_seq: Drop check of snd_seq_open() return value; it's + not relevant for a compile/link test, and it fails in containers and other + environments which don't actually have /dev/snd/. + + -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 25 Feb 2014 17:52:27 +0100 + +alsa-lib (1.0.27.2-3ubuntu3) trusty; urgency=medium + + * debian/patches/0005-Add-UCM-config-files-for-Nexus-5.patch: + adds the UCM config files for msm8974-taiko-mtp-snd-card + + -- Oliver Grawert <ogra@ubuntu.com> Tue, 25 Feb 2014 13:01:16 +0100 + +alsa-lib (1.0.27.2-3ubuntu2) trusty; urgency=low + + * Fix-access-of-freed-memory-in-namehints.patch: + Some applications using the namehints API might + occasionally crash (LP: #1008600) + + -- David Henningsson <david.henningsson@canonical.com> Fri, 07 Feb 2014 08:33:55 +0100 + +alsa-lib (1.0.27.2-3ubuntu1) trusty; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/control: Add Vcs-Bzr URI + - Show hints for non-standard devices that lack configuration files + - Add a compile/run autopkg test + - Add config file for the tegra alc5632 chip found in the AC100 netbook. + - Add UCM configuration files for the Nexus 7 first generation, nexus 10, + Nexus 4, and Galaxy Nexus + + -- Luke Yelavich <themuso@ubuntu.com> Thu, 31 Oct 2013 11:13:19 -0700 + alsa-lib (1.0.27.2-3) unstable; urgency=low * Add preinst scripts to -dbg and -dev packages to correctly @@ -16,6 +74,58 @@ alsa-lib (1.0.27.2-2) unstable; urgency=high -- Cyril Brulebois <kibi@debian.org> Mon, 14 Oct 2013 23:30:27 +0200 +alsa-lib (1.0.27.2-1ubuntu7) trusty; urgency=low + + * debian/changelog: Re-add XS-Testsuite header (LP:#1246392) + + -- Jean-Baptiste Lallement <jean-baptiste.lallement@canonical.com> Wed, 30 Oct 2013 17:04:54 +0100 + +alsa-lib (1.0.27.2-1ubuntu6) saucy; urgency=low + + * Fixup Nexus 10 UCM config file: + - Headphones now work (thanks YC Cheng) + - Added dummy handling of the SPDIF card + + -- David Henningsson <david.henningsson@canonical.com> Thu, 12 Sep 2013 12:07:48 -0400 + +alsa-lib (1.0.27.2-1ubuntu5) saucy; urgency=low + + * Raise maximum speaker volume on N4 (LP: #1217986) + * Fixup Nexus 7 UCM config file + * Added Nexus 10 UCM config file + + -- David Henningsson <david.henningsson@canonical.com> Tue, 03 Sep 2013 13:43:00 +0200 + +alsa-lib (1.0.27.2-1ubuntu4) saucy; urgency=low + + * Updating default volume in the UCM config for Galaxy Nexus + + -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> Wed, 28 Aug 2013 19:50:17 -0300 + +alsa-lib (1.0.27.2-1ubuntu3) saucy; urgency=low + + * Add UCM config file for Nexus 7 + Improve UCM config file for Nexus 4 and Galaxy Nexus + + -- David Henningsson <david.henningsson@canonical.com> Wed, 28 Aug 2013 11:40:16 +0200 + +alsa-lib (1.0.27.2-1ubuntu2) saucy; urgency=low + + * Add UCM config files for Nexus 4 (Mako) and Galaxy Nexus (Maguro) + + -- David Henningsson <david.henningsson@canonical.com> Tue, 27 Aug 2013 09:46:37 +0200 + +alsa-lib (1.0.27.2-1ubuntu1) saucy; urgency=low + + [ Luke Yelavich ] + * Merge from debian unstable. Remaining changes: + - debian/control: Add Vcs-Bzr URI + - Show hints for non-standard devices that lack configuration files + - Add a compile/run autopkg test + - Add config file for the tegra alc5632 chip found in the AC100 netbook. + + -- Luke Yelavich <themuso@ubuntu.com> Fri, 26 Jul 2013 10:54:32 +1000 + alsa-lib (1.0.27.2-1) unstable; urgency=low * New upstream release. @@ -119,6 +229,44 @@ alsa-lib (1.0.26-1) experimental; urgency=low -- Jordi Mallach <jordi@debian.org> Sun, 31 Mar 2013 23:22:54 -0500 +alsa-lib (1.0.25-4ubuntu4) saucy; urgency=low + + * sys_types_include.patch: Use the upstrea version of this patch. + (LP: #1174429) + + -- Luke Yelavich <themuso@ubuntu.com> Mon, 06 May 2013 13:09:15 +1000 + +alsa-lib (1.0.25-4ubuntu3) raring; urgency=low + + * sys_types_include.patch: Explicitly include <sys/types.h> (LP: #1109298) + + -- Adam Conrad <adconrad@ubuntu.com> Sat, 09 Feb 2013 20:07:54 -0700 + +alsa-lib (1.0.25-4ubuntu2) raring; urgency=low + + [ Marcin Juszkiewicz ] + * Add Samsung Chromebook UCM configuration - LP: #1085392 + + [ Adam Conrad ] + * Re-introduce PandaES UCM profiles dropped in a previous merge. + + -- Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Sat, 01 Dec 2012 13:22:52 +0100 + +alsa-lib (1.0.25-4ubuntu1) raring-proposed; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/control: Add Vcs-Bzr URI + - Ship smixer plugins for native and bi-arch packages + - Add Echo3G support + - Show hints for non-standard devices that lack configuration files + - Add Pandaboard and Pandaboard ES UCM configuration + - Hide digital devices on some common, analog-only USB devices + - Ship proper ucm default configuration to make sound work out of the box on + ac100 netbooks + - Add a compile/run autopkg test + + -- Luke Yelavich <themuso@ubuntu.com> Mon, 05 Nov 2012 12:31:05 +1100 + alsa-lib (1.0.25-4) unstable; urgency=low * Add htcl_remove_useless_assert.patch: apply patch from git to remove @@ -127,6 +275,55 @@ alsa-lib (1.0.25-4) unstable; urgency=low -- Jordi Mallach <jordi@debian.org> Fri, 03 Aug 2012 23:35:47 +0200 +alsa-lib (1.0.25-3ubuntu5) raring-proposed; urgency=low + + * Add a compile/run autopkg test, thanks to Rafał Cieślak. (LP: #1073346) + + -- Luke Yelavich <themuso@ubuntu.com> Wed, 31 Oct 2012 13:49:43 +0100 + +alsa-lib (1.0.25-3ubuntu4) raring; urgency=low + + * Drop the libasound2-python package; this isn't built in Debian, it + doesn't look like anything uses the module, it isn't ported to python3, + and the python-dev build-dependency prevents cross-building alsa-lib. + * debian/patches/fix-broken-cross-compiler-detection.patch: Drop a + broken non-standard attempt to find a cross-compiler. + * Update Vcs-Bzr field for new branch. Instead of putting the release name + in the branch, just use 'ubuntu' so that this doesn't have to be updated + for each new series and SRU branches can be created only when needed. + + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 18 Oct 2012 21:43:27 -0700 + +alsa-lib (1.0.25-3ubuntu3) quantal; urgency=low + + * debian/ucm/tegraalc5632/tegraalc5632.conf: fix recording, set sane volume + defaults (LP: #1046412) + + -- Oliver Grawert <ogra@ubuntu.com> Wed, 12 Sep 2012 12:10:18 +0200 + +alsa-lib (1.0.25-3ubuntu2) quantal; urgency=low + + * debian/ucm/PandaES -> debian/ucm/PandaBoardES + * Change contents of PandaBoard ES files as above. + * Make similar changes for PandaBoard as well, Panda -> PandaBoard. + + -- Luke Yelavich <themuso@ubuntu.com> Thu, 09 Aug 2012 19:17:34 +1000 + +alsa-lib (1.0.25-3ubuntu1) quantal; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/control: Add Vcs-Bzr URI + - Ship smixer plugins for native and bi-arch packages + - Create libasound2-python package for the python mixer plugin + - Add Echo3G support + - Show hints for non-standard devices that lack configuration files + - Add Pandaboard and Pandaboard ES UCM configuration + - Hide digital devices on some common, analog-only USB devices + - Ship proper ucm default configuration to make sound work out of the box on + ac100 netbooks + + -- Luke Yelavich <themuso@ubuntu.com> Fri, 22 Jun 2012 16:31:22 +1000 + alsa-lib (1.0.25-3) unstable; urgency=low * Merge from Ubuntu: @@ -161,6 +358,96 @@ alsa-lib (1.0.25-2) unstable; urgency=low -- Jordi Mallach <jordi@debian.org> Sun, 12 Feb 2012 01:50:17 +0100 +alsa-lib (1.0.25-1ubuntu11) quantal; urgency=low + + * Update vcs-bzr field to quantal + * 0001-USB-Audio-Blacklist-iec958-for-some-USB-devices.patch: + Add more USB devices to the IEC958 blacklist (LP: #987163) + + -- David Henningsson <david.henningsson@canonical.com> Fri, 11 May 2012 14:20:20 -0700 + +alsa-lib (1.0.25-1ubuntu10) precise; urgency=low + + * Undo accidental revert of PandaES changes from the previous upload. + + -- Adam Conrad <adconrad@ubuntu.com> Fri, 16 Mar 2012 14:53:37 -0600 + +alsa-lib (1.0.25-1ubuntu9) precise; urgency=low + + * 0001-USB-Audio-Blacklist-iec958-for-some-USB-devices.patch: + Hide digital devices on some common, analog-only USB devices + (LP: #940145) + + -- David Henningsson <david.henningsson@canonical.com> Fri, 09 Mar 2012 11:50:30 +0100 + +alsa-lib (1.0.25-1ubuntu8) precise; urgency=low + + * add tegraalc5632 dir and tegraalc5632.conf to debian/ucm/, shipping a + proper ucm default configuration to make sound work out of the box on + ac100 netbooks + + -- Oliver Grawert <ogra@ubuntu.com> Wed, 07 Mar 2012 15:27:43 +0100 + +alsa-lib (1.0.25-1ubuntu7) precise; urgency=low + + * Move PandaES bits to debian/ucm, so they'll actually get used. + + -- Adam Conrad <adconrad@ubuntu.com> Wed, 29 Feb 2012 18:27:23 -0700 + +alsa-lib (1.0.25-1ubuntu6) precise; urgency=low + + * Fix the patch header of pandaES-naming-changes.patch and actually add + Tobin Davis <gruemaster@gmail.com> as the original creator. + + -- Oliver Grawert <ogra@ubuntu.com> Fri, 24 Feb 2012 18:43:13 +0100 + +alsa-lib (1.0.25-1ubuntu5) precise; urgency=low + + * debian/patches/pandaES-naming-changes.patch: [device naming for the + PandaES differs from Panda, make ucm and udev take that into account] + + -- Oliver Grawert <ogra@ubuntu.com> Fri, 24 Feb 2012 16:11:06 +0100 + +alsa-lib (1.0.25-1ubuntu4) precise; urgency=low + + * Add config file for the tegra alc5632 chip found in the AC100 netbook. + + -- Luke Yelavich <themuso@ubuntu.com> Wed, 15 Feb 2012 16:22:53 +1100 + +alsa-lib (1.0.25-1ubuntu3) precise; urgency=low + + * Pre-Depends: dpkg (>= 1.15.7.2) in lib32asound2 as well as in the other + binary packages using dpkg-maintscript-helper. + + -- Colin Watson <cjwatson@ubuntu.com> Mon, 13 Feb 2012 16:31:14 +0000 + +alsa-lib (1.0.25-1ubuntu2) precise; urgency=low + + [ Tobin Davis ] + * Change control names for Panda (omap4) in ucm config files. (LP: #929813) + + -- Luke Yelavich <themuso@ubuntu.com> Mon, 13 Feb 2012 10:25:58 +1100 + +alsa-lib (1.0.25-1ubuntu1) precise; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/control: Add Vcs-Bzr URI + - Ship smixer plugins for native and bi-arch packages + - drop libcxxtools-dev build dependency, its in universe + - Pre-depend on dpkg >= 1.15.7.2 to make things slightly safer for + upgrades from lucid, can be dropped in precise+1 + - Create libasound2-python package for the python mixer plugin + - Remove old ld.so.conf files on upgrade, can be dropped in precise+1 + - Add Echo3G support + - Show hints for non-standard devices that lack configuration files + - Only build lib32asound2 packages for amd64 + - Do not build bi-arch packages for ppc64 + * Remove trailing whitespace character from the end of the + DEB_HOST_MULTIARCH definition, as it was breaking the plugin directory + path + + -- Luke Yelavich <themuso@ubuntu.com> Wed, 08 Feb 2012 14:49:08 +1100 + alsa-lib (1.0.25-1) experimental; urgency=low * New upstream release. @@ -193,6 +480,26 @@ alsa-lib (1.0.25-1) experimental; urgency=low -- Jordi Mallach <jordi@debian.org> Tue, 31 Jan 2012 00:09:11 +0100 +alsa-lib (1.0.24.1-4ubuntu1) precise; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/control: Add Vcs-Bzr URI + - Add configuration files for bluetooth/bluez-alsa + - Ship smixer plugins for native and bi-arch packages + - drop libcxxtools-dev build dependency, its in universe + - Pre-depend on dpkg >= 1.15.7.2 to make things slightly safer for + upgrades from lucid + - Build depend on python-dev + - Create libasound2-python package for the python mixer plugin + - Remove old ld.so.conf files on upgrade + - Add ucm support for SDP4430 and Panda hardware + - Add Echo3G support + - Show hints for non-standard devices that lack configuration files + - Only build lib32asound2 packages for amd64 + - Do not build bi-arch packages for ppc64 + + -- Luke Yelavich <themuso@ubuntu.com> Tue, 18 Oct 2011 11:00:33 +1100 + alsa-lib (1.0.24.1-4) unstable; urgency=low [ Jordi Mallach ] @@ -261,6 +568,132 @@ alsa-lib (1.0.24.1-1) unstable; urgency=low -- Jordi Mallach <jordi@debian.org> Sat, 16 Jul 2011 05:35:10 +0200 +alsa-lib (1.0.24.1-0ubuntu10) oneiric; urgency=low + + * No, really, s/SDP4430/Panda/ on the ucm/Panda configs (LP: #820466) + + -- Adam Conrad <adconrad@ubuntu.com> Fri, 30 Sep 2011 03:30:21 -0600 + +alsa-lib (1.0.24.1-0ubuntu9) oneiric; urgency=low + + * Duplicate ucm/SDP4430 configs as ucm/Panda configs, reflecting the + fact that Pandaboard now has a non-generic card name (LP: #746023) + * Comment out AMIC PDM Switch config from ucm/Panda/record, as that + device seems to have stopped existing in recent kernel versions. + + -- Adam Conrad <adconrad@ubuntu.com> Thu, 29 Sep 2011 11:41:38 -0600 + +alsa-lib (1.0.24.1-0ubuntu8) oneiric; urgency=low + + * Split the python-based mixer into a separate package, so our Multi-Arch + libasound2 is actually co-installable. + + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 11 Aug 2011 17:32:34 +0000 + +alsa-lib (1.0.24.1-0ubuntu7) oneiric; urgency=low + + * Merge changes from Debian svn: + - Bump to debhelper compat v8. + - Remove debian/tmp prefixes from .install file. + - Add multiarch support: + + Build-Depend on debhelper 8.1.3. + + Add Pre-Depends: ${misc:Pre-Depends} to libasound2. + + Declare DEB_HOST_MULTIARCH and use it to define $libdir. + + Add an explicit --with-plugindir argument to base plugindir on the + multiarch dir. + + Update libasound2-dev.install. + + Mark libasound2 Multi-Arch: same. + - Break current versions of packages providing ALSA plugins. + - Remove libasound2's .la file, as any reference will be now broken. + - Remove unneeded Suggests and Conflicts from -udeb. + - Set Section to debian-installer. + - Replace versioned conflicts with Breaks, and remove some obsolete ones. + - Bump Standards-Version to 3.9.2 (no further changes). + - Update upstream URL in copyright file. + - Use versioned pointer to LGPL 2.1 licence. + * Drop the hard-coded versioned dependency on libc6-i386. If we don't need + this as a pre-depends for cycle breaking, we don't need to declare it at + all since shlibdeps will do the right thing. + * debian/patches/multiarch-safe-dlopen-search-path.patch: compile in + the ALSA search path instead of relying on ld.so.conf. + * With the plugin path corrected, drop the existing ld.so.conf snippets, + removing them on upgrade. + * Spell out the plugin dir path: the build system fails to expand + substitutions, and '${libdir}' is obviously not present on the + filesystem. + + -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 21 Jul 2011 18:02:01 +0200 + +alsa-lib (1.0.24.1-0ubuntu6) oneiric; urgency=low + + * debian/control: Update Vcs-Bzr field + * debian/rules, debian/libasound2.install: Change the way that smixer files + are installed, following on from the changes made in the addition of an + libasound2 udeb + + Cherry-pick changes from debian ALSA svn: + + [ Jordi Mallach ] + * Switch to architecture wildcard 'linux-any'. + + [ Elimar Riesebieter ] + * Provide libasound2-udeb based on a patch from Samuel Thibault. Thanks. + (closes: #613092) + * Added armhf to supported arch's of libasound2 and libasound2-dev + (closes: #596968) + + -- Luke Yelavich <themuso@ubuntu.com> Fri, 06 May 2011 10:22:14 +1000 + +alsa-lib (1.0.24.1-0ubuntu5) natty; urgency=low + + * Add ALSA UCM config files for omap4 (LP: #746023) + + -- Luke Yelavich <themuso@ubuntu.com> Mon, 11 Apr 2011 20:52:10 +1000 + +alsa-lib (1.0.24.1-0ubuntu4) natty; urgency=low + + * lp178442-ICE1712.patch: Makes pulseaudio succeed in opening + ICE1712 chips such as Maudio 2496 and Delta 1010LT. + (LP: #178442) + + -- David Henningsson <david.henningsson@canonical.com> Mon, 28 Mar 2011 11:01:55 +0200 + +alsa-lib (1.0.24.1-0ubuntu3) natty; urgency=low + + * alsa-lib-ucm-allow-values-to-be-read-from-devices.patch: Refresh to include + various fixes to the initial patch, as well as some further fixes from + Jaroslav Kysela + + -- Luke Yelavich <themuso@ubuntu.com> Mon, 21 Mar 2011 17:06:44 +1100 + +alsa-lib (1.0.24.1-0ubuntu2) natty; urgency=low + + * alsa-lib-ucm-allow-values-to-be-read-from-devices.patch: Patch from the + alsa-devel mailing list, written by Margarita Olaya Cabrera: + - ucm: allow values to be read from devices (LP: #736242) + + -- Luke Yelavich <themuso@ubuntu.com> Fri, 18 Mar 2011 09:26:57 +1100 + +alsa-lib (1.0.24.1-0ubuntu1) natty; urgency=low + + [ David Henningsson ] + * New upstream version. + * Dropped patches: + - thread-specific-locale.patch + - thread-safe-locale.patch + - lp652035-fix-missing-hw-devices.patch + - refcount-dlobjs.patch + - libtool-out-of-tree.patch + + [ Luke Yelavich ] + * debian/changelog.ALSA: Updated + * debian/rules: + - Bumped shlibs + - Create usr/share/alsa/ucm directory to satisfy the alsaucm utility + * debian/control: Update Vcs-bzr field to point to new branch location + + -- Luke Yelavich <themuso@ubuntu.com> Mon, 21 Feb 2011 18:08:28 +1100 + alsa-lib (1.0.23-4) unstable; urgency=low [ Jordi Mallach ] @@ -295,6 +728,37 @@ alsa-lib (1.0.23-3) unstable; urgency=low -- Jordi Mallach <jordi@debian.org> Mon, 18 Apr 2011 19:41:43 +0200 +alsa-lib (1.0.23-2.1ubuntu2) natty; urgency=low + + * Rebuild with python2.7 as the default python version. + + -- Matthias Klose <doko@ubuntu.com> Thu, 09 Dec 2010 14:52:01 +0100 + +alsa-lib (1.0.23-2.1ubuntu2) natty; urgency=low + + * Rebuild with python2.7 as the default python version. + + -- Matthias Klose <doko@ubuntu.com> Thu, 09 Dec 2010 14:52:01 +0100 + +alsa-lib (1.0.23-2.1ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/rules: + + Don't bail when removing include/alsa + - debian/control: Add Vcs-Bzr URI + - Add configuration files for bluetooth/bluez-alsa and pulseaudio + - debian/libasound2.install: Ship smixer plugins for native and bi-arch + packages + - drop libcxxtools-dev build dependency, its in universe + - add --with-plugindir=\$${prefix}/lib/alsa-lib to configure-stamp + - Demote libc6-i386 pre-depends to depends for lib32asound2 + - correctly free dl handles + - Comment out debian's thread patches + * debian/patches/series: Comment out refcount patch, as this is already + in ubuntu + + -- Luke Yelavich <themuso@ubuntu.com> Fri, 29 Oct 2010 12:16:45 -0400 + alsa-lib (1.0.23-2.1) unstable; urgency=low * Non-maintainer upload. @@ -307,6 +771,33 @@ alsa-lib (1.0.23-2.1) unstable; urgency=low -- Simon McVittie <smcv@debian.org> Fri, 08 Oct 2010 08:30:54 +0100 +alsa-lib (1.0.23-2ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/rules: + + Don't bail when removing include/alsa + - debian/control: Add Vcs-Bzr URI + - Add configuration files for bluetooth/bluez-alsa and pulseaudio + - debian/libasound2.install: Ship smixer plugins for native and bi-arch + packages + - drop libcxxtools-dev build dependency, its in universe + - add --with-plugindir=\$${prefix}/lib/alsa-lib to configure-stamp + - Demote libc6-i386 pre-depends to depends for lib32asound2 + - correctly free dl handles + * debian/patches/series: Uncomment debian's thread patches, as our + relibtoolize.patch encorporates those fixes already, as well as the above + dl handlers fix, and its a little difficult unraveling them + + [ Daniel T Chen ] + * Apply upstream git changesets + 0244370 and c049d48 to help fix LP: #652035. + * lp652035-use-extended-namehints.patch: Show hints for non-standard + devices that lack configuration files. This patch is also required + to help fix LP: #652035 and by consequence also addresses + LP: #425362. + + -- Luke Yelavich <themuso@ubuntu.com> Sat, 16 Oct 2010 15:05:11 +1100 + alsa-lib (1.0.23-2) unstable; urgency=medium [ Elimar Riesebieter ] @@ -317,6 +808,31 @@ alsa-lib (1.0.23-2) unstable; urgency=medium -- Jordi Mallach <jordi@debian.org> Wed, 22 Sep 2010 12:22:18 +0200 +alsa-lib (1.0.23-1ubuntu2) maverick; urgency=low + + * Apply upstream git changesets aadcbab through 72c7260ce + and rediff debian/patches/relibtoolise.patch + - correctly free dl handles, fixes LP: #552411, #584393 + (Closes: #589896) + + -- Daniel T Chen <crimsun@ubuntu.com> Sun, 29 Aug 2010 13:13:19 -0400 + +alsa-lib (1.0.23-1ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining changes: + * Merge from debian unstable, remaining changes: + - debian/rules: + + Don't bail when removing include/alsa + - debian/control: Add Vcs-Bzr URI + - Add configuration files for bluetooth/bluez-alsa and pulseaudio + - debian/libasound2.install: Ship smixer plugins for native and bi-arch + packages + - drop libcxxtools-dev build dependency, its in universe + - add --with-plugindir=\$${prefix}/lib/alsa-lib to configure-stamp + - Demote libc6-i386 pre-depends to depends for lib32asound2 + + -- Luke Yelavich <themuso@ubuntu.com> Mon, 19 Jul 2010 00:49:45 +1000 + alsa-lib (1.0.23-1) unstable; urgency=low * New upstream release. @@ -334,6 +850,33 @@ alsa-lib (1.0.23-1) unstable; urgency=low -- Jordi Mallach <jordi@debian.org> Wed, 02 Jun 2010 20:21:04 +0200 +alsa-lib (1.0.23-0ubuntu1) maverick; urgency=low + + * New upstream release + - debian/patches/: + + Dont_leak_timer_fd_on_pcm_slave_close.patch + + Fix-S24_3LE-softvol-distortion.patc + + Fix-modem-on-hook.patch + + Fix-stream-state-updates.patch + + Fix-pcm-timer-open-subdevice-pcm_hw.patch + + b9dbee6-Fix-threading-drain.patch + - Dropped + + Fix-str-lit-no-format.patch + + lp433573-Support-Echo3G.patch + - retained, need to be sent upstream + * Merge from debian unstable, remaining changes: + - debian/rules: + + Don't bail when removing include/alsa + - debian/control: Add Vcs-Bzr URI + - Add configuration files for bluetooth/bluez-alsa and pulseaudio + - debian/libasound2.install: Ship smixer plugins for native and bi-arch + packages + - drop libcxxtools-dev build dependency, its in universe + - add --with-plugindir=\$${prefix}/lib/alsa-lib to configure-stamp + - Demote libc6-i386 pre-depends to depends for lib32asound2 + + -- Luke Yelavich <themuso@ubuntu.com> Wed, 19 May 2010 11:04:50 +1000 + alsa-lib (1.0.22-2) unstable; urgency=low [ Jordi Mallach ] @@ -369,6 +912,112 @@ alsa-lib (1.0.22-1) unstable; urgency=low -- Jordi Mallach <jordi@debian.org> Thu, 11 Feb 2010 21:24:39 +0100 +alsa-lib (1.0.22-0ubuntu7) lucid; urgency=low + + * Demote libc6-i386 pre-depends to depends for lib32asound2 to + prevent cycle. Ubuntu has always shipped in /usr/lib32 instead + of /emul, which makes the pre-depends unnecessary. + (LP: #554149) + + -- Daniel T Chen <crimsun@ubuntu.com> Tue, 06 Apr 2010 10:46:15 -0400 + +alsa-lib (1.0.22-0ubuntu6) lucid; urgency=low + + * debian/patches/b9dbee6-Fix-threading-drain.patch: + Prevent drain() from blocking in threads. + * debian/patches/lp433573-Support-Echo3G.patch: + Fix missing support for Echo3G devices. Thanks, + unimatrix! (LP: #433573) + + -- Daniel T Chen <crimsun@ubuntu.com> Wed, 03 Mar 2010 08:20:24 -0500 + +alsa-lib (1.0.22-0ubuntu5) lucid; urgency=low + + * debian/patches/Fix-pcm-timer-open-subdevice-pcm_hw.patch: + Fix hw plugin opening webcams. + + -- Daniel T Chen <crimsun@ubuntu.com> Sun, 28 Feb 2010 17:22:53 -0500 + +alsa-lib (1.0.22-0ubuntu4) lucid; urgency=low + + * debian/rules: Fix plugindir prefix application as per gutsy. + + -- Daniel T Chen <crimsun@ubuntu.com> Thu, 18 Feb 2010 20:01:46 -0500 + +alsa-lib (1.0.22-0ubuntu3) lucid; urgency=low + + * debian/rules: add --with-plugindir=\$${prefix}/lib/alsa-lib to + configure-stamp. Thanks to Daniel T Chen. (LP: #523716) + + -- Jamie Strandboge <jamie@ubuntu.com> Thu, 18 Feb 2010 11:54:14 -0600 + +alsa-lib (1.0.22-0ubuntu2) lucid; urgency=low + + * debian/patches/: + + Fix-modem-on-hook.patch (2e4843) + + Fix-stream-state-updates.patch (63acb8) + + Fix-str-lit-no-format.patch + + -- Daniel T Chen <crimsun@ubuntu.com> Mon, 01 Feb 2010 19:42:40 -0500 + +alsa-lib (1.0.22-0ubuntu1) lucid; urgency=low + + * debian/patches/: + - Drop backported Always-use-delay-ioctl.patch, + Allow-dmix-dsnoop-slave-hook.patch, Fix-compare_default.patch, + Optimise-and-fix-hints.patch, Add-FD_CLOEXEC-support.patch, + Fix-enum-check.patch + + Add Fix-S24_3LE-softvol-distortion.patch (bdf80) from master + HEAD + * debian/rules: Bump shlibs to >> 1.0.22 due to added symbols + + -- Daniel T Chen <crimsun@ubuntu.com> Thu, 24 Dec 2009 02:38:07 -0500 + +alsa-lib (1.0.21a-1ubuntu4) lucid; urgency=low + + * debian/patches/: + + Dont_leak_timer_fd_on_pcm_slave_close.patch: Use upstream's + fix for LP #451893, so remove: + - 0001-ALSA-pcm-Properly-close-timer-when-freeing-slaves.patch + + -- Daniel T Chen <crimsun@ubuntu.com> Mon, 21 Dec 2009 06:33:01 -0500 + +alsa-lib (1.0.21a-1ubuntu3) lucid; urgency=low + + * 0001-ALSA-pcm-Properly-close-timer-when-freeing-slaves.patch: + Properly free timer fd when closing pcm slaves. Thanks, Dan + McCombs! (submitted upstream, LP: #451893) + + -- Daniel T Chen <crimsun@ubuntu.com> Sun, 20 Dec 2009 15:41:06 -0500 + +alsa-lib (1.0.21a-1ubuntu2) lucid; urgency=low + + * Backport from origin/master HEAD: + + Always-use-delay-ioctl.patch (ecf4b) + + Allow-dmix-dsnoop-slave-hook.patch (d9e59) + + Fix-compare_default.patch (0110d) + + Optimise-and-fix-hints.patch (e1c7d..407e9) + + Add-FD_CLOEXEC-support.patch (ef2d3..30f59, 4de76) + + Fix-enum-check.patch (34409, 762fe) + * Remove Fix-fpe-snd_pcm_mmap_begin.patch; we need to fix this in linux. + + -- Daniel T Chen <crimsun@ubuntu.com> Sat, 12 Dec 2009 13:47:12 -0500 + +alsa-lib (1.0.21a-1ubuntu1) lucid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/rules: + + Don't bail when removing include/alsa + - debian/control: Add Vcs-Bzr URI + - Add configuration files for bluetooth/bluez-alsa and pulseaudio + - debian/libasound2.install: Ship smixer plugins for native and bi-arch + packages + - drop libcxxtools-dev build dependency, its in universe + - debian/patches/Fix-fpe-snd_pcm_mmap_begin.patch: Handle attempts to + divide by zero + + -- Luke Yelavich <themuso@ubuntu.com> Wed, 04 Nov 2009 19:04:11 +1100 + alsa-lib (1.0.21a-1) unstable; urgency=low [ Elimar Riesebieter ] @@ -407,6 +1056,58 @@ alsa-lib (1.0.20-4) unstable; urgency=low -- Jordi Mallach <jordi@debian.org> Fri, 28 Aug 2009 11:37:38 +0200 +alsa-lib (1.0.20-3ubuntu6) karmic; urgency=low + + * debian/patches/Fix-fpe-snd_pcm_mmap_begin.patch: Handle attempts + to div by zero (LP: #412677) + + -- Daniel T Chen <crimsun@ubuntu.com> Sun, 27 Sep 2009 16:49:08 -0400 + +alsa-lib (1.0.20-3ubuntu5) karmic; urgency=low + + * debian/patches/: + + Refresh Add-config-file-for-SB-XFi-driver.patch + + Revert conf parsing changes (LP: #421351) + + -- Daniel T Chen <crimsun@ubuntu.com> Sun, 06 Sep 2009 10:21:01 -0400 + +alsa-lib (1.0.20-3ubuntu4) karmic; urgency=low + + * debian/patches/Backport-git-head-fixes.patch: Apply as of + changeset cbf5675eef5d4194532d3a57c8b5d4c0af831ed7 + + -- Daniel T Chen <crimsun@ubuntu.com> Fri, 21 Aug 2009 16:30:44 -0400 + +alsa-lib (1.0.20-3ubuntu3) karmic; urgency=low + + * debian/patches/Fix-fpe-pcm_rate.patch: Fix division by zero + (Closes: #539454) + + -- Daniel T Chen <crimsun@ubuntu.com> Thu, 06 Aug 2009 17:41:19 -0400 + +alsa-lib (1.0.20-3ubuntu2) karmic; urgency=low + + * Add config file for the Creative SB-XFi series of cards, taken from git + master. + + -- Luke Yelavich <themuso@ubuntu.com> Thu, 16 Jul 2009 12:17:08 +1000 + +alsa-lib (1.0.20-3ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/rules: + + Don't bail when removing include/alsa + - debian/control: Add Vcs-Bzr URI + - Add configuration files for bluetooth/bluez-alsa and pulseaudio + - debian/libasound2.install: Ship smixer plugins for native and bi-arch + packages + - drop libcxxtools-dev build dependency, its in universe + * Remove pre-depends on libc6-i386 for lib32asound2. Ubuntu already uses + usr/lib32, and Ubuntu doesn't have the required version of libc6-i386 + yet anyway + + -- Luke Yelavich <themuso@ubuntu.com> Thu, 25 Jun 2009 14:09:49 +1000 + alsa-lib (1.0.20-3) unstable; urgency=low [ Jordi Mallach ] @@ -420,6 +1121,27 @@ alsa-lib (1.0.20-3) unstable; urgency=low -- Jordi Mallach <jordi@debian.org> Wed, 24 Jun 2009 13:40:03 +0200 +alsa-lib (1.0.20-2ubuntu2) karmic; urgency=low + + * Build-depend on python-dev, not python2.4-dev - the latter is a no-op + anyway since python-config is not available. + + -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 06 Jun 2009 00:05:22 +0000 + +alsa-lib (1.0.20-2ubuntu1) karmic; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/rules: + + Install into /usr/lib32/ on amd64 for the lib32asound2 package + + Don't bail when removing include/alsa + - debian/control: Add Vcs-Bzr URI + - Add configuration files for bluetooth/bluez-alsa and pulseaudio + - debian/libasound2.install: Ship smixer plugins for native and bi-arch + packages + - drop libcxxtools-dev build dependency, its in universe + + -- Luke Yelavich <themuso@ubuntu.com> Fri, 29 May 2009 14:54:52 +0200 + alsa-lib (1.0.20-2) unstable; urgency=medium [ Elimar Riesebieter ] @@ -430,6 +1152,20 @@ alsa-lib (1.0.20-2) unstable; urgency=medium -- Jordi Mallach <jordi@debian.org> Fri, 29 May 2009 01:56:26 +0200 +alsa-lib (1.0.20-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/rules: + + Install into /usr/lib32/ on amd64 for the lib32asound2 package + + Don't bail when removing include/alsa + - debian/control: Add Vcs-Bzr URI + - Add configuration files for bluetooth/bluez-alsa and pulseaudio + - debian/libasound2.install: Ship smixer plugins for native and bi-arch + packages + - drop libcxxtools-dev build dependency, its in universe + + -- Luke Yelavich <themuso@ubuntu.com> Tue, 26 May 2009 08:57:32 +0200 + alsa-lib (1.0.20-1) unstable; urgency=low * New upstream release. @@ -445,6 +1181,34 @@ alsa-lib (1.0.20-1) unstable; urgency=low -- Jordi Mallach <jordi@debian.org> Thu, 21 May 2009 02:34:29 +0200 +alsa-lib (1.0.19-1ubuntu3) karmic; urgency=low + + * re-add patch from git head for validating numid of external plugins + + -- Luke Yelavich <themuso@ubuntu.com> Tue, 05 May 2009 15:31:33 +1000 + +alsa-lib (1.0.19-1ubuntu2) karmic; urgency=low + + * debian/control: drop libcxxtools-dev build dependency. Its in universe. + + -- Luke Yelavich <themuso@ubuntu.com> Mon, 04 May 2009 15:34:10 +1000 + +alsa-lib (1.0.19-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/rules: + + Install into /usr/lib32/ on amd64 for the lib32asound2 package + + Don't bail when removing include/alsa + - debian/control: Add Vcs-Bzr URI + - Add configuration files for bluetooth/bluez-alsa and pulseaudio + - debian/libasound2.install: Ship smixer plugins for native and bi-arch + packages + - debian/rules: Don't bail when removing include/alsa. + * drop all asoundconf related notifications and code. asoundconf will not + be available in karmic and beyond. + + -- Luke Yelavich <themuso@ubuntu.com> Mon, 04 May 2009 15:22:15 +1000 + alsa-lib (1.0.19-1) unstable; urgency=low * New upstream release. @@ -461,6 +1225,85 @@ alsa-lib (1.0.19-1) unstable; urgency=low -- Jordi Mallach <jordi@debian.org> Wed, 04 Mar 2009 01:44:12 +0100 +alsa-lib (1.0.18-1ubuntu9) jaunty; urgency=low + + * Don't display notifier hint if ~/.asoundrc and + ~/.asoundrc.asoundconf aren't writable, either + + -- Daniel T Chen <crimsun@ubuntu.com> Sun, 29 Mar 2009 18:10:58 -0400 + +alsa-lib (1.0.18-1ubuntu8) jaunty; urgency=low + + * Don't display notifier hint if in GNOME (LP: #328245) + + -- Daniel T Chen <crimsun@ubuntu.com> Mon, 23 Mar 2009 01:27:49 -0400 + +alsa-lib (1.0.18-1ubuntu7) jaunty; urgency=low + + * Backport fix from git HEAD for validating numid of external + plugins (also requires alsa-plugins update) + + -- Daniel T Chen <crimsun@ubuntu.com> Tue, 17 Feb 2009 16:34:39 -0500 + +alsa-lib (1.0.18-1ubuntu6) jaunty; urgency=low + + * Backport fix from git HEAD for non-zero device number on + HDA codecs' digital stream + + -- Daniel T Chen <crimsun@ubuntu.com> Sat, 14 Feb 2009 01:28:26 -0500 + +alsa-lib (1.0.18-1ubuntu5) jaunty; urgency=low + + * Backport fixes from git HEAD: + - fix_unhandled_pcm_access_cases.patch, + - pcm-set-params-doc.patch + + -- Daniel T Chen <crimsun@ubuntu.com> Thu, 12 Feb 2009 18:20:21 -0500 + +alsa-lib (1.0.18-1ubuntu4) jaunty; urgency=low + + * Backport fixes from git HEAD: + - fix_missing_ldl_modules_mixer_simple.patch, + - fix_gus_conf.patch, + - fix_plug_conv_mmap_emul.patch (required for fix_gus_conf), + - fix_off-t_mmap_offset.patch, + - strict_revents.patch + + -- Daniel T Chen <crimsun@ubuntu.com> Tue, 03 Feb 2009 18:01:10 -0500 + +alsa-lib (1.0.18-1ubuntu3) jaunty; urgency=low + + * Backport fixes from 1.0.19: + - fix_vol_switch_updates.patch, + - use_linear_plug_for_ice1724.patch, + - fix_uninitialised_type-conf.patch, + - fix_softvol_outside_plug.patch, + - fix_softvol_access.patch, + - fix_alsa-config-patch_check.patch, + - add_softvol_for_cmi8788.patch + + -- Daniel T Chen <crimsun@ubuntu.com> Mon, 19 Jan 2009 23:38:43 -0500 + +alsa-lib (1.0.18-1ubuntu2) jaunty; urgency=low + + * debian/libasound2.install: Ship smixer plugins located in + /usr/lib/alsa-lib/smixer. + + -- Luke Yelavich <themuso@ubuntu.com> Mon, 19 Jan 2009 15:16:23 +1100 + +alsa-lib (1.0.18-1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable. + * Packaging + + debian/libasound2.p{ostinst,rerm}: Install,remove update-notifier + file, respectively; + + debian/user-must-execute-asoundconf-set-default-card.update-notifier: + Tighten Display test; + + debian/control: Add Vcs-Bzr URI. + * Add configuration files for bluetooth/bluez-alsa and pulseaudio. + + -- Luke Yelavich <themuso@ubuntu.com> Thu, 06 Nov 2008 02:55:25 +1100 + alsa-lib (1.0.18-1) experimental; urgency=low * New upstream release. @@ -477,6 +1320,59 @@ alsa-lib (1.0.18-1) experimental; urgency=low -- Jordi Mallach <jordi@debian.org> Wed, 05 Nov 2008 21:17:55 +0100 +alsa-lib (1.0.17a-0ubuntu4) intrepid; urgency=low + + [ Mario Limonciello ] + * debian/patches/bluetooth_configuration.patch: + - Adds a pointer to the bluetooth configuration file. + If a user has bluez-audio installed and a heaset paired + this will allow them to use a headset by the name of + "headset" (LP: #274950) + + [ Luke Yelavich ] + * Add files to /etc/ld.so.conf.d for libasound2 and libasound2 bi-arch + packages. This Allows for alsa plugins to be referred to in alsa + configuration files without the need for absolute paths, the pulseaudio + runtime check is one such example. (LP: #273693) + + -- Luke Yelavich <themuso@ubuntu.com> Tue, 07 Oct 2008 17:49:28 +1100 + +alsa-lib (1.0.17a-0ubuntu3) intrepid; urgency=low + + * Revert below patches due to 100% CPU usage with amarok: (LP: #273645) + - from_git_dont_lose_no_xxx_flags.patch + - from_git_remove_access_type_change_for_refine.patch + + -- Luke Yelavich <themuso@ubuntu.com> Wed, 24 Sep 2008 11:04:22 +1000 + +alsa-lib (1.0.17a-0ubuntu2) intrepid; urgency=low + + * Some fixes from alsa-lib git (no API/ABI changes): + - from_git_dont_lose_no_xxx_flags.patch + - from_git_Reword_snd_pcm_delay_doxygen_doc.patch + - from_git_dont_call_simple_mixer_interface_legacy.patch + - from_git_remove_access_type_change_for_refine.patch + - from_git_fix_snd_pcm_read_comment.patch + - from_git_fix_async_callback_error_messages.patch + * debian/patches/pulseaudio_configuration.patch: Add a pointer to + an alsa configuration file for pulseaudio, which will allow the pulseaudio + alsa plugin to be used whenever pulseaudio is installed and running. + + -- Luke Yelavich <themuso@ubuntu.com> Mon, 22 Sep 2008 09:57:25 +1000 + +alsa-lib (1.0.17a-0ubuntu1) intrepid; urgency=low + + * New upstream release. + * Merge from Debian experimental. + * Packaging + + debian/libasound2.p{ostinst,rerm}: Install,remove update-notifier + file, respectively; + + debian/user-must-execute-asoundconf-set-default-card.update-notifier: + Tighten Display test; + + debian/control: Add Vcs-Bzr URI. + + -- Luke Yelavich <themuso@ubuntu.com> Fri, 22 Aug 2008 12:39:52 +1000 + alsa-lib (1.0.17-1) experimental; urgency=low [ Elimar Riesebieter ] @@ -503,6 +1399,21 @@ alsa-lib (1.0.17-1) experimental; urgency=low -- Jordi Mallach <jordi@debian.org> Thu, 24 Jul 2008 22:22:44 +0200 +alsa-lib (1.0.16-2ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. + * Patches + - debian/patches/{dont,fix}*: Remove (already applied upstream). + * Packaging + + debian/libasound2.p{ostinst,rerm}: Install,remove update-notifier + file, respectively; + + debian/user-must-execute-asoundconf-set-default-card.update-notifier: + Tighten Display test; + + debian/control: Add lpia to supported arches, adhere to + DebianMaintainerField, add Vcs-Bzr URI. + + -- Daniel T Chen <crimsun@ubuntu.com> Thu, 01 May 2008 18:40:46 -0400 + alsa-lib (1.0.16-2) unstable; urgency=medium [ Elimar Riesebieter ] @@ -528,6 +1439,49 @@ alsa-lib (1.0.16-1) unstable; urgency=low -- Jordi Mallach <jordi@debian.org> Mon, 25 Feb 2008 23:36:01 +0100 +alsa-lib (1.0.15-3ubuntu4) hardy; urgency=low + + * Backport fixes from hg tip (no API/ABI changes): + - fix_sem_deadlock_in_dmix.patch (LP: #190059), + - fix_const_casts.patch, + - fix_ioplug.patch, + - fix_control_range.patch, + - dont_use_hackish_callback_in_rate_plugin.patch, + - fix_cpu_hog_in_rate_plug.patch, + - fix_mmap_with_multi_plug.patch, + - fix_wrong_return_values_in_direct_plug.patch, + - fix_timestamp_in_status_pcm_direct_plug.patch, + - fix_configs_error_handling.patch, + - fix_not_updated_bit_set.patch, + - fix_device_assignment.patch, + - fix_missing_aliases.patch. + + -- Daniel T Chen <crimsun@ubuntu.com> Tue, 11 Mar 2008 23:31:24 -0400 + +alsa-lib (1.0.15-3ubuntu3) hardy; urgency=low + + * Fix the inverted logic in the test whether pulseaudio is running. + + -- Daniel T Chen <crimsun@ubuntu.com> Sat, 12 Jan 2008 17:08:01 -0500 + +alsa-lib (1.0.15-3ubuntu2) hardy; urgency=low + + * Don't display notifier on update if pulseaudio is running. + + -- Daniel T Chen <crimsun@ubuntu.com> Sat, 12 Jan 2008 13:12:01 -0500 + +alsa-lib (1.0.15-3ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. + * Ubuntu-specific changes: + - debian/libasound2.p{ostinst,rerm}: Install,remove update-notifier + file, respectively; + - debian/control: Add lpia to supported arches, adhere to + DebianMaintainerField, add Vcs-Bzr URI. + * Included patch addresses clicking/snapping/crackling, LP: #116990. + + -- Daniel T Chen <crimsun@ubuntu.com> Tue, 11 Dec 2007 21:41:52 +0000 + alsa-lib (1.0.15-3) unstable; urgency=medium [ Jordi Mallach ] @@ -539,6 +1493,19 @@ alsa-lib (1.0.15-3) unstable; urgency=medium -- Jordi Mallach <jordi@debian.org> Tue, 11 Dec 2007 10:55:26 +0100 +alsa-lib (1.0.15-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. + * Ubuntu-specific changes: + - debian/libasound2.p{ostinst,rerm}: Install,remove update-notifier + file, respectively; + - debian/control: Add lpia to supported arches, adhere to + DebianMaintainerField. + * Dmix/dsnoop no longer use sockets (LP: #85157). + * Biarch plugins support fixed (LP: #145645). + + -- Daniel T Chen <crimsun@ubuntu.com> Sat, 01 Dec 2007 18:50:12 -0500 + alsa-lib (1.0.15-2) unstable; urgency=low [ Elimar Riesebieter ] @@ -547,6 +1514,21 @@ alsa-lib (1.0.15-2) unstable; urgency=low -- Jordi Mallach <jordi@debian.org> Wed, 14 Nov 2007 00:57:45 +0100 +alsa-lib (1.0.15-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Install/remove libasound2.p{ostinst,rerm}; + - Add lpia to the arch lists for libasound and libasound-dev; + - Adhere to DebianMaintainerField; + * Remove obsoleted changes: + - Fix lfloat plugin logic error, LP: #132037; + - Drop debian/patches/fix-sampling-bit-shifts.patch, fixed + upstream; + - Drop --with-plugindir=\$${prefix}/lib/alsa-lib \ + for configure targets in debian/rules. + + -- Daniel T Chen <crimsun@ubuntu.com> Sun, 28 Oct 2007 11:34:42 -0400 + alsa-lib (1.0.15-1) unstable; urgency=low * New upstream release @@ -589,6 +1571,73 @@ alsa-lib (1.0.14-2) unstable; urgency=low -- Jordi Mallach <jordi@debian.org> Mon, 11 Jun 2007 15:19:20 +0200 +alsa-lib (1.0.14-1ubuntu8) gutsy; urgency=high + + * New patch, fix-sampling-bit-shifts, revert HG r2264 (changeset + 23c4c0f5de40) as the bit shifts overflow when the volume is high for 32 + bits to 16 bits resampling; Alsa #3360; GNOME #436192; LP: #116990; + Mandriva #33908. + + -- Loic Minier <lool@dooz.org> Sun, 14 Oct 2007 19:28:45 +0200 + +alsa-lib (1.0.14-1ubuntu7) gutsy; urgency=low + + * Trigger rebuild for hppa. + + -- LaMont Jones <lamont@ubuntu.com> Tue, 02 Oct 2007 06:32:36 -0600 + +alsa-lib (1.0.14-1ubuntu6) gutsy; urgency=low + + * Add lpia to the arch lists for libasound and libasound-dev. + + -- Adam Conrad <adconrad@ubuntu.com> Tue, 31 Jul 2007 14:31:02 +1000 + +alsa-lib (1.0.14-1ubuntu5) gutsy; urgency=low + + * debian/user-must-execute-asoundconf-set-default-card.update-notifier: + - Fix DisplayIf invocation, and make the message more meaningful, + LP: #122252. + + -- Daniel T Chen <crimsun@ubuntu.com> Fri, 29 Jun 2007 01:34:15 -0400 + +alsa-lib (1.0.14-1ubuntu4) gutsy; urgency=low + + * debian/: + - libasound2.p{ostinst,rerm}: Install/remove, respectively, the + update-notifier hook mentioned next, + - user-must-execute-asoundconf-set-default-card.update-notifier: + Add this update-notifier hook so that the user is informed that + he/she needs to execute the asoundconf(1) set-default-card macro, + because new ALSA configuration presets have been added + (LP: #120691). + + -- Daniel T Chen <crimsun@ubuntu.com> Mon, 25 Jun 2007 23:47:17 -0400 + +alsa-lib (1.0.14-1ubuntu3) gutsy; urgency=low + + * debian/patches/fix_plugindir.patch: Omit useless libtool hunk. + * debian/rules: Use the prefix, resolving the plugindir issue. + + -- Daniel T Chen <crimsun@ubuntu.com> Tue, 12 Jun 2007 18:24:38 -0400 + +alsa-lib (1.0.14-1ubuntu2) gutsy; urgency=low + + * debian/patches/{fix_plugindir.patch,series}: Pull proper upstream + fix for plugindir from 1.0.14a configure{,.in}. + + -- Daniel T Chen <crimsun@ubuntu.com> Tue, 12 Jun 2007 02:56:34 -0400 + +alsa-lib (1.0.14-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/control: Adhere to DebianMaintainerField, + - debian/patches/*.dpatch: Remove - incorporated into upstream, + - debian/rules: Pass --with-plugindir=\$${prefix}/lib/alsa-lib \ + to configure targets (Debian #428334). + * New upstream version fixes LP: #33736, LP: #97004. + + -- Daniel T Chen <crimsun@ubuntu.com> Mon, 11 Jun 2007 16:48:21 -0400 + alsa-lib (1.0.14-1) unstable; urgency=low * New upstream release @@ -654,6 +1703,69 @@ alsa-lib (1.0.13-2) unstable; urgency=medium -- Jordi Mallach <jordi@debian.org> Mon, 26 Feb 2007 18:20:43 +0100 +alsa-lib (1.0.13-1ubuntu5) feisty; urgency=low + + * debian/patches/{00list,62_add_dmix_usbaudio.dpatch}: + Don't apply for Feisty release. I made a test patch that has + yet to receive feedback, so this close to release we take the + conservative approach (reopens LP #33736). + + -- Daniel T Chen <crimsun@ubuntu.com> Tue, 10 Apr 2007 10:46:59 -0400 + +alsa-lib (1.0.13-1ubuntu4) feisty; urgency=low + + The "grey is a color" release. + + * debian/control: Adhere to DebianMaintainerField, + * debian/patches/: + - 63_improved_resampling.dpatch: Add, fixes resampling issues in + plugins, + - 64_duplex_multi.dpatch: Add, fixes linked start/stop for multiple + audio devices, + Closes LP: #44275, LP: #66657, + Thanks to Luke Yelavich <themuso@ubuntu.com> for testing. + + -- Daniel T Chen <crimsun@ubuntu.com> Tue, 13 Mar 2007 02:45:33 -0400 + +alsa-lib (1.0.13-1ubuntu3) feisty; urgency=low + + * debian/patches: Add 62_add_dmix_usbaudio.dpatch. This patch + enables dmix and proper 5.1 routing by default for USB audio + devices. Closes LP #33736. + + -- Daniel T Chen <crimsun@ubuntu.com> Wed, 14 Feb 2007 21:11:05 -0500 + +alsa-lib (1.0.13-1ubuntu2) feisty; urgency=low + + The "What Super Bowl?" release. + + * debian/patches: Add (backported from alsa-lib hg): + - 50_fix_error_recovery_path_for_volume_switch_write.dpatch, + - 51_fix_rate_plugin_boundary_calc.dpatch, + - 52_use_dmix_dsnoop_for_maestro3.dpatch, + - 53_fix_pkgconfig_libs.dpatch, + - 54_fix_sconf_mem_leak.dpatch, + - 55_fix_ipc_offset_calc_for_direct_plugins.dpatch, + - 56_fix_cs46xx_capture_ubuntu_76311.dpatch (lp#76311), + - 57_fix_channel_number_select_for_direct_plugins.dpatch, + - 58_fix_format_select_for_direct_plugins.dpatch, + - 59_fix_ladspa_none_policy.dpatch, + - 60_init_dl_handles.dpatch, + - 61_fix_timer_query_exit_code.dpatch, + * debian/rules: Don't bail when removing include/alsa. + + -- Daniel T Chen <crimsun@ubuntu.com> Sun, 4 Feb 2007 17:45:12 -0500 + +alsa-lib (1.0.13-1ubuntu1) feisty; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/control: Don't Conflict with ia32-libs (<< 1.9), + - debian/rules: Install into /usr/lib32/ on amd64. + * Remove Ubuntu changes to debian/patches/ and snd-aoa conf, + included in new upstream version already. + + -- Daniel T Chen <crimsun@ubuntu.com> Fri, 17 Nov 2006 22:01:56 -0500 + alsa-lib (1.0.13-1) unstable; urgency=low * New upstream release @@ -683,6 +1795,32 @@ alsa-lib (1.0.12-1) unstable; urgency=low -- Jordi Mallach <jordi@debian.org> Mon, 11 Sep 2006 11:14:58 +0200 +alsa-lib (1.0.11-7ubuntu3) edgy; urgency=low + + * On amd64, install into /usr/lib32. + + -- Matthias Klose <doko@ubuntu.com> Thu, 13 Jul 2006 12:08:28 +0000 + +alsa-lib (1.0.11-7ubuntu2) edgy; urgency=low + + * Add config for snd-aoa (aliased to PMacToonie) now that Edgy's + kernel supports it (taken from upstream alsa-lib hg changeset + 2318a83a6145). + + -- Daniel T Chen <crimsun@ubuntu.com> Thu, 13 Jul 2006 02:41:00 -0400 + +alsa-lib (1.0.11-7ubuntu1) edgy; urgency=low + + * Merge from debian unstable: + - debian/control: Don't Conflict with ia32-libs (<< 1.9). + - debian/patches/: Remove 05* (except for multiarch) and 24* + (they're present in 1.0.11); don't apply + 41_configure_cross_compile (already applied). + - debian/rules: Use Debian Sid's changes (--datadir, disabling + maintainer mode). + + -- Daniel T Chen <crimsun@ubuntu.com> Fri, 30 Jun 2006 15:01:52 +0100 + alsa-lib (1.0.11-7) unstable; urgency=medium [ Elimar Riesebieter ] @@ -785,6 +1923,47 @@ alsa-lib (1.0.10+1.0.11rc1-1) experimental; urgency=low -- Jordi Mallach <jordi@debian.org> Fri, 30 Dec 2005 13:51:41 +0100 +alsa-lib (1.0.10-2ubuntu4) dapper; urgency=low + + * debian/patches: Add: + - 24_dont_free_uninitialised_pointer. + - 24_fix_generation_of_iec958_subframes_and_preamble. + - 24_fix_pcm_no_control_status_mmap_on_32_compat_mode_64_bit_kernel. + - 24_make_dmix_dsnoop_defaults_for_aureonxx, + 24_make_dmix_dsnoop_defaults_for_ice17xx. + + -- Daniel T Chen <crimsun@ubuntu.com> Wed, 10 May 2006 19:54:05 -0400 + +alsa-lib (1.0.10-2ubuntu3) dapper; urgency=low + + * Run dh_makeshlibs for the biarch libraries. + + -- Matthias Klose <doko@ubuntu.com> Sat, 6 May 2006 22:20:06 +0000 + +alsa-lib (1.0.10-2ubuntu2) dapper; urgency=low + + * debian/patches/: Add: + - Memory leak fixes: 05_fix_mem_double_free,05_fix_mem_leaks_1, + 05_fix_mem_leaks_2,05_fix_mem_leaks_3 . + - Minor fixes: 05_fix_nonblocking_mode_typo, + 05_fix_plugin_dmix_crackling_from_byteswapping, + 05_fix_possible_infinite_loop_in_snd-pcm-wait_when_xrun + - 32/64-bit cpu polling issue: + 05_fix_timer_read_poll_100_percent_cpu__malone_41367 + (Closes: Malone #41367). + + -- Daniel T Chen <crimsun@ubuntu.com> Sat, 29 Apr 2006 19:53:05 -0400 + +alsa-lib (1.0.10-2ubuntu1) dapper; urgency=low + + * Synchronize to Debian. + * src/conf/cards/PMacToonie.conf: Fix missing 'playback.pcm {'. + (Malone #29722) + * debian/rules: Do not fail the build on dh_shlibdeps failures since + dh_shlibdeps cannot use ldd on 64 bit libraries on i386 buildds. + + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 26 Jan 2006 14:54:36 +0100 + alsa-lib (1.0.10-2) unstable; urgency=low [ Thomas Hood ] @@ -797,6 +1976,18 @@ alsa-lib (1.0.10-2) unstable; urgency=low -- Jordi Mallach <jordi@debian.org> Tue, 13 Dec 2005 21:49:29 +0100 +alsa-lib (1.0.10-1ubuntu2) dapper; urgency=low + + * Replace (build-)dependency ia32-libs-dev [amd64] -> libc6-dev-i386 [amd64] + + -- Matthias Klose <doko@ubuntu.com> Fri, 13 Jan 2006 20:27:30 +0000 + +alsa-lib (1.0.10-1ubuntu1) dapper; urgency=low + + * Synchronise with unstable. + + -- Matthias Klose <doko@ubuntu.com> Thu, 24 Nov 2005 11:01:37 +0100 + alsa-lib (1.0.10-1) unstable; urgency=low * New upstream release @@ -839,6 +2030,44 @@ alsa-lib (1.0.9+1.0.10rc1-1) experimental; urgency=low -- Jordi Mallach <jordi@debian.org> Mon, 19 Sep 2005 21:32:10 +0200 +alsa-lib (1.0.9-3ubuntu1) dapper; urgency=low + + * Build biarch library packages. + + -- Matthias Klose <doko@ubuntu.com> Wed, 16 Nov 2005 06:38:30 +0000 + +alsa-lib (1.0.9+1.0.10rc3-1) experimental; urgency=low + + * New upstream release candidate + * Thomas Hood + - Conflict with pre-1.0.9 libasound2-plugins + * Jordi Mallach + - Add "armeb" to our static list of target architectures. + + -- Jordi Mallach <jordi@debian.org> Thu, 10 Nov 2005 17:18:45 -0500 + +alsa-lib (1.0.9+1.0.10rc2-1) experimental; urgency=low + + * New upstream release candidate + * Thomas Hood + - debian/control: s/Architecture: any/Architecture: <Linux arches>/ + (Closes: #327186) + + -- Jordi Mallach <jordi@debian.org> Tue, 25 Oct 2005 10:25:11 +0200 + +alsa-lib (1.0.9+1.0.10rc1-1) experimental; urgency=low + + * New upstream release candidate + - Closes: #277539 (allow control of shm gid) + * Thomas Hood + - Update upstream changelog; put it and NOTES in -doc + - Replace -dev's doc dir with a symlink + - Make -dev and -doc Suggest each other + * Jordi Mallach + - Bump shlibs + + -- Jordi Mallach <jordi@debian.org> Mon, 19 Sep 2005 21:32:10 +0200 + alsa-lib (1.0.9-3) unstable; urgency=low * Thomas Hood @@ -1657,7 +2886,7 @@ alsalib (0.3.0-pre2-2) unstable; urgency=low * Fixed wrong documentID in doc-base registration -- Wichert Akkerman <wakkerma@debian.org> Sat, 23 Jan 1999 23:45:06 +0100 - + alsalib (0.3.0-pre2-1) unstable; urgency=low * New upstream version @@ -1700,3 +2929,4 @@ alsalib (0.0.8-1) unstable; urgency=low * Initial release -- Wichert Akkerman <wakkerma@debian.org> Sun, 7 Jun 1998 16:53:01 +0200 + diff --git a/debian/control b/debian/control index dfd83e3f..24a34a00 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: alsa-lib Section: libs Priority: optional -Maintainer: Debian ALSA Maintainers <pkg-alsa-devel@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian ALSA Maintainers <pkg-alsa-devel@lists.alioth.debian.org> Uploaders: Jordi Mallach <jordi@debian.org>, Elimar Riesebieter <riesebie@lxtec.de> Build-Depends: autotools-dev, @@ -11,8 +12,10 @@ Build-Depends: autotools-dev, Build-Depends-Indep: doxygen Standards-Version: 3.9.4 Homepage: http://www.alsa-project.org/ -Vcs-Svn: svn://anonscm.debian.org/pkg-alsa/trunk/alsa-lib -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-alsa/trunk/alsa-lib/ +XS-Debian-Vcs-Svn: svn://anonscm.debian.org/pkg-alsa/trunk/alsa-lib +XS-Debian-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-alsa/trunk/alsa-lib/ +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-audio-dev/alsa-lib/ubuntu +XS-Testsuite: autopkgtest Package: libasound2 Architecture: linux-any diff --git a/debian/patches/0001-Add-UCM-configuration-for-Nexus-4-Mako.patch b/debian/patches/0001-Add-UCM-configuration-for-Nexus-4-Mako.patch new file mode 100644 index 00000000..ddb4cd0a --- /dev/null +++ b/debian/patches/0001-Add-UCM-configuration-for-Nexus-4-Mako.patch @@ -0,0 +1,485 @@ +From 7fd8e14ff90e4b1477e3b3ae19a74e8452c1a490 Mon Sep 17 00:00:00 2001 +From: David Henningsson <david.henningsson@canonical.com> +Date: Tue, 27 Aug 2013 07:04:37 +0200 +Subject: [PATCH 1/4] Add UCM configuration for Nexus 4 (Mako) + +The VoiceCall profile is mostly empty, because in my implementation, +this is handled by talking to the audio HAL. +--- + configure.in | 1 + + src/conf/ucm/Makefile.am | 2 +- + src/conf/ucm/apq8064-tabla-snd-card/HiFi | 260 ++++++++++++++++++++ + src/conf/ucm/apq8064-tabla-snd-card/Makefile.am | 4 + + src/conf/ucm/apq8064-tabla-snd-card/VoiceCall | 121 +++++++++ + .../apq8064-tabla-snd-card.conf | 8 + + 6 files changed, 395 insertions(+), 1 deletion(-) + create mode 100644 src/conf/ucm/apq8064-tabla-snd-card/HiFi + create mode 100644 src/conf/ucm/apq8064-tabla-snd-card/Makefile.am + create mode 100644 src/conf/ucm/apq8064-tabla-snd-card/VoiceCall + create mode 100644 src/conf/ucm/apq8064-tabla-snd-card/apq8064-tabla-snd-card.conf + +Index: alsa-lib-1.0.27.2/configure.in +=================================================================== +--- alsa-lib-1.0.27.2.orig/configure.in 2013-07-08 09:31:36.000000000 -0300 ++++ alsa-lib-1.0.27.2/configure.in 2014-03-10 02:07:28.000000000 -0300 +@@ -669,6 +669,7 @@ + src/conf/ucm/PandaBoardES/Makefile \ + src/conf/ucm/SDP4430/Makefile \ + src/conf/ucm/tegraalc5632/Makefile \ ++ src/conf/ucm/apq8064-tabla-snd-card/Makefile \ + modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \ + alsalisp/Makefile aserver/Makefile \ + test/Makefile test/lsb/Makefile \ +Index: alsa-lib-1.0.27.2/src/conf/ucm/Makefile.am +=================================================================== +--- alsa-lib-1.0.27.2.orig/src/conf/ucm/Makefile.am 2013-07-08 09:31:36.000000000 -0300 ++++ alsa-lib-1.0.27.2/src/conf/ucm/Makefile.am 2014-03-10 02:07:28.000000000 -0300 +@@ -1 +1 @@ +-SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 ++SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 apq8064-tabla-snd-card +Index: alsa-lib-1.0.27.2/src/conf/ucm/apq8064-tabla-snd-card/HiFi +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ alsa-lib-1.0.27.2/src/conf/ucm/apq8064-tabla-snd-card/HiFi 2014-03-10 02:08:14.306081574 -0300 +@@ -0,0 +1,260 @@ ++SectionVerb { ++ EnableSequence [ ++ cdev "hw:apq8064tablasnd" ++ ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:apq8064tablasnd" ++ ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 0" ++ ] ++ ++ Value { ++ TQ "HiFi" ++ ++ CapturePCM "hw:apq8064tablasnd,0" ++ PlaybackPCM "hw:apq8064tablasnd,0" ++ } ++} ++ ++SectionDevice."Earpiece" { ++ #Name "Earpiece" ++ Comment "Earpiece speaker" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Headphones" ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:apq8064tablasnd" ++ ++ # We need to disable this while setting up the route, else the ++ # driver will hang if the stream is open. ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ ++ cset "name='SLIM_0_RX Channels' One" ++ cset "name='RX1 MIX1 INP1' RX1" ++ cset "name='RX1 MIX1 INP2' RX1" ++ cset "name='RX1 Digital Volume' 68" ++ cset "name='EAR PA Gain' POS_6_DB" ++ cset "name='DAC1 Switch' 1" ++ cset "name='SLIM TX3 MUX' RMIX1" ++ ++ # Route has been set up, re-enable the mixer. ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:apq8064tablasnd" ++ ++ # See comment in EnableSequence ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ ++ cset "name='RX1 MIX1 INP1' ZERO" ++ cset "name='RX1 MIX1 INP2' ZERO" ++ cset "name='RX1 Digital Volume' 68" ++ cset "name='DAC1 Switch' 0" ++ cset "name='SLIM TX3 MUX' ZERO" ++ ++ # See comment in EnableSequence ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Speaker" { ++ #Name "Speaker" ++ Comment "Main speaker" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Earpiece" ++ "Headphones" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:apq8064tablasnd" ++ ++ # We need to disable this while setting up the route, else the ++ # driver will hang if the stream is open. ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ ++ cset "name='SLIM_0_RX Channels' One" ++ cset "name='RX3 MIX1 INP1' RX1" ++ cset "name='RX3 MIX1 INP2' RX6" ++ cset "name='RX4 DSM MUX' DSM_INV" ++ cset "name='RX3 Digital Volume' 80" ++ cset "name='LINEOUT1 Volume' 100" ++ cset "name='LINEOUT3 Volume' 100" ++ cset "name='SLIM TX3 MUX' RMIX3" ++ ++ # Route has been set up, re-enable the mixer. ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:apq8064tablasnd" ++ ++ # See comment in EnableSequence ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ ++ cset "name='RX3 MIX1 INP1' ZERO" ++ cset "name='RX3 MIX1 INP2' ZERO" ++ cset "name='RX4 DSM MUX' CIC_OUT" ++ cset "name='RX3 Digital Volume' 68" ++ cset "name='LINEOUT1 Volume' 0" ++ cset "name='LINEOUT3 Volume' 0" ++ cset "name='SLIM TX3 MUX' ZERO" ++ ++ # See comment in EnableSequence ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ PlaybackPriority "150" ++ } ++} ++ ++SectionDevice."Headphones" { ++ #Name "Headphones" ++ Comment "Headphones" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Earpiece" ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:apq8064tablasnd" ++ ++ # We need to disable this while setting up the route, else the ++ # driver will hang if the stream is open. ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ ++ cset "name='SLIM_0_RX Channels' Two" ++ cset "name='RX1 MIX1 INP1' RX1" ++ cset "name='RX1 MIX1 INP2' RX6" ++ cset "name='RX2 MIX1 INP1' RX2" ++ cset "name='RX2 MIX1 INP2' RX7" ++ cset "name='HPHL DAC Switch' 1" ++ #FIXME ENOEXIST: cset "name='HPHR DAC Switch' 1" ++ cset "name='RX1 Digital Volume' 68" ++ cset "name='RX2 Digital Volume' 68" ++ cset "name='HPHL Volume' 50" ++ cset "name='HPHR Volume' 50" ++ cset "name='SLIM TX3 MUX' RMIX1" ++ cset "name='SLIM TX5 MUX' RMIX2" ++ ++ # Route has been set up, re-enable the mixer. ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:apq8064tablasnd" ++ ++ # See comment in EnableSequence ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ ++ cset "name='RX1 MIX1 INP1' ZERO" ++ cset "name='RX1 MIX1 INP2' ZERO" ++ cset "name='RX2 MIX1 INP1' ZERO" ++ cset "name='RX2 MIX1 INP2' ZERO" ++ cset "name='HPHL DAC Switch' 0" ++ #FIXME ENOEXIST: cset "name='HPHR DAC Switch' 0" ++ cset "name='RX1 Digital Volume' 68" ++ cset "name='RX2 Digital Volume' 68" ++ cset "name='HPHL Volume' 0" ++ cset "name='HPHR Volume' 0" ++ cset "name='SLIM TX3 MUX' ZERO" ++ cset "name='SLIM TX5 MUX' ZERO" ++ ++ # See comment in EnableSequence ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Headset" { ++ #Name "Headset" ++ Comment "Headset Microphone" ++ ++ ConflictingDevice [ ++ "Handset" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:apq8064tablasnd" ++ ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 0" ++ cset "name='SLIM_0_TX Channels' One" ++ cset "name='SLIM TX7 MUX' DEC8" ++ cset "name='DEC8 MUX' ADC2" ++ cset "name='ADC2 Volume' 3" ++ cset "name='DEC8 Volume' 84" ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:apq8064tablasnd" ++ ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 0" ++ cset "name='SLIM TX7 MUX' ZERO" ++ cset "name='DEC8 MUX' ZERO" ++ cset "name='ADC2 Volume' 0" ++ ] ++ ++ Value { ++ CaptureChannels "1" ++ } ++} ++ ++SectionDevice."Handset" { ++ #Name "Handset" ++ Comment "Handset Microphone" ++ ++ ConflictingDevice [ ++ "Headset" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:apq8064tablasnd" ++ ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 0" ++ cset "name='SLIM_0_TX Channels' One" ++ cset "name='SLIM TX7 MUX' DEC7" ++ cset "name='DEC7 MUX' ADC1" ++ cset "name='DEC7 Volume' 80" ++ cset "name='ADC1 Volume' 100" ++ cset "name='MICBIAS1 CAPLESS Switch' 0" ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:apq8064tablasnd" ++ ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 0" ++ cset "name='SLIM TX7 MUX' ZERO" ++ cset "name='DEC7 MUX' ZERO" ++ cset "name='DEC7 Volume' 0" ++ cset "name='ADC1 Volume' 0" ++ cset "name='MICBIAS1 CAPLESS Switch' 1" ++ ] ++ ++ Value { ++ CaptureChannels "1" ++ } ++} +Index: alsa-lib-1.0.27.2/src/conf/ucm/apq8064-tabla-snd-card/Makefile.am +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ alsa-lib-1.0.27.2/src/conf/ucm/apq8064-tabla-snd-card/Makefile.am 2014-03-10 02:06:53.000000000 -0300 +@@ -0,0 +1,4 @@ ++alsaconfigdir = @ALSA_CONFIG_DIR@ ++ucmdir = $(alsaconfigdir)/ucm/apq8064-tabla-snd-card ++ucm_DATA = apq8064-tabla-snd-card.conf HiFi VoiceCall ++EXTRA_DIST = $(ucm_DATA) +Index: alsa-lib-1.0.27.2/src/conf/ucm/apq8064-tabla-snd-card/VoiceCall +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ alsa-lib-1.0.27.2/src/conf/ucm/apq8064-tabla-snd-card/VoiceCall 2014-03-10 02:07:45.906081319 -0300 +@@ -0,0 +1,154 @@ ++# There is no mixer setup here - it is handled by PulseAudio's audio HAL module. ++ ++SectionVerb { ++ EnableSequence [ ++ cdev "hw:apq8064tablasnd" ++ cset "name='MultiMedia1 Mixer SLIM_4_TX' 1" ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:apq8064tablasnd" ++ cset "name='MultiMedia1 Mixer SLIM_4_TX' 0" ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ ] ++ ++ Value { ++ CapturePCM "hw:apq8064tablasnd,0" ++ PlaybackPCM "hw:apq8064tablasnd,0" ++ } ++} ++ ++SectionDevice."Earpiece" { ++ #Name "Earpiece" ++ Comment "Earpiece speaker" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Headphones" ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:apq8064tablasnd" ++ cset "name='RX1 Digital Volume' 84" ++ cset "name='EAR PA Gain' POS_6_DB" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:apq8064tablasnd" ++ cset "name='RX1 Digital Volume' 68" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Speaker" { ++ #Name "Speaker" ++ Comment "Main speaker" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Earpiece" ++ "Headphones" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:apq8064tablasnd" ++ cset "name='RX3 Digital Volume' 80" ++ cset "name='LINEOUT1 Volume' 100" ++ cset "name='LINEOUT3 Volume' 100" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:apq8064tablasnd" ++ cset "name='RX3 Digital Volume' 68" ++ cset "name='LINEOUT1 Volume' 0" ++ cset "name='LINEOUT3 Volume' 0" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Headphones" { ++ #Name "Headphones" ++ Comment "Headphones" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Earpiece" ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:apq8064tablasnd" ++ cset "name='RX1 Digital Volume' 68" ++ cset "name='RX2 Digital Volume' 68" ++ cset "name='HPHL Volume' 50" ++ cset "name='HPHR Volume' 50" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:apq8064tablasnd" ++ cset "name='RX1 Digital Volume' 68" ++ cset "name='RX2 Digital Volume' 68" ++ cset "name='HPHL Volume' 0" ++ cset "name='HPHR Volume' 0" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Headset" { ++ #Name "Headset" ++ Comment "Headset Microphone" ++ ++ ConflictingDevice [ ++ "Handset" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:apq8064tablasnd" ++ cset "name='ADC2 Volume' 66" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:apq8064tablasnd" ++ cset "name='ADC2 Volume' 0" ++ ] ++ ++ Value { ++ CaptureChannels "1" ++ } ++} ++ ++SectionDevice."Handset" { ++ #Name "Handset" ++ Comment "Handset Microphone" ++ ++ ConflictingDevice [ ++ "Headset" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:apq8064tablasnd" ++ cset "name='DEC7 Volume' 80" ++ cset "name='ADC1 Volume' 100" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:apq8064tablasnd" ++ cset "name='DEC7 Volume' 0" ++ cset "name='ADC1 Volume' 0" ++ ] ++ ++ Value { ++ CaptureChannels "1" ++ } ++} +Index: alsa-lib-1.0.27.2/src/conf/ucm/apq8064-tabla-snd-card/apq8064-tabla-snd-card.conf +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ alsa-lib-1.0.27.2/src/conf/ucm/apq8064-tabla-snd-card/apq8064-tabla-snd-card.conf 2014-03-10 02:06:53.000000000 -0300 +@@ -0,0 +1,8 @@ ++SectionUseCase."HiFi" { ++ File "HiFi" ++ Comment "Play HiFi quality Music." ++} ++SectionUseCase."Voice Call" { ++ File "VoiceCall" ++ Comment "Make a phone call" ++} diff --git a/debian/patches/0002-Add-UCM-config-file-for-Galaxy-Nexus-maguro.patch b/debian/patches/0002-Add-UCM-config-file-for-Galaxy-Nexus-maguro.patch new file mode 100644 index 00000000..ec80b81e --- /dev/null +++ b/debian/patches/0002-Add-UCM-config-file-for-Galaxy-Nexus-maguro.patch @@ -0,0 +1,681 @@ +From 68f94a1fa946e8a3035a7c2cc6c62058fd9b8070 Mon Sep 17 00:00:00 2001 +From: David Henningsson <david.henningsson@canonical.com> +Date: Tue, 27 Aug 2013 09:43:31 +0200 +Subject: [PATCH 2/4] Add UCM config file for Galaxy Nexus (maguro) + +--- + configure.in | 1 + + src/conf/ucm/Makefile.am | 2 +- + src/conf/ucm/Tuna/HiFi | 354 +++++++++++++++++++++++++++++++++++++++++ + src/conf/ucm/Tuna/Makefile.am | 4 + + src/conf/ucm/Tuna/Tuna.conf | 14 ++ + src/conf/ucm/Tuna/VoiceCall | 245 ++++++++++++++++++++++++++++ + 6 files changed, 619 insertions(+), 1 deletion(-) + create mode 100644 src/conf/ucm/Tuna/HiFi + create mode 100644 src/conf/ucm/Tuna/Makefile.am + create mode 100644 src/conf/ucm/Tuna/Tuna.conf + create mode 100644 src/conf/ucm/Tuna/VoiceCall + +diff --git a/configure.in b/configure.in +index 25fdc81..de4e2ef 100644 +--- a/configure.in ++++ b/configure.in +@@ -670,6 +670,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ + src/conf/ucm/SDP4430/Makefile \ + src/conf/ucm/tegraalc5632/Makefile \ + src/conf/ucm/apq8064-tabla-snd-card/Makefile \ ++ src/conf/ucm/Tuna/Makefile \ + modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \ + alsalisp/Makefile aserver/Makefile \ + test/Makefile test/lsb/Makefile \ +diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am +index adb3c87..029e1e8 100644 +--- a/src/conf/ucm/Makefile.am ++++ b/src/conf/ucm/Makefile.am +@@ -1 +1 @@ +-SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 apq8064-tabla-snd-card ++SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 apq8064-tabla-snd-card Tuna +diff --git a/src/conf/ucm/Tuna/HiFi b/src/conf/ucm/Tuna/HiFi +new file mode 100644 +index 0000000..3a7fe5e +--- /dev/null ++++ b/src/conf/ucm/Tuna/HiFi +@@ -0,0 +1,354 @@ ++# Use case Configuration for TI Tuna HiFi audio playback and capture ++# By Liam Girdwood <lrg@ti.com> ++# Updated by Sebastien Jan <s-jan@ti.com> ++# Adapted to Ubuntu Touch by David Henningsson <david.henningsson@canonical.com> ++ ++######### Main Verb Config ################# ++ ++SectionVerb { ++ ++ EnableSequence [ ++ # Set SDP device for following cset commands ++ cdev "hw:Tuna" ++ ++ # Enable ABE playback path through DL1 ++ cset "name='DL1 Mixer Multimedia' 1" ++ cset "name='Sidetone Mixer Playback' 1" ++ cset "name='DL1 PDM Switch' 1" ++ ++ # set ABE playback gains to 0dB ++ cset "name='DL1 Media Playback Volume' 120" ++ cset "name='DL2 Media Playback Volume' 120" ++ cset "name='SDT DL Volume' 120" ++ ++ # Enable ABE PDM-UL Capture path ++ cset "name='MUX_UL10' 11" ++ cset "name='MUX_UL11' 12" ++ ++ # set ABE capture gains to 0dB ++ cset "name='AMIC UL Volume' 120" ++ ++ # Disable Earpiece output, leave enabling to device enable ++ # sequence ++ cset "name='Earphone Enable Switch' 0" ++ ] ++ ++ DisableSequence [ ++ # Set SDP device for following cset commands ++ cdev "hw:Tuna" ++ ++ # Disable ABE playback path through DL1 ++ cset "name='DL1 Mixer Multimedia' 0" ++ cset "name='Sidetone Mixer Playback' 0" ++ cset "name='DL1 PDM Switch' 0" ++ ++ # mute ABE playback gains ++ cset "name='DL1 Media Playback Volume' 0" ++ cset "name='DL2 Media Playback Volume' 0" ++ cset "name='SDT DL Volume' 0" ++ ++ # Disable ABE PDM-UL Capture path ++ cset "name='MUX_UL10' 0" ++ cset "name='MUX_UL11' 0" ++ ++ # mute ABE capture gains ++ cset "name='AMIC UL Volume' 0" ++ ++ ] ++ ++ # ALSA PCM ++ Value { ++ ++ TQ "HiFi" ++ ++ # ALSA PCM device for HiFi ++ PlaybackPCM "hw:Tuna,0" ++ CapturePCM "hw:Tuna,1" ++ } ++} ++ ++###### Headset Devices Options ############ ++ ++SectionDevice."Headset" { ++ Comment "Headset Microphone" ++ ++ # Headset is mutually exclusive to some devices ++ ConflictingDevice [ ++ "Mainmic" ++ "Submic" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:Tuna" ++ ++ # TWL6040 Capture Path ++ cset "name='Analog Left Capture Route' 0" ++ cset "name='Analog Right Capture Route' 0" ++ cset "name='Capture Preamplifier Volume' 2" ++ ++ cset "name='Capture Volume' 4" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:Tuna" ++ ++ # TWL6040 Capture path ++ cset "name='Analog Left Capture Route' 3" ++ cset "name='Analog Right Capture Route' 3" ++ cset "name='Capture Preamplifier Volume' 0" ++ ] ++ ++ Value { ++ CaptureChannels "2" ++ } ++} ++ ++###### Headphones Devices Options ############ ++ ++SectionDevice."Headphones" { ++ Comment "Tuna 3.5mm Headphones playback" ++ ++ # Headphones is mutually exclusive to some devices ++ ConflictingDevice [ ++ "Speaker" ++ "Earpiece" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:Tuna" ++ ++ # TWL6040 playback path ++ cset "name='HS Left Playback' 1" ++ cset "name='HS Right Playback' 1" ++ ++ cset "name='Headset Playback Volume' 14" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:Tuna" ++ ++ cset "name='Headset Playback Volume' 0" ++ # TWL6040 playback path ++ cset "name='HS Right Playback' 0" ++ cset "name='HS Left Playback' 0" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++########### Earpiece Device Options ################ ++ ++SectionDevice."Earpiece" { ++ Comment "Earpiece playback" ++ ++ EnableSequence [ ++ cdev "hw:Tuna" ++ ++ # TWL6040 playback path ++ cset "name='Earphone Enable Switch' 1" ++ ++ cset "name='Earphone Enable Volume' 13" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:Tuna" ++ ++ cset "name='Earphone Enable Volume' 0" ++ ++ # TWL6040 playback path ++ cset "name='Earphone Enable Switch' 0" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++########### Speaker Device Options ################ ++ ++SectionDevice."Speaker" { ++ Comment "Main speaker playback" ++ ++ EnableSequence [ ++ cdev "hw:Tuna" ++ ++ # ABE playback path through DL2 ++ cset "name='DL2 Mixer Multimedia' 1" ++ ++ # TWL6040 playback path ++ cset "name='HF Left Playback' 1" ++ cset "name='HF Right Playback' 1" ++ ++ cset "name='Handsfree Playback Volume' 28" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:Tuna" ++ ++ cset "name='Handsfree Playback Volume' 0" ++ ++ # ABE playback path through DL2 ++ cset "name='DL2 Mixer Multimedia' 0" ++ ++ # TWL6040 playback path ++ cset "name='HF Left Playback' 0" ++ cset "name='HF Right Playback' 0" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++############ Main Mic Device ######################### ++ ++SectionDevice."Handset" { ++ Comment "Main Microphone Left Channel Capture" ++ ++ ConflictingDevice [ ++ "Headset" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:Tuna" ++ ++ # TWL6040 Capture Path ++ cset "name='Analog Left Capture Route' 0" ++ cset "name='Capture Volume' 4" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:Tuna" ++ ++ # TWL6040 Capture path ++ cset "name='Analog Left Capture Route' 3" ++ ] ++ ++ Value { ++ # Default ALSA volume gain and mute kcontrols ++ CaptureChannels "2" ++ } ++} ++ ++############ Sub Mic Device ######################### ++ ++SectionDevice."Submic" { ++ Comment "Sub Microphone Right Channel Capture" ++ ++ ConflictingDevice [ ++ "Headset" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:Tuna" ++ ++ # TWL6040 Capture Path ++ cset "name='Analog Right Capture Route' 1" ++ ++ cset "name='Capture Volume' 4" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:Tuna" ++ ++ # TWL6040 Capture path ++ cset "name='Analog Right Capture Route' 3" ++ ] ++ ++ Value { ++ CaptureChannels "2" ++ } ++} ++ ++############## Play Tone Modifier #################### ++# ++# We have 2 PlayTone modifiers. Each one supports different devices as the ++# path configuration is different depending on the device being used when ++# the modifier is enabled. ++# ++ ++SectionModifier."PlayTone" { ++ Comment "Play a ring tone or system sound" ++ ++ # For the following devices we need to set the DL2 path ++ SupportedDevice [ ++ "Headphones" ++ "Earpiece" ++ ] ++ ++ EnableSequence [ ++ ++ # Set SDP device for following cset commands ++ cdev "hw:Tuna" ++ ++ # ABE playback path through DL2 ++ cset "name='DL2 Mixer Tones' 1" ++ cset "name='DL2 Tones Playback Volume' 120" ++ cset "name='DL1 Mixer Tones' 1" ++ cset "name='DL1 Tones Playback Volume' 120" ++ ++# # TWL6040 playback path ++# cset "name='HF Left Playback' 1" ++# cset "name='HF Right Playback' 1" ++ ] ++ ++ DisableSequence [ ++ ++ # Set SDP device for following cset commands ++ cdev "hw:Tuna" ++ ++ # ABE playback path through DL2 ++ cset "name='DL2 Mixer Tones' 0" ++ cset "name='DL2 Tones Playback Volume' 0" ++ cset "name='DL1 Mixer Tones' 0" ++ cset "name='DL1 Tones Playback Volume' 0" ++ ++# # TWL6040 playback path ++# cset "name='HF Left Playback' 0" ++# cset "name='HF Right Playback' 0" ++ ] ++ ++ # QoS, Mixers and ALSA PCMs ++ Value { ++ TQ "Tones" ++ PlaybackPCM "hw:Tuna,3" ++ PlaybackVolume "name='DL2 Tones Playback Volume' 120" ++ } ++} ++ ++SectionModifier."PlayTone" { ++ Comment "Play a ring tone or system sound" ++ ++ # For the following devices we dont need to set the DL2 path ++ SupportedDevice [ ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ ++ # Set SDP device for following cset commands ++ cdev "hw:Tuna" ++ ++ # ABE playback path through DL2 ++ cset "name='DL2 Mixer Tones' 1" ++ cset "name='DL2 Tones Playback Volume' 120" ++ ] ++ ++ DisableSequence [ ++ ++ # Set SDP device for following cset commands ++ cdev "hw:Tuna" ++ ++ cset "name='DL2 Mixer Tones' 0" ++ ] ++ ++ # QoS, Mixers and ALSA PCMs ++ Value { ++ TQ "Tones" ++ PlaybackPCM "hw:Tuna,3" ++ PlaybackVolume "name='DL2 Tones Playback Volume' 120" ++ } ++} ++ +diff --git a/src/conf/ucm/Tuna/Makefile.am b/src/conf/ucm/Tuna/Makefile.am +new file mode 100644 +index 0000000..f8a69dd +--- /dev/null ++++ b/src/conf/ucm/Tuna/Makefile.am +@@ -0,0 +1,4 @@ ++alsaconfigdir = @ALSA_CONFIG_DIR@ ++ucmdir = $(alsaconfigdir)/ucm/Tuna ++ucm_DATA = Tuna.conf HiFi VoiceCall ++EXTRA_DIST = $(ucm_DATA) +diff --git a/src/conf/ucm/Tuna/Tuna.conf b/src/conf/ucm/Tuna/Tuna.conf +new file mode 100644 +index 0000000..c517b21 +--- /dev/null ++++ b/src/conf/ucm/Tuna/Tuna.conf +@@ -0,0 +1,14 @@ ++# UCM configuration for SDP4430 ++SectionUseCase."HiFi" { ++ File "HiFi" ++ Comment "Play HiFi quality Music" ++} ++ ++SectionUseCase."Voice Call" { ++ File "VoiceCall" ++ Comment "Voice Phone Call" ++} ++ ++SectionDefaults [ ++ cdev "hw:Tuna" ++] +diff --git a/src/conf/ucm/Tuna/VoiceCall b/src/conf/ucm/Tuna/VoiceCall +new file mode 100644 +index 0000000..47a2ba3 +--- /dev/null ++++ b/src/conf/ucm/Tuna/VoiceCall +@@ -0,0 +1,245 @@ ++# Use case Configuration for TI Tuna RF MODEM Voice Call ++# By Liam Girdwood <lrg@ti.com> ++# Adapted to Ubuntu Touch by David Henningsson <david.henningsson@canonical.com> ++ ++SectionVerb { ++ ++ EnableSequence [ ++ cdev "hw:Tuna" ++ ++ # Enable ABE sidetone paths at 0dB (needs tuned) ++ cset "name='Sidetone Mixer Capture' 1" ++ cset "name='Sidetone Mixer Playback' 1" ++ cset "name='SDT DL Volume' 120" ++ cset "name='SDT UL Volume' 120" ++ ++ # Enable ABE DL1 Voice at 0dB ++ cset "name='DL1 Mixer Multimedia' 1" ++ cset "name='DL1 Mixer Voice' 1" ++ cset "name='DL1 Voice Playback Volume' 120" ++ ++ # Only enabled for Speaker ++ cset "name='DL2 Mixer Multimedia' 0" ++ cset "name='DL2 Mixer Voice' 0" ++ ++ # Disable DL2 Mono Mixer ++ cset "name='DL2 Mono Mixer' 0" ++ ++ # Enable Uplink ++ cset "name='Voice Capture Mixer Capture' 1" ++ ++ # Todo - Execute modem startup command if required. ++ ++ # FIXME: Copying Handset enable here to allow the PCM to be ++ # opened. Better fix required, possibly driver-side. ++ # Enable ABE paths to PDM and AMIC ++ cset "name='DL1 PDM Switch' 1" ++ cset "name='MUX_VX0' 11" ++ cset "name='MUX_VX1' 12" ++ ++ # set ABE capture gains to 0dB ++ cset "name='AMIC UL Volume' 120" ++ ++ # TWL6040 playback path ++ cset "name='Earphone Enable Switch' 1" ++ ++ # TWL6040 Capture Path with Main Mic and Sub Mic ++ cset "name='Analog Left Capture Route' 1" ++ cset "name='Analog Right Capture Route' 1" ++ cset "name='Capture Preamplifier Volume' 2" ++ # END OF FIXME ++ ++ # Enable extra PCMs ++ ++ # ABE Music playback path through DL1 at 0dB (tune this) ++ cset "name='DL1 Mixer Multimedia' 1" ++ cset "name='DL1 Media Playback Volume' 120" ++ ++ # Enable VX_REC for call capture at 0dB ++ cset "name='Capture Mixer Voice Playback' 1" ++ cset "name='Capture Mixer Voice Capture' 1" ++ cset "name='VXREC Voice UL Volume' 120" ++ cset "name='VXREC Voice DL Volume' 120" ++ ++ # set ROUTE_UL path ++ cset "name='MUX_UL10' 13" ++ cset "name='MUX_UL11' 14" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:Tuna" ++ ++ # Disable Extra PCMs ++ ++ # Enable VX_REC for call capture at 0dB ++ cset "name='Capture Mixer Voice Playback' 0" ++ cset "name='Capture Mixer Voice Capture' 0" ++ cset "name='VXREC Voice UL Volume' 0" ++ cset "name='VXREC Voice DL Volume' 0" ++ ++ # set ROUTE_UL path ++ cset "name='MUX_UL10' 0" ++ cset "name='MUX_UL11' 0" ++ ++ # disable ABE Music path to near end ++ cset "name='DL1 Mixer Tones' 0" ++ cset "name='DL1 Tones Playback Volume' 0" ++ ++ # ABE mute tone playback path through DL2 ++ cset "name='DL2 Mixer Tones' 0" ++ cset "name='DL2 Tones Playback Volume' 0" ++ ++ # Todo - Execute modem shutdown command if required. ++ ++ # Disable ABE sidetone paths and mute (needs tuned) ++ cset "name='Sidetone Mixer Capture' 0" ++ cset "name='Sidetone Mixer Playback' 0" ++ cset "name='SDT DL Volume' 0" ++ cset "name='SDT UL Volume' 0" ++ ++ # Disable ABE DL1 Voice and mute ++ cset "name='DL1 Mixer Voice' 0" ++ cset "name='DL1 Voice Playback Volume' 0" ++ ++ # Enable DL2 Multimedia ++ cset "name='DL2 Mixer Multimedia' 1" ++ ++ # Enable DL2 Mono Mixer ++ cset "name='DL2 Mono Mixer' 1" ++ ++ # Disable Uplink ++ cset "name='Voice Capture Mixer Capture' 0" ++ ++ # FIXME: Copying Handset disable here to allow the PCM to be ++ # opened. Better fix required, possibly driver-side. ++ # Set SDP device for following cset commands ++ cdev "hw:Tuna" ++ ++ # Enable ABE paths ++ cset "name='DL1 PDM Switch' 0" ++ cset "name='MUX_VX0' 0" ++ cset "name='MUX_VX1' 0" ++ ++ # mute ABE capture gains ++ cset "name='AMIC UL Volume' 120" ++ ++ # TWL6040 playback path ++ cset "name='HS Right Playback' 0" ++ cset "name='HS Left Playback' 0" ++ ++ # TWL6040 Capture path ++ cset "name='Analog Left Capture Route' 3" ++ cset "name='Analog Right Capture Route' 3" ++ cset "name='Capture Preamplifier Volume' 0" ++ # END OF FIXME ++ ] ++ ++ # QoS and ALSA PCMs ++ Value { ++ TQ "Voice" ++ ++ CapturePCM "hw:Tuna,1" ++ PlaybackPCM "hw:Tuna,0" ++ } ++} ++ ++SectionDevice."Earpiece" { ++ #Name "Earpiece" ++ Comment "Earpiece output" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Headphones" ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ ] ++ DisableSequence [ ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Headphones" { ++ #Name "Earpiece" ++ Comment "Headphone output" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Earpiece" ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ ] ++ DisableSequence [ ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Speaker" { ++ #Name "Earpiece" ++ Comment "Speaker output" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Earpiece" ++ "Headphones" ++ ] ++ ++ EnableSequence [ ++ ] ++ DisableSequence [ ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++ ++SectionDevice."Handset" { ++ Comment "Main mic input" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Headset" ++ ] ++ ++ EnableSequence [ ++ ] ++ DisableSequence [ ++ ] ++ ++ Value { ++ CaptureChannels "2" ++ } ++} ++ ++SectionDevice."Headset" { ++ Comment "Headset mic input" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Handset" ++ ] ++ ++ EnableSequence [ ++ ] ++ DisableSequence [ ++ ] ++ ++ Value { ++ CaptureChannels "2" ++ } ++} ++ ++ ++ ++ +-- +1.7.9.5 + diff --git a/debian/patches/0003-Add-UCM-files-for-Nexus-7.patch b/debian/patches/0003-Add-UCM-files-for-Nexus-7.patch new file mode 100644 index 00000000..16e2af34 --- /dev/null +++ b/debian/patches/0003-Add-UCM-files-for-Nexus-7.patch @@ -0,0 +1,166 @@ +From b2f9e96bb12f2df988d47bd392418fec7a5a4043 Mon Sep 17 00:00:00 2001 +From: David Henningsson <david.henningsson@canonical.com> +Date: Wed, 28 Aug 2013 11:35:24 +0200 +Subject: [PATCH 3/4] Add UCM files for Nexus 7 + +--- + configure.in | 1 + + src/conf/ucm/Makefile.am | 2 +- + src/conf/ucm/tegra-rt5640/HiFi | 98 +++++++++++++++++++++++++++ + src/conf/ucm/tegra-rt5640/Makefile.am | 4 ++ + src/conf/ucm/tegra-rt5640/tegra-rt5640.conf | 8 +++ + 5 files changed, 112 insertions(+), 1 deletion(-) + create mode 100644 src/conf/ucm/tegra-rt5640/HiFi + create mode 100644 src/conf/ucm/tegra-rt5640/Makefile.am + create mode 100644 src/conf/ucm/tegra-rt5640/tegra-rt5640.conf + +diff --git a/configure.in b/configure.in +index de4e2ef..92e5db5 100644 +--- a/configure.in ++++ b/configure.in +@@ -671,6 +671,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ + src/conf/ucm/tegraalc5632/Makefile \ + src/conf/ucm/apq8064-tabla-snd-card/Makefile \ + src/conf/ucm/Tuna/Makefile \ ++ src/conf/ucm/tegra-rt5640/Makefile \ + modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \ + alsalisp/Makefile aserver/Makefile \ + test/Makefile test/lsb/Makefile \ +diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am +index 029e1e8..e8cc02d 100644 +--- a/src/conf/ucm/Makefile.am ++++ b/src/conf/ucm/Makefile.am +@@ -1 +1 @@ +-SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 apq8064-tabla-snd-card Tuna ++SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 apq8064-tabla-snd-card Tuna tegra-rt5640 +diff --git a/src/conf/ucm/tegra-rt5640/HiFi b/src/conf/ucm/tegra-rt5640/HiFi +new file mode 100644 +index 0000000..3f2e77b +--- /dev/null ++++ b/src/conf/ucm/tegra-rt5640/HiFi +@@ -0,0 +1,98 @@ ++# Use case Configuration for Nexus 7 ++# Adapted to Ubuntu Touch by David Henningsson <david.henningsson@canonical.com> ++ ++SectionVerb { ++ ++ EnableSequence [ ++ ] ++ ++ DisableSequence [ ++ ] ++ ++ # ALSA PCM ++ Value { ++ # ALSA PCM device for HiFi ++ PlaybackPCM "hw:tegrart5640" ++ CapturePCM "hw:tegrart5640" ++ } ++} ++ ++SectionDevice."Headphones" { ++ Comment "Headphones playback" ++ ++ ConflictingDevice [ ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:tegrart5640" ++ cset "name='Headphone Jack Switch' on" ++ cset "name='HP Playback Switch' on" ++ cset "name='HP Playback Volume' 29" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:tegrart5640" ++ cset "name='Headphone Jack Switch' on" ++ cset "name='HP Playback Switch' off" ++ cset "name='HP Playback Volume' 0" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Speaker" { ++ Comment "Speaker playback" ++ ++ ConflictingDevice [ ++ "Headphones" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:tegrart5640" ++ cset "name='Int Spk Switch' on" ++ cset "name='Speaker Playback Switch' on" ++ cset "name='Speaker Playback Volume' 29" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:tegrart5640" ++ cset "name='Int Spk Switch' off" ++ cset "name='Speaker Playback Switch' off" ++ cset "name='Speaker Playback Volume' 0" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Handset" { ++ Comment "Main Microphone" ++ ++ EnableSequence [ ++ cdev "hw:tegrart5640" ++ ++ cset "name='ADC Switch' on" ++ cset "name='ADC Capture Switch' on" ++ cset "name='ADC Capture Volume' 100" ++ cset "name='ADC Boost Gain' 1" ++ cset "name='DMIC Switch' DMIC1" ++ cset "name='Int Mic Switch' on" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:tegrart5640" ++ cset "name='ADC Switch' off" ++ cset "name='ADC Capture Switch' off" ++ cset "name='Int Mic Switch' off" ++ ] ++ ++ Value { ++ CaptureChannels "2" ++ } ++} ++ ++ +diff --git a/src/conf/ucm/tegra-rt5640/Makefile.am b/src/conf/ucm/tegra-rt5640/Makefile.am +new file mode 100644 +index 0000000..408e065 +--- /dev/null ++++ b/src/conf/ucm/tegra-rt5640/Makefile.am +@@ -0,0 +1,4 @@ ++alsaconfigdir = @ALSA_CONFIG_DIR@ ++ucmdir = $(alsaconfigdir)/ucm/tegra-rt5640 ++ucm_DATA = tegra-rt5640.conf HiFi ++EXTRA_DIST = $(ucm_DATA) +diff --git a/src/conf/ucm/tegra-rt5640/tegra-rt5640.conf b/src/conf/ucm/tegra-rt5640/tegra-rt5640.conf +new file mode 100644 +index 0000000..f86e080 +--- /dev/null ++++ b/src/conf/ucm/tegra-rt5640/tegra-rt5640.conf +@@ -0,0 +1,8 @@ ++SectionUseCase."HiFi" { ++ File "HiFi" ++ Comment "Play HiFi quality Music" ++} ++ ++SectionDefaults [ ++ cdev "hw:tegrart5640" ++] +-- +1.7.9.5 + diff --git a/debian/patches/0004-Add-UCM-config-files-for-Nexus-10.patch b/debian/patches/0004-Add-UCM-config-files-for-Nexus-10.patch new file mode 100644 index 00000000..6d9caa5f --- /dev/null +++ b/debian/patches/0004-Add-UCM-config-files-for-Nexus-10.patch @@ -0,0 +1,317 @@ +From c148a16236422ad36320029cb72b920e3fc589f0 Mon Sep 17 00:00:00 2001 +From: David Henningsson <david.henningsson@canonical.com> +Date: Tue, 3 Sep 2013 13:35:35 +0200 +Subject: [PATCH 4/4] Add UCM config files for Nexus 10 + +Signed-off-by: David Henningsson <david.henningsson@canonical.com> +--- + configure.in | 2 + + src/conf/ucm/Makefile.am | 2 +- + src/conf/ucm/Manta-I2S/HiFi | 211 ++++++++++++++++++++++++++++++ + src/conf/ucm/Manta-I2S/Makefile.am | 4 + + src/conf/ucm/Manta-I2S/Manta-I2S.conf | 7 + + src/conf/ucm/Manta-SPDIF/Dummy | 3 + + src/conf/ucm/Manta-SPDIF/Makefile.am | 4 + + src/conf/ucm/Manta-SPDIF/Manta-SPDIF.conf | 6 + + 8 files changed, 238 insertions(+), 1 deletion(-) + create mode 100644 src/conf/ucm/Manta-I2S/HiFi + create mode 100644 src/conf/ucm/Manta-I2S/Makefile.am + create mode 100644 src/conf/ucm/Manta-I2S/Manta-I2S.conf + create mode 100644 src/conf/ucm/Manta-SPDIF/Dummy + create mode 100644 src/conf/ucm/Manta-SPDIF/Makefile.am + create mode 100644 src/conf/ucm/Manta-SPDIF/Manta-SPDIF.conf + +diff --git a/configure.in b/configure.in +index 92e5db5..daf3b91 100644 +--- a/configure.in ++++ b/configure.in +@@ -672,6 +672,8 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ + src/conf/ucm/apq8064-tabla-snd-card/Makefile \ + src/conf/ucm/Tuna/Makefile \ + src/conf/ucm/tegra-rt5640/Makefile \ ++ src/conf/ucm/Manta-I2S/Makefile \ ++ src/conf/ucm/Manta-SPDIF/Makefile \ + modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \ + alsalisp/Makefile aserver/Makefile \ + test/Makefile test/lsb/Makefile \ +diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am +index e8cc02d..d284864 100644 +--- a/src/conf/ucm/Makefile.am ++++ b/src/conf/ucm/Makefile.am +@@ -1 +1 @@ +-SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 apq8064-tabla-snd-card Tuna tegra-rt5640 ++SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 apq8064-tabla-snd-card Tuna tegra-rt5640 Manta-I2S Manta-SPDIF +diff --git a/src/conf/ucm/Manta-I2S/HiFi b/src/conf/ucm/Manta-I2S/HiFi +new file mode 100644 +index 0000000..9e0f00c +--- /dev/null ++++ b/src/conf/ucm/Manta-I2S/HiFi +@@ -0,0 +1,211 @@ ++# By David Henningsson <david.henningsson@canonical.com> ++# Translated from mixer_paths.xml in Manta repository ++ ++SectionVerb { ++ ++ EnableSequence [ ++ cdev "hw:MantaI2S" ++ ++ # A lot of defaults ++ cset "name='DAC2 Switch' 0" ++ cset "name='AIF1DRC1 Mode' Default" ++ cset "name='AIF1DAC1 DRC Switch' 0" ++ cset "name='Speaker Switch' 0" ++ cset "name='SPKR DAC1 Switch' 0" ++ cset "name='SPKL DAC1 Switch' 0" ++ cset "name='Speaker Mixer Volume' 0" ++ ++ cset "name='Headphone Switch' 0" ++ cset "name='Left Output Mixer DAC Switch' 0" ++ cset "name='Right Output Mixer DAC Switch' 0" ++ ++ cset "name='MIXINL IN1L Switch' 0" ++ cset "name='IN1L Switch' 0" ++ cset "name='IN1L PGA IN1LP Switch' 0" ++ cset "name='IN1L PGA IN1LN Switch' 1" ++ ++ cset "name='MIXINL IN2L Switch' 0" ++ cset "name='IN2L Switch' 0" ++ cset "name='IN2L PGA IN2LP Switch' 0" ++ cset "name='IN2L PGA IN2LN Switch' 1" ++ ++ cset "name='MIXINR IN1R Switch' 0" ++ cset "name='IN1R Switch' 0" ++ cset "name='IN1R PGA IN1RP Switch' 0" ++ cset "name='IN1R PGA IN1RN Switch' 1" ++ ++ cset "name='MIXINR IN2R Switch' 0" ++ cset "name='IN2R Switch' 0" ++ cset "name='IN2R PGA IN2RP Switch' 0" ++ cset "name='IN2R PGA IN2RN Switch' 1" ++ ++ cset "name='AIF2DACL Mux' AIF3" ++ cset "name='AIF2DACR Mux' AIF3" ++ cset "name='AIF2DAC Mux' AIF3DACDAT" ++ cset "name='AIF3ADC Mux' AIF2ADCDAT" ++ ++ cset "name='AIF1ADC1L Mixer AIF2 Switch' 0" ++ cset "name='AIF1ADC1R Mixer AIF2 Switch' 0" ++ cset "name='AIF1ADC2L Mixer AIF2 Switch' 0" ++ cset "name='AIF1ADC2R Mixer AIF2 Switch' 0" ++ ++ # Enable dac1 ++ cset "name='DAC1R Mixer AIF1.1 Switch' 1" ++ cset "name='DAC1L Mixer AIF1.1 Switch' 1" ++ cset "name='DAC1 Switch' 1" ++ ++ # Enable adc to aif1adc ++ cset "name='AIF1ADC1L Mixer ADC/DMIC Switch' 1" ++ cset "name='AIF1ADC1R Mixer ADC/DMIC Switch' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:MantaI2S" ++ ++ # Disable dac1 ++ cset "name='DAC1R Mixer AIF1.1 Switch' 0" ++ cset "name='DAC1L Mixer AIF1.1 Switch' 0" ++ cset "name='DAC1 Switch' 0" ++ ++ # Disable adc to aif1adc ++ cset "name='AIF1ADC1L Mixer ADC/DMIC Switch' 0" ++ cset "name='AIF1ADC1R Mixer ADC/DMIC Switch' 0" ++ ] ++ ++ # ALSA PCM ++ Value { ++ ++ TQ "HiFi" ++ ++ # ALSA PCM device for HiFi ++ PlaybackPCM "hw:MantaI2S,0" ++ CapturePCM "hw:MantaI2S,0" ++ } ++ ++} ++ ++SectionDevice."Speaker" { ++ Comment "Main speaker" ++ ++ EnableSequence [ ++ cdev "hw:MantaI2S" ++ ++ # Enable speaker ++ cset "name='Speaker Switch' 1" ++ cset "name='SPKR DAC1 Switch' 1" ++ cset "name='SPKL DAC1 Switch' 1" ++ cset "name='Speaker Mixer Volume' 3" ++ cset "name='Speaker Boost Volume' 5" ++ cset "name='AIF1DRC1 Mode' 'Speakers Media'" ++ cset "name='AIF1DAC1 DRC Switch' 1" ++ ++ # Set EQ for speaker ++ cset "name='AIF1DAC1 EQ Switch' 1" ++ cset "name='AIF1DAC1 EQ1 Volume' 3" ++ cset "name='AIF1DAC1 EQ2 Volume' 8" ++ cset "name='AIF1DAC1 EQ3 Volume' 16" ++ cset "name='AIF1DAC1 EQ4 Volume' 10" ++ cset "name='AIF1DAC1 EQ5 Volume' 11" ++ ++ # Set Volume for speaker ++ cset "name='Speaker Volume' 61,62" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:MantaI2S" ++ ++ cset "name='Speaker Switch' 0" ++ cset "name='AIF1DAC1 EQ Switch' 0" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ PlaybackPriority "150" ++ } ++} ++ ++SectionDevice."Headphones" { ++ Comment "Headphone jack" ++ ++ EnableSequence [ ++ cdev "hw:MantaI2S" ++ ++ cset "name='Headphone Switch' 1" ++ cset "name='AIF1DAC1 EQ Switch' 0" ++ cset "name='Headphone Volume' 55,55" ++ cset "name='Left Headphone Mux' 'DAC'" ++ cset "name='Right Headphone Mux' 'DAC'" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:MantaI2S" ++ ++ cset "name='Headphone Switch' 0" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Microphone" { ++ Comment "Internal microphone" ++ ++ EnableSequence [ ++ cdev "hw:MantaI2S" ++ ++ # Main mic ++ cset "name='MIXINR IN2R Switch' 1" ++ cset "name='MIXINR IN2R Volume' 1" ++ cset "name='IN2R Switch' 1" ++ cset "name='AIF1ADCL Source' Right" ++ ++ # Second mic right ++ cset "name='MIXINL IN2L Switch' 1" ++ cset "name='MIXINL IN2L Volume' 1" ++ cset "name='IN2L Switch' 1" ++ cset "name='AIF1ADCR Source' Left" ++ ++ # Volume ++ cset "name='IN2R Volume' 16" ++ cset "name='IN2L Volume' 16" ++ cset "name='AIF1ADC1 HPF Switch' 1" ++ cset "name='AIF1ADC1 HPF Mode' HiFi" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:MantaI2S" ++ ++ ] ++ ++ Value { ++ CaptureChannels "2" ++ } ++} ++ ++SectionDevice."HeadsetMic" { ++ Comment "Headset microphone" ++ ++ EnableSequence [ ++ cdev "hw:MantaI2S" ++ ++ # Headset Mic ++ # Is this really correct? It looks a lot like main mic ++ cset "name='MIXINR IN2R Switch' 1" ++ cset "name='MIXINR IN2R Volume' 1" ++ cset "name='IN2R Switch' 1" ++ cset "name='AIF1ADCL Source' Right" ++ ++ cset "name='IN2R Volume' 16" ++ cset "name='AIF1ADC1 HPF Mode' HiFi" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:MantaI2S" ++ ++ ] ++ ++ Value { ++ CaptureChannels "1" ++ } ++} +diff --git a/src/conf/ucm/Manta-I2S/Makefile.am b/src/conf/ucm/Manta-I2S/Makefile.am +new file mode 100644 +index 0000000..f053707 +--- /dev/null ++++ b/src/conf/ucm/Manta-I2S/Makefile.am +@@ -0,0 +1,4 @@ ++alsaconfigdir = @ALSA_CONFIG_DIR@ ++ucmdir = $(alsaconfigdir)/ucm/Manta-I2S ++ucm_DATA = Manta-I2S.conf HiFi ++EXTRA_DIST = $(ucm_DATA) +diff --git a/src/conf/ucm/Manta-I2S/Manta-I2S.conf b/src/conf/ucm/Manta-I2S/Manta-I2S.conf +new file mode 100644 +index 0000000..83b61ec +--- /dev/null ++++ b/src/conf/ucm/Manta-I2S/Manta-I2S.conf +@@ -0,0 +1,7 @@ ++# UCM configuration for Manta / Nexus 10 ++ ++SectionUseCase."HiFi" { ++ File "HiFi" ++ Comment "Play HiFi quality Music." ++} ++ +diff --git a/src/conf/ucm/Manta-SPDIF/Dummy b/src/conf/ucm/Manta-SPDIF/Dummy +new file mode 100644 +index 0000000..a2ad2a7 +--- /dev/null ++++ b/src/conf/ucm/Manta-SPDIF/Dummy +@@ -0,0 +1,3 @@ ++SectionVerb { ++} ++SectionDevice.Dummy { } +diff --git a/src/conf/ucm/Manta-SPDIF/Makefile.am b/src/conf/ucm/Manta-SPDIF/Makefile.am +new file mode 100644 +index 0000000..0e2c0dc +--- /dev/null ++++ b/src/conf/ucm/Manta-SPDIF/Makefile.am +@@ -0,0 +1,4 @@ ++alsaconfigdir = @ALSA_CONFIG_DIR@ ++ucmdir = $(alsaconfigdir)/ucm/Manta-SPDIF ++ucm_DATA = Manta-SPDIF.conf Dummy ++EXTRA_DIST = $(ucm_DATA) +diff --git a/src/conf/ucm/Manta-SPDIF/Manta-SPDIF.conf b/src/conf/ucm/Manta-SPDIF/Manta-SPDIF.conf +new file mode 100644 +index 0000000..1db14c9 +--- /dev/null ++++ b/src/conf/ucm/Manta-SPDIF/Manta-SPDIF.conf +@@ -0,0 +1,6 @@ ++# This empty file makes PulseAudio avoid the card. ++ ++SectionUseCase."Dummy" { ++ File Dummy ++ Comment "Dummy" ++} +-- +1.8.3.2 + diff --git a/debian/patches/0005-Add-UCM-config-files-for-Nexus-5.patch b/debian/patches/0005-Add-UCM-config-files-for-Nexus-5.patch new file mode 100644 index 00000000..e98928ec --- /dev/null +++ b/debian/patches/0005-Add-UCM-config-files-for-Nexus-5.patch @@ -0,0 +1,404 @@ +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL +Index: alsa-lib-1.0.27.2/src/conf/ucm/msm8974-taiko-mtp-snd-card/HiFi +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ alsa-lib-1.0.27.2/src/conf/ucm/msm8974-taiko-mtp-snd-card/HiFi 2014-02-24 13:57:38.000000000 +0100 +@@ -0,0 +1,259 @@ ++SectionVerb { ++ EnableSequence [ ++ cdev "hw:msm8974taikomtp" ++ ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:msm8974taikomtp" ++ ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 0" ++ ] ++ ++ Value { ++ TQ "HiFi" ++ ++ CapturePCM "hw:msm8974taikomtp,0" ++ PlaybackPCM "hw:msm8974taikomtp,0" ++ } ++} ++ ++SectionDevice."Earpiece" { ++ #Name "Earpiece" ++ Comment "Earpiece speaker" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Headphones" ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:msm8974taikomtp" ++ ++ # We need to disable this while setting up the route, else the ++ # driver will hang if the stream is open. ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ ++ cset "name='SLIM RX1 MUX' AIF1_PB" ++ cset "name='SLIM_0_RX Channels' One" ++ cset "name='RX1 MIX1 INP1' RX1" ++ cset "name='CLASS_H_DSM MUX' DSM_HPHL_RX1" ++ cset "name='RX1 Digital Volume' 65" ++ cset "name='EAR PA Gain' POS_6_DB" ++ cset "name='DAC1 Switch' 1" ++ ++ # Route has been set up, re-enable the mixer. ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:msm8974taikomtp" ++ ++ # See comment in EnableSequence ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ ++ cset "name='SLIM RX1 MUX' ZERO" ++ cset "name='RX1 MIX1 INP1' ZERO" ++ cset "name='CLASS_H_DSM MUX' ZERO" ++ cset "name='RX1 Digital Volume' 0" ++ cset "name='DAC1 Switch' 0" ++ ++ # See comment in EnableSequence ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Speaker" { ++ #Name "Speaker" ++ Comment "Main speaker" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Earpiece" ++ "Headphones" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:msm8974taikomtp" ++ ++ # We need to disable this while setting up the route, else the ++ # driver will hang if the stream is open. ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ ++ cset "name='SLIM RX1 MUX' AIF1_PB" ++ cset "name='SLIM_0_RX Channels' One" ++ cset "name='RX7 MIX1 INP1' RX1" ++ cset "name='RX7 Digital Volume' 88" ++ cset "name='SPK DRV Volume' 6" ++ ++ # Route has been set up, re-enable the mixer. ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:msm8974taikomtp" ++ ++ # See comment in EnableSequence ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ ++ cset "name='SLIM RX1 MUX' ZERO" ++ cset "name='RX7 MIX1 INP1' ZERO" ++ cset "name='RX7 Digital Volume' 0" ++ cset "name='SPK DRV Volume' 0" ++ ++ # See comment in EnableSequence ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ PlaybackPriority "150" ++ } ++} ++ ++SectionDevice."Headphones" { ++ #Name "Headphones" ++ Comment "Headphones" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Earpiece" ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:msm8974taikomtp" ++ ++ # We need to disable this while setting up the route, else the ++ # driver will hang if the stream is open. ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ ++ cset "name='SLIM RX1 MUX' AIF1_PB" ++ cset "name='SLIM RX2 MUX' AIF1_PB" ++ cset "name='SLIM_0_RX Channels' Two" ++ cset "name='RX1 MIX1 INP1' RX1" ++ cset "name='RX2 MIX1 INP1' RX2" ++ cset "name='CLASS_H_DSM MUX' DSM_HPHL_RX1" ++ cset "name='HPHL DAC Switch' 1" ++ cset "name='HPHL Volume' 15" ++ cset "name='HPHR Volume' 15" ++ cset "name='RX1 Digital Volume' 83" ++ cset "name='RX2 Digital Volume' 83" ++ ++ ++ ++ # Route has been set up, re-enable the mixer. ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:msm8974taikomtp" ++ ++ # See comment in EnableSequence ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ ++ cset "name='SLIM RX1 MUX' ZERO" ++ cset "name='SLIM RX2 MUX' ZERO" ++ cset "name='RX1 MIX1 INP1' ZERO" ++ cset "name='RX2 MIX1 INP1' ZERO" ++ cset "name='CLASS_H_DSM MUX' ZERO" ++ cset "name='HPHL DAC Switch' 0" ++ cset "name='HPHL Volume' 0" ++ cset "name='HPHR Volume' 0" ++ cset "name='RX1 Digital Volume' 0" ++ cset "name='RX2 Digital Volume' 0" ++ ++ # See comment in EnableSequence ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Headset" { ++ #Name "Headset" ++ Comment "Headset Microphone" ++ ++ ConflictingDevice [ ++ "Handset" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:msm8974taikomtp" ++ ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 0" ++ cset "name='AIF1_CAP Mixer SLIM TX7' 1" ++ cset "name='SLIM_0_TX Channels' One" ++ cset "name='SLIM TX7 MUX' DEC5" ++ cset "name='DEC5 MUX' ADC2" ++ cset "name='DEC5 Volume' 84" ++ cset "name='ADC2 Volume' 16" ++ cset "name='IIR1 INP1 MUX' DEC5" ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:msm8974taikomtp" ++ ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 0" ++ cset "name='AIF1_CAP Mixer SLIM TX7' 0" ++ cset "name='SLIM TX7 MUX' ZERO" ++ cset "name='DEC5 MUX' ZERO" ++ cset "name='ADC2 Volume' 0" ++ cset "name='DEC5 Volume' 0" ++ cset "name='IIR1 INP1 MUX' ZERO" ++ ] ++ ++ Value { ++ CaptureChannels "1" ++ } ++} ++ ++SectionDevice."Handset" { ++ #Name "Handset" ++ Comment "Handset Microphone" ++ ++ ConflictingDevice [ ++ "Headset" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:msm8974taikomtp" ++ ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 0" ++ cset "name='AIF1_CAP Mixer SLIM TX7' 1" ++ cset "name='SLIM_0_TX Channels' One" ++ cset "name='SLIM TX7 MUX' DEC6" ++ cset "name='DEC6 MUX' ADC1" ++ cset "name='ADC1 Volume' 16" ++ cset "name='DEC6 Volume' 86" ++ cset "name='IIR1 INP1 MUX' DEC6" ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:msm8974taikomtp" ++ ++ cset "name='MultiMedia1 Mixer SLIM_0_TX' 0" ++ cset "name='AIF1_CAP Mixer SLIM TX7' 0" ++ cset "name='SLIM TX7 MUX' ZERO" ++ cset "name='DEC6 MUX' ZERO" ++ cset "name='ADC1 Volume' 0" ++ cset "name='DEC6 Volume' 0" ++ cset "name='IIR1 INP1 MUX' ZERO" ++ ] ++ ++ Value { ++ CaptureChannels "1" ++ } ++} +Index: alsa-lib-1.0.27.2/src/conf/ucm/msm8974-taiko-mtp-snd-card/VoiceCall +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ alsa-lib-1.0.27.2/src/conf/ucm/msm8974-taiko-mtp-snd-card/VoiceCall 2014-02-23 13:05:15.000000000 +0100 +@@ -0,0 +1,119 @@ ++# There is no mixer setup here - it is handled by PulseAudio's audio HAL module. ++ ++SectionVerb { ++ EnableSequence [ ++ cdev "hw:msm8974taikomtp" ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:msm8974taikomtp" ++ cset "name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 0" ++ ] ++ ++ Value { ++ CapturePCM "hw:msm8974taikomtp,0" ++ PlaybackPCM "hw:msm8974taikomtp,0" ++ } ++} ++ ++SectionDevice."Earpiece" { ++ #Name "Earpiece" ++ Comment "Earpiece speaker" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Headphones" ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ ] ++ ++ DisableSequence [ ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Speaker" { ++ #Name "Speaker" ++ Comment "Main speaker" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Earpiece" ++ "Headphones" ++ ] ++ ++ EnableSequence [ ++ ] ++ ++ DisableSequence [ ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Headphones" { ++ #Name "Headphones" ++ Comment "Headphones" ++ ++ # FIXME ++ ConflictingDevice [ ++ "Earpiece" ++ "Speaker" ++ ] ++ ++ EnableSequence [ ++ ] ++ ++ DisableSequence [ ++ ] ++ ++ Value { ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Headset" { ++ #Name "Headset" ++ Comment "Headset Microphone" ++ ++ ConflictingDevice [ ++ "Handset" ++ ] ++ ++ EnableSequence [ ++ ] ++ ++ DisableSequence [ ++ ] ++ ++ Value { ++ CaptureChannels "1" ++ } ++} ++ ++SectionDevice."Handset" { ++ #Name "Handset" ++ Comment "Handset Microphone" ++ ++ ConflictingDevice [ ++ "Headset" ++ ] ++ ++ EnableSequence [ ++ ] ++ ++ DisableSequence [ ++ ] ++ ++ Value { ++ CaptureChannels "1" ++ } ++} +Index: alsa-lib-1.0.27.2/src/conf/ucm/msm8974-taiko-mtp-snd-card/msm8974-taiko-mtp-snd-card.conf +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ alsa-lib-1.0.27.2/src/conf/ucm/msm8974-taiko-mtp-snd-card/msm8974-taiko-mtp-snd-card.conf 2014-02-23 13:05:07.000000000 +0100 +@@ -0,0 +1,8 @@ ++SectionUseCase."HiFi" { ++ File "HiFi" ++ Comment "Play HiFi quality Music." ++} ++SectionUseCase."Voice Call" { ++ File "VoiceCall" ++ Comment "Make a phone call" ++} diff --git a/debian/patches/Fix-access-of-freed-memory-in-namehints.patch b/debian/patches/Fix-access-of-freed-memory-in-namehints.patch new file mode 100644 index 00000000..c2bcefd3 --- /dev/null +++ b/debian/patches/Fix-access-of-freed-memory-in-namehints.patch @@ -0,0 +1,116 @@ +From 23bf1dce9438c0cf74357928289aa8f06957c283 Mon Sep 17 00:00:00 2001 +From: David Henningsson <david.henningsson@canonical.com> +Date: Fri, 13 Sep 2013 13:21:44 -0400 +Subject: [PATCH] Fix access of freed memory in namehints + +Sometimes a hook manipulates the config tree, which makes currently +running iterators point to freed memory. As a workaround, make two +copies, one for the iterators and another for the hooks. + +BugLink: https://bugs.launchpad.net/bugs/1008600 +Signed-off-by: David Henningsson <david.henningsson@canonical.com> +Signed-off-by: Takashi Iwai <tiwai@suse.de> +--- + src/control/namehint.c | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) + +diff --git a/src/control/namehint.c b/src/control/namehint.c +index 8d5e925..28975a4 100644 +--- a/src/control/namehint.c ++++ b/src/control/namehint.c +@@ -406,7 +406,7 @@ static const next_devices_t next_devices[] = { + }; + #endif + +-static int add_card(snd_config_t *config, struct hint_list *list, int card) ++static int add_card(snd_config_t *config, snd_config_t *rw_config, struct hint_list *list, int card) + { + int err, ok; + snd_config_t *conf, *n; +@@ -449,7 +449,7 @@ static int add_card(snd_config_t *config, struct hint_list *list, int card) + ok = 0; + for (device = 0; err >= 0 && device <= max_device; device++) { + list->device = device; +- err = try_config(config, list, list->siface, str); ++ err = try_config(rw_config, list, list->siface, str); + if (err < 0) + break; + ok++; +@@ -464,7 +464,7 @@ static int add_card(snd_config_t *config, struct hint_list *list, int card) + if (err < 0) { + list->card = card; + list->device = -1; +- err = try_config(config, list, list->siface, str); ++ err = try_config(rw_config, list, list->siface, str); + } + if (err == -ENOMEM) + goto __error; +@@ -493,7 +493,8 @@ static int get_card_name(struct hint_list *list, int card) + return 0; + } + +-static int add_software_devices(snd_config_t *config, struct hint_list *list) ++static int add_software_devices(snd_config_t *config, snd_config_t *rw_config, ++ struct hint_list *list) + { + int err; + snd_config_t *conf, *n; +@@ -509,7 +510,7 @@ static int add_software_devices(snd_config_t *config, struct hint_list *list) + continue; + list->card = -1; + list->device = -1; +- err = try_config(config, list, list->siface, str); ++ err = try_config(rw_config, list, list->siface, str); + if (err == -ENOMEM) + return -ENOMEM; + } +@@ -547,7 +548,7 @@ int snd_device_name_hint(int card, const char *iface, void ***hints) + struct hint_list list; + char ehints[24]; + const char *str; +- snd_config_t *conf, *local_config = NULL; ++ snd_config_t *conf, *local_config = NULL, *local_config_rw = NULL; + snd_config_update_t *local_config_update = NULL; + snd_config_iterator_t i, next; + int err; +@@ -557,6 +558,7 @@ int snd_device_name_hint(int card, const char *iface, void ***hints) + err = snd_config_update_r(&local_config, &local_config_update, NULL); + if (err < 0) + return err; ++ err = snd_config_copy(&local_config_rw, local_config); + list.list = NULL; + list.count = list.allocated = 0; + list.siface = iface; +@@ -586,9 +588,9 @@ int snd_device_name_hint(int card, const char *iface, void ***hints) + if (card >= 0) { + err = get_card_name(&list, card); + if (err >= 0) +- err = add_card(local_config, &list, card); ++ err = add_card(local_config, local_config_rw, &list, card); + } else { +- add_software_devices(local_config, &list); ++ add_software_devices(local_config, local_config_rw, &list); + err = snd_card_next(&card); + if (err < 0) + goto __error; +@@ -596,7 +598,7 @@ int snd_device_name_hint(int card, const char *iface, void ***hints) + err = get_card_name(&list, card); + if (err < 0) + goto __error; +- err = add_card(local_config, &list, card); ++ err = add_card(local_config, local_config_rw, &list, card); + if (err < 0) + goto __error; + err = snd_card_next(&card); +@@ -630,6 +632,8 @@ int snd_device_name_hint(int card, const char *iface, void ***hints) + if (list.cardname) + free(list.cardname); + } ++ if (local_config_rw) ++ snd_config_delete(local_config_rw); + if (local_config) + snd_config_delete(local_config); + if (local_config_update) +-- +1.7.9.5 + diff --git a/debian/patches/add-tegra-alc5632.patch b/debian/patches/add-tegra-alc5632.patch new file mode 100644 index 00000000..a6820e03 --- /dev/null +++ b/debian/patches/add-tegra-alc5632.patch @@ -0,0 +1,40 @@ +Index: alsa-lib-1.0.25/src/conf/cards/Makefile.am +=================================================================== +--- alsa-lib-1.0.25.orig/src/conf/cards/Makefile.am 2012-02-15 16:19:51.444263639 +1100 ++++ alsa-lib-1.0.25/src/conf/cards/Makefile.am 2012-02-15 16:20:48.900265439 +1100 +@@ -45,6 +45,7 @@ + RME9652.conf \ + SI7018.conf \ + SB-XFi.conf \ ++ tegra-alc5632.conf \ + TRID4DWAVENX.conf \ + USB-Audio.conf \ + YMF744.conf \ +Index: alsa-lib-1.0.25/src/conf/cards/tegra-alc5632.conf +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ alsa-lib-1.0.25/src/conf/cards/tegra-alc5632.conf 2012-02-15 16:21:06.228265983 +1100 +@@ -0,0 +1,23 @@ ++# default with dmix/dsnoop ++tegra-alc5632.pcm.default { ++ @args [ CARD ] ++ @args.CARD { ++ type string ++ } ++ type asym ++ playback.pcm { ++ type plug ++ slave.pcm { ++ @func concat ++ strings [ "dmix:CARD=" $CARD ",RATE=44100" ] ++ } ++ } ++ capture.pcm { ++ type plug ++ slave.pcm { ++ @func concat ++ strings [ "dsnoop:CARD=" $CARD ",RATE=44100" ] ++ } ++ } ++} ++ diff --git a/debian/patches/lp652035-use-extended-namehints.patch b/debian/patches/lp652035-use-extended-namehints.patch new file mode 100644 index 00000000..bff4aa63 --- /dev/null +++ b/debian/patches/lp652035-use-extended-namehints.patch @@ -0,0 +1,18 @@ +Index: alsa-lib-1.0.23/src/conf/alsa.conf +=================================================================== +--- alsa-lib-1.0.23.orig/src/conf/alsa.conf 2010-10-03 15:05:47.000000000 -0400 ++++ alsa-lib-1.0.23/src/conf/alsa.conf 2010-10-03 15:09:27.000000000 -0400 +@@ -54,11 +54,11 @@ + # + + # show all name hints also for definitions without hint {} section +-defaults.namehint.showall off ++defaults.namehint.showall on + # show just basic name hints + defaults.namehint.basic on + # show extended name hints +-defaults.namehint.extended off ++defaults.namehint.extended on + # + defaults.ctl.card 0 + defaults.pcm.card 0 diff --git a/debian/patches/series b/debian/patches/series index a827fa8e..d9cddb99 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,9 @@ tests_lm_ftbfs.patch +lp652035-use-extended-namehints.patch +add-tegra-alc5632.patch +0001-Add-UCM-configuration-for-Nexus-4-Mako.patch +0002-Add-UCM-config-file-for-Galaxy-Nexus-maguro.patch +0003-Add-UCM-files-for-Nexus-7.patch +0004-Add-UCM-config-files-for-Nexus-10.patch +Fix-access-of-freed-memory-in-namehints.patch +0005-Add-UCM-config-files-for-Nexus-5.patch diff --git a/debian/tests/build_seq b/debian/tests/build_seq new file mode 100644 index 00000000..d9d6ec13 --- /dev/null +++ b/debian/tests/build_seq @@ -0,0 +1,26 @@ +#!/bin/sh +# autopkgtest check: Builds a small application against libasound2, checking +# if it compiles, links and runs successfully +# Author: Rafał Cieślak <rafalcieslak256@ubuntu.com> + +set -e + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cd $WORKDIR +cat <<EOF > asound_build_test.c +#include <alsa/asoundlib.h> +int main(int argc, char **argv) +{ + //Simple test that opens MIDI seq. That will work regardless of hardware factors. + snd_seq_t *seq_handle; + snd_seq_open(&seq_handle, "default", SND_SEQ_OPEN_INPUT, 0); + return 0; +} +EOF + +gcc -o asound_build_test asound_build_test.c -lasound +echo "build: OK" +[ -x asound_build_test ] +./asound_build_test 2>&1 +echo "run: OK" diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 00000000..fb04ed8b --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,2 @@ +Tests: build_seq +Depends: libasound2-dev, build-essential |