rpms/alsa-lib/devel alsa-lib-1.0.21-dmix-conf.patch, NONE, 1.1 alsa-lib-1.0.21-revert-hook.patch, NONE, 1.1 alsa-lib-1.0.21-speaker.patch, NONE, 1.1 alsa-lib.spec, 1.85, 1.86
perex
perex at fedoraproject.org
Wed Sep 9 09:52:36 UTC 2009
Author: perex
Update of /cvs/pkgs/rpms/alsa-lib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7631
Modified Files:
alsa-lib.spec
Added Files:
alsa-lib-1.0.21-dmix-conf.patch
alsa-lib-1.0.21-revert-hook.patch
alsa-lib-1.0.21-speaker.patch
Log Message:
alsa-lib: fix bug #521988
alsa-lib-1.0.21-dmix-conf.patch:
dmix.conf | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
--- NEW FILE alsa-lib-1.0.21-dmix-conf.patch ---
>From 1f126fd7c6ef37b04ad745609bbebf0dbbf2e1fd Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Wed, 9 Sep 2009 11:38:11 +0200
Subject: [PATCH] Change dmix.conf to accept user configuration from defaults.dmix.<driver_id>.xxx
An attempt to fix problem described in reverted patch "Fix driver conf
parsing in snd_config_hook_load_for_all_cards()".
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
src/conf/pcm/dmix.conf | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf
index 4108ddb..e62cb29 100644
--- a/src/conf/pcm/dmix.conf
+++ b/src/conf/pcm/dmix.conf
@@ -63,12 +63,12 @@ pcm.!dmix {
name {
@func concat
strings [
- "cards."
+ "defaults.dmix."
{
@func card_driver
card $CARD
}
- ".pcm.dmix.period_size"
+ ".period_size"
]
}
default 1024
@@ -78,12 +78,12 @@ pcm.!dmix {
name {
@func concat
strings [
- "cards."
+ "defaults.dmix."
{
@func card_driver
card $CARD
}
- ".pcm.dmix.period_time"
+ ".period_time"
]
}
default -1
@@ -93,12 +93,12 @@ pcm.!dmix {
name {
@func concat
strings [
- "cards."
+ "defaults.dmix."
{
@func card_driver
card $CARD
}
- ".pcm.dmix.periods"
+ ".periods"
]
}
default 16
--
1.5.5.1
alsa-lib-1.0.21-revert-hook.patch:
conf.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE alsa-lib-1.0.21-revert-hook.patch ---
>From 133819d420d962b6888c280352a5532da93f1a3a Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Wed, 9 Sep 2009 11:24:11 +0200
Subject: [PATCH] Revert "Fix driver conf parsing in snd_config_hook_load_for_all_cards()"
This reverts commit 96da0c842d14b40ce8e37726b259229634b3aa21.
This way of fix brokes card-specific configuration loading.
See http://bugzilla.redhat.com bug#521988 for details.
Appropriate way to handle this problem is to fix the dmix configuration file.
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
src/conf.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/conf.c b/src/conf.c
index 3f0dfe1..570c90f 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -3477,8 +3477,9 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
err = snd_determine_driver(card, &fdriver);
if (err < 0)
return err;
- if (snd_config_search(root, fdriver, &n) >= 0 &&
- snd_config_get_string(n, &driver) >= 0) {
+ if (snd_config_search(root, fdriver, &n) >= 0) {
+ if (snd_config_get_string(n, &driver) < 0)
+ goto __err;
assert(driver);
while (1) {
char *s = strchr(driver, '.');
--
1.5.5.1
alsa-lib-1.0.21-speaker.patch:
simple_none.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE alsa-lib-1.0.21-speaker.patch ---
>From ac9de424bc0a896e8e30b5ec176daf924a2cefb2 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai at suse.de>
Date: Mon, 31 Aug 2009 16:41:12 +0200
Subject: [PATCH] mixer: Add Speaker and Beep names to the weight list
Added strings "Speaker" and "Beep" to the weight list so that the entries
appear in more appropriate positions.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
src/mixer/simple_none.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c
index 4802200..9259a08 100644
--- a/src/mixer/simple_none.c
+++ b/src/mixer/simple_none.c
@@ -134,6 +134,7 @@ static int get_compare_weight(const char *name, unsigned int idx)
static const char *const names[] = {
"Master",
"Headphone",
+ "Speaker",
"Tone",
"Bass",
"Treble",
@@ -158,6 +159,7 @@ static int get_compare_weight(const char *name, unsigned int idx)
"I2S",
"IEC958",
"PC Speaker",
+ "Beep",
"Aux",
"Mono",
"Playback",
--
1.5.5.1
Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- alsa-lib.spec 2 Sep 2009 08:11:20 -0000 1.85
+++ alsa-lib.spec 9 Sep 2009 09:52:36 -0000 1.86
@@ -5,7 +5,7 @@
Summary: The Advanced Linux Sound Architecture (ALSA) library
Name: alsa-lib
Version: 1.0.21
-Release: 1%{?prever_dot}%{?dist}
+Release: 3%{?prever_dot}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
@@ -13,6 +13,9 @@ Source10: asound.conf
Patch0: alsa-lib-1.0.17-config.patch
Patch2: alsa-lib-1.0.14-glibc-open.patch
Patch4: alsa-lib-1.0.16-no-dox-date.patch
+Patch10: alsa-lib-1.0.21-speaker.patch
+Patch11: alsa-lib-1.0.21-revert-hook.patch
+Patch12: alsa-lib-1.0.21-dmix-conf.patch
URL: http://www.alsa-project.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: doxygen
@@ -44,6 +47,9 @@ against the ALSA libraries and interface
%patch0 -p1 -b .config
%patch2 -p1 -b .glibc-open
%patch4 -p1 -b .no-dox-date
+%patch10 -p1 -b .speaker
+%patch11 -p1 -b .revert-hook
+%patch12 -p1 -b .dmix-conf
%build
%configure --disable-aload
@@ -93,8 +99,12 @@ rm -rf %{buildroot}
%{_datadir}/aclocal/alsa.m4
%changelog
+* Wed Sep 9 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-3
+- Add Speaker and Beep control names to mixer weight list
+- Fix redhat bug #521988
+
* Wed Sep 2 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-1
-* Updated to 1.0.21 final
+- Updated to 1.0.21 final
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list