summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-02 13:06:38 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-02 13:06:38 +0200
commit9c99c075a925519eb073744d9cbdaee596abb4ab (patch)
tree1a1ba45a06c2db586c4da69239ea8779f75fedc9
parent2fee45f4280aa07fe23dc6dc51039ac0f2a9f825 (diff)
remove musl patch, breaks alsamixer on eglibc/glibc systems with futex deadlock
-rw-r--r--package/alsa-lib/Makefile2
-rw-r--r--package/alsa-lib/patches/patch-src_conf_c13
2 files changed, 1 insertions, 14 deletions
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index fa01868b7..ed9e41012 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:= 2
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
deleted file mode 100644
index a6f296614..000000000
--- a/package/alsa-lib/patches/patch-src_conf_c
+++ /dev/null
@@ -1,13 +0,0 @@
-* added idea/patch from https://github.com/rofl0r/sabotage
-
---- 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>
-
- #ifdef HAVE_LIBPTHREAD
- static pthread_mutex_t snd_config_update_mutex =
-- PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+ {{{1,0,0,0,0,0,0,0,0,0}}};
- #endif
-
- struct _snd_config {