diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-10-03 09:45:00 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-10-03 09:45:00 +0200 |
| commit | 05a7f514cca7e6858e5f5dd46cecd0c3bd6f9f71 (patch) | |
| tree | 9f67adc12bb980b4c942cdb62155d5b1c1132551 /package/alsa-lib | |
| parent | 9019d28c87b2c0382834a8af861cda4dc12e2b06 (diff) | |
| parent | 35a633529c04b797a8172d9e33d9fbb33a5777fc (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/alsa-lib')
| -rw-r--r-- | package/alsa-lib/Makefile | 2 | ||||
| -rw-r--r-- | package/alsa-lib/patches/patch-src_conf_c | 34 |
2 files changed, 29 insertions, 7 deletions
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index fa01868b7..01d5fee2e 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-lib PKG_VERSION:= 1.0.27.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 3 PKG_MD5SUM:= 69129a7c37697f81ac092335e9fa452b PKG_DESCR:= ALSA sound library PKG_SECTION:= libs diff --git a/package/alsa-lib/patches/patch-src_conf_c b/package/alsa-lib/patches/patch-src_conf_c index a6f296614..f3c1e70bd 100644 --- a/package/alsa-lib/patches/patch-src_conf_c +++ b/package/alsa-lib/patches/patch-src_conf_c @@ -1,13 +1,35 @@ -* added idea/patch from https://github.com/rofl0r/sabotage - +from alpinelinux + http://git.alpinelinux.org/cgit/aports/tree/main/alsa-lib/alsa-lib-portable-mutex.patch --- alsa-lib-1.0.27.2.orig/src/conf.c 2013-07-08 14:31:36.000000000 +0200 -+++ alsa-lib-1.0.27.2/src/conf.c 2013-09-17 18:30:14.000000000 +0200 -@@ -428,7 +428,7 @@ beginning:</P> ++++ alsa-lib-1.0.27.2/src/conf.c 2013-10-02 14:32:15.000000000 +0200 +@@ -427,8 +427,8 @@ beginning:</P> + #ifndef DOC_HIDDEN #ifdef HAVE_LIBPTHREAD - static pthread_mutex_t snd_config_update_mutex = +-static pthread_mutex_t snd_config_update_mutex = - PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -+ {{{1,0,0,0,0,0,0,0,0,0}}}; ++static pthread_mutex_t snd_config_update_mutex; ++static pthread_once_t snd_config_update_mutex_once = PTHREAD_ONCE_INIT; #endif struct _snd_config { +@@ -472,8 +472,19 @@ typedef struct { + + #ifdef HAVE_LIBPTHREAD + ++static void snd_config_init_mutex(void) ++{ ++ pthread_mutexattr_t attr; ++ ++ pthread_mutexattr_init(&attr); ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); ++ pthread_mutex_init(&snd_config_update_mutex, &attr); ++ pthread_mutexattr_destroy(&attr); ++} ++ + static inline void snd_config_lock(void) + { ++ pthread_once(&snd_config_update_mutex_once, snd_config_init_mutex); + pthread_mutex_lock(&snd_config_update_mutex); + } + |