pool/alsa
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 500331 from multimedia:libs

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/500331
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa?expand=0&rev=177
This commit is contained in:
Dominique Leuenberger 2017-06-03 23:48:49 +00:00 committed by Git OBS Bridge
commit 835a14b98a
6 changed files with 21 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
0001-build-Define-__USE_UNIX98-for-old-glibc.patch
View File

@ -1,28 +0,0 @@
From 3cf3fbebddad4e58efbd03e4d2217f0a0d07a2ed Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 16 May 2017 16:17:57 +0200
Subject: [PATCH] build: Define __USE_UNIX98 for old glibc
Otherwise PTHREAD_MUTEX_RECURSIVE isn't defined and we get an error
with old glibc.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
src/pcm/pcm_local.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h
index 32e6dcdf6fcd..e4f652187c49 100644
--- a/src/pcm/pcm_local.h
+++ b/src/pcm/pcm_local.h
@@ -35,6 +35,7 @@
#include "local.h"
#ifdef THREAD_SAFE_API
+#define __USE_UNIX98 1 /* for old glibc */
#include <pthread.h>
#endif
--
2.13.0

68
0098-dmix-Workaround-for-binary-incompatibility.patch
View File

@ -1,68 +0,0 @@
From: Takashi Iwai <tiwai@suse.de>
Subject: Workaround for binary incompatibility of dmix with old libs
Patch-mainline: Never
References: boo#1033080
Put the new field "recoveries" to the unused field "s.xfer_align" to
keep the dmix working with the old lib somehow...
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
src/pcm/pcm_direct.c | 8 ++++----
src/pcm/pcm_direct.h | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
--- a/src/pcm/pcm_direct.c
+++ b/src/pcm/pcm_direct.c
@@ -615,7 +615,7 @@ int snd_pcm_direct_slave_recover(snd_pcm
}
return ret;
}
- direct->shmptr->recoveries++;
+ direct->shmptr->s.recoveries++;
semerr = snd_pcm_direct_semaphore_up(direct,
DIRECT_IPC_SEM_CLIENT);
if (semerr < 0) {
@@ -631,11 +631,11 @@ int snd_pcm_direct_slave_recover(snd_pcm
*/
int snd_pcm_direct_client_chk_xrun(snd_pcm_direct_t *direct, snd_pcm_t *pcm)
{
- if (direct->shmptr->recoveries != direct->recoveries) {
+ if (direct->shmptr->s.recoveries != direct->recoveries) {
/* no matter how many xruns we missed -
* so don't increment but just update to actual counter
*/
- direct->recoveries = direct->shmptr->recoveries;
+ direct->recoveries = direct->shmptr->s.recoveries;
pcm->fast_ops->drop(pcm);
/* trigger_tstamp update is missing in drop callbacks */
gettimestamp(&direct->trigger_tstamp, pcm->tstamp_type);
@@ -1539,7 +1539,7 @@ int snd_pcm_direct_open_secondary_client
dmix->slave_buffer_size = spcm->buffer_size;
dmix->slave_period_size = dmix->shmptr->s.period_size;
dmix->slave_boundary = spcm->boundary;
- dmix->recoveries = dmix->shmptr->recoveries;
+ dmix->recoveries = dmix->shmptr->s.recoveries;
ret = snd_pcm_mmap(spcm);
if (ret < 0) {
--- a/src/pcm/pcm_direct.h
+++ b/src/pcm/pcm_direct.h
@@ -66,7 +66,6 @@ typedef struct {
char socket_name[256]; /* name of communication socket */
snd_pcm_type_t type; /* PCM type (currently only hw) */
int use_server;
- unsigned int recoveries; /* no of executed recoveries on slave*/
struct {
unsigned int format;
snd_interval_t rate;
@@ -95,7 +94,7 @@ typedef struct {
unsigned int stop_threshold;
unsigned int silence_threshold;
unsigned int silence_size;
- unsigned int xfer_align; /* not used */
+ unsigned int recoveries; /* no of executed recoveries on slave*/
unsigned long long boundary;
unsigned int info;
unsigned int msbits;

3
alsa-lib-1.1.4.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:91bb870c14d1c7c269213285eeed874fa3d28112077db061a3af8010d0885b76
size 974584

3
alsa-lib-1.1.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:82f50a09487079755d93e4c9384912196995bade6280bce9bfdcabf094bfb515
size 973825

16
alsa.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Jun 1 09:58:27 CEST 2017 - tiwai@suse.de
- Update to alsa-lib 1.1.4.1: it's a bug-fix release, including
all previous patches:
* pcm: dmix: Fix the inconsistent PCM state
* pcm: dshare: Call snd_pcm_dshare_state() directly
* pcm: dmix: Workaround for binary incompatibility
* test: add a test for list operation to user-defined element sets
* conf: Check the availability of PTHREAD_MUTEX_RECURSIVE
* build: Define __USE_UNIX98 for old glibc
- Obsoleted patches:
0001-build-Define-__USE_UNIX98-for-old-glibc.patch
0098-dmix-Workaround-for-binary-incompatibility.patch
-------------------------------------------------------------------
Tue May 16 15:32:13 CEST 2017 - tiwai@suse.de

8
alsa.spec
View File

@ -16,12 +16,12 @@
#
%define package_version 1.1.4
%define package_version 1.1.4.1
%if 0%{?suse_version} < 1200
%define _udevrulesdir /lib/udev/rules.d/
%endif
Name: alsa
Version: 1.1.4
Version: 1.1.4.1
Release: 0
Summary: Advanced Linux Sound Architecture
License: LGPL-2.1+
@ -45,9 +45,7 @@ Source34: alsa-init.sh
Source40: 50-alsa.conf
Source41: install-snd-module
# upstream fixes
Patch1: 0001-build-Define-__USE_UNIX98-for-old-glibc.patch
# rest suse patches
Patch98: 0098-dmix-Workaround-for-binary-incompatibility.patch
BuildRequires: doxygen
BuildRequires: libtool
BuildRequires: pkgconfig
@ -110,8 +108,6 @@ Architecture.
%prep
%setup -q -n alsa-lib-%{package_version}
%patch1 -p1
%patch98 -p1
%build
export AUTOMAKE_JOBS="%{?_smp_mflags}"