forked from pool/alsa-utils
Accepting request 176490 from home:tiwai:branches:multimedia:libs
- Bump to version 1.0.27.1, including previous fixes - Removed requirement of libudev-devel, as the superfluous rules file is dropped in 1.0.27.1. - Backport upstream fix: 0001-Release-v1.0.27.1.patch OBS-URL: https://build.opensuse.org/request/show/176490 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=80
This commit is contained in:
Git OBS Bridge
parent
2f76079787
commit
8d81fdc2fb
30
0001-Require-alsa-lib-1.0.27.patch
Normal file
30
0001-Require-alsa-lib-1.0.27.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From 2f2576518c8336f5d64f1111f2a1a0abeda54a1f Mon Sep 17 00:00:00 2001
|
||||
From: Jordi Mallach <jordi@debian.org>
|
||||
Date: Fri, 17 May 2013 14:30:46 +0200
|
||||
Subject: [PATCH] Require alsa-lib 1.0.27.
|
||||
|
||||
Both aplay and speaker-test use the new snd_pcm_abort() function, which was
|
||||
introduced in alsa-lib 1.0.27.
|
||||
|
||||
Signed-off-by: Jordi Mallach <jordi@debian.org>
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
configure.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 39f2d0d..0e43327 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -32,7 +32,7 @@ AC_PROG_MKDIR_P
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_SED
|
||||
PKG_PROG_PKG_CONFIG
|
||||
-AM_PATH_ALSA(1.0.24)
|
||||
+AM_PATH_ALSA(1.0.27)
|
||||
if test "x$enable_alsatest" = "xyes"; then
|
||||
AC_CHECK_FUNC([snd_ctl_elem_add_enumerated],
|
||||
, [AC_ERROR([No user enum control support in alsa-lib])])
|
||||
--
|
||||
1.8.2.3
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 3616b1fe3ca603832b2f88abeb722cba2f0dde7e Mon Sep 17 00:00:00 2001
|
||||
From: Takashi Iwai <tiwai@suse.de>
|
||||
Date: Mon, 15 Apr 2013 11:20:41 +0200
|
||||
Subject: [PATCH] alsactl: Fix a typo in systemd alsa-restore.service
|
||||
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
alsactl/alsa-restore.service.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in
|
||||
index ab3c30d..245a439 100644
|
||||
--- a/alsactl/alsa-restore.service.in
|
||||
+++ b/alsactl/alsa-restore.service.in
|
||||
@@ -12,6 +12,6 @@ Before=shutdown.target
|
||||
Conflicts=shutdown.target
|
||||
|
||||
[Service]
|
||||
-Type=oneshop
|
||||
+Type=oneshot
|
||||
ExecStart=-@sbindir@/alsactl restore
|
||||
StandardOutput=syslog
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 95788fea25c1a59985828d4b91af0772d077600b Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Mon, 15 Apr 2013 14:44:13 +0200
|
||||
Subject: [PATCH 1/1] 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>
|
||||
---
|
||||
alsactl/lock.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
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)
|
||||
--
|
||||
1.7.11.4
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From b4f34ac26037c10ac51c4bb29203500165848977 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Wed, 17 Apr 2013 08:34:34 +0200
|
||||
Subject: [PATCH] arecord: add a missing break to the capture loop
|
||||
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
aplay/aplay.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
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
|
||||
*/
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
3
alsa-utils-1.0.27.1.tar.bz2
Normal file
3
alsa-utils-1.0.27.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3de65a2fae0ce679027be24cf477935d901038fa8bf7056130ea368e449a9350
|
||||
size 1142802
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6f76cd77341ceb22949c4fb9d4df145483f56baa899f0621d617b8df96a45aef
|
||||
size 1142833
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 23 15:44:23 CEST 2013 - tiwai@suse.de
|
||||
|
||||
- Bump to version 1.0.27.1, including previous fixes
|
||||
- Removed requirement of libudev-devel, as the superfluous rules
|
||||
file is dropped in 1.0.27.1.
|
||||
- Backport upstream fix:
|
||||
0001-Release-v1.0.27.1.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 18 18:39:38 CEST 2013 - tiwai@suse.de
|
||||
|
||||
|
||||
@ -28,23 +28,15 @@ BuildRequires: systemd
|
||||
%define use_systemd 0
|
||||
%define use_varlib 0
|
||||
%endif
|
||||
%if %suse_version > 1200
|
||||
%define _udevdir %(pkg-config --variable=udevdir udev)
|
||||
%else
|
||||
%define _udevdir /lib/udev
|
||||
%endif
|
||||
|
||||
Name: alsa-utils
|
||||
BuildRequires: alsa-devel
|
||||
BuildRequires: automake
|
||||
BuildRequires: libsamplerate-devel
|
||||
%if %suse_version > 1200
|
||||
BuildRequires: libudev-devel
|
||||
%endif
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: xmlto
|
||||
%define package_version 1.0.27
|
||||
%define package_version 1.0.27.1
|
||||
Provides: alsa-conf
|
||||
Requires: alsa
|
||||
Requires: dialog
|
||||
@ -52,15 +44,13 @@ Requires: pciutils
|
||||
Summary: Advanced Linux Sound Architecture Utilities
|
||||
License: GPL-2.0+
|
||||
Group: Productivity/Multimedia/Sound/Players
|
||||
Version: 1.0.27
|
||||
Version: 1.0.27.1
|
||||
Release: 0
|
||||
Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{package_version}.tar.bz2
|
||||
Source1: 01beep.conf
|
||||
# Patch: alsa-utils-git-fixes.diff
|
||||
# upstream fix patches
|
||||
Patch1: 0001-alsactl-Fix-a-typo-in-systemd-alsa-restore.service.patch
|
||||
Patch2: 0002-alsactl-Fix-the-string-size-for-the-lock-file-contents.patch
|
||||
Patch3: 0003-arecord-add-a-missing-break-to-the-capture-loop.patch
|
||||
Patch1: 0001-Require-alsa-lib-1.0.27.patch
|
||||
#
|
||||
Patch99: alsa-utils-gettext-version-removal.diff
|
||||
Url: http://www.alsa-project.org/
|
||||
@ -77,8 +67,6 @@ sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am
|
||||
# rm -f po/Makefile* po/*.gmo po/*.pot po/*.header po/stamp-*
|
||||
# patch -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
#
|
||||
%if %suse_version < 1020
|
||||
%patch99 -p1
|
||||
@ -100,7 +88,6 @@ opts="$opts --with-asound-state-dir=/etc"
|
||||
%if %suse_version < 1030
|
||||
opts="$opts --disable-xmlto"
|
||||
%endif
|
||||
opts="$opts --with-udev-rules-dir=%{_udevdir}/rules.d"
|
||||
%configure --with-curses=ncursesw $opts
|
||||
make %{?_smp_mflags}
|
||||
|
||||
@ -130,7 +117,6 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/alsa
|
||||
%{_sbindir}/*
|
||||
%{_datadir}/sounds/alsa
|
||||
%{_datadir}/alsa
|
||||
%{_udevdir}
|
||||
%if %use_systemd
|
||||
%{_unitdir}/*.service
|
||||
%{_unitdir}/basic.target.wants/alsa-state.service
|
||||
|
||||
Loading…
Reference in New Issue
Block a user