Thu May 23 01:28:33 PDT 2013

5 files changed, 6 insertions, 95 deletions

diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD
index f48a7dbd4..da828c0e1 100644
--- a/extra/alsa-utils/PKGBUILD
+++ b/extra/alsa-utils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185745 2013-05-18 09:51:58Z tpowa $
+# $Id: PKGBUILD 186218 2013-05-22 06:35:50Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-utils
-pkgver=1.0.27
-pkgrel=5
+pkgver=1.0.27.1
+pkgrel=1
 pkgdesc="An alternative implementation of Linux sound support"
 arch=('i686' 'x86_64')
 url="http://www.alsa-project.org"
@@ -13,21 +13,9 @@ 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
-        90alsa
-        alsa-restore-1.0.27.service.patch
-        alsactl-fix-buffer-overflow-1.0.27.patch
-        arecord-1.0.27.patch)
+        90alsa)
 backup=(etc/conf.d/alsa)
 
-prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  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 --sbindir=/usr/bin \
@@ -44,8 +32,5 @@ package() {
   # dir where to save ALSA state
   install -d ${pkgdir}/var/lib/alsa
 }
-md5sums=('cbfb21a24f63fb052b3392195639ce48'
-         '529216f6a46e61a546640e08ea7a0879'
-         '0a27f7b80351d6baa274c32d859bf037'
-         'cd577445636542f9f60b420e4ffe3f0f'
-         'cecb38f03bd245d0584bfd63370e9a05')
+md5sums=('3d81357b997744a139881ef72bc6921a'
+         '529216f6a46e61a546640e08ea7a0879')
diff --git a/extra/alsa-utils/alsa-restore-1.0.27.service.patch b/extra/alsa-utils/alsa-restore-1.0.27.service.patch
deleted file mode 100644
index b3a9d48fd..000000000
--- a/extra/alsa-utils/alsa-restore-1.0.27.service.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
diff --git a/extra/alsa-utils/alsa.conf.d b/extra/alsa-utils/alsa.conf.d
deleted file mode 100644
index bd50dcca2..000000000
--- a/extra/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"
diff --git a/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch b/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch
deleted file mode 100644
index d4b526614..000000000
--- a/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Mon, 15 Apr 2013 12:44:13 +0000 (+0200)
-Subject: alsactl: Fix the string size for the lock file contents
-X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=95788fea25c1a59985828d4b91af0772d077600b
-
-alsactl: Fix the string size for the lock file contents
-
-The string length is 10 characters + LF + '\0' = 12 characters.
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
-
-diff --git a/alsactl/lock.c b/alsactl/lock.c
-index d34d013..fce208b 100644
---- a/alsactl/lock.c
-+++ b/alsactl/lock.c
-@@ -35,7 +35,7 @@ static int state_lock_(const char *file, int lock, int timeout)
- 	int fd = -1, err = 0;
- 	struct flock lck;
- 	struct stat st;
--	char lcktxt[11];
-+	char lcktxt[12];
- 	char *nfile;
- 
- 	if (!do_lock)
diff --git a/extra/alsa-utils/arecord-1.0.27.patch b/extra/alsa-utils/arecord-1.0.27.patch
deleted file mode 100644
index f9edb2d21..000000000
--- a/extra/alsa-utils/arecord-1.0.27.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 17 Apr 2013 06:34:34 +0000 (+0200)
-Subject: arecord: add a missing break to the capture loop
-X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=b4f34ac26037c10ac51c4bb29203500165848977
-
-arecord: add a missing break to the capture loop
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
-
-diff --git a/aplay/aplay.c b/aplay/aplay.c
-index 5bdc39c..000d25b 100644
---- a/aplay/aplay.c
-+++ b/aplay/aplay.c
-@@ -3021,6 +3021,9 @@ static void capture(char *orig_name)
- 			fd = -1;
- 		}
- 
-+		if (in_aborting)
-+			break;
-+
- 		/* repeat the loop when format is raw without timelimit or
- 		 * requested counts of data are recorded
- 		 */