summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-11-21 18:00:58 +0100
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-11-21 18:04:22 +0100
commite10858075ced78ef88fee94bd80f5cd4ec631441 (patch)
tree3c9bc0c26a138484be5443716d157090444bcb9e /package
parentf175d45b4c350905956688e2bd40cd9f27f9026e (diff)
alsa-lib: allow to build for noMMU targets, patches from Buildroot
Diffstat (limited to 'package')
-rw-r--r--package/alsa-lib/Makefile2
-rw-r--r--package/alsa-lib/patches/patch-configure_ac13
-rw-r--r--package/alsa-lib/patches/patch-include_pcm_h6
-rw-r--r--package/alsa-lib/patches/patch-src_pcm_pcm_direct_c25
4 files changed, 39 insertions, 7 deletions
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 009271aa1..46d54327c 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= alsa-lib
PKG_VERSION:= 1.0.29
-PKG_RELEASE:= 4
+PKG_RELEASE:= 5
PKG_HASH:= 73043c35eb9636be0f4af6a240235c213f12a25feb1f04aeeac8cb7e30fcbdd0
PKG_DESCR:= sound library
PKG_SECTION:= libs/audio
diff --git a/package/alsa-lib/patches/patch-configure_ac b/package/alsa-lib/patches/patch-configure_ac
index 631869f5c..c9e7cfbf6 100644
--- a/package/alsa-lib/patches/patch-configure_ac
+++ b/package/alsa-lib/patches/patch-configure_ac
@@ -1,6 +1,13 @@
---- alsa-lib-1.0.28.orig/configure.ac 2014-06-17 14:34:19.000000000 +0200
-+++ alsa-lib-1.0.28/configure.ac 2014-08-19 21:19:11.000000000 +0200
-@@ -72,16 +72,6 @@ AC_SUBST(LIBTOOL_VERSION_INFO)
+--- alsa-lib-1.0.29.orig/configure.ac 2015-02-26 13:34:52.000000000 +0100
++++ alsa-lib-1.0.29/configure.ac 2016-11-20 18:20:58.456540169 +0100
+@@ -67,21 +67,13 @@ dnl Checks for library functions.
+ AC_PROG_GCC_TRADITIONAL
+ AC_CHECK_FUNCS([uselocale])
+
++AC_CHECK_FUNC([fork])
++
+ SAVE_LIBRARY_VERSION
+ AC_SUBST(LIBTOOL_VERSION_INFO)
test "x$prefix" = xNONE && prefix=$ac_default_prefix
diff --git a/package/alsa-lib/patches/patch-include_pcm_h b/package/alsa-lib/patches/patch-include_pcm_h
index 6fe117463..a82c1a7b2 100644
--- a/package/alsa-lib/patches/patch-include_pcm_h
+++ b/package/alsa-lib/patches/patch-include_pcm_h
@@ -1,7 +1,7 @@
* added idea/patch from https://github.com/rofl0r/sabotage
---- alsa-lib-1.0.27.2.orig/include/pcm.h 2013-07-08 14:31:36.000000000 +0200
-+++ alsa-lib-1.0.27.2/include/pcm.h 2013-09-16 17:04:30.000000000 +0200
+--- alsa-lib-1.0.29.orig/include/pcm.h 2015-02-26 13:34:52.000000000 +0100
++++ alsa-lib-1.0.29/include/pcm.h 2016-11-20 18:14:09.708758715 +0100
@@ -33,6 +33,8 @@
extern "C" {
#endif
@@ -11,7 +11,7 @@
/**
* \defgroup PCM PCM Interface
* See the \ref pcm page for more details.
-@@ -1048,10 +1050,10 @@ int snd_pcm_format_width(snd_pcm_format_
+@@ -1063,10 +1065,10 @@ int snd_pcm_format_width(snd_pcm_format_
int snd_pcm_format_physical_width(snd_pcm_format_t format); /* in bits */
snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd, int big_endian);
ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples);
diff --git a/package/alsa-lib/patches/patch-src_pcm_pcm_direct_c b/package/alsa-lib/patches/patch-src_pcm_pcm_direct_c
new file mode 100644
index 000000000..0ca0e211f
--- /dev/null
+++ b/package/alsa-lib/patches/patch-src_pcm_pcm_direct_c
@@ -0,0 +1,25 @@
+--- alsa-lib-1.0.29.orig/src/pcm/pcm_direct.c 2015-02-26 13:34:52.000000000 +0100
++++ alsa-lib-1.0.29/src/pcm/pcm_direct.c 2016-11-20 18:20:58.456540169 +0100
+@@ -424,13 +424,21 @@ int snd_pcm_direct_server_create(snd_pcm
+ close(dmix->server_fd);
+ return ret;
+ }
+-
++
++#ifdef HAVE_FORK
+ ret = fork();
++#else
++ ret = vfork();
++#endif
+ if (ret < 0) {
+ close(dmix->server_fd);
+ return ret;
+ } else if (ret == 0) {
++#ifdef HAVE_FORK
+ ret = fork();
++#else
++ ret = vfork();
++#endif
+ if (ret == 0)
+ server_job(dmix);
+ _exit(EXIT_SUCCESS);