Hello community,
here is the log from the commit of package alsa
checked in at Thu Nov 20 15:09:09 CET 2008.
--------
--- alsa/alsa.changes 2008-11-13 15:02:20.000000000 +0100
+++ /mounts/work_src_done/STABLE/alsa/alsa.changes 2008-11-19 16:17:06.000000000 +0100
@@ -1,0 +2,13 @@
+Wed Nov 19 16:16:50 CET 2008 - tiwai@suse.de
+
+- Fix segfault of meter plugin with undefined scope type.
+
+-------------------------------------------------------------------
+Wed Nov 19 15:04:46 CET 2008 - tiwai@suse.de
+
+- Fix SPDIF configuration for ice1724-based boards (bnc#345421)
+- Fix set_default_volume script to use hw:x for avoiding pulse
+ plugin, and also accept any value of device name
+ (related bug bnc#444349)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
alsa-lib-ice1724-spdif-fix.diff
alsa-lib-meter-plugin-segfault-fix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa.spec ++++++
--- /var/tmp/diff_new_pack.n10975/_old 2008-11-20 15:06:29.000000000 +0100
+++ /var/tmp/diff_new_pack.n10975/_new 2008-11-20 15:06:29.000000000 +0100
@@ -29,7 +29,7 @@
AutoReqProv: on
Summary: Advanced Linux Sound Architecture
Version: 1.0.18
-Release: 7
+Release: 8
Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
Source8: 40-alsa.rules
Source11: alsasound
@@ -46,6 +46,8 @@
Source33: alsa-info.sh
Source34: alsa-init.sh
Patch: alsa-lib-git-fixes.diff
+Patch1: alsa-lib-ice1724-spdif-fix.diff
+Patch2: alsa-lib-meter-plugin-segfault-fix.diff
Url: http://www.alsa-project.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -118,6 +120,8 @@
%prep
%setup -q -n alsa-lib-%{package_version}
%patch -p1
+%patch1 -p1
+%patch2 -p1
%build
# build alsa-lib
@@ -239,6 +243,13 @@
%{_datadir}/alsa
%changelog
+* Wed Nov 19 2008 tiwai@suse.de
+- Fix segfault of meter plugin with undefined scope type.
+* Wed Nov 19 2008 tiwai@suse.de
+- Fix SPDIF configuration for ice1724-based boards (bnc#345421)
+- Fix set_default_volume script to use hw:x for avoiding pulse
+ plugin, and also accept any value of device name
+ (related bug bnc#444349)
* Thu Nov 13 2008 tiwai@suse.de
- check /etc/asound.state before calling alsactl restore
(related bug bnc#444349)
++++++ alsa-lib-ice1724-spdif-fix.diff ++++++
commit cb1fd837d93fbc495eab4aa3efaf8072937ff2df
Author: Takashi Iwai
Date: Wed Nov 19 14:59:03 2008 +0100
Add linear plugin wrapping iec958 PCM for ice1724-based boards
The ice1724-based cards can handle only 32bit while the apps almost
expet 16bit format for SPDIF I/O. This prevents the default config
working on many apps like mplayer, xine, etc.
This patch simply adds the least automatic conversion by linear plugin.
Note that "plug" isn't used here. Otherwise we get a problem of the
routing (plug over plug is buggy).
Signed-off-by: Takashi Iwai
diff --git a/src/conf/cards/Aureon51.conf b/src/conf/cards/Aureon51.conf
index 1b8ee85..24b4d94 100644
--- a/src/conf/cards/Aureon51.conf
+++ b/src/conf/cards/Aureon51.conf
@@ -121,6 +121,8 @@ Aureon51.pcm.iec958.0 {
}
type asym
playback.pcm {
+ type linear
+ slave.pcm {
type hooks
slave.pcm {
type hw
@@ -147,8 +149,12 @@ Aureon51.pcm.iec958.0 {
}
]
}
+ }
+ slave.format S32_LE
}
capture.pcm {
+ type linear
+ slave.pcm {
type hooks
slave.pcm {
type hw
@@ -167,5 +173,7 @@ Aureon51.pcm.iec958.0 {
}
]
}
+ }
+ slave.format S32_LE
}
}
diff --git a/src/conf/cards/Aureon71.conf b/src/conf/cards/Aureon71.conf
index 8a88cce..1479c25 100644
--- a/src/conf/cards/Aureon71.conf
+++ b/src/conf/cards/Aureon71.conf
@@ -132,6 +132,8 @@ Aureon71.pcm.iec958.0 {
}
type asym
playback.pcm {
+ type linear
+ slave.pcm {
type hooks
slave.pcm {
type hw
@@ -158,8 +160,12 @@ Aureon71.pcm.iec958.0 {
}
]
}
+ }
+ slave.format S32_LE
}
capture.pcm {
+ type linear
+ slave.pcm {
type hooks
slave.pcm {
type hw
@@ -178,5 +184,7 @@ Aureon71.pcm.iec958.0 {
}
]
}
+ }
+ slave.format S32_LE
}
}
diff --git a/src/conf/cards/ICE1724.conf b/src/conf/cards/ICE1724.conf
index 7f15332..e806b36 100644
--- a/src/conf/cards/ICE1724.conf
+++ b/src/conf/cards/ICE1724.conf
@@ -166,6 +166,8 @@ ICE1724.pcm.iec958.0 {
}
type asym
playback.pcm {
+ type linear
+ slave.pcm {
type hooks
slave.pcm {
type hw
@@ -192,8 +194,12 @@ ICE1724.pcm.iec958.0 {
}
]
}
+ }
+ slave.format S32_LE
}
capture.pcm {
+ type linear
+ slave.pcm {
type hooks
slave.pcm {
type hw
@@ -212,5 +218,7 @@ ICE1724.pcm.iec958.0 {
}
]
}
+ }
+ slave.format S32_LE
}
}
++++++ alsa-lib-meter-plugin-segfault-fix.diff ++++++
commit 73ddcda842935c2aed6dd57d141688fe61985b26
Author: Takashi Iwai
Date: Wed Nov 19 16:14:27 2008 +0100
Fix segfault with invalid meter plugin option
snd_pcm_meter_add_scope_conf() may cause a segfault when pcm_scope_type
isn't defined.
Initialize type_conf properly to avoid it.
Signed-off-by: Takashi Iwai
diff --git a/src/pcm/pcm_meter.c b/src/pcm/pcm_meter.c
index 0dedb42..83d643a 100644
--- a/src/pcm/pcm_meter.c
+++ b/src/pcm/pcm_meter.c
@@ -603,7 +603,7 @@ static int snd_pcm_meter_add_scope_conf(snd_pcm_t *pcm, const char *name,
snd_config_iterator_t i, next;
const char *id;
const char *lib = NULL, *open_name = NULL, *str = NULL;
- snd_config_t *c, *type_conf;
+ snd_config_t *c, *type_conf = NULL;
int (*open_func)(snd_pcm_t *, const char *,
snd_config_t *, snd_config_t *) = NULL;
snd_pcm_meter_t *meter = pcm->private_data;
++++++ set_default_volume ++++++
--- /var/tmp/diff_new_pack.n10975/_old 2008-11-20 15:06:30.000000000 +0100
+++ /var/tmp/diff_new_pack.n10975/_new 2008-11-20 15:06:30.000000000 +0100
@@ -17,7 +17,12 @@
fi
if [ -n "$1" ]; then
- card="-c $1"
+ case "$1" in
+ [0-9]*)
+ card="-D hw:$1";;
+ *)
+ card="-D $1";;
+ esac
fi
amixer -q -s $card <