rpms/alsa-lib/F-9 alsa-lib-1.0.17-pcm-no-flags.patch, NONE, 1.1 alsa-lib-1.0.17-pcm-softvol.patch, NONE, 1.1 .cvsignore, 1.32, 1.33 alsa-lib.spec, 1.68, 1.69 sources, 1.36, 1.37

Fri Sep 12 08:27:31 UTC 2008

Author: perex

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

Modified Files:
	.cvsignore alsa-lib.spec sources 
Added Files:
	alsa-lib-1.0.17-pcm-no-flags.patch 
	alsa-lib-1.0.17-pcm-softvol.patch 
Log Message:
alsa-lib: updated to 1.0.17a

alsa-lib-1.0.17-pcm-no-flags.patch:

--- NEW FILE alsa-lib-1.0.17-pcm-no-flags.patch ---
>From 73d20069e072e2b62bbc3ea12e46ae19d8b6cac9 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <mznyfn at 0pointer.de>
Date: Sun, 31 Aug 2008 03:41:48 +0200
Subject: [PATCH] alsa-lib: Make sure SND_PCM_NO_xxx flags don't get lost when nonblocking mode is enabled

The plug PCM copies the 'mode' field from the slave PCM. If blocking mode is
enabled for the plug PCM the mode is subsequently overwritten with the original
requested 'mode'. If non-blocking mode is requested this does not happen.

Because the hw PCM synthesizes the 'mode' from the actual file descriptor flags
no SND_PCM_NO_xxx will ever be set for it. This has the effect that the 'mode'
of the plug PCM will also not include those flags anymore -- unless they are
overwritten as mentioned above. This basically means SND_PCM_NO_xxx is ignored
for plug:hw:4711 style device strings opened in non-blocking mode.

You can easily test this with "aplay --channels 7 --disable-channels -f S16_LE
-r 44100 -D plug:hw:0" on a device that cannot do 7 channels. Normally this
call should fail, however if you add "-N" to the command line this call will
succeed.

This patch simply copies the SND_PCM_NO_xxx flags back into the 'mode' field in
case we don't overwrite it with the original anyway.

Probably closes bug 3571 for good.

From: Lennart Poettering <mznyfn at 0pointer.de>
Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/pcm/pcm_hw.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
index 1e1889c..c8d9a62 100644
--- a/src/pcm/pcm_hw.c
+++ b/src/pcm/pcm_hw.c
@@ -1507,7 +1507,13 @@ int _snd_pcm_hw_open(snd_pcm_t **pcmp, const char *name,
 		/* revert to blocking mode for read/write access */
 		snd_pcm_hw_nonblock(*pcmp, 0);
 		(*pcmp)->mode = mode;
-	}
+	} else
+		/* make sure the SND_PCM_NO_xxx flags don't get lost on the
+		 * way */
+		(*pcmp)->mode |= mode & (SND_PCM_NO_AUTO_RESAMPLE|
+					 SND_PCM_NO_AUTO_CHANNELS|
+					 SND_PCM_NO_AUTO_FORMAT|
+					 SND_PCM_NO_SOFTVOL);
 
 	hw = (*pcmp)->private_data;
 	if (format != SND_PCM_FORMAT_UNKNOWN)
-- 
1.5.5.1


alsa-lib-1.0.17-pcm-softvol.patch:

--- NEW FILE alsa-lib-1.0.17-pcm-softvol.patch ---
>From a13707da6bb0161db855a146c3e4d1d849e4108b Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex at perex.cz>
Date: Tue, 9 Sep 2008 13:07:39 +0200
Subject: [PATCH] pcm_softvol plugin: remove access type change for refine

The softvol plugin does in-place sample recalculation. The access type
cannot be changed like in linear plugins. Remove access type change
in refine functions.

This bug was detected with PulseAudio on Sony PS3 platform.

Signed-off-by: Jaroslav Kysela <perex at perex.cz>
---
 src/pcm/pcm_softvol.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c
index eee6424..8268f1d 100644
--- a/src/pcm/pcm_softvol.c
+++ b/src/pcm/pcm_softvol.c
@@ -399,7 +399,6 @@ static int snd_pcm_softvol_hw_refine_cprepare(snd_pcm_t *pcm,
 {
 	int err;
 	snd_pcm_softvol_t *svol = pcm->private_data;
-	snd_pcm_access_mask_t access_mask = { SND_PCM_ACCBIT_SHM };
 	snd_pcm_format_mask_t format_mask = {
 		{
 			(1ULL << SND_PCM_FORMAT_S16_LE) |
@@ -413,10 +412,6 @@ static int snd_pcm_softvol_hw_refine_cprepare(snd_pcm_t *pcm,
 		snd_pcm_format_mask_none(&format_mask);
 		snd_pcm_format_mask_set(&format_mask, svol->sformat);
 	}
-	err = _snd_pcm_hw_param_set_mask(params, SND_PCM_HW_PARAM_ACCESS,
-					 &access_mask);
-	if (err < 0)
-		return err;
 	err = _snd_pcm_hw_param_set_mask(params, SND_PCM_HW_PARAM_FORMAT,
 					 &format_mask);
 	if (err < 0)
@@ -434,10 +429,7 @@ static int snd_pcm_softvol_hw_refine_cprepare(snd_pcm_t *pcm,
 static int snd_pcm_softvol_hw_refine_sprepare(snd_pcm_t *pcm, snd_pcm_hw_params_t *sparams)
 {
 	snd_pcm_softvol_t *svol = pcm->private_data;
-	snd_pcm_access_mask_t saccess_mask = { SND_PCM_ACCBIT_MMAP };
 	_snd_pcm_hw_params_any(sparams);
-	_snd_pcm_hw_param_set_mask(sparams, SND_PCM_HW_PARAM_ACCESS,
-				   &saccess_mask);
 	if (svol->sformat != SND_PCM_FORMAT_UNKNOWN) {
 		_snd_pcm_hw_params_set_format(sparams, svol->sformat);
 		_snd_pcm_hw_params_set_subformat(sparams, SND_PCM_SUBFORMAT_STD);
@@ -451,7 +443,8 @@ static int snd_pcm_softvol_hw_refine_schange(snd_pcm_t *pcm,
 {
 	snd_pcm_softvol_t *svol = pcm->private_data;
 	int err;
-	unsigned int links = (SND_PCM_HW_PARBIT_CHANNELS |
+	unsigned int links = (SND_PCM_HW_PARBIT_ACCESS |
+			      SND_PCM_HW_PARBIT_CHANNELS |
 			      SND_PCM_HW_PARBIT_RATE |
 			      SND_PCM_HW_PARBIT_PERIODS |
 			      SND_PCM_HW_PARBIT_PERIOD_SIZE |
@@ -475,7 +468,8 @@ static int snd_pcm_softvol_hw_refine_cchange(snd_pcm_t *pcm,
 {
 	snd_pcm_softvol_t *svol = pcm->private_data;
 	int err;
-	unsigned int links = (SND_PCM_HW_PARBIT_CHANNELS |
+	unsigned int links = (SND_PCM_HW_PARBIT_ACCESS |
+			      SND_PCM_HW_PARBIT_CHANNELS |
 			      SND_PCM_HW_PARBIT_RATE |
 			      SND_PCM_HW_PARBIT_PERIODS |
 			      SND_PCM_HW_PARBIT_PERIOD_SIZE |
-- 
1.5.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-9/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	19 Jun 2008 14:25:17 -0000	1.32
+++ .cvsignore	12 Sep 2008 08:27:01 -0000	1.33
@@ -19,3 +19,4 @@
 alsa-lib-1.0.15rc3.tar.bz2
 alsa-lib-1.0.16.tar.bz2
 alsa-lib-1.0.17rc2.tar.bz2
+alsa-lib-1.0.17a.tar.bz2


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-9/alsa-lib.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- alsa-lib.spec	19 Jun 2008 14:25:18 -0000	1.68
+++ alsa-lib.spec	12 Sep 2008 08:27:01 -0000	1.69
@@ -1,10 +1,11 @@
-%define  prever         rc2
-%define  prever_dot     .rc2
+#define  prever         rc2
+#define  prever_dot     .%{prever}
+%define	 postver	a
 
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.17
-Release: 1%{?prever_dot}%{?dist}
+Release: 2%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
@@ -12,6 +13,8 @@
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
 Patch3:	 alsa-lib-pulse-default.patch
 Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
+Patch5:  alsa-lib-1.0.17-pcm-no-flags.patch
+Patch6:  alsa-lib-1.0.17-pcm-softvol.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: doxygen
@@ -39,11 +42,13 @@
 against the ALSA libraries and interfaces.
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever}
+%setup -q -n %{name}-%{version}%{?prever}%{?postver}
 %patch0 -p1 -b .config
 %patch2 -p1 -b .glibc-open
 %patch3 -p1 -b .pulse-default
 %patch4 -p1 -b .no-dox-date
+%patch5 -p1 -b .pcm-no-flags
+%patch6 -p1 -b .pcm-softvol
 
 %build
 %configure --with-configdir=%{_sysconfdir}/alsa
@@ -91,6 +96,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Fri Sep 12 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.17-2
+- updated to 1.0.17a
+
 * Thu Jun 19 2008 Jaroslav Kysela <jkysela at redhat.com> 1.0.17-1.rc2
 - updated to 1.0.17rc2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-9/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	19 Jun 2008 14:25:18 -0000	1.36
+++ sources	12 Sep 2008 08:27:01 -0000	1.37
@@ -1 +1 @@
-5177ad39854d2fb7fcc567bf24ba99f4  alsa-lib-1.0.17rc2.tar.bz2
+4284535ff10f5e71152f8f69b325d08d  alsa-lib-1.0.17a.tar.bz2


