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

2013-05-18 Thread 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
===
--- PKGBUILD2013-05-18 09:28:36 UTC (rev 185743)
+++ PKGBUILD2013-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
===
--- alsa2013-05-18 09:28:36 UTC (rev 185743)
+++ alsa2013-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



[arch-commits] Commit in alsa-utils/trunk (PKGBUILD alsa-restore-1.0.27.service.patch)

2013-04-15 Thread Tobias Powalowski
Date: Monday, April 15, 2013 @ 14:43:43
  Author: tpowa
Revision: 182800

upgpkg: alsa-utils 1.0.27-2

fix alsa-restore.service file #34790 #34792

Added:
  alsa-utils/trunk/alsa-restore-1.0.27.service.patch
Modified:
  alsa-utils/trunk/PKGBUILD

---+
 PKGBUILD  |   13 ++---
 alsa-restore-1.0.27.service.patch |   10 ++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-15 11:37:50 UTC (rev 182799)
+++ PKGBUILD2013-04-15 12:43:43 UTC (rev 182800)
@@ -4,7 +4,7 @@
 
 pkgname=alsa-utils
 pkgver=1.0.27
-pkgrel=1
+pkgrel=2
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64')
 url="http://www.alsa-project.org";
@@ -13,9 +13,15 @@
 makedepends=('xmlto' 'docbook-xsl')
 license=('GPL')
 source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2
-90alsa)
+90alsa
+alsa-restore-1.0.27.service.patch)
 backup=(etc/conf.d/alsa)
 
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/alsa-restore-1.0.27.service.patch
+}
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-alsaconf \
@@ -33,4 +39,5 @@
   install -d ${pkgdir}/var/lib/alsa
 }
 md5sums=('cbfb21a24f63fb052b3392195639ce48'
- '529216f6a46e61a546640e08ea7a0879')
+ '529216f6a46e61a546640e08ea7a0879'
+ '0a27f7b80351d6baa274c32d859bf037')

Added: alsa-restore-1.0.27.service.patch
===
--- alsa-restore-1.0.27.service.patch   (rev 0)
+++ alsa-restore-1.0.27.service.patch   2013-04-15 12:43:43 UTC (rev 182800)
@@ -0,0 +1,10 @@
+--- alsa-utils-1.0.27/alsactl/alsa-restore.service.in.old  2013-04-15 
14:37:57.326541394 +0200
 alsa-utils-1.0.27/alsactl/alsa-restore.service.in  2013-04-15 
14:38:10.179673494 +0200
+@@ -12,6 +12,6 @@
+ Conflicts=shutdown.target
+ 
+ [Service]
+-Type=oneshop
++Type=oneshot
+ ExecStart=-@sbindir@/alsactl restore
+ StandardOutput=syslog



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

2010-05-02 Thread Tobias Powalowski
Date: Sunday, May 2, 2010 @ 10:42:00
  Author: tpowa
Revision: 79271

upgpkg: alsa-utils 1.0.23-2
fix #19314

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

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

Modified: PKGBUILD
===
--- PKGBUILD2010-05-02 14:40:37 UTC (rev 79270)
+++ PKGBUILD2010-05-02 14:42:00 UTC (rev 79271)
@@ -2,7 +2,7 @@
 # Maintainer: judd 
 pkgname=alsa-utils
 pkgver=1.0.23
-pkgrel=1
+pkgrel=2
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64')
 url="http://www.alsa-project.org";
@@ -26,6 +26,6 @@
   install -D -m644 ../alsa.conf.d $startdir/pkg/etc/conf.d/alsa
 }
 md5sums=('cb0cf46029ac9549cf3a31bff6a4f4e1'
- '9dff78913b13b10e67c4195e90395ed2'
+ '3ef812cae83053d01cd560284efad71f'
  '62ebef77d5617d0036012cc541dcf23c'
  '93089f0d8872078939f76dd2acaebc2b')

Modified: alsa
===
--- alsa2010-05-02 14:40:37 UTC (rev 79270)
+++ alsa2010-05-02 14:42:00 UTC (rev 79271)
@@ -19,13 +19,13 @@
 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
+  [ -c /dev/dsp ] && 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
+  [ -c /dev/dsp ] && echo 1 > /dev/dsp
 fi
 ;;
   stop)