diff options
| -rw-r--r-- | package/alsa-lib/Makefile | 7 | ||||
| -rw-r--r-- | package/alsa-lib/patches/patch-include_local_h | 22 | ||||
| -rw-r--r-- | package/alsa-lib/patches/patch-src_compat_hsearch_r_c | 15 | ||||
| -rw-r--r-- | package/alsa-lib/patches/patch-src_conf_c | 35 |
4 files changed, 3 insertions, 76 deletions
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index 29b50f18a..22fb2aa42 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -4,12 +4,11 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= alsa-lib -PKG_VERSION:= 1.0.27.2 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 69129a7c37697f81ac092335e9fa452b +PKG_VERSION:= 1.0.28 +PKG_RELEASE:= 1 +PKG_MD5SUM:= c9e21b88a2b3e6e12ea7ba0f3b271fc3 PKG_DESCR:= sound library PKG_SECTION:= libs/audio -PKG_BUILDDEP:= alsa-lib-host PKG_URL:= http://www.alsa-project.org/ PKG_SITES:= ftp://ftp.alsa-project.org/pub/lib/ PKG_OPTS:= dev diff --git a/package/alsa-lib/patches/patch-include_local_h b/package/alsa-lib/patches/patch-include_local_h deleted file mode 100644 index 5897edf59..000000000 --- a/package/alsa-lib/patches/patch-include_local_h +++ /dev/null @@ -1,22 +0,0 @@ -* added idea/patch from https://github.com/rofl0r/sabotage - ---- alsa-lib-1.0.27.2.orig/include/local.h 2013-07-08 14:31:36.000000000 +0200 -+++ alsa-lib-1.0.27.2/include/local.h 2013-09-17 09:53:17.000000000 +0200 -@@ -30,7 +30,7 @@ - #include <assert.h> - #include <endian.h> - #include <stdarg.h> --#include <sys/poll.h> -+#include <poll.h> - #include <errno.h> - #include <linux/ioctl.h> - -@@ -116,7 +116,7 @@ - /* kill and replace kernel-specific types */ - #define __user - #define __force --#define __kernel_off_t off_t -+//#define __kernel_off_t off_t - - #include <sound/asound.h> - diff --git a/package/alsa-lib/patches/patch-src_compat_hsearch_r_c b/package/alsa-lib/patches/patch-src_compat_hsearch_r_c deleted file mode 100644 index bb2bef0b5..000000000 --- a/package/alsa-lib/patches/patch-src_compat_hsearch_r_c +++ /dev/null @@ -1,15 +0,0 @@ -* added idea/patch from https://github.com/rofl0r/sabotage - and https://bitbucket.org/GregorR/musl-pkgsrc-patches - ---- alsa-lib-1.0.27.2.orig/src/compat/hsearch_r.c 2013-07-08 14:31:36.000000000 +0200 -+++ alsa-lib-1.0.27.2/src/compat/hsearch_r.c 2013-09-17 18:14:02.000000000 +0200 -@@ -1,3 +1,4 @@ -+#if 0 - /* Copyright (C) 1993, 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1993. -@@ -234,3 +235,4 @@ hsearch_r (item, action, retval, htab) - *retval = NULL; - return 0; - } -+#endif diff --git a/package/alsa-lib/patches/patch-src_conf_c b/package/alsa-lib/patches/patch-src_conf_c deleted file mode 100644 index f3c1e70bd..000000000 --- a/package/alsa-lib/patches/patch-src_conf_c +++ /dev/null @@ -1,35 +0,0 @@ -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-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 = -- PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -+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); - } - |