From e1754caa88788d95d4884f822920e0aad78778646f00daf014289421653d9e07 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 12 Nov 2007 20:39:46 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa-utils?expand=0&rev=11 --- alsa-utils-alsactl-tlv-comment-fix.diff | 36 +++++++++++++++++++++++++ alsa-utils.changes | 5 ++++ alsa-utils.spec | 6 ++++- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 alsa-utils-alsactl-tlv-comment-fix.diff diff --git a/alsa-utils-alsactl-tlv-comment-fix.diff b/alsa-utils-alsactl-tlv-comment-fix.diff new file mode 100644 index 0000000..61b8080 --- /dev/null +++ b/alsa-utils-alsactl-tlv-comment-fix.diff @@ -0,0 +1,36 @@ +# HG changeset patch +# User tiwai +# Date 1194884667 -3600 +# Node ID 40051fabcab00bd4fcfab41e11b609acf32a6a22 +# Parent 19947765f0332b66b5eabab06929f0bbe2061749 +alsactl - fix double entry of comment.tlv + +The entry comment.tlv can be doubly written via alsactl store, and this +results in an error. I forgot to remove the old code... + +diff -r 19947765f033 -r 40051fabcab0 alsactl/state.c +--- a/alsactl/state.c Mon Nov 05 12:44:13 2007 +0100 ++++ b/alsactl/state.c Mon Nov 12 17:24:27 2007 +0100 +@@ -330,22 +330,6 @@ static int get_control(snd_ctl_t *handle + if (err < 0) + return err; + } +- if (snd_ctl_elem_info_is_tlv_readable(info)) { +- unsigned int tlv[MAX_USER_TLV_SIZE]; +- err = snd_ctl_elem_tlv_read(handle, id, tlv, sizeof(tlv)); +- if (err >= 0) { +- char *s = tlv_to_str(tlv); +- if (s) { +- err = snd_config_string_add(comment, "tlv", s); +- if (err < 0) { +- error("snd_config_string_add: %s", snd_strerror(err)); +- return err; +- } +- free(s); +- } +- } +- } +- + break; + } + case SND_CTL_ELEM_TYPE_INTEGER64: diff --git a/alsa-utils.changes b/alsa-utils.changes index bc6d2fc..b539f33 100644 --- a/alsa-utils.changes +++ b/alsa-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 12 17:28:30 CET 2007 - tiwai@suse.de + +- fix double entries of comment.tlv in alsactl (#340516) + ------------------------------------------------------------------- Mon Nov 5 18:33:20 CET 2007 - tiwai@suse.de diff --git a/alsa-utils.spec b/alsa-utils.spec index bc0fb3f..13e0212 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -20,10 +20,11 @@ Requires: dialog pciutils AutoReqProv: on Summary: Advanced Linux Sound Architecture Utilities Version: 1.0.15 -Release: 6 +Release: 8 Source: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2 Patch: alsa-utils-hg-fixes.diff Patch1: alsa-utils-speaker-test-fix.diff +Patch2: alsa-utils-alsactl-tlv-comment-fix.diff Url: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,6 +43,7 @@ Authors: %setup -q -n %{name}-%{package_version} %patch -p1 %patch1 -p1 +%patch2 -p1 mv alsamixer/README alsamixer/README-alsamixer %{?suse_update_config:%{suse_update_config -f .}} @@ -70,6 +72,8 @@ make DESTDIR=$RPM_BUILD_ROOT install %{_datadir}/sounds/alsa %{_datadir}/alsa %changelog +* Mon Nov 12 2007 - tiwai@suse.de +- fix double entries of comment.tlv in alsactl (#340516) * Mon Nov 05 2007 - tiwai@suse.de - fix speaker-test with pulse plugin output - use stderr for error message from speaker-test