[arch-commits] Commit in alsa-utils/trunk (PKGBUILD alsa alsa.conf.d)

[Aaron Griffin]

    Date: Tuesday, July 22, 2008 @ 16:59:14
  Author: aaron
Revision: 6022

Add updated daemon from FS#10003

Modified:
  alsa-utils/trunk/PKGBUILD
  alsa-utils/trunk/alsa
  alsa-utils/trunk/alsa.conf.d

-------------+
 PKGBUILD    |    8 ++------
 alsa        |   30 ++++++++++++++++++++----------
 alsa.conf.d |   10 ++++++++++
 3 files changed, 32 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-22 20:22:10 UTC (rev 6021)
+++ PKGBUILD	2008-07-22 20:59:14 UTC (rev 6022)
@@ -1,20 +1,16 @@
 # $Id$
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=alsa-utils
-pkgver=1.0.16
+pkgver=1.0.17
 pkgrel=1
 pkgdesc="An alternative implementation of Linux sound support"
 arch=(i686 x86_64)
 url="http://www.alsa-project.org"
-depends=('alsa-lib>=1.0.16' 'dialog' 'pciutils' 'ncurses')
+depends=("alsa-lib>=$pkgver" 'dialog' 'pciutils' 'ncurses')
 license=('GPL')
 source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 \
         alsa alsaconf.patch alsa.conf.d)
 backup=(etc/conf.d/alsa)
-md5sums=('b9f803f45e6988bb27a6bed521a949fc'
-         'cce0969b0203a2bb35540fdf4f7e96ae'
-         '538f82650d08e901efea86c5395520df'
-         '366d370f874a45e67b63ce4a8b048202')
 
 build() {
   cd $startdir/src/$pkgname-${pkgver}

Modified: alsa
===================================================================
--- alsa	2008-07-22 20:22:10 UTC (rev 6021)
+++ alsa	2008-07-22 20:59:14 UTC (rev 6022)
@@ -7,7 +7,8 @@
 case "$1" in
   start)
     stat_busy "Restoring ALSA Levels"
-    /usr/sbin/alsactl restore
+    STATE_FILE=${STATE_FILE:-/etc/asound.state}
+    /usr/sbin/alsactl --file $STATE_FILE restore
     if [ $? -gt 0 ]; then
       stat_fail
     else
@@ -17,20 +18,29 @@
 
     POWERSAVE=${POWERSAVE:-0}
     if [ -e /sys/module/snd_ac97_codec/parameters/power_save \
-	 -a $POWERSAVE -ne 0 ]; then
-        echo $POWERSAVE > /sys/module/snd_ac97_codec/parameters/power_save
-        echo 1 > /dev/dsp
+	  -a $POWERSAVE -ne 0 ]; then
+      echo $POWERSAVE > /sys/module/snd_ac97_codec/parameters/power_save
+      echo 1 > /dev/dsp
     fi
 
     if [ -e /sys/module/snd_hda_intel/parameters/power_save \
-	 -a $POWERSAVE -ne 0 ]; then
-	echo $POWERSAVE > /sys/module/snd_hda_intel/parameters/power_save
-        echo 1 > /dev/dsp
+      -a $POWERSAVE -ne 0 ]; then
+      echo $POWERSAVE > /sys/module/snd_hda_intel/parameters/power_save
+      echo 1 > /dev/dsp
     fi
     ;;
   stop)
-    stat_busy "Saving ALSA Levels"
-    /usr/sbin/alsactl store
+    STATE_FILE=${STATE_FILE:-/etc/asound.state}
+    SAVE_VOLUME=${SAVE_VOLUME:-yes}
+    if [ "$SAVE_VOLUME" == "yes" ]; then
+      stat_busy "Saving ALSA Levels"
+      /usr/sbin/alsactl --file $STATE_FILE store
+    else
+      stat_busy "Stopping ALSA"
+    fi
+    if [ "$MUTE_VOLUME" == "yes" ]; then
+      /usr/bin/amixer -q set Master 0 mute
+    fi
     if [ $? -gt 0 ]; then
       stat_fail
     else
@@ -44,5 +54,5 @@
     $0 start
     ;;
   *)
-    echo "usage: $0 {start|stop|restart}"  
+    echo "usage: $0 {start|stop|restart}"
 esac

Modified: alsa.conf.d
===================================================================
--- alsa.conf.d	2008-07-22 20:22:10 UTC (rev 6021)
+++ alsa.conf.d	2008-07-22 20:59:14 UTC (rev 6022)
@@ -1,3 +1,6 @@
+# Sound card state storage file, containing mixer settings.
+STATE_FILE=/etc/asound.state
+
 # Enables powersaving mode for AC97 and hda_intel audio chips.
 # Set to 1 to enable powersaving.
 # Set to 0 to disable powersaving (default).
@@ -2 +5,8 @@
 POWERSAVE=0
+
+# Whether to save volume levels when stopped ("yes" or "no").
+SAVE_VOLUME="yes"
+
+# Whether to mute the master volume when stopped ("yes" or "no").
+# Useful for bad audio cards which make a noise on system poweroff.
+MUTE_VOLUME="no"