summaryrefslogtreecommitdiff
path: root/extra/alsa-utils
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-05-19 01:31:03 -0700
committerroot <root@rshg054.dnsready.net>2013-05-19 01:31:03 -0700
commit9a30c3d0083b8330b1aa6c0f89245e68ae762ee5 (patch)
treed7249e7354a9daabdf75f5c25da47363d35f15a6 /extra/alsa-utils
parent4e1091baf58d4d28f6bf3cc4fee8ea0bfd10a7a8 (diff)
Sun May 19 01:30:44 PDT 2013
Diffstat (limited to 'extra/alsa-utils')
-rw-r--r--extra/alsa-utils/PKGBUILD8
-rwxr-xr-xextra/alsa-utils/alsa62
2 files changed, 5 insertions, 65 deletions
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD
index ff0ae1a20..f48a7dbd4 100644
--- a/extra/alsa-utils/PKGBUILD
+++ b/extra/alsa-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183071 2013-04-17 07:11:00Z tpowa $
+# $Id: PKGBUILD 185745 2013-05-18 09:51:58Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=alsa-utils
pkgver=1.0.27
-pkgrel=4
+pkgrel=5
pkgdesc="An alternative implementation of Linux sound support"
arch=('i686' 'x86_64')
url="http://www.alsa-project.org"
@@ -24,11 +24,13 @@ prepare() {
patch -Np1 -i ${srcdir}/alsa-restore-1.0.27.service.patch
patch -Np1 -i ${srcdir}/alsactl-fix-buffer-overflow-1.0.27.patch
patch -Np1 -i ${srcdir}/arecord-1.0.27.patch
+ # remove wrong udev file from sources
+ rm alsactl/90-alsa-restore.rules
}
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
diff --git a/extra/alsa-utils/alsa b/extra/alsa-utils/alsa
deleted file mode 100755
index 1e7b57fa3..000000000
--- a/extra/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