diff -Nru alsa-lib-1.0.24.1/debian/changelog alsa-lib-1.0.24.1/debian/changelog --- alsa-lib-1.0.24.1/debian/changelog 2011-05-14 13:14:52.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/changelog 2011-09-29 08:44:15.000000000 +0000 @@ -1,8 +1,67 @@ -alsa-lib (1.0.24.1-0ubuntu6~lucid1) lucid; urgency=low +alsa-lib (1.0.24.1-0ubuntu8~linaro4) natty; urgency=low - * Build for Lucid. + * Removing IMX53 config for now, breaks Panda - -- Aron Xu Sat, 14 May 2011 21:14:43 +0800 + -- Ricardo Salveti de Araujo Thu, 29 Sep 2011 05:43:52 -0300 + +alsa-lib (1.0.24.1-0ubuntu8~linaro3) natty; urgency=low + + * Fixing debhelper dependency version for Natty + + -- Ricardo Salveti de Araujo Tue, 27 Sep 2011 13:47:41 -0300 + +alsa-lib (1.0.24.1-0ubuntu8~linaro2) natty; urgency=low + + * Updating ucm files from weifeng/alsa-ucm-conf.git - hash f337d5a5 + + -- Ricardo Salveti de Araujo Fri, 23 Sep 2011 21:09:36 -0300 + +alsa-lib (1.0.24.1-0ubuntu8~linaro1) natty; urgency=low + + * Backport from Natty + + -- Ricardo Salveti de Araujo Fri, 23 Sep 2011 20:27:22 -0300 + +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 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 Thu, 21 Jul 2011 18:02:01 +0200 alsa-lib (1.0.24.1-0ubuntu6) oneiric; urgency=low diff -Nru alsa-lib-1.0.24.1/debian/compat alsa-lib-1.0.24.1/debian/compat --- alsa-lib-1.0.24.1/debian/compat 2011-05-06 00:22:42.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/compat 2011-08-11 15:20:23.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru alsa-lib-1.0.24.1/debian/control alsa-lib-1.0.24.1/debian/control --- alsa-lib-1.0.24.1/debian/control 2011-05-06 00:22:42.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/control 2011-09-27 16:47:37.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: Debian ALSA Maintainers Uploaders: Jordi Mallach , Mikael Magnusson , Elimar Riesebieter -Build-Depends: debhelper (>= 7), +Build-Depends: debhelper (>= 8.1.2ubuntu4), autotools-dev, doxygen, libc6-dev-powerpc [ppc64], @@ -17,7 +17,7 @@ lib64gcc1 [i386 powerpc sparc s390], gcc-multilib [amd64 i386 powerpc ppc64 s390 sparc], python-dev -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://www.alsa-project.org/ XS-Debian-Vcs-Svn: svn://svn.debian.org/pkg-alsa/trunk/alsa-lib XS-Debian-Vcs-Browser: http://svn.debian.org/wsvn/pkg-alsa/trunk/alsa-lib/ @@ -25,22 +25,34 @@ Package: libasound2 Architecture: linux-any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.7.2) Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: libasound2-plugins (>= 1.0.18) -Conflicts: libasound2-plugins (<< 1.0.18) +Suggests: libasound2-plugins (>= 1.0.18), libasound2-python +Breaks: libasound2-plugins (<< 1.0.24-0ubuntu3), libasound2-plugin-equal (<= 0.6-1), bluez-alsa (<< 4.94-0ubuntu2) Description: shared library for ALSA applications This package contains the ALSA library and its standard plugins. . ALSA is the Advanced Linux Sound Architecture. +Package: libasound2-python +Architecture: linux-any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: libasound2 (<< 1.0.24.1-0ubuntu8) +Replaces: libasound2 (<< 1.0.24.1-0ubuntu8) +Description: ALSA library python mixer + This package contains the python mixer plugin for the ALSA library. + . + ALSA is the Advanced Linux Sound Architecture. + Package: libasound2-dev Architecture: linux-any Section: libdevel Provides: libasound-dev Depends: libc6-dev | libc-dev, libasound2 (= ${binary:Version}), ${misc:Depends} Suggests: libasound2-doc -Conflicts: libasound-dev, alsa-headers -Replaces: libasound2 (<< 0.9.0rc7-2), alsa-headers Description: shared library for ALSA applications -- development files This package contains files required for developing software that makes use of libasound2, the ALSA library. @@ -49,9 +61,10 @@ Package: lib64asound2 Architecture: sparc s390 i386 powerpc +Pre-Depends: dpkg (>= 1.15.7.2) Depends: libasound2 (= ${binary:Version}), ${shlibs:Depends}, ${bilib:depends}, ${misc:Depends} Suggests: lib64asound2-plugins (>= 1.0.18) -Conflicts: libasound2-plugins (<< 1.0.18) +Breaks: libasound2-plugins (<< 1.0.18) Description: shared library for ALSA applications (64 bit) This package contains the ALSA library (64 bit) and its standard plugins. @@ -71,9 +84,10 @@ Package: lib32asound2 Architecture: amd64 -Depends: libasound2 (= ${binary:Version}), ${shlibs:Depends}, ${bilib:depends}, ${misc:Depends}, libc6-i386 (>= 2.9-18) +Pre-Depends: dpkg (>= 1.15.7.2) +Depends: libasound2 (= ${binary:Version}), ${shlibs:Depends}, ${bilib:depends}, ${misc:Depends} Suggests: lib32asound2-plugins (>= 1.0.18) -Conflicts: libasound2-plugins (<< 1.0.18), ia32-libs (<< 1.9), libc6-i386 (<= 2.9-18) +Breaks: libasound2-plugins (<< 1.0.18), ia32-libs (<< 1.9), libc6-i386 (<= 2.9-18) Replaces: ia32-libs (<< 1.9) Description: shared library for ALSA applications (32 bit) This package contains the ALSA library (32 bit) and its standard @@ -86,7 +100,7 @@ Section: libdevel Depends: lib32asound2 (= ${binary:Version}), libasound2-dev (= ${binary:Version}), ${bidev:depends}, ${misc:Depends} Suggests: libasound2-doc -Conflicts: libc6-i386 (<= 2.9-18) +Breaks: libc6-i386 (<= 2.9-18) Description: shared library for ALSA applications -- development files (32 bit) This package contains files required for developing software that makes use of lib32asound2, the ALSA library (32 bit). @@ -94,13 +108,12 @@ ALSA is the Advanced Linux Sound Architecture. Package: libasound2-udeb +Section: debian-installer Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: libasound2-plugins (>= 1.0.18) -Conflicts: libasound2-plugins (<< 1.0.18) Package-Type: udeb Description: shared library for ALSA applications - This package contains the ALSA library and its standard plugins. + This package contains the ALSA library for use in the Debian Installer. . ALSA is the Advanced Linux Sound Architecture. diff -Nru alsa-lib-1.0.24.1/debian/copyright alsa-lib-1.0.24.1/debian/copyright --- alsa-lib-1.0.24.1/debian/copyright 2011-05-06 00:22:42.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/copyright 2011-08-11 15:20:23.000000000 +0000 @@ -10,7 +10,7 @@ The source code was downloaded from the ALSA homepage: - http://alsa.sourceforge.net + http://www.alsa-project.org/ alsa-lib -------- @@ -32,4 +32,4 @@ MA 02110-1301, USA. On Debian systems, the complete text of the GNU Lesser General Public License -can be found in /usr/share/common-licenses/LGPL. +can be found in /usr/share/common-licenses/LGPL-2.1. diff -Nru alsa-lib-1.0.24.1/debian/lib32asound2.postinst alsa-lib-1.0.24.1/debian/lib32asound2.postinst --- alsa-lib-1.0.24.1/debian/lib32asound2.postinst 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/lib32asound2.postinst 2011-08-11 15:20:23.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/lib32asound2.conf 1.0.24.1-0ubuntu6 -- "$@" + +#DEBHELPER# diff -Nru alsa-lib-1.0.24.1/debian/lib32asound2.postrm alsa-lib-1.0.24.1/debian/lib32asound2.postrm --- alsa-lib-1.0.24.1/debian/lib32asound2.postrm 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/lib32asound2.postrm 2011-08-11 15:20:23.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/lib32asound2.conf 1.0.24.1-0ubuntu6 -- "$@" + +#DEBHELPER# diff -Nru alsa-lib-1.0.24.1/debian/lib32asound2.preinst alsa-lib-1.0.24.1/debian/lib32asound2.preinst --- alsa-lib-1.0.24.1/debian/lib32asound2.preinst 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/lib32asound2.preinst 2011-08-11 15:20:23.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/lib32asound2.conf 1.0.24.1-0ubuntu6 -- "$@" + +#DEBHELPER# diff -Nru alsa-lib-1.0.24.1/debian/lib64asound2.postinst alsa-lib-1.0.24.1/debian/lib64asound2.postinst --- alsa-lib-1.0.24.1/debian/lib64asound2.postinst 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/lib64asound2.postinst 2011-08-11 15:20:23.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/lib64asound2.conf 1.0.24.1-0ubuntu6 -- "$@" + +#DEBHELPER# diff -Nru alsa-lib-1.0.24.1/debian/lib64asound2.postrm alsa-lib-1.0.24.1/debian/lib64asound2.postrm --- alsa-lib-1.0.24.1/debian/lib64asound2.postrm 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/lib64asound2.postrm 2011-08-11 15:20:23.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/lib64asound2.conf 1.0.24.1-0ubuntu6 -- "$@" + +#DEBHELPER# diff -Nru alsa-lib-1.0.24.1/debian/lib64asound2.preinst alsa-lib-1.0.24.1/debian/lib64asound2.preinst --- alsa-lib-1.0.24.1/debian/lib64asound2.preinst 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/lib64asound2.preinst 2011-08-11 15:20:23.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/lib64asound2.conf 1.0.24.1-0ubuntu6 -- "$@" + +#DEBHELPER# diff -Nru alsa-lib-1.0.24.1/debian/libasound2-dev.install alsa-lib-1.0.24.1/debian/libasound2-dev.install --- alsa-lib-1.0.24.1/debian/libasound2-dev.install 2011-05-06 00:22:42.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/libasound2-dev.install 2011-08-11 15:20:23.000000000 +0000 @@ -1,6 +1,5 @@ -debian/tmp/usr/share/aclocal -debian/tmp/usr/include -debian/tmp/usr/lib/libasound.a -debian/tmp/usr/lib/libasound.so -debian/tmp/usr/lib/libasound.la -debian/tmp/usr/lib/pkgconfig +usr/share/aclocal +usr/include +usr/lib/*/libasound.a +usr/lib/*/libasound.so +usr/lib/*/pkgconfig diff -Nru alsa-lib-1.0.24.1/debian/libasound2.postinst alsa-lib-1.0.24.1/debian/libasound2.postinst --- alsa-lib-1.0.24.1/debian/libasound2.postinst 2011-05-06 00:22:42.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/libasound2.postinst 2011-08-11 15:20:23.000000000 +0000 @@ -1,6 +1,8 @@ #!/bin/sh set -e +dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/libasound2.conf 1.0.24.1-0ubuntu6 -- "$@" + case "$1" in configure) # Remove very old cruft @@ -11,4 +13,3 @@ esac #DEBHELPER# - diff -Nru alsa-lib-1.0.24.1/debian/libasound2.postrm alsa-lib-1.0.24.1/debian/libasound2.postrm --- alsa-lib-1.0.24.1/debian/libasound2.postrm 2011-05-06 00:22:42.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/libasound2.postrm 2011-08-11 15:20:23.000000000 +0000 @@ -1,6 +1,8 @@ #!/bin/sh set -e +dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/libasound2.conf 1.0.24.1-0ubuntu6 -- "$@" + case "$1" in purge) # Remove very old cruft @@ -11,4 +13,3 @@ esac #DEBHELPER# - diff -Nru alsa-lib-1.0.24.1/debian/libasound2.preinst alsa-lib-1.0.24.1/debian/libasound2.preinst --- alsa-lib-1.0.24.1/debian/libasound2.preinst 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/libasound2.preinst 2011-08-11 15:20:23.000000000 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/libasound2.conf 1.0.24.1-0ubuntu6 -- "$@" + +#DEBHELPER# diff -Nru alsa-lib-1.0.24.1/debian/patches/debian-changes-1.0.24.1-0ubuntu6~lucid1 alsa-lib-1.0.24.1/debian/patches/debian-changes-1.0.24.1-0ubuntu6~lucid1 --- alsa-lib-1.0.24.1/debian/patches/debian-changes-1.0.24.1-0ubuntu6~lucid1 2011-05-14 13:15:30.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/patches/debian-changes-1.0.24.1-0ubuntu6~lucid1 1970-01-01 00:00:00.000000000 +0000 @@ -1,182 +0,0 @@ -Description: Upstream changes introduced in version 1.0.24.1-0ubuntu6~lucid1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - alsa-lib (1.0.24.1-0ubuntu6~lucid1) lucid; urgency=low - . - * Build for Lucid. - . - The person named in the Author field signed this changelog entry. -Author: Aron Xu - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Forwarded: -Reviewed-By: -Last-Update: - ---- alsa-lib-1.0.24.1.orig/configure -+++ alsa-lib-1.0.24.1/configure -@@ -3579,7 +3579,7 @@ ac_clean_files="$ac_clean_files conftest - # the compiler is broken, or we cross compile. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 - $as_echo_n "checking whether we are cross compiling... " >&6; } --if false && test "$cross_compiling" != yes; then -+if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ---- alsa-lib-1.0.24.1.orig/src/ucm/main.c -+++ alsa-lib-1.0.24.1/src/ucm/main.c -@@ -75,10 +75,8 @@ static int alloc_str_list(struct list_he - int cnt; - - cnt = list_count(list) * mult; -- if (cnt == 0) { -- *result = NULL; -+ if (cnt == 0) - return cnt; -- } - res = calloc(mult, cnt * sizeof(char *)); - if (res == NULL) - return -ENOMEM; -@@ -860,7 +858,6 @@ static int add_values(struct list_head * - val = malloc(sizeof(struct myvalue)); - if (val == NULL) - return -ENOMEM; -- val->value = v->data; - list_add_tail(&val->list, list); - } - } -@@ -914,8 +911,8 @@ static int get_value_list(snd_use_case_m - goto __fail; - } - err = alloc_str_list(&mylist, 1, &res); -+ *list = (const char **)res; - if (err >= 0) { -- *list = (const char **)res; - list_for_each(pos, &mylist) { - val = list_entry(pos, struct myvalue, list); - *res = strdup(val->value); -@@ -1062,31 +1059,24 @@ static int get_value3(const char **value - * \param uc_mgr Use case manager - * \param identifier Value identifier (string) - * \param value Returned value string -- * \param item Modifier or Device name (string) -+ * \param modifier modifier name (string) - * \return Zero on success (value is filled), otherwise a negative error code - */ - static int get_value(snd_use_case_mgr_t *uc_mgr, -- const char *identifier, -- const char **value, -- const char *item) -+ const char *identifier, -+ const char **value, -+ const char *modifier) - { -- struct use_case_modifier *mod; -- struct use_case_device *dev; -+ struct use_case_modifier *mod; - int err; - -- if (item != NULL) { -- mod = find_modifier(uc_mgr, item); -+ if (modifier != NULL) { -+ mod = find_modifier(uc_mgr, modifier); - if (mod != NULL) { - err = get_value1(value, &mod->value_list, identifier); - if (err >= 0 || err != -ENOENT) - return err; - } -- dev = find_device(uc_mgr->active_verb, item); -- if (dev != NULL) { -- err = get_value1(value, &dev->value_list, identifier); -- if (err >= 0 || err != -ENOENT) -- return err; -- } - } - err = get_value1(value, &uc_mgr->active_verb->value_list, identifier); - if (err >= 0 || err != -ENOENT) ---- alsa-lib-1.0.24.1.orig/src/conf/alsa.conf -+++ alsa-lib-1.0.24.1/src/conf/alsa.conf -@@ -8,8 +8,6 @@ - { - func load - files [ -- "/usr/share/alsa/pulse.conf" -- "/usr/share/alsa/bluetooth.conf" - "/etc/asound.conf" - "~/.asoundrc" - ] -@@ -54,11 +52,11 @@ cards.@hooks [ - # - - # show all name hints also for definitions without hint {} section --defaults.namehint.showall on -+defaults.namehint.showall off - # show just basic name hints - defaults.namehint.basic on - # show extended name hints --defaults.namehint.extended on -+defaults.namehint.extended off - # - defaults.ctl.card 0 - defaults.pcm.card 0 ---- alsa-lib-1.0.24.1.orig/src/conf/cards/ICE1712.conf -+++ alsa-lib-1.0.24.1/src/conf/cards/ICE1712.conf -@@ -32,26 +32,12 @@ ICE1712.pcm.front.0 { - @args.CARD { - type string - } -- type asym -- playback.pcm { -- type route -- ttable.0.0 1 -- ttable.1.1 1 -- slave.pcm { -- type hw -- card $CARD -- } -- slave.channels 10 -- } -- capture.pcm { -- type route -- ttable.0.0 1 -- ttable.1.1 1 -- slave.pcm { -- type hw -- card $CARD -- } -- slave.channels 12 -+ type route -+ ttable.0.0 1 -+ ttable.1.1 1 -+ slave.pcm { -+ type hw -+ card $CARD - } - } - -@@ -71,7 +57,6 @@ ICE1712.pcm.surround40.0 { - type hw - card $CARD - } -- slave.channels 10 - } - - -@@ -94,7 +79,6 @@ ICE1712.pcm.surround51.0 { - type hw - card $CARD - } -- slave.channels 10 - } - - diff -Nru alsa-lib-1.0.24.1/debian/patches/multiarch-safe-dlopen-search-path.patch alsa-lib-1.0.24.1/debian/patches/multiarch-safe-dlopen-search-path.patch --- alsa-lib-1.0.24.1/debian/patches/multiarch-safe-dlopen-search-path.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/patches/multiarch-safe-dlopen-search-path.patch 2011-08-11 15:20:23.000000000 +0000 @@ -0,0 +1,41 @@ +Description: compile in the ALSA search path instead of relying on ld.so.conf + The Ubuntu package currently uses ld.so.conf.d fragments to add + /usr/lib/alsa-lib and /usr/lib{32,64}/alsa-lib to the dlopen search path. + These don't *belong* on the global search path, and it becomes much more + problematic to put them there with the advent of multiarch because each + architecture then needs its own distinct config file to add the separate + path... which is then also put in the global library namespace. Instead, + let ALSA make use of the already defined ALSA_PLUGIN_DIR to look up plugins. +Author: Steve Langasek + +Index: alsa-lib-1.0.24.1/src/dlmisc.c +=================================================================== +--- alsa-lib-1.0.24.1.orig/src/dlmisc.c ++++ alsa-lib-1.0.24.1/src/dlmisc.c +@@ -67,7 +67,25 @@ + #endif + #endif + #ifdef HAVE_LIBDL +- return dlopen(name, mode); ++ /* ++ * Handle the plugin dir not being on the default dlopen search ++ * path, without resorting to polluting the entire system namespace ++ * via ld.so.conf. ++ */ ++ void *handle = NULL; ++ char *filename; ++ ++ if (name && name[0] != '/') { ++ filename = malloc(sizeof(ALSA_PLUGIN_DIR) + 1 + strlen(name) + 1); ++ strcpy(filename, ALSA_PLUGIN_DIR); ++ strcat(filename, "/"); ++ strcat(filename, name); ++ handle = dlopen(filename, mode); ++ free(filename); ++ } ++ if (!handle) ++ handle = dlopen(name, mode); ++ return handle; + #else + return NULL; + #endif diff -Nru alsa-lib-1.0.24.1/debian/patches/series alsa-lib-1.0.24.1/debian/patches/series --- alsa-lib-1.0.24.1/debian/patches/series 2011-05-14 13:15:30.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/patches/series 2011-08-11 15:20:23.000000000 +0000 @@ -7,4 +7,4 @@ lp652035-use-extended-namehints.patch alsa-lib-ucm-allow-values-to-be-read-from-devices.patch lp178442-ICE1712.patch -debian-changes-1.0.24.1-0ubuntu6~lucid1 +multiarch-safe-dlopen-search-path.patch diff -Nru alsa-lib-1.0.24.1/debian/rules alsa-lib-1.0.24.1/debian/rules --- alsa-lib-1.0.24.1/debian/rules 2011-05-06 00:22:42.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/rules 2011-09-24 00:07:36.000000000 +0000 @@ -6,11 +6,12 @@ PACKAGE:= alsa-lib #include /usr/share/quilt/quilt.make -export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) biarch_map := i386=amd64 powerpc=ppc64 sparc=sparc64 s390=s390x \ amd64=i386 # ppc64=powerpc @@ -54,12 +55,13 @@ ln -s /usr/share/misc/config.sub config.sub ln -s /usr/share/misc/config.guess config.guess ./configure --prefix=/usr \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --datadir=\$${prefix}/share \ + --with-plugindir=/usr/lib/$(DEB_HOST_MULTIARCH)/alsa-lib \ --build $(DEB_BUILD_GNU_TYPE) \ - --enable-static --disable-maintainer-mode \ - --with-plugindir=/usr/lib/alsa-lib + --enable-static --disable-maintainer-mode touch configure-stamp configure-biarch-stamp: @@ -115,7 +117,7 @@ dh_prep -s $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp mkdir -p $(CURDIR)/debian/tmp/usr/share/alsa/ucm - cp -r $(CURDIR)/debian/ucm/SDP4430 \ + cp -r $(CURDIR)/debian/ucm/* \ $(CURDIR)/debian/tmp/usr/share/alsa/ucm ifneq (,$(build_biarch_stamp)) rm -rf debian/bitmp @@ -128,32 +130,32 @@ debian/lib$(bi)asound2/$(bilibdir)/alsa-lib/smixer/ mkdir -p debian/lib$(bi)asound2-dev/$(bilibdir)/alsa-lib/smixer # mkdir -p debian/lib$(bi)asound2-dev/$(bilibdir)/pkgconfig - cp -a \ - debian/bitmp/usr/lib/libasound.so \ - debian/bitmp/usr/lib/libasound.a \ - debian/lib$(bi)asound2-dev/$(bilibdir)/ + cp -a debian/bitmp/usr/lib/libasound.so \ + debian/bitmp/usr/lib/libasound.a \ + debian/lib$(bi)asound2-dev/$(bilibdir) sed -e "/^libdir=/s,=.*,='/$(bilibdir)',;s,^dependency_libs=.*,dependency_libs=''," \ debian/bitmp/usr/lib/libasound.la \ > debian/lib$(bi)asound2-dev/$(bilibdir)/libasound.la - mkdir -p debian/lib$(bi)asound2/etc/ld.so.conf.d - echo "/$(bilibdir)/alsa-lib" > debian/lib$(bi)asound2/etc/ld.so.conf.d/lib$(bi)asound2.conf # sed -e "/^libdir=.*lib$$/s,=.*,=/$(bilibdir)," \ # debian/bitmp/usr/lib/pkgconfig/alsa.pc \ # > debian/lib$(bi)asound2-dev/$(bilibdir)/pkgconfig/alsa.pc -else - sed -ie "s,^dependency_libs=.*,dependency_libs=''," \ - debian/tmp/usr/lib/libasound.la endif - mkdir -p debian/libasound2/etc/ld.so.conf.d - echo "/usr/lib/alsa-lib" > debian/libasound2/etc/ld.so.conf.d/libasound2.conf dh_installdirs -s dh_install -s dh_installdocs -plibasound2 dh_installexamples -s doc/asoundrc.txt dh_installchangelogs -plibasound2 debian/changelog.ALSA - dh_install -plibasound2 /usr/lib/libasound.so.2.0.0 /usr/lib/libasound.so.2 /usr/lib - dh_install -plibasound2-udeb /usr/lib/libasound.so.2.0.0 /usr/lib/libasound.so.2 /usr/lib - dh_install -plibasound2 /usr/lib/alsa-lib/smixer/*.so /usr/lib/alsa-lib + dh_install -plibasound2 \ + /usr/lib/$(DEB_HOST_MULTIARCH)/libasound.so.2.0.0 \ + /usr/lib/$(DEB_HOST_MULTIARCH)/libasound.so.2 \ + /usr/lib/$(DEB_HOST_MULTIARCH) + dh_install -plibasound2-udeb \ + /usr/lib/$(DEB_HOST_MULTIARCH)/libasound.so.2.0.0 \ + /usr/lib/$(DEB_HOST_MULTIARCH)/libasound.so.2 /usr/lib + dh_install -plibasound2-python /usr/lib/$(DEB_HOST_MULTIARCH)/alsa-lib/smixer/smixer-python.so \ + /usr/lib/$(DEB_HOST_MULTIARCH)/alsa-lib + rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/alsa-lib/smixer/smixer-python.so + dh_install -plibasound2 /usr/lib/$(DEB_HOST_MULTIARCH)/alsa-lib/smixer/*.so /usr/lib/$(DEB_HOST_MULTIARCH)/alsa-lib cp -a debian/tmp/usr/share/alsa debian/libasound2/usr/share/ cp -a debian/tmp/usr/share/alsa debian/libasound2-udeb/usr/share/ dh_strip -s @@ -176,7 +178,7 @@ dh_fixperms -i binary-arch: build-arch-stamp install-arch - dh_makeshlibs -plibasound2 -V'libasound2 (>> 1.0.24.1)' --add-udeb=libasound2-udeb --exclude=usr/lib/alsa-lib/smixer + dh_makeshlibs -plibasound2 -V'libasound2 (>> 1.0.24.1)' --add-udeb=libasound2-udeb --exclude=usr/lib/$(DEB_HOST_MULTIARCH)/alsa-lib/smixer ifneq (,$(build_biarch_stamp)) dh_makeshlibs -plib$(bi)asound2 -V'lib$(bi)asound2 (>> 1.0.24.1)' --exclude=usr/lib$(bi)/alsa-lib/smixer endif @@ -202,7 +204,7 @@ #-$(MAKE) distclean [ ! -f Makefile ] || $(MAKE) distclean -rm -f *-stamp - rm -f config.sub config.guess config.status config.cache + -rm -f config.sub config.guess config.status config.cache -rm -rf doc/doxygen rm -rf bibuild debian/bitmp -rm -f include/alsa diff -Nru alsa-lib-1.0.24.1/debian/ucm/Panda/FMAnalog alsa-lib-1.0.24.1/debian/ucm/Panda/FMAnalog --- alsa-lib-1.0.24.1/debian/ucm/Panda/FMAnalog 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/ucm/Panda/FMAnalog 2011-09-24 00:14:17.000000000 +0000 @@ -0,0 +1,46 @@ +# Use case Configurationfor TI Panda HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cdev "hw:0" + cset "name='AMIC_UL PDM Switch' 1" + cset "name='MUX_UL00' 9" + cset "name='MUX_UL01' 10" + cset "name='Capture Volume' 4" + ] + + + DisableSequence [ + cdev "hw:0" + cset "name='AMIC_UL PDM Switch' 0" + cset "name='MUX_UL00' 0" + cset "name='MUX_UL01' 0" + cset "name='Capture Volume' 0" + ] + + # Optional TQ and ALSA PCMs + Value { + TQ "Music" + CapturePCM "hw:0,0" + } +} + +SectionDevice."Headset".0 { + Comment "Panda 3.5mm Headset" + + EnableSequence [ + cdev "hw:0" + cset "name='Analog Left Capture Route' 2" + cset "name='Analog Right Capture Route' 2" + cset "name='Capture Preamplifier Volume' 2" + ] + + DisableSequence [ + cdev "hw:0" + cset "name='Analog Left Capture Route' 3" + cset "name='Analog Right Capture Route' 3" + cset "name='Capture Preamplifier Volume' 0" + ] +} + diff -Nru alsa-lib-1.0.24.1/debian/ucm/Panda/Panda.conf alsa-lib-1.0.24.1/debian/ucm/Panda/Panda.conf --- alsa-lib-1.0.24.1/debian/ucm/Panda/Panda.conf 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/ucm/Panda/Panda.conf 2011-09-24 00:14:17.000000000 +0000 @@ -0,0 +1,57 @@ +SectionUseCase."HiFi" { + File "hifi" + Comment "Play and record HiFi quality Music." +} + +#SectionUseCase."Record" { +# File "record" +# Comment "Record." +#} + +SectionUseCase."HiFi_Low_Power" { + File "hifiLP" + Comment "Play HiFi quality Music in Low Power Mode." +} + +#SectionUseCase."Voice" { +# File "voice" +# Comment "Playback Voice quality." +#} +# +#SectionUseCase."Voice_Low_Power" { +# File "voice" +# Comment "Playback Voice quality in Low Power Mode." +#} +# +#SectionUseCase."Voice_Call" { +# File "voiceCall" +# Comment "Capture and Playback in Voice quality." +#} +# +#SectionUseCase."Voice_Call_IP" { +# File "voiceCall" +# Comment "Capture and Playback in Voice quality." +#} +# +#SectionUseCase."FM_Analog_Radio" { +# File "FMAnalog" +# Comment "Capture FM Analog Radio." +#} + +ValueDefaults { + PlaybackCTL "hw:0" + CaptureCTL "hw:0" +} + +SectionDefaults [ + cset "name='Headset Playback Volume' 13,13" + cset "name='HS Right Playback' 1" + cset "name='HS Left Playback' 1" + cset "name='DL1 Media Playback Volume' 120" + cset "name='DL1 PDM Switch' 1" + cset "name='DL1 Mixer Multimedia' 1" + cset "name='Sidetone Mixer Playback' 1" + cset "name='SDT DL Volume' 120" + exec "echo Im setting defaults" +] + diff -Nru alsa-lib-1.0.24.1/debian/ucm/Panda/hifi alsa-lib-1.0.24.1/debian/ucm/Panda/hifi --- alsa-lib-1.0.24.1/debian/ucm/Panda/hifi 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/ucm/Panda/hifi 2011-09-24 00:14:17.000000000 +0000 @@ -0,0 +1,126 @@ +# Use case Configuration for TI Panda HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cset "name='Sidetone Mixer Playback' 1" + cset "name='DL1 PDM Switch' 1" + cset "name='DL1 Media Playback Volume' 120" + cset "name='DL1 Mixer Multimedia' 1" + cset "name='SDT DL Volume' 120" + cset "name='Headset Power Mode' 1" + ] + DisableSequence [ + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL1 PDM Switch' 0" + cset "name='DL1 Media Playback Volume' 0" + cset "name='DL1 Mixer Multimedia' 0" + cset "name='SDT DL Volume' 0" + cset "name='Headset Power Mode' 0" + ] + + # QoS and ALSA PCMs + Value { + TQ "Music" + CaptureCTL "hw:0" + PlaybackCTL "hw:0" + } +} + +#SectionDevice."Earphone".0 { +# Comment "Panda Earphone" +# +# EnableSequence [ +# cset "name='Earphone Driver Switch' 1" +# ] +# +# DisableSequence [ +# cset "name='Earphone Driver Switch' 0" +# ] +# +# Value { +# MasterPlaybackVolume "Earphone Playback Volume" +# CapturePCM "hw:0,2" +# PlaybackPCM "hw:0,2" +# } +#} + +SectionDevice."Headset".0 { + Comment "Panda 3.5mm Headset" + + EnableSequence [ + cset "name='HS Right Playback' 1" + cset "name='HS Left Playback' 1" + ] + + DisableSequence [ + cset "name='HS Right Playback' 0" + cset "name='HS Left Playback' 0" + ] + + Value { + MasterPlaybackVolume "Headset Playback Volume" + MasterCaptureVolume "Capture Volume" + CapturePCM "hw:0,0" + PlaybackPCM "hw:0,0" + } +} + +#SectionDevice."Handsfree".0 { +# Comment "Panda Handsfree Speakers LS2 & LS3" +# +# EnableSequence [ +# cset "name='HF Right Playback' 1" +# cset "name='HF Left Playback' 1" +# ] +# +# DisableSequence [ +# cset "name='HF Right Playback' 0" +# cset "name='HF Left Playback' 0" +# ] +# +# Value { +# MasterPlaybackVolume "Handsfree Playback Volume" +# MasterCaptureVolume "Capture Volume" +# CapturePCM "hw:0,0" +# PlaybackPCM "hw:0,0" +# } +#} + +# Headset/Handsfree Tone playback +#SectionModifier."Play_Tone".0 { +# Comment "Play tone to headset or speaker during music playback" +# SupportedDevice [ +# "Handsfree" +# "Headset" +# ] +# +# EnableSequence [ +# cset "name='DL1 Mixer Tones' 1" +# cset "name='DL2 Mixer Tones' 1" +# ] +# +# DisableSequence [ +# cset "name='DL1 Mixer Tones' 0" +# cset "name='DL2 Mixer Tones' 0" +# ] +# +# Value { +# PlaybackPCM "hw:0,3" +# MasterPlaybackVolume "DL2 Tones Playback Volume" +# } +#} + +SectionDevice."HDMI".0 { + Comment "HDMI connected to TV" + + EnableSequence [ + ] + + DisableSequence [ + ] + + Value { + PlaybackPCM "hw:1,0" + } +} diff -Nru alsa-lib-1.0.24.1/debian/ucm/Panda/hifiLP alsa-lib-1.0.24.1/debian/ucm/Panda/hifiLP --- alsa-lib-1.0.24.1/debian/ucm/Panda/hifiLP 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/ucm/Panda/hifiLP 2011-09-24 00:14:17.000000000 +0000 @@ -0,0 +1,58 @@ +# Use case Configuration for TI Panda HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cset "name='DL1 Mixer Multimedia' 1" + cset "name='DL1 PDM Switch' 1" + cset "name='DL1 Media Playback Volume' 120,120" + cset "name='Sidetone Mixer Playback' 1" + cset "name='SDT DL Volume' 120" + ] + + DisableSequence [ + cset "name='DL1 Mixer Multimedia' 0" + cset "name='DL1 PDM Switch' 0" + cset "name='DL1 Media Playback Volume' 0,0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='SDT DL Volume' 0" + ] + + # Optional TQ and ALSA PCMs + Value { + TQ "Music" + PlaybackCTL "hw:0" + } +} + +SectionDevice."Headset".0 { + Comment "Panda 3.5mm Headset" + + EnableSequence [ + cset "name='HS Left Playback' 1" + cset "name='HS Right Playback' 1" + ] + + DisableSequence [ + cset "name='HS Right Playback' 0" + cset "name='HS Left Playback' 0" + ] + Value { + MasterPlaybackVolume "Headset Playback Volume" + PlaybackPCM "hw:0,6" + } +} + +SectionDevice."HDMI".0 { + Comment "HDMI connected to TV" + + EnableSequence [ + ] + + DisableSequence [ + ] + + Value { + PlaybackPCM "hw:1,0" + } +} diff -Nru alsa-lib-1.0.24.1/debian/ucm/Panda/record alsa-lib-1.0.24.1/debian/ucm/Panda/record --- alsa-lib-1.0.24.1/debian/ucm/Panda/record 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/ucm/Panda/record 2011-09-24 00:14:17.000000000 +0000 @@ -0,0 +1,45 @@ +# Use case Configuration for TI Panda HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cdev "hw:0" + cset "name='AMIC_UL PDM Switch' 1" + cset "name='MUX_UL00' 9" + cset "name='MUX_UL01' 10" + cset "name='Capture Volume' 4" + ] + + DisableSequence [ + cdev "hw:0" + cset "name='AMIC_UL PDM Switch' 0" + cset "name='MUX_UL00' 0" + cset "name='MUX_UL01' 0" + cset "name='Capture Volume' 0" + ] + + # Optional TQ and ALSA PCMs + Value { + TQ "Music" + CapturePCM "hw:0,0" + } + +} + +SectionDevice."Headset".0 { + Comment "Panda 3.5mm Headset" + + EnableSequence [ + cdev "hw:0" + cset "name='Analog Left Capture Route' 0" + cset "name='Analog Right Capture Route' 0" + cset "name='Capture amplifier Volume' 2" + ] + + DisableSequence [ + cdev "hw:0" + cset "name='Analog Left Capture Route' 3" + cset "name='Analog Right Capture Route' 3" + cset "name='Capture Preamplifier Volume' 0" + ] +} diff -Nru alsa-lib-1.0.24.1/debian/ucm/Panda/voice alsa-lib-1.0.24.1/debian/ucm/Panda/voice --- alsa-lib-1.0.24.1/debian/ucm/Panda/voice 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/ucm/Panda/voice 2011-09-24 00:14:17.000000000 +0000 @@ -0,0 +1,46 @@ +# Use case Configuration for TI Panda HiFi Music +# By Liam Girdwood + +SectionVerb { + EnableSequence [ + cdev "hw:0" + cset "name='DL1 Mixer Voice' 1" + cset "name='Sidetone Mixer Playback' 1" + cset "name='DL1 PDM Switch' 1" + cset "name='DL1 Voice Playback Volume' 90,90" + cset "name='SDT DL Volume' 120" + ] + + DisableSequence [ + cdev "hw:0" + cset "name='DL1 Mixer Voice' 0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL1 PDM Switch' 0" + cset "name='DL1 Voice Playback Volume' 0,0" + cset "name='SDT DL Volume' 0" + ] + + # Optional TQ and ALSA PCMs + Value { + TQ "Voice" + PlaybackPCM "hw:0,2" + } +} + +SectionDevice."Headset".0 { + Comment "Panda 3.5mm Headset" + + EnableSequence [ + cdev "hw:0" + cset "name='HS Left Playback' 1" + cset "name='HS Right Playback' 1" + cset "name='Headset Playback Volume' 13" + ] + + DisableSequence [ + cdev "hw:0" + cset "name='HS Right Playback' 0" + cset "name='HS Left Playback' 0" + cset "name='Headset Playback Volume' 0" + ] +} diff -Nru alsa-lib-1.0.24.1/debian/ucm/Panda/voiceCall alsa-lib-1.0.24.1/debian/ucm/Panda/voiceCall --- alsa-lib-1.0.24.1/debian/ucm/Panda/voiceCall 1970-01-01 00:00:00.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/ucm/Panda/voiceCall 2011-09-24 00:14:17.000000000 +0000 @@ -0,0 +1,140 @@ +# Example Use case verb section for Voice call blah +# By Joe Blogs + +SectionVerb { + # enable and disable sequences are compulsory + EnableSequence [ + ] + + DisableSequence [ + ] + + # Optional QoS and ALSA PCMs + Value { + TQ "Music" + PlaybackCTL "hw:0" + CaptureCTL "hw:0" + PlaybackPCM "hw:0" + CapturePCM "hw:0" + } +} + +SectionDevice."Headphones".0 { + + EnableSequence [ + cset "name='DL1 Media Playback Volume' 10" + cset "name='Sidetone Mixer Playback' 1" + cset "name='HF Right Playback' 1" + cset "name='HF Left Playback' 1" + ] + + DisableSequence [ + cset "name='HF Right Playback' 0" + cset "name='HF Left Playback' 0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL1 Media Playback Volume' 0" + ] + + Value { + MasterPlaybackVolume "35" + } +} + +SectionDevice."Headset".0 { + + EnableSequence [ + cset "name='DL1 Media Playback Volume' 10" + cset "name='Sidetone Mixer Playback' 1" + cset "name='HS Right Playback' 1" + cset "name='HS Left Playback' 1" + cset "name='MUX_UL11' 9" + cset "name='MUX_UL10' 10" + ] + + DisableSequence [ + cset "name='MUX_UL11' 0" + cset "name='MUX_UL10' 0" + cset "name='HS Right Playback' 0" + cset "name='HS Left Playback' 0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL1 Media Playback Volume' 0" + ] + + Value { + MasterPlaybackVolume "35" + MasterCaptureVolume "33" + } +} + +SectionDevice."Handset".0 { + + EnableSequence [ + cset "name='DL2 Media Playback Volume' 10" + cset "name='Sidetone Mixer Playback' 1" + cset "name='HF Right Playback' 1" + cset "name='HF Left Playback' 1" + cset "name='MUX_UL11' 9" + cset "name='MUX_UL10' 10" + ] + + DisableSequence [ + cset "name='MUX_UL11' 0" + cset "name='MUX_UL10' 0" + cset "name='HF Right Playback' 0" + cset "name='HF Left Playback' 0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL2 Media Playback Volume' 0" + ] + + Value { + MasterPlaybackVolume "36" + MasterCaptureVolume "33" + } +} + +SectionModifier."Play_Tone".0 { + Comment "Play tone to handset during music playback" + SupportedDevice [ + "Handset" + ] + + EnableSequence [ + cset "name='DL2 Tones Playback Volume' 10" + ] + + DisableSequence [ + cset "name='DL2 Tones Playback Volume' 0" + ] + + Value { + PlaybackPCM "2" + MasterPlaybackVolume "36" + } +} + +SectionModifier."Play_Tone".1 { + Comment "Play tone to headset and handset during music playback" + SupportedDevice [ + "Headset" + ] + + EnableSequence [ + 'DL2 Tones Playback Volume':1:10 + 'DL1 Tones Playback Volume':1:10 + 'HF Right Playback':1:1 + 'HF Left Playback':1:1 + ] + + DisableSequence [ + 'DL2 Tones Playback Volume':1:0 + 'DL1 Tones Playback Volume':1:0 + 'HF Right Playback':1:0 + 'HF Left Playback':1:0 + ] + + Value { + PlaybackPCM "2" + MasterPlaybackVolume "36" + } +} + diff -Nru alsa-lib-1.0.24.1/debian/ucm/SDP4430/FMAnalog alsa-lib-1.0.24.1/debian/ucm/SDP4430/FMAnalog --- alsa-lib-1.0.24.1/debian/ucm/SDP4430/FMAnalog 2011-05-06 00:22:42.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/ucm/SDP4430/FMAnalog 2011-09-24 00:14:17.000000000 +0000 @@ -2,45 +2,45 @@ # By Liam Girdwood SectionVerb { - EnableSequence [ - cdev "hw:SDP4430" - cset "name='AMIC_UL PDM Switch' 1" - cset "name='MUX_UL00' 9" - cset "name='MUX_UL01' 10" - cset "name='Capture Volume' 4" - ] - - - DisableSequence [ - cdev "hw:SDP4430" - cset "name='AMIC_UL PDM Switch' 0" - cset "name='MUX_UL00' 0" - cset "name='MUX_UL01' 0" - cset "name='Capture Volume' 0" - ] - - # Optional TQ and ALSA PCMs - Value { - TQ "Music" - CapturePCM "hw:0,0" - } + EnableSequence [ + cdev "hw:0" + cset "name='AMIC_UL PDM Switch' 1" + cset "name='MUX_UL00' 9" + cset "name='MUX_UL01' 10" + cset "name='Capture Volume' 4" + ] + + + DisableSequence [ + cdev "hw:0" + cset "name='AMIC_UL PDM Switch' 0" + cset "name='MUX_UL00' 0" + cset "name='MUX_UL01' 0" + cset "name='Capture Volume' 0" + ] + + # Optional TQ and ALSA PCMs + Value { + TQ "Music" + CapturePCM "hw:0,0" + } } SectionDevice."Headset".0 { - Comment "SDP4430 3.5mm Headset" - - EnableSequence [ - cdev "hw:SDP4430" - cset "name='Analog Left Capture Route' 2" - cset "name='Analog Right Capture Route' 2" - cset "name='Capture Preamplifier Volume' 2" - ] - - DisableSequence [ - cdev "hw:SDP4430" - cset "name='Analog Left Capture Route' 3" - cset "name='Analog Right Capture Route' 3" - cset "name='Capture Preamplifier Volume' 0" - ] + Comment "SDP4430 3.5mm Headset" + + EnableSequence [ + cdev "hw:0" + cset "name='Analog Left Capture Route' 2" + cset "name='Analog Right Capture Route' 2" + cset "name='Capture Preamplifier Volume' 2" + ] + + DisableSequence [ + cdev "hw:0" + cset "name='Analog Left Capture Route' 3" + cset "name='Analog Right Capture Route' 3" + cset "name='Capture Preamplifier Volume' 0" + ] } diff -Nru alsa-lib-1.0.24.1/debian/ucm/SDP4430/SDP4430.conf alsa-lib-1.0.24.1/debian/ucm/SDP4430/SDP4430.conf --- alsa-lib-1.0.24.1/debian/ucm/SDP4430/SDP4430.conf 2011-05-06 00:22:42.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/ucm/SDP4430/SDP4430.conf 2011-09-24 00:14:17.000000000 +0000 @@ -1,45 +1,57 @@ -# UCM configuration for SDP4430 -SectionUseCase."Record" { - File "record" - Comment "Record." -} - SectionUseCase."HiFi" { - File "hifi" - Comment "Play HiFi quality Music." -} - -SectionUseCase."HiFi_Low_Power" { - File "hifiLP" - Comment "Play HiFi quality Music in Low Power Mode." -} - -SectionUseCase."Voice" { - File "voice" - Comment "Playback Voice quality." -} - -SectionUseCase."Voice_Low_Power" { - File "voice" - Comment "Playback Voice quality in Low Power Mode." + File "hifi" + Comment "Play and record HiFi quality Music." } -SectionUseCase."Voice_Call" { - File "voiceCall" - Comment "Capture and Playback in Voice quality." -} +#SectionUseCase."Record" { +# File "record" +# Comment "Record." +#} -SectionUseCase."Voice_Call_IP" { - File "voiceCall" - Comment "Capture and Playback in Voice quality." +SectionUseCase."HiFi_Low_Power" { + File "hifiLP" + Comment "Play HiFi quality Music in Low Power Mode." } -SectionUseCase."FM_Analog_Radio" { - File "FMAnalog" - Comment "Capture FM Analog Radio." +#SectionUseCase."Voice" { +# File "voice" +# Comment "Playback Voice quality." +#} +# +#SectionUseCase."Voice_Low_Power" { +# File "voice" +# Comment "Playback Voice quality in Low Power Mode." +#} +# +#SectionUseCase."Voice_Call" { +# File "voiceCall" +# Comment "Capture and Playback in Voice quality." +#} +# +#SectionUseCase."Voice_Call_IP" { +# File "voiceCall" +# Comment "Capture and Playback in Voice quality." +#} +# +#SectionUseCase."FM_Analog_Radio" { +# File "FMAnalog" +# Comment "Capture FM Analog Radio." +#} + +ValueDefaults { + PlaybackCTL "hw:0" + CaptureCTL "hw:0" } SectionDefaults [ - cdev "hw:SDP4430" - exec "echo Im setting defaults" + cset "name='Headset Playback Volume' 13,13" + cset "name='HS Right Playback' 1" + cset "name='HS Left Playback' 1" + cset "name='DL1 Media Playback Volume' 120" + cset "name='DL1 PDM Switch' 1" + cset "name='DL1 Mixer Multimedia' 1" + cset "name='Sidetone Mixer Playback' 1" + cset "name='SDT DL Volume' 120" + exec "echo Im setting defaults" ] + diff -Nru alsa-lib-1.0.24.1/debian/ucm/SDP4430/hifi alsa-lib-1.0.24.1/debian/ucm/SDP4430/hifi --- alsa-lib-1.0.24.1/debian/ucm/SDP4430/hifi 2011-05-06 00:22:42.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/ucm/SDP4430/hifi 2011-09-24 00:14:17.000000000 +0000 @@ -2,82 +2,125 @@ # By Liam Girdwood SectionVerb { - EnableSequence [ - cdev "hw:SDP4430" - cset "name='DL1 Mixer Multimedia' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Media Playback Volume' 90,90" - cset "name='SDT DL Volume' 120" - - cset "name='HS Left Playback' 1" - cset "name='HS Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cdev "hw:SDP4430" - cset "name='DL1 Mixer Multimedia' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Media Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - - cset "name='HS Right Playback' 0" - cset "name='HS Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - # Optional TQ and ALSA PCMs -# Value { -# TQ "Music" -# PlaybackPCM "hw:0,0" -# PlaybackVolume "name='DL1 Media Playback Volume' 90,90" -# PlaybackSwitch "name='DL1 PDM Switch' 1" -# } + EnableSequence [ + cset "name='Sidetone Mixer Playback' 1" + cset "name='DL1 PDM Switch' 1" + cset "name='DL1 Media Playback Volume' 120" + cset "name='DL1 Mixer Multimedia' 1" + cset "name='SDT DL Volume' 120" + cset "name='Headset Power Mode' 1" + ] + DisableSequence [ + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL1 PDM Switch' 0" + cset "name='DL1 Media Playback Volume' 0" + cset "name='DL1 Mixer Multimedia' 0" + cset "name='SDT DL Volume' 0" + cset "name='Headset Power Mode' 0" + ] + + # QoS and ALSA PCMs + Value { + TQ "Music" + CaptureCTL "hw:0" + PlaybackCTL "hw:0" + } } +#SectionDevice."Earphone".0 { +# Comment "SDP4430 Earphone" +# +# EnableSequence [ +# cset "name='Earphone Driver Switch' 1" +# ] +# +# DisableSequence [ +# cset "name='Earphone Driver Switch' 0" +# ] +# +# Value { +# MasterPlaybackVolume "Earphone Playback Volume" +# CapturePCM "hw:0,2" +# PlaybackPCM "hw:0,2" +# } +#} + SectionDevice."Headset".0 { - Comment "SDP4430 3.5mm Headset" + Comment "SDP4430 3.5mm Headset" - EnableSequence [ - cdev "hw:SDP4430" - cset "name='HS Left Playback' 1" - cset "name='HS Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cdev "hw:SDP4430" - cset "name='HS Right Playback' 0" - cset "name='HS Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] + EnableSequence [ + cset "name='HS Right Playback' 1" + cset "name='HS Left Playback' 1" + ] + + DisableSequence [ + cset "name='HS Right Playback' 0" + cset "name='HS Left Playback' 0" + ] + + Value { + MasterPlaybackVolume "Headset Playback Volume" + MasterCaptureVolume "Capture Volume" + CapturePCM "hw:0,0" + PlaybackPCM "hw:0,0" + } } -#SectionModifier."RecordMedia".0 { -# SupportedDevice [ -# "Headset" -# ] - # EnableSequence [ - # .... - # ] - # - # DisableSequence [ - # ... - # ] - # - # TransitionSequence."ToModifierName" [ - # ... - # ] - # - # # Optional TQ and ALSA PCMs - # Value { - # TQ Voice - # CapturePCM "hw:1" - # PlaybackVolume "name='Master Playback Volume',index=2" - # PlaybackSwitch "name='Master Playback Switch',index=2" - # } +#SectionDevice."Handsfree".0 { +# Comment "SDP4430 Handsfree Speakers LS2 & LS3" +# +# EnableSequence [ +# cset "name='HF Right Playback' 1" +# cset "name='HF Left Playback' 1" +# ] +# +# DisableSequence [ +# cset "name='HF Right Playback' 0" +# cset "name='HF Left Playback' 0" +# ] # +# Value { +# MasterPlaybackVolume "Handsfree Playback Volume" +# MasterCaptureVolume "Capture Volume" +# CapturePCM "hw:0,0" +# PlaybackPCM "hw:0,0" +# } #} +# Headset/Handsfree Tone playback +#SectionModifier."Play_Tone".0 { +# Comment "Play tone to headset or speaker during music playback" +# SupportedDevice [ +# "Handsfree" +# "Headset" +# ] +# +# EnableSequence [ +# cset "name='DL1 Mixer Tones' 1" +# cset "name='DL2 Mixer Tones' 1" +# ] +# +# DisableSequence [ +# cset "name='DL1 Mixer Tones' 0" +# cset "name='DL2 Mixer Tones' 0" +# ] +# +# Value { +# PlaybackPCM "hw:0,3" +# MasterPlaybackVolume "DL2 Tones Playback Volume" +# } +#} + +SectionDevice."HDMI".0 { + Comment "HDMI connected to TV" + + EnableSequence [ + ] + + DisableSequence [ + ] + + Value { + PlaybackPCM "hw:1,0" + } +} diff -Nru alsa-lib-1.0.24.1/debian/ucm/SDP4430/hifiLP alsa-lib-1.0.24.1/debian/ucm/SDP4430/hifiLP --- alsa-lib-1.0.24.1/debian/ucm/SDP4430/hifiLP 2011-05-06 00:22:42.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/ucm/SDP4430/hifiLP 2011-09-24 00:14:17.000000000 +0000 @@ -2,45 +2,57 @@ # By Liam Girdwood SectionVerb { - EnableSequence [ - cdev "hw:SDP4430" - cset "name='DL1 Mixer Multimedia' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Media Playback Volume' 90,90" - cset "name='SDT DL Volume' 120" - ] - - DisableSequence [ - cdev "hw:SDP4430" - cset "name='DL1 Mixer Multimedia' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Media Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - ] - - # Optional TQ and ALSA PCMs - Value { - TQ "Music" - PlaybackPCM "hw:0,6" - } + EnableSequence [ + cset "name='DL1 Mixer Multimedia' 1" + cset "name='DL1 PDM Switch' 1" + cset "name='DL1 Media Playback Volume' 120,120" + cset "name='Sidetone Mixer Playback' 1" + cset "name='SDT DL Volume' 120" + ] + + DisableSequence [ + cset "name='DL1 Mixer Multimedia' 0" + cset "name='DL1 PDM Switch' 0" + cset "name='DL1 Media Playback Volume' 0,0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='SDT DL Volume' 0" + ] + + # Optional TQ and ALSA PCMs + Value { + TQ "Music" + PlaybackCTL "hw:0" + } } SectionDevice."Headset".0 { - Comment "SDP4430 3.5mm Headset" - - EnableSequence [ - cdev "hw:SDP4430" - cset "name='HS Left Playback' 1" - cset "name='HS Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cdev "hw:SDP4430" - cset "name='HS Right Playback' 0" - cset "name='HS Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] + Comment "SDP4430 3.5mm Headset" + + EnableSequence [ + cset "name='HS Left Playback' 1" + cset "name='HS Right Playback' 1" + ] + + DisableSequence [ + cset "name='HS Right Playback' 0" + cset "name='HS Left Playback' 0" + ] + Value { + MasterPlaybackVolume "Headset Playback Volume" + PlaybackPCM "hw:0,6" + } +} + +SectionDevice."HDMI".0 { + Comment "HDMI connected to TV" + + EnableSequence [ + ] + + DisableSequence [ + ] + + Value { + PlaybackPCM "hw:1,0" + } } diff -Nru alsa-lib-1.0.24.1/debian/ucm/SDP4430/record alsa-lib-1.0.24.1/debian/ucm/SDP4430/record --- alsa-lib-1.0.24.1/debian/ucm/SDP4430/record 2011-05-06 00:22:42.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/ucm/SDP4430/record 2011-09-24 00:14:17.000000000 +0000 @@ -3,7 +3,7 @@ SectionVerb { EnableSequence [ - cdev "hw:SDP4430" + cdev "hw:0" cset "name='AMIC_UL PDM Switch' 1" cset "name='MUX_UL00' 9" cset "name='MUX_UL01' 10" @@ -11,7 +11,7 @@ ] DisableSequence [ - cdev "hw:SDP4430" + cdev "hw:0" cset "name='AMIC_UL PDM Switch' 0" cset "name='MUX_UL00' 0" cset "name='MUX_UL01' 0" @@ -30,14 +30,14 @@ Comment "SDP4430 3.5mm Headset" EnableSequence [ - cdev "hw:SDP4430" + cdev "hw:0" cset "name='Analog Left Capture Route' 0" cset "name='Analog Right Capture Route' 0" - cset "name='Capture Preamplifier Volume' 2" + cset "name='Capture amplifier Volume' 2" ] DisableSequence [ - cdev "hw:SDP4430" + cdev "hw:0" cset "name='Analog Left Capture Route' 3" cset "name='Analog Right Capture Route' 3" cset "name='Capture Preamplifier Volume' 0" diff -Nru alsa-lib-1.0.24.1/debian/ucm/SDP4430/voice alsa-lib-1.0.24.1/debian/ucm/SDP4430/voice --- alsa-lib-1.0.24.1/debian/ucm/SDP4430/voice 2011-05-06 00:22:42.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/ucm/SDP4430/voice 2011-09-24 00:14:17.000000000 +0000 @@ -3,7 +3,7 @@ SectionVerb { EnableSequence [ - cdev "hw:SDP4430" + cdev "hw:0" cset "name='DL1 Mixer Voice' 1" cset "name='Sidetone Mixer Playback' 1" cset "name='DL1 PDM Switch' 1" @@ -12,7 +12,7 @@ ] DisableSequence [ - cdev "hw:SDP4430" + cdev "hw:0" cset "name='DL1 Mixer Voice' 0" cset "name='Sidetone Mixer Playback' 0" cset "name='DL1 PDM Switch' 0" @@ -31,14 +31,14 @@ Comment "SDP4430 3.5mm Headset" EnableSequence [ - cdev "hw:SDP4430" + cdev "hw:0" cset "name='HS Left Playback' 1" cset "name='HS Right Playback' 1" cset "name='Headset Playback Volume' 13" ] DisableSequence [ - cdev "hw:SDP4430" + cdev "hw:0" cset "name='HS Right Playback' 0" cset "name='HS Left Playback' 0" cset "name='Headset Playback Volume' 0" diff -Nru alsa-lib-1.0.24.1/debian/ucm/SDP4430/voiceCall alsa-lib-1.0.24.1/debian/ucm/SDP4430/voiceCall --- alsa-lib-1.0.24.1/debian/ucm/SDP4430/voiceCall 2011-05-06 00:22:42.000000000 +0000 +++ alsa-lib-1.0.24.1/debian/ucm/SDP4430/voiceCall 2011-09-24 00:14:17.000000000 +0000 @@ -1,67 +1,140 @@ -# Use case Configuration for TI SDP4430 HiFi Music -# By Liam Girdwood +# Example Use case verb section for Voice call blah +# By Joe Blogs SectionVerb { - EnableSequence [ - cdev "hw:SDP4430" - cset "name='AMIC_UL PDM Switch' 1" - cset "name='Sidetone Mixer Capture' 1" - cset "name='MUX_VX0' 9" - cset "name='MUX_VX1' 10" - cset "name='DL1 Mixer Voice' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Voice Playback Volume' 90,90" - cset "name='Capture Volume' 4" - cset "name='Capture Mixer Voice Capture' 90,90" - cset "name='SDT DL Volume' 120" - ] - - - DisableSequence [ - cdev "hw:SDP4430" - cset "name='AMIC_UL PDM Switch' 0" - cset "name='Sidetone Mixer Capture' 0" - cset "name='MUX_VX0' 0" - cset "name='MUX_VX1' 0" - cset "name='DL1 Mixer Voice' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Voice Playback Volume' 0,0" - cset "name='Capture Volume' 0" - cset "name='DL1 Voice Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - ] - - # Optional TQ and ALSA PCMs - Value { - TQ "Voice" - CapturePCM "hw:0,2" - PlaybackPCM "hw:0,2" - } + # enable and disable sequences are compulsory + EnableSequence [ + ] + + DisableSequence [ + ] + + # Optional QoS and ALSA PCMs + Value { + TQ "Music" + PlaybackCTL "hw:0" + CaptureCTL "hw:0" + PlaybackPCM "hw:0" + CapturePCM "hw:0" + } +} + +SectionDevice."Headphones".0 { + + EnableSequence [ + cset "name='DL1 Media Playback Volume' 10" + cset "name='Sidetone Mixer Playback' 1" + cset "name='HF Right Playback' 1" + cset "name='HF Left Playback' 1" + ] + + DisableSequence [ + cset "name='HF Right Playback' 0" + cset "name='HF Left Playback' 0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL1 Media Playback Volume' 0" + ] + + Value { + MasterPlaybackVolume "35" + } } SectionDevice."Headset".0 { - Comment "SDP4430 3.5mm Headset" - EnableSequence [ - cdev "hw:SDP4430" - cset "name='Analog Left Capture Route' 0" - cset "name='Analog Right Capture Route' 0" - cset "name='Capture Preamplifier Volume' 2" - cset "name='HS Left Playback' 1" - cset "name='HS Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cdev "hw:SDP4430" - cset "name='Analog Left Capture Route' 3" - cset "name='Analog Right Capture Route' 3" - cset "name='Capture Preamplifier Volume' 0" - cset "name='HS Right Playback' 0" - cset "name='HS Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] + EnableSequence [ + cset "name='DL1 Media Playback Volume' 10" + cset "name='Sidetone Mixer Playback' 1" + cset "name='HS Right Playback' 1" + cset "name='HS Left Playback' 1" + cset "name='MUX_UL11' 9" + cset "name='MUX_UL10' 10" + ] + + DisableSequence [ + cset "name='MUX_UL11' 0" + cset "name='MUX_UL10' 0" + cset "name='HS Right Playback' 0" + cset "name='HS Left Playback' 0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL1 Media Playback Volume' 0" + ] + + Value { + MasterPlaybackVolume "35" + MasterCaptureVolume "33" + } +} + +SectionDevice."Handset".0 { + + EnableSequence [ + cset "name='DL2 Media Playback Volume' 10" + cset "name='Sidetone Mixer Playback' 1" + cset "name='HF Right Playback' 1" + cset "name='HF Left Playback' 1" + cset "name='MUX_UL11' 9" + cset "name='MUX_UL10' 10" + ] + + DisableSequence [ + cset "name='MUX_UL11' 0" + cset "name='MUX_UL10' 0" + cset "name='HF Right Playback' 0" + cset "name='HF Left Playback' 0" + cset "name='Sidetone Mixer Playback' 0" + cset "name='DL2 Media Playback Volume' 0" + ] + + Value { + MasterPlaybackVolume "36" + MasterCaptureVolume "33" + } +} + +SectionModifier."Play_Tone".0 { + Comment "Play tone to handset during music playback" + SupportedDevice [ + "Handset" + ] + + EnableSequence [ + cset "name='DL2 Tones Playback Volume' 10" + ] + + DisableSequence [ + cset "name='DL2 Tones Playback Volume' 0" + ] + + Value { + PlaybackPCM "2" + MasterPlaybackVolume "36" + } +} + +SectionModifier."Play_Tone".1 { + Comment "Play tone to headset and handset during music playback" + SupportedDevice [ + "Headset" + ] + + EnableSequence [ + 'DL2 Tones Playback Volume':1:10 + 'DL1 Tones Playback Volume':1:10 + 'HF Right Playback':1:1 + 'HF Left Playback':1:1 + ] + + DisableSequence [ + 'DL2 Tones Playback Volume':1:0 + 'DL1 Tones Playback Volume':1:0 + 'HF Right Playback':1:0 + 'HF Left Playback':1:0 + ] + + Value { + PlaybackPCM "2" + MasterPlaybackVolume "36" + } }