diff --git a/.cvsignore b/.cvsignore index 11c4294..6a94f7e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -19,3 +19,4 @@ alsa-utils-1.0.16.tar.bz2 alsa-utils-1.0.17.tar.bz2 alsa-utils-1.0.18rc3.tar.bz2 alsa-utils-1.0.18.tar.bz2 +alsa-utils-1.0.19.tar.bz2 diff --git a/alsa-utils.spec b/alsa-utils.spec index fad85a1..07babc9 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -3,8 +3,8 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils -Version: 1.0.18 -Release: 6%{?prever_dot}%{?dist} +Version: 1.0.19 +Release: 1%{?prever_dot}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -13,7 +13,6 @@ Source4: alsaunmute Source6: alsa-info.sh Source10: alsa.rules Source11: alsactl.conf -Patch0: alsactl-fix-restore1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel >= %{version} BuildRequires: ncurses-devel @@ -27,7 +26,6 @@ Architecture (ALSA). %prep %setup -q -n %{name}-%{version}%{?prever} -%patch0 -p1 -b .restore1 %build %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --sbindir=/sbin --disable-alsaconf @@ -92,6 +90,9 @@ if [ -s /etc/alsa/asound.state -a ! -s /etc/asound.state ] ; then fi %changelog +* Tue Jan 20 2009 Jaroslav Kysela 1.0.19-1 +- updated to 1.0.19 final + * Fri Nov 21 2008 Jaroslav Kysela 1.0.18-6 - fix alsactl restore when driver has more controls than asound.state file diff --git a/alsactl-fix-restore1.patch b/alsactl-fix-restore1.patch deleted file mode 100644 index 42d80d7..0000000 --- a/alsactl-fix-restore1.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 05f78cc6811110156c701fd9a2a5d15de8b4b1c7 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Fri, 21 Nov 2008 14:44:31 +0100 -Subject: [PATCH] alsactl: Fix restore / init call behaviour when driver contains more controls - -Fix check when driver contains more controls than state file. In this case, -initialization procedure should be run, too. - -Signed-off-by: Jaroslav Kysela ---- - alsactl/state.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/alsactl/state.c b/alsactl/state.c -index 467fa93..635a999 100644 ---- a/alsactl/state.c -+++ b/alsactl/state.c -@@ -1162,7 +1162,7 @@ static int set_control(snd_ctl_t *handle, snd_config_t *control, - return -EINVAL; - } - numid = atoi(id); -- if (numid > *maxnumid) -+ if ((int)numid > *maxnumid) - *maxnumid = numid; - snd_config_for_each(i, next, control) { - snd_config_t *n = snd_config_iterator_entry(i); -@@ -1398,7 +1398,7 @@ static int set_controls(int card, snd_config_t *top, int doit) - snd_ctl_card_info_t *info; - snd_config_t *control; - snd_config_iterator_t i, next; -- int err, maxnumid; -+ int err, maxnumid = -1; - char name[32], tmpid[16]; - const char *id; - snd_ctl_card_info_alloca(&info); -@@ -1442,7 +1442,7 @@ static int set_controls(int card, snd_config_t *top, int doit) - - /* check if we have additional controls in driver */ - /* in this case we should go through init procedure */ -- if (!doit) { -+ if (!doit && maxnumid >= 0) { - snd_ctl_elem_id_t *id; - snd_ctl_elem_info_t *info; - snd_ctl_elem_id_alloca(&id); --- -1.6.0.1.217.gb4928 - diff --git a/sources b/sources index e779a9f..3690e0f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 0a6b26d27cc2adfd591d91d8c155fdb7 alsa-utils-1.0.18.tar.bz2 +5ff0379c707c1a29083233edc9ab4e06 alsa-utils-1.0.19.tar.bz2