diff --git a/40-alsa.rules b/40-alsa.rules index 32c67c1..83108c4 100644 --- a/40-alsa.rules +++ b/40-alsa.rules @@ -6,4 +6,4 @@ KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" KERNEL=="midiC[D0-9]*", NAME="snd/%k" KERNEL=="timer", NAME="snd/%k" KERNEL=="seq", NAME="snd/%k" -SUBSYSTEM=="sound", KERNEL=="controlC?", RUN+="/usr/sbin/alsactl -F restore %n" +SUBSYSTEM=="sound", KERNEL=="controlC?", RUN+="/usr/sbin/alsa-init %n" diff --git a/alsa-info.sh b/alsa-info.sh index d883fcc..747543e 100644 --- a/alsa-info.sh +++ b/alsa-info.sh @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION=0.4.41 +SCRIPT_VERSION=0.4.43 CHANGELOG="http://hg.alsa-project.org/alsa/log/tip/alsa-info.sh" ################################################################################# @@ -77,11 +77,11 @@ withaplay() { echo "" >> $FILE echo "APLAY" >> $FILE echo "" >> $FILE - aplay -l >> $FILE + aplay -l >> $FILE 2>&1 echo "" >> $FILE echo "ARECORD" >> $FILE echo "" >> $FILE - arecord -l >> $FILE + arecord -l >> $FILE 2>&1 echo "" >> $FILE } @@ -102,7 +102,7 @@ withamixer() { CARD_NAME=`grep "^ *$i " /tmp/alsainfo/alsacards.tmp|awk {'print $2'}` echo "!!-------Mixer controls for card $i $CARD_NAME]" >> $FILE echo "" >>$FILE - amixer -c$i>> $FILE + amixer -c$i>> $FILE 2>&1 echo "" >> $FILE done echo "" >> $FILE @@ -270,7 +270,7 @@ fi mkdir $TEMPDIR 2>/dev/null #Fetch the info and store in temp files/variables -DISTRO=`grep -ihs "buntu\|SUSE\|Fedora\|PCLinuxOS\|MEPIS\|Mandriva\|Debian\|Damn\|Sabayon\|Slackware\|KNOPPIX\|Gentoo\|Zenwalk\|Mint\|Kubuntu\|FreeBSD\|Puppy\|Freespire\|Vector\|Dreamlinux\|CentOS\|Arch\|Xandros\|Elive\|SLAX\|Red\|BSD\|KANOTIX\|Nexenta\|Foresight\|GeeXboX\|Frugalware\|64\|SystemRescue\|Novell\|Solaris\|BackTrack\|KateOS" /etc/{issue,*release,*version}` +DISTRO=`grep -ihs "buntu\|SUSE\|Fedora\|PCLinuxOS\|MEPIS\|Mandriva\|Debian\|Damn\|Sabayon\|Slackware\|KNOPPIX\|Gentoo\|Zenwalk\|Mint\|Kubuntu\|FreeBSD\|Puppy\|Freespire\|Vector\|Dreamlinux\|CentOS\|Arch\|Xandros\|Elive\|SLAX\|Red\|BSD\|KANOTIX\|Nexenta\|Foresight\|GeeXboX\|Frugalware\|64\|SystemRescue\|Novell\|Solaris\|BackTrack\|KateOS\|Pardus" /etc/{issue,*release,*version}` KERNEL_VERSION=`uname -r` KERNEL_PROCESSOR=`uname -p` KERNEL_MACHINE=`uname -m` diff --git a/alsa-init.sh b/alsa-init.sh new file mode 100644 index 0000000..d01e978 --- /dev/null +++ b/alsa-init.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# alsa-init card# + +/usr/bin/set_default_volume -f $1 >/dev/null 2>&1 +exec /usr/sbin/alsactl -F restore $1 >/dev/null 2>&1 +exit 0 diff --git a/alsa.changes b/alsa.changes index 30d674c..56ce1fc 100644 --- a/alsa.changes +++ b/alsa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 23 15:29:49 CEST 2008 - tiwai@suse.de + +- misc fixes (typo, stsderr out, distro checks) in alsa-info.sh +- initialize the volume first for any possible new volume + elements by the alsa-driver update (bnc#330409, bnc#392321) + ------------------------------------------------------------------- Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de diff --git a/alsa.spec b/alsa.spec index dc41bed..7fb55c0 100644 --- a/alsa.spec +++ b/alsa.spec @@ -22,7 +22,7 @@ PreReq: %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Advanced Linux Sound Architecture Version: 1.0.16 -Release: 26 +Release: 34 Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source8: 40-alsa.rules Source11: alsasound @@ -37,6 +37,7 @@ Source30: all_notes_off Source31: all_notes_off.bin Source32: all_notes_off.mid Source33: alsa-info.sh +Source34: alsa-init.sh Patch: alsa-lib-hg-fixes.diff Url: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -134,7 +135,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/aserver # # install helper scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} +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 # 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 @@ -149,7 +152,6 @@ install -c -m 0644 %{SOURCE32} $RPM_BUILD_ROOT/usr/lib 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 -mkdir -p $RPM_BUILD_ROOT%{_sbindir} 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 @@ -250,6 +252,10 @@ exit 0 %{_datadir}/alsa %changelog +* Fri May 23 2008 tiwai@suse.de +- misc fixes (typo, stsderr out, distro checks) in alsa-info.sh +- initialize the volume first for any possible new volume + elements by the alsa-driver update (bnc#330409, bnc#392321) * Thu Apr 10 2008 ro@suse.de - added baselibs.conf file to build xxbit packages for multilib support