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

[Tobias Powalowski]

    Date: Saturday, May 18, 2013 @ 11:51:42
  Author: tpowa
Revision: 185744

upgpkg: alsa-utils 1.0.27-5

move /usr/sbin to /usr/bin

Modified:
  alsa-utils/trunk/PKGBUILD
Deleted:
  alsa-utils/trunk/alsa

----------+
 PKGBUILD |    6 +++--
 alsa     |   62 -------------------------------------------------------------
 2 files changed, 4 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-18 09:28:36 UTC (rev 185743)
+++ PKGBUILD	2013-05-18 09:51:42 UTC (rev 185744)
@@ -4,7 +4,7 @@
 
 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 @@
   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

Deleted: alsa
===================================================================
--- alsa	2013-05-18 09:28:36 UTC (rev 185743)
+++ alsa	2013-05-18 09:51:42 UTC (rev 185744)
@@ -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