Hello community, here is the log from the commit of package alsa for openSUSE:Factory checked in at Mon May 23 15:20:20 CEST 2011.
-------- --- alsa/alsa.changes 2011-03-31 15:03:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/alsa/alsa.changes 2011-04-01 17:10:20.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Mar 31 15:05:48 CEST 2011 - ti...@suse.de + +- Update alsa-info.sh to 0.4.60: show usb mixer, DMI product + version, fixed typos +- Fix set_default_volume script not to give 100% volume when no + Master is present; just for older stuff (bnc#677563) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.ACwTwX/_old 2011-05-23 15:19:24.000000000 +0200 +++ /var/tmp/diff_new_pack.ACwTwX/_new 2011-05-23 15:19:24.000000000 +0200 @@ -34,7 +34,7 @@ # Summary: Advanced Linux Sound Architecture Version: 1.0.24.1 -Release: 8 +Release: 10 Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source2: baselibs.conf Source8: 40-alsa.rules ++++++ alsa-info.sh ++++++ --- /var/tmp/diff_new_pack.ACwTwX/_old 2011-05-23 15:19:24.000000000 +0200 +++ /var/tmp/diff_new_pack.ACwTwX/_new 2011-05-23 15:19:24.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION=0.4.58 +SCRIPT_VERSION=0.4.60 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"; ################################################################################# @@ -423,9 +423,11 @@ # No root privileges are required when using sysfs method DMI_SYSTEM_MANUFACTURER=$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null) DMI_SYSTEM_PRODUCT_NAME=$(cat /sys/class/dmi/id/product_name 2>/dev/null) + DMI_SYSTEM_PRODUCT_VERSION=$(cat /sys/class/dmi/id/product_version 2>/dev/null) elif [ -x $DMIDECODE ]; then DMI_SYSTEM_MANUFACTURER=$($DMIDECODE -s system-manufacturer 2>/dev/null) DMI_SYSTEM_PRODUCT_NAME=$($DMIDECODE -s system-product-name 2>/dev/null) + DMI_SYSTEM_PRODUCT_VERSION=$($DMIDECODE -s system-version 2>/dev/null) fi cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp @@ -439,6 +441,9 @@ cat /proc/asound/card*/codec97\#0/ac97\#0-0 > $TEMPDIR/alsa-ac97.tmp 2> /dev/null cat /proc/asound/card*/codec97\#0/ac97\#0-0+regs > $TEMPDIR/alsa-ac97-regs.tmp 2> /dev/null +#Check for USB mixer setup +cat /proc/asound/card*/usbmixer > $TEMPDIR/alsa-usbmixer.tmp 2> /dev/null + #Fetch the info, and put it in $FILE in a nice readable format. if [[ -z $PASTEBIN ]]; then echo "upload=true&script=true&cardinfo=" > $FILE @@ -463,6 +468,7 @@ echo "" >> $FILE echo "Manufacturer: $DMI_SYSTEM_MANUFACTURER" >> $FILE echo "Product Name: $DMI_SYSTEM_PRODUCT_NAME" >> $FILE +echo "Product Version: $DMI_SYSTEM_PRODUCT_VERSION" >> $FILE echo "" >> $FILE echo "" >> $FILE echo "!!Kernel Information" >> $FILE @@ -537,7 +543,7 @@ cat $TEMPDIR/lspci.tmp >> $FILE echo "" >> $FILE echo "" >> $FILE -echo "!!Advanced information - PCI Vendor/Device/Susbsystem ID's" >> $FILE +echo "!!Advanced information - PCI Vendor/Device/Subsystem ID's" >> $FILE echo "!!--------------------------------------------------------" >> $FILE echo "" >> $FILE lspci -vvn |grep -A1 040[1-3] >> $FILE @@ -596,6 +602,17 @@ echo "" >> $FILE fi +if [ -s "$TEMPDIR/alsa-usbmixer.tmp" ] +then + echo "!!USB Mixer information" >> $FILE + echo "!!---------------------------" >> $FILE + echo "--startcollapse--" >> $FILE + echo "" >> $FILE + cat $TEMPDIR/alsa-usbmixer.tmp >> $FILE + echo "--endcollapse--" >> $FILE + echo "" >> $FILE + echo "" >> $FILE +fi #If no command line options are specified, then run as though --with-all was specified if [[ -z "$1" ]] ++++++ set_default_volume ++++++ --- /var/tmp/diff_new_pack.ACwTwX/_old 2011-05-23 15:19:24.000000000 +0200 +++ /var/tmp/diff_new_pack.ACwTwX/_new 2011-05-23 15:19:24.000000000 +0200 @@ -7,15 +7,17 @@ # written by Takashi Iwai <ti...@suse.de> # -if [ -f /var/lib/alsa/asound.state -a x$1 != x-f ]; then - /usr/sbin/alsactl restore >/dev/null 2>&1 - exit 0 -fi - +forced= if [ x$1 = x-f ]; then + forced=yes shift fi +if [ -f /var/lib/alsa/asound.state -a -z "$forced" ]; then + /usr/sbin/alsactl restore >/dev/null 2>&1 + exit 0 +fi + if [ -n "$1" ]; then case "$1" in [0-9]*) @@ -23,8 +25,14 @@ *) card="-D $1";; esac +fi + +if amixer $card | grep -q "'Master"; then + slavevolp="100%" + slavevoldb="0dB" else - card="-D hw" + slavevolp="75%" + slavevoldb="-12dB" fi amixer -q -s $card <<EOF @@ -32,16 +40,16 @@ set Master -12dB set 'Master Mono' 75% unmute set 'Master Mono' -12dB -set Front 75% unmute -set Front 0dB -set PCM 90% unmute -set PCM 0dB -set Synth 90% unmute -set Synth 0dB -set Speaker 90% unmute -set Speaker 0dB -set CD 90% unmute -set CD 0dB +set Front $slavevolp unmute +set Front $slavevoldb +set PCM $slavevolp unmute +set PCM $slavevoldb +set Synth $slavevolp unmute +set Synth $slavevoldb +set Speaker $slavevolp unmute +set Speaker $slavevoldb +set CD $slavevolp unmute +set CD $slavevoldb # mute mic set Mic 0% mute # ESS 1969 chipset has 2 PCM channels @@ -61,8 +69,8 @@ set DAC,1 90% unmute set DAC,1 -12dB # some notebooks use headphone instead of master -set Headphone 75% unmute -set Headphone -12dB +set Headphone $slavevolp unmute +set Headphone $slavevoldb set Playback 100% unmute # turn off digital switches set "SB Live Analog/Digital Output Jack" off @@ -76,4 +84,16 @@ set Capture 12dB cap EOF +# run platform-defined scripts (if any) +for i in /etc/alsa.d/volume/*; do + if [ -x "$i" ]; then + case "$i" in + *~|*.bak|*.rpm*) + ;; + [0-9]*) + "$i" "$@" + esac + fi +done + exit 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
