rpms/alsa-lib/F-11 alsa-lib-1.0.21-dmix-conf.patch, NONE, 1.1 alsa-lib-1.0.21-revert-hook.patch, NONE, 1.1 alsa-lib.spec, 1.85, 1.86

[perex]

Author: perex

Update of /cvs/pkgs/rpms/alsa-lib/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13238

Modified Files:
	alsa-lib.spec 
Added Files:
	alsa-lib-1.0.21-dmix-conf.patch 
	alsa-lib-1.0.21-revert-hook.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



Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-11/alsa-lib.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- alsa-lib.spec	7 Sep 2009 10:47:15 -0000	1.85
+++ alsa-lib.spec	9 Sep 2009 11:59:19 -0000	1.86
@@ -15,6 +15,8 @@ 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
 Patch5:  alsa-lib-1.0.21-weight.patch
+Patch6:  alsa-lib-1.0.21-revert-hook.patch
+Patch7:  alsa-lib-1.0.21-dmix-conf.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
@@ -47,6 +49,8 @@ against the ALSA libraries and interface
 %patch2 -p1 -b .glibc-open
 %patch4 -p1 -b .no-dox-date
 %patch5 -p1 -b .weight
+%patch6 -p1 -b .revert
+%patch7 -p1 -b .dmix
 
 %build
 %configure --disable-aload
@@ -96,6 +100,9 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Sep  9 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-3
+- Fix redhat bug #521988
+
 * Mon Sep  7 2009 Jaroslav Kysela <jkysela at redhat.com> - 1.0.21-2
 - Added mixer weight patch for Speaker and Beep controls