commit alsa for openSUSE:11.4
Hello community,
here is the log from the commit of package alsa for openSUSE:11.4
checked in at Mon Mar 28 17:47:21 CEST 2011.
--- old-versions/11.4/all/alsa/alsa.changes 2011-01-31 18:47:03.0
+0100
+++ 11.4/alsa/alsa.changes 2011-03-25 12:06:38.0 +0100
@@ -1,0 +2,12 @@
+Fri Mar 25 11:41:18 CET 2011 - ti...@suse.de
+
+- Fix asound.state path in other scripts, too
+- Replace the asound.state path for older distros
+
+---
+Thu Mar 24 11:27:27 UTC 2011 - wer...@suse.de
+
+- Make boot script load modules on boot (bnc#68)
+- Correct location of saved sound state in the boot script (bnc#68)
+
+---
Package does not exist at destination yet. Using Fallback
old-versions/11.4/all/alsa
Destination is old-versions/11.4/UPDATES/all/alsa
calling whatdependson for 11.4-i586
Other differences:
--
++ alsa.spec ++
--- /var/tmp/diff_new_pack.4Dv3k4/_old 2011-03-28 17:47:05.0 +0200
+++ /var/tmp/diff_new_pack.4Dv3k4/_new 2011-03-28 17:47:05.0 +0200
@@ -34,7 +34,7 @@
#
Summary:Advanced Linux Sound Architecture
Version:1.0.24.1
-Release:1
+Release:4.
Source:
ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
Source2:baselibs.conf
Source8:40-alsa.rules
@@ -166,6 +166,10 @@
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
install -c -m 0755 %{SOURCE16} $RPM_BUILD_ROOT%{_bindir}
install -c -m 0755 %{SOURCE34} $RPM_BUILD_ROOT%{_sbindir}/alsa-init
+%if %suse_version < 1140
+sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g'
$RPM_BUILD_ROOT%{_bindir}/set_default_volume
+sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g'
$RPM_BUILD_ROOT%{_sbindir}/alsa-init
+%endif
# install test wave file
mkdir -p $RPM_BUILD_ROOT%{_datadir}/sounds/alsa
install -c -m 0644 %{SOURCE17} $RPM_BUILD_ROOT%{_datadir}/sounds/alsa/test.wav
@@ -180,6 +184,9 @@
mkdir -p $RPM_BUILD_ROOT/etc/init.d
install -c -m 0755 %{SOURCE11} $RPM_BUILD_ROOT/etc/init.d
install -c -m 0755 %{SOURCE13} $RPM_BUILD_ROOT/etc/init.d
+%if %suse_version < 1140
+sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g'
$RPM_BUILD_ROOT/etc/init.d/alsasound
+%endif
rm -f $RPM_BUILD_ROOT%{_sbindir}/rcalsasound
ln -s ../../etc/init.d/alsasound $RPM_BUILD_ROOT%{_sbindir}/rcalsasound
rm -f $RPM_BUILD_ROOT%{_sbindir}/rcjoystick
++ alsa-init.sh ++
--- /var/tmp/diff_new_pack.4Dv3k4/_old 2011-03-28 17:47:05.0 +0200
+++ /var/tmp/diff_new_pack.4Dv3k4/_new 2011-03-28 17:47:05.0 +0200
@@ -2,7 +2,7 @@
# alsa-init card#
/usr/bin/set_default_volume -f $1 >/dev/null 2>&1
-test -s /etc/asound.state && /usr/sbin/alsactl -F restore $1 >/dev/null 2>&1
+test -s /var/lib/asound.state && /usr/sbin/alsactl -F restore $1 >/dev/null
2>&1
# increase buffer-preallocation size (for PA)
if [ -f /proc/asound/card$1/pcm0p/sub0/prealloc_max ]; then
pmax=$(< /proc/asound/card$1/pcm0p/sub0/prealloc_max)
++ alsasound ++
--- /var/tmp/diff_new_pack.4Dv3k4/_old 2011-03-28 17:47:05.0 +0200
+++ /var/tmp/diff_new_pack.4Dv3k4/_new 2011-03-28 17:47:05.0 +0200
@@ -58,7 +58,7 @@
rc_reset
alsactl=/usr/sbin/alsactl
-asoundcfg=/etc/asound.state
+asoundcfg=/var/lib/asound.state
aconnect=/usr/bin/aconnect
#
@@ -78,7 +78,7 @@
get_drivers() {
/sbin/modprobe -c | \
-grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | sort | \
+grep -E "^[[:space:]]*alias[[:space:]]+snd-card-[[:digit:]]" | sort -u | \
while read a b card; do
echo $card
done
@@ -188,8 +188,8 @@
# See how we were called.
case "$1" in
start)
- if [ "$PREVLEVEL" = "N" ]; then
- test -d /proc/asound && start_rest
+ if test "$PREVLEVEL" = "N" -a -d /proc/asound ; then
+ start_rest
else
start_all
fi
++ set_default_volume ++
--- /var/tmp/diff_new_pack.4Dv3k4/_old 2011-03-28 17:47:05.0 +0200
+++ /var/tmp/diff_new_pack.4Dv3k4/_new 2011-03-28 17:47:05.0 +0200
@@ -7,7 +7,7 @@
# written by Takashi Iwai
#
-if [ -f /etc/asound.state -a x$1 != x-f ]; then
+if [ -f /var/lib/asound.state -a x$1 != x-f ]; then
/usr/sbin/alsactl restore >/dev/null 2>&1
exit 0
fi
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit alsa for openSUSE:11.4
Hello community,
here is the log from the commit of package alsa for openSUSE:11.4
checked in at Fri Apr 8 23:28:33 CEST 2011.
--- old-versions/11.4/UPDATES/all/alsa/alsa.changes 2011-03-25
12:06:38.0 +0100
+++ 11.4/alsa/alsa.changes 2011-03-31 15:03:04.0 +0200
@@ -1,0 +2,6 @@
+Thu Mar 31 15:00:07 CEST 2011 - ti...@suse.de
+
+- Fix typos in the previous fix; the correct path is
+ /var/lib/alsa/asound.state
+
+---
calling whatdependson for 11.4-i586
Other differences:
--
++ alsa.spec ++
--- /var/tmp/diff_new_pack.3b1fnR/_old 2011-04-08 23:28:10.0 +0200
+++ /var/tmp/diff_new_pack.3b1fnR/_new 2011-04-08 23:28:10.0 +0200
@@ -34,7 +34,7 @@
#
Summary:Advanced Linux Sound Architecture
Version:1.0.24.1
-Release:4.
+Release:4.
Source:
ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
Source2:baselibs.conf
Source8:40-alsa.rules
@@ -167,8 +167,8 @@
install -c -m 0755 %{SOURCE16} $RPM_BUILD_ROOT%{_bindir}
install -c -m 0755 %{SOURCE34} $RPM_BUILD_ROOT%{_sbindir}/alsa-init
%if %suse_version < 1140
-sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g'
$RPM_BUILD_ROOT%{_bindir}/set_default_volume
-sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g'
$RPM_BUILD_ROOT%{_sbindir}/alsa-init
+sed -i -e 's@/var/lib/alsa/asound.state@/etc/asound.state@g'
$RPM_BUILD_ROOT%{_bindir}/set_default_volume
+sed -i -e 's@/var/lib/alsa/asound.state@/etc/asound.state@g'
$RPM_BUILD_ROOT%{_sbindir}/alsa-init
%endif
# install test wave file
mkdir -p $RPM_BUILD_ROOT%{_datadir}/sounds/alsa
@@ -185,7 +185,7 @@
install -c -m 0755 %{SOURCE11} $RPM_BUILD_ROOT/etc/init.d
install -c -m 0755 %{SOURCE13} $RPM_BUILD_ROOT/etc/init.d
%if %suse_version < 1140
-sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g'
$RPM_BUILD_ROOT/etc/init.d/alsasound
+sed -i -e 's@/var/lib/alsa/asound.state@/etc/asound.state@g'
$RPM_BUILD_ROOT/etc/init.d/alsasound
%endif
rm -f $RPM_BUILD_ROOT%{_sbindir}/rcalsasound
ln -s ../../etc/init.d/alsasound $RPM_BUILD_ROOT%{_sbindir}/rcalsasound
++ alsa-init.sh ++
--- /var/tmp/diff_new_pack.3b1fnR/_old 2011-04-08 23:28:10.0 +0200
+++ /var/tmp/diff_new_pack.3b1fnR/_new 2011-04-08 23:28:10.0 +0200
@@ -2,7 +2,7 @@
# alsa-init card#
/usr/bin/set_default_volume -f $1 >/dev/null 2>&1
-test -s /var/lib/asound.state && /usr/sbin/alsactl -F restore $1 >/dev/null
2>&1
+test -s /var/lib/alsa/asound.state && /usr/sbin/alsactl -F restore $1
>/dev/null 2>&1
# increase buffer-preallocation size (for PA)
if [ -f /proc/asound/card$1/pcm0p/sub0/prealloc_max ]; then
pmax=$(< /proc/asound/card$1/pcm0p/sub0/prealloc_max)
++ alsasound ++
--- /var/tmp/diff_new_pack.3b1fnR/_old 2011-04-08 23:28:10.0 +0200
+++ /var/tmp/diff_new_pack.3b1fnR/_new 2011-04-08 23:28:10.0 +0200
@@ -58,7 +58,7 @@
rc_reset
alsactl=/usr/sbin/alsactl
-asoundcfg=/var/lib/asound.state
+asoundcfg=/var/lib/alsa/asound.state
aconnect=/usr/bin/aconnect
#
++ set_default_volume ++
--- /var/tmp/diff_new_pack.3b1fnR/_old 2011-04-08 23:28:10.0 +0200
+++ /var/tmp/diff_new_pack.3b1fnR/_new 2011-04-08 23:28:10.0 +0200
@@ -7,7 +7,7 @@
# written by Takashi Iwai
#
-if [ -f /var/lib/asound.state -a x$1 != x-f ]; then
+if [ -f /var/lib/alsa/asound.state -a x$1 != x-f ]; then
/usr/sbin/alsactl restore >/dev/null 2>&1
exit 0
fi
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit alsa for openSUSE:11.4
Hello community,
here is the log from the commit of package alsa for openSUSE:11.4
checked in at Thu Jul 14 17:41:29 CEST 2011.
--- old-versions/11.4/UPDATES/all/alsa/alsa.changes 2011-03-31
15:03:04.0 +0200
+++ 11.4/alsa/alsa.changes 2011-07-12 16:38:15.0 +0200
@@ -1,0 +2,6 @@
+Tue Jul 12 16:05:30 CEST 2011 - ti...@suse.de
+
+- Fix alsasound init script for separated /var partition
+ (bnc#700781)
+
+---
calling whatdependson for 11.4-i586
Other differences:
--
++ alsa.spec ++
--- /var/tmp/diff_new_pack.7SNpkb/_old 2011-07-14 17:39:52.0 +0200
+++ /var/tmp/diff_new_pack.7SNpkb/_new 2011-07-14 17:39:52.0 +0200
@@ -34,7 +34,7 @@
#
Summary:Advanced Linux Sound Architecture
Version:1.0.24.1
-Release:4.
+Release:4.
Source:
ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
Source2:baselibs.conf
Source8:40-alsa.rules
++ alsasound ++
--- /var/tmp/diff_new_pack.7SNpkb/_old 2011-07-14 17:39:52.0 +0200
+++ /var/tmp/diff_new_pack.7SNpkb/_new 2011-07-14 17:39:52.0 +0200
@@ -32,9 +32,9 @@
#
### BEGIN INIT INFO
# Provides: alsasound
-# Required-Start:
+# Required-Start: $local_fs
# Should-Start: $remote_fs resmgr
-# Required-Stop:
+# Required-Stop: $local_fs
# Should-Stop: $remote_fs resmgr
# Default-Start: 2 3 5
# Default-Stop:
@@ -189,6 +189,13 @@
case "$1" in
start)
if test "$PREVLEVEL" = "N" -a -d /proc/asound ; then
+ # re-run alsactl when /var is a seprate partition (bnc#700781)
+ case $asoundcfg in
+ /var/*)
+ grep -q " /var " /proc/mounts && \
+ $alsactl -F -f $asoundcfg restore >/dev/null 2>&1
+ ;;
+ esac
start_rest
else
start_all
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
