alsa : 1.0.27

3 files changed, 12 insertions, 89 deletions

diff --git a/abs/core/alsa-utils/PKGBUILD b/abs/core/alsa-utils/PKGBUILD
index 918a84d..0ee6995 100644
--- a/abs/core/alsa-utils/PKGBUILD
+++ b/abs/core/alsa-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157726 2012-04-29 04:09:24Z allan $
+# $Id: PKGBUILD 191710 2013-07-29 10:16:55Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-utils
-pkgver=1.0.25
-pkgrel=3
+pkgver=1.0.27.2
+pkgrel=1
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64')
 url="http://www.alsa-project.org"
@@ -13,30 +13,30 @@ depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc' 'libsamplerate
 makedepends=('xmlto' 'docbook-xsl')
 license=('GPL')
 source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2
-        alsa
-        alsa.conf.d
         90alsa)
-backup=(etc/conf.d/alsa)
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-alsaconf \
+  ./configure --prefix=/usr --disable-alsaconf --sbindir=/usr/bin \
     --with-udev-rules-dir=/usr/lib/udev/rules.d \
     --with-systemdsystemunitdir=/usr/lib/systemd/system
   make
+  # fix udev rules genaration
+  cd alsactl
+  make 90-alsa-restore.rules
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-  install -D -m755 ../alsa ${pkgdir}/etc/rc.d/alsa
-  install -D -m644 ../alsa.conf.d ${pkgdir}/etc/conf.d/alsa
   install -D -m755 ../90alsa ${pkgdir}/etc/pm/sleep.d/90alsa
 
+  # install alsa udev rule file
+  install -D -m644 alsactl/90-alsa-restore.rules \
+          ${pkgdir}/usr/lib/udev/rules.d/90-alsa-restore.rules
+
   # dir where to save ALSA state
   install -d ${pkgdir}/var/lib/alsa
 }
-md5sums=('f81f9dcb9a014fd32cb3a70066a5b9a9'
-         '2ba1a1cbf653bf1a69f8a720fd6549da'
-         '4c8ae9f976c7df5e271a4cb91ccc7767'
+md5sums=('b65e9a04181bd7c9db7667a4566f8dc3'
          '529216f6a46e61a546640e08ea7a0879')
diff --git a/abs/core/alsa-utils/alsa b/abs/core/alsa-utils/alsa
deleted file mode 100755
index 1e7b57f..0000000
--- a/abs/core/alsa-utils/alsa
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/conf.d/alsa
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Restoring ALSA Levels"
-    if [[ ! -e /var/lib/alsa/asound.state ]]; then
-      /usr/sbin/alsactl $ALSA_ARGS store || { stat_fail; exit 1; }
-    fi
-    if /usr/sbin/alsactl $ALSA_ARGS restore; then
-      stat_done
-      add_daemon alsa
-    else
-      stat_fail
-      exit 1
-    fi
-
-    POWERSAVE=${POWERSAVE:-0}
-    if [[ -e /sys/module/snd_ac97_codec/parameters/power_save ]] \
-	  && (( $POWERSAVE )); then
-      echo $POWERSAVE > /sys/module/snd_ac97_codec/parameters/power_save
-      [[ -c /dev/dsp ]] && echo 1 > /dev/dsp
-    fi
-    if [[ -e /sys/module/snd_hda_intel/parameters/power_save ]] \
-	  && (( $POWERSAVE )); then
-      echo $POWERSAVE > /sys/module/snd_hda_intel/parameters/power_save
-      [[ -c /dev/dsp ]] && echo 1 > /dev/dsp
-    fi
-    ;;
-  stop)
-    SAVE_VOLUME=${SAVE_VOLUME:-yes}
-    if [[ "$SAVE_VOLUME" = "yes" ]]; then
-      stat_busy "Saving ALSA Levels"
-      /usr/sbin/alsactl $ALSA_ARGS store || { stat_fail; exit 1; }
-    else
-      stat_busy "Stopping ALSA"
-    fi
-    if [ "$MUTE_VOLUME" == "yes" ]; then
-      /usr/bin/amixer -q set Master 0 mute || { stat_fail; exit 1; }
-    fi
-    stat_done
-    rm_daemon alsa
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  force-restart)
-    stat_busy "Trying to TERM or KILL processes that are blocking ALSA..."
-    FILES="$(ls -1 /dev/snd/* | grep -vi control)"
-    fuser -k -SIGTERM $FILES
-    fuser -k $FILES
-    stat_done
-    $0 restart
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|force-restart}"
-esac
diff --git a/abs/core/alsa-utils/alsa.conf.d b/abs/core/alsa-utils/alsa.conf.d
deleted file mode 100644
index bd50dcc..0000000
--- a/abs/core/alsa-utils/alsa.conf.d
+++ /dev/null
@@ -1,15 +0,0 @@
-# Arguments for alsactl
-# example: ALSA_ARGS="--file /var/lib/alsa/asound.state"
-ALSA_ARGS="--file /var/lib/alsa/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).
-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"