Hello community, here is the log from the commit of package alsa-oss for openSUSE:Factory checked in at 2014-04-29 17:33:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-oss (Old) and /work/SRC/openSUSE:Factory/.alsa-oss.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-oss" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-oss/alsa-oss.changes 2013-05-28 07:24:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alsa-oss.new/alsa-oss.changes 2014-04-29 17:33:10.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Apr 28 17:03:38 CEST 2014 - [email protected] + +- Fix for dmix with unaligned sample rate: + 0003-Fix-the-argument-passed-to-snd_pcm_dump_setup.patch + 0004-Workaround-for-aoss-dmix-with-unaligned-rates.patch + +------------------------------------------------------------------- +Mon Apr 28 12:28:36 CEST 2014 - [email protected] + +- Revert 0001-Fix-path-to-libaoss.so.patch, as this causes + regressions on multi-arch (bnc#874331) + +------------------------------------------------------------------- Old: ---- 0001-Fix-path-to-libaoss.so.patch New: ---- 0003-Fix-the-argument-passed-to-snd_pcm_dump_setup.patch 0004-Workaround-for-aoss-dmix-with-unaligned-rates.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-oss.spec ++++++ --- /var/tmp/diff_new_pack.NhcVgR/_old 2014-04-29 17:33:11.000000000 +0200 +++ /var/tmp/diff_new_pack.NhcVgR/_new 2014-04-29 17:33:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package alsa-oss # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,8 +29,9 @@ Source2: baselibs.conf # Patch: alsa-oss-hg-fixes.diff # upstream fixes -Patch1: 0001-Fix-path-to-libaoss.so.patch Patch2: 0002-Add-AM_MAINTAINER_MODE-enable-to-configure.in.patch +Patch3: 0003-Fix-the-argument-passed-to-snd_pcm_dump_setup.patch +Patch4: 0004-Workaround-for-aoss-dmix-with-unaligned-rates.patch Url: http://www.alsa-project.org/ %ifarch s390x Recommends: %{name}-32bit = %{version} @@ -44,8 +45,9 @@ %prep %setup -q -n %{name}-%{package_version} # %patch -p1 -%patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build autoreconf -fi ++++++ 0003-Fix-the-argument-passed-to-snd_pcm_dump_setup.patch ++++++ >From 40357524a04019173d7073b683ebc2465c3db30a Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> Date: Mon, 28 Apr 2014 16:54:29 +0200 Subject: [PATCH] Fix the argument passed to snd_pcm_dump_setup() Although it's currently disabled via ifdef, better to fix it so that any other people won't fall into the same hole like me. Signed-off-by: Takashi Iwai <[email protected]> --- alsa/pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alsa/pcm.c b/alsa/pcm.c index 19b67e0fe8e4..fdf99337997f 100644 --- a/alsa/pcm.c +++ b/alsa/pcm.c @@ -308,8 +308,8 @@ static int oss_dsp_hw_params(oss_dsp_t *dsp) if (err < 0) return err; #if 0 - if (alsa_oss_debug) - snd_pcm_dump_setup(pcm, stderr); + if (alsa_oss_debug && alsa_oss_debug_out) + snd_pcm_dump_setup(pcm, alsa_oss_debug_out); #endif if (err < 0) return err; -- 1.9.2 ++++++ 0004-Workaround-for-aoss-dmix-with-unaligned-rates.patch ++++++ >From 22dc53a906f3550b4ad0ce82684d98228d95713c Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> Date: Mon, 28 Apr 2014 16:57:18 +0200 Subject: [PATCH] Workaround for aoss + dmix with unaligned rates When an OSS stream is setup (e.g. two periods) with a rate that doesn't align with the fixed rate of the slave PCM, dmix can't establish the hw_params properly. As a dirty workaround, set either only min or max periods so that they don't conflict with each other. Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=874342 Signed-off-by: Takashi Iwai <[email protected]> --- alsa/pcm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/alsa/pcm.c b/alsa/pcm.c index fdf99337997f..c23d0423fc86 100644 --- a/alsa/pcm.c +++ b/alsa/pcm.c @@ -263,10 +263,11 @@ static int oss_dsp_hw_params(oss_dsp_t *dsp) if (err < 0) return err; periods_min = 2; - err = snd_pcm_hw_params_set_periods_min(pcm, hw, &periods_min, 0); - if (err < 0) - return err; - if (dsp->maxfrags > 0) { + if (!dsp->maxfrags) { + err = snd_pcm_hw_params_set_periods_min(pcm, hw, &periods_min, 0); + if (err < 0) + return err; + } else { unsigned int periods_max = periods_min > dsp->maxfrags ? periods_min : dsp->maxfrags; err = snd_pcm_hw_params_set_periods_max(pcm, hw, -- 1.9.2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
