alsa-utils: update to 1.0.27.

This commit is contained in:
Juan RP 2013-04-17 10:27:09 +02:00
parent e403357f8c
commit e8cf449522
4 changed files with 66 additions and 5 deletions

View file

@ -0,0 +1,10 @@
--- alsactl/alsa-restore.service.in.old 2013-04-15 14:37:57.326541394 +0200
+++ 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

View file

@ -0,0 +1,25 @@
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
--- alsactl/lock.c
+++ 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)

View file

@ -0,0 +1,24 @@
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
--- aplay/aplay.c
+++ 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
*/

View file

@ -1,18 +1,18 @@
# Template build file for 'alsa-utils'. # Template build file for 'alsa-utils'.
pkgname=alsa-utils pkgname=alsa-utils
version=1.0.26 version=1.0.27
revision=2 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-systemdsystemunitdir=/usr/lib/systemd/system configure_args="--with-systemdsystemunitdir=/usr/lib/systemd/system
--with-udev-rules-dir=/usr/lib/udev/rules.d" --with-udev-rules-dir=/usr/lib/udev/rules.d"
hostmakedepends="pkg-config xmlto" hostmakedepends="pkg-config xmlto"
makedepends="ncurses-devel alsa-lib-devel libsamplerate-devel" makedepends="ncurses-devel alsa-lib-devel>=1.0.27 libsamplerate-devel"
short_desc="The Advanced Linux Sound Architecture (ALSA) utils" short_desc="The Advanced Linux Sound Architecture (ALSA) utils"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.alsa-project.org" homepage="http://www.alsa-project.org"
license="GPL-2" license="GPL-2"
distfiles="ftp://ftp.alsa-project.org/pub/utils/$pkgname-$version.tar.bz2" distfiles="ftp://ftp.alsa-project.org/pub/utils/$pkgname-$version.tar.bz2"
checksum=f85f2a3aa6e78475bbe35b0cad3a8cabb99f45ebc5f37962f2137b8df8b081e7 checksum=6f76cd77341ceb22949c4fb9d4df145483f56baa899f0621d617b8df96a45aef
long_desc=" long_desc="
The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
functionality to the Linux operating system. functionality to the Linux operating system.
@ -20,6 +20,8 @@ long_desc="
This package includes the ALSA runtime utilities." This package includes the ALSA runtime utilities."
alsa-utils_package() { alsa-utils_package() {
# Needs snd_pcm_abort() from >= 1.0.27.
depends="alsa-lib>=1.0.27"
make_dirs="/var/lib/alsa 0750 root root" make_dirs="/var/lib/alsa 0750 root root"
pkg_install() { pkg_install() {
vmove usr vmove usr