Date: Wednesday, August 17, 2011 @ 03:45:33 Author: tpowa Revision: 135666
archrelease: copy trunk to extra-i686 Added: alsa-utils/repos/extra-i686/90alsa (from rev 135665, alsa-utils/trunk/90alsa) alsa-utils/repos/extra-i686/PKGBUILD (from rev 135665, alsa-utils/trunk/PKGBUILD) alsa-utils/repos/extra-i686/alsa (from rev 135665, alsa-utils/trunk/alsa) alsa-utils/repos/extra-i686/alsa.conf.d (from rev 135665, alsa-utils/trunk/alsa.conf.d) alsa-utils/repos/extra-i686/alsaconf.patch (from rev 135665, alsa-utils/trunk/alsaconf.patch) Deleted: alsa-utils/repos/extra-i686/90alsa alsa-utils/repos/extra-i686/PKGBUILD alsa-utils/repos/extra-i686/alsa alsa-utils/repos/extra-i686/alsa.conf.d alsa-utils/repos/extra-i686/alsaconf.patch ----------------+ 90alsa | 26 +++++------ PKGBUILD | 84 ++++++++++++++++++------------------- alsa | 124 +++++++++++++++++++++++++++---------------------------- alsa.conf.d | 30 ++++++------- alsaconf.patch | 64 ++++++++++++++-------------- 5 files changed, 164 insertions(+), 164 deletions(-) Deleted: 90alsa =================================================================== --- 90alsa 2011-08-17 07:43:14 UTC (rev 135665) +++ 90alsa 2011-08-17 07:45:33 UTC (rev 135666) @@ -1,13 +0,0 @@ -#!/bin/sh -# -# 90alsa: suspend/wakeup ALSA devices - -case "$1" in -hibernate|suspend) -;; -thaw|resume) -aplay -d 1 /dev/zero -;; -*) exit $NA -;; -esac Copied: alsa-utils/repos/extra-i686/90alsa (from rev 135665, alsa-utils/trunk/90alsa) =================================================================== --- 90alsa (rev 0) +++ 90alsa 2011-08-17 07:45:33 UTC (rev 135666) @@ -0,0 +1,13 @@ +#!/bin/sh +# +# 90alsa: suspend/wakeup ALSA devices + +case "$1" in +hibernate|suspend) +;; +thaw|resume) +aplay -d 1 /dev/zero +;; +*) exit $NA +;; +esac Deleted: PKGBUILD =================================================================== --- PKGBUILD 2011-08-17 07:43:14 UTC (rev 135665) +++ PKGBUILD 2011-08-17 07:45:33 UTC (rev 135666) @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Tobias Powalowski <tp...@archlinux.org> -# Contributor: judd <jvi...@zeroflux.org> - -pkgname=alsa-utils -pkgver=1.0.24.2 -pkgrel=2 -pkgdesc="An alternative implementation of Linux sound support" -arch=('i686' 'x86_64') -url="http://www.alsa-project.org" -#can not use >=$pkgver due to use of letters in alsa-lib update versioning -depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc') -makedepends=('xmlto' 'docbook-xsl') -license=('GPL') -source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 - alsa - alsaconf.patch - alsa.conf.d - 90alsa) -backup=(etc/conf.d/alsa) -md5sums=('8238cd57cb301d1c36bcf0ecb59ce6b2' - '2ba1a1cbf653bf1a69f8a720fd6549da' - '62ebef77d5617d0036012cc541dcf23c' - '4c8ae9f976c7df5e271a4cb91ccc7767' - '529216f6a46e61a546640e08ea7a0879') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ../alsaconf.patch - ./configure --prefix=/usr --with-systemdsystemunitdir=/lib/systemd/system - make -} - -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 - # dir where to save ALSA state - install -d ${pkgdir}/var/lib/alsa -} Copied: alsa-utils/repos/extra-i686/PKGBUILD (from rev 135665, alsa-utils/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2011-08-17 07:45:33 UTC (rev 135666) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=alsa-utils +pkgver=1.0.24.2 +pkgrel=3 +pkgdesc="An alternative implementation of Linux sound support" +arch=('i686' 'x86_64') +url="http://www.alsa-project.org" +#can not use >=$pkgver due to use of letters in alsa-lib update versioning +depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc') +makedepends=('xmlto' 'docbook-xsl') +license=('GPL') +source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 + alsa + alsaconf.patch + alsa.conf.d + 90alsa) +backup=(etc/conf.d/alsa) + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ../alsaconf.patch + ./configure --prefix=/usr --with-systemdsystemunitdir=/lib/systemd/system + make +} + +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 + # dir where to save ALSA state + install -d ${pkgdir}/var/lib/alsa +} +md5sums=('8238cd57cb301d1c36bcf0ecb59ce6b2' + '2ba1a1cbf653bf1a69f8a720fd6549da' + '7521bf20f5b3501a510ec4462ae4a934' + '4c8ae9f976c7df5e271a4cb91ccc7767' + '529216f6a46e61a546640e08ea7a0879') Deleted: alsa =================================================================== --- alsa 2011-08-17 07:43:14 UTC (rev 135665) +++ alsa 2011-08-17 07:45:33 UTC (rev 135666) @@ -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 Copied: alsa-utils/repos/extra-i686/alsa (from rev 135665, alsa-utils/trunk/alsa) =================================================================== --- alsa (rev 0) +++ alsa 2011-08-17 07:45:33 UTC (rev 135666) @@ -0,0 +1,62 @@ +#!/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 Deleted: alsa.conf.d =================================================================== --- alsa.conf.d 2011-08-17 07:43:14 UTC (rev 135665) +++ alsa.conf.d 2011-08-17 07:45:33 UTC (rev 135666) @@ -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" Copied: alsa-utils/repos/extra-i686/alsa.conf.d (from rev 135665, alsa-utils/trunk/alsa.conf.d) =================================================================== --- alsa.conf.d (rev 0) +++ alsa.conf.d 2011-08-17 07:45:33 UTC (rev 135666) @@ -0,0 +1,15 @@ +# 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" Deleted: alsaconf.patch =================================================================== --- alsaconf.patch 2011-08-17 07:43:14 UTC (rev 135665) +++ alsaconf.patch 2011-08-17 07:45:33 UTC (rev 135666) @@ -1,32 +0,0 @@ -diff -Naur alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in alsa-utils-1.0.9a/alsaconf/alsaconf.in ---- alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in 2005-03-24 00:24:52.000000000 -0800 -+++ alsa-utils-1.0.9a/alsaconf/alsaconf.in 2005-07-18 09:25:02.000000000 -0700 -@@ -58,6 +58,8 @@ - distribution="redhat" - elif test -f /etc/fedora-release && grep -q "Fedora" /etc/fedora-release; then - distribution="fedora" -+elif test -f /etc/arch-release && grep -q "Arch" /etc/arch-release; then -+ distribution="arch" - elif [ -f /etc/slackware-version -o -f /etc/slamd64-version ]; then - distribution="slackware" - else -@@ -382,6 +384,8 @@ - rcalsasound=/etc/rc.d/init.d/alsasound - elif [ -x /etc/init.d/alsa ]; then - rcalsasound=/etc/init.d/alsa -+elif [ -x /etc/rc.d/alsa ]; then -+ rcalsasound=/etc/rc.d/alsa - else - rcalsasound=rcalsasound - fi ---- alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in 2010-01-03 19:44:08.000000000 +0100 -+++ alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in 2010-01-03 19:44:08.000000000 +0100 -@@ -315,7 +315,7 @@ - 3.[789]*) - ;; - *) -- cfgout="/etc/modprobe.d/sound" -+ cfgout="/etc/modprobe.d/sound.conf" - cfgoldout="" - ;; - esac Copied: alsa-utils/repos/extra-i686/alsaconf.patch (from rev 135665, alsa-utils/trunk/alsaconf.patch) =================================================================== --- alsaconf.patch (rev 0) +++ alsaconf.patch 2011-08-17 07:45:33 UTC (rev 135666) @@ -0,0 +1,32 @@ +diff -Naur alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in alsa-utils-1.0.9a/alsaconf/alsaconf.in +--- alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in 2005-03-24 00:24:52.000000000 -0800 ++++ alsa-utils-1.0.9a/alsaconf/alsaconf.in 2005-07-18 09:25:02.000000000 -0700 +@@ -58,6 +58,8 @@ + distribution="redhat" + elif test -f /etc/fedora-release && grep -q "Fedora" /etc/fedora-release; then + distribution="fedora" ++elif test -f /etc/arch-release; then ++ distribution="arch" + elif [ -f /etc/slackware-version -o -f /etc/slamd64-version ]; then + distribution="slackware" + else +@@ -382,6 +384,8 @@ + rcalsasound=/etc/rc.d/init.d/alsasound + elif [ -x /etc/init.d/alsa ]; then + rcalsasound=/etc/init.d/alsa ++elif [ -x /etc/rc.d/alsa ]; then ++ rcalsasound=/etc/rc.d/alsa + else + rcalsasound=rcalsasound + fi +--- alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in 2010-01-03 19:44:08.000000000 +0100 ++++ alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in 2010-01-03 19:44:08.000000000 +0100 +@@ -315,7 +315,7 @@ + 3.[789]*) + ;; + *) +- cfgout="/etc/modprobe.d/sound" ++ cfgout="/etc/modprobe.d/sound.conf" + cfgoldout="" + ;; + esac