diff options
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch | 70 | ||||
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb | 1 |
2 files changed, 71 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch new file mode 100644 index 0000000000..85559950e8 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch | |||
| @@ -0,0 +1,70 @@ | |||
| 1 | From f6ab3c3aa7a1841c8add04828029356d2a8c88e7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 6 Apr 2015 21:56:31 -0700 | ||
| 4 | Subject: [PATCH] padsp: Make it compile on musl | ||
| 5 | |||
| 6 | break assumptions on glibc and there is no stat64 on non | ||
| 7 | glibc C libraries | ||
| 8 | |||
| 9 | See pulseaudio bug | ||
| 10 | |||
| 11 | https://bugs.freedesktop.org/show_bug.cgi?id=85319 | ||
| 12 | |||
| 13 | Upstream-Status: Pending | ||
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 15 | --- | ||
| 16 | src/utils/padsp.c | 15 +++++++++------ | ||
| 17 | 1 file changed, 9 insertions(+), 6 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/src/utils/padsp.c b/src/utils/padsp.c | ||
| 20 | index e61373c..684721a 100644 | ||
| 21 | --- a/src/utils/padsp.c | ||
| 22 | +++ b/src/utils/padsp.c | ||
| 23 | @@ -2368,7 +2368,7 @@ fail: | ||
| 24 | return ret; | ||
| 25 | } | ||
| 26 | |||
| 27 | -#ifdef sun | ||
| 28 | +#ifndef __GLIBC__ | ||
| 29 | int ioctl(int fd, int request, ...) { | ||
| 30 | #else | ||
| 31 | int ioctl(int fd, unsigned long request, ...) { | ||
| 32 | @@ -2508,10 +2508,13 @@ int stat(const char *pathname, struct stat *buf) { | ||
| 33 | |||
| 34 | return 0; | ||
| 35 | } | ||
| 36 | - | ||
| 37 | #ifdef HAVE_OPEN64 | ||
| 38 | - | ||
| 39 | +#undef stat64 | ||
| 40 | +#ifdef __GLIBC__ | ||
| 41 | int stat64(const char *pathname, struct stat64 *buf) { | ||
| 42 | +#else | ||
| 43 | +int stat64(const char *pathname, struct stat *buf) { | ||
| 44 | +#endif | ||
| 45 | struct stat oldbuf; | ||
| 46 | int ret; | ||
| 47 | |||
| 48 | @@ -2544,7 +2547,7 @@ int stat64(const char *pathname, struct stat64 *buf) { | ||
| 49 | |||
| 50 | return 0; | ||
| 51 | } | ||
| 52 | - | ||
| 53 | +#undef open64 | ||
| 54 | int open64(const char *filename, int flags, ...) { | ||
| 55 | va_list args; | ||
| 56 | mode_t mode = 0; | ||
| 57 | @@ -2670,8 +2673,8 @@ FILE* fopen(const char *filename, const char *mode) { | ||
| 58 | } | ||
| 59 | |||
| 60 | #ifdef HAVE_OPEN64 | ||
| 61 | - | ||
| 62 | -FILE *fopen64(const char *filename, const char *mode) { | ||
| 63 | +#undef fopen64 | ||
| 64 | +FILE *fopen64(const char *__restrict filename, const char *__restrict mode) { | ||
| 65 | |||
| 66 | debug(DEBUG_LEVEL_VERBOSE, __FILE__": fopen64(%s)\n", filename?filename:"NULL"); | ||
| 67 | |||
| 68 | -- | ||
| 69 | 2.1.4 | ||
| 70 | |||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb index 91027bf654..fb33c7c85d 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_6.0.bb | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | require pulseaudio.inc | 1 | require pulseaudio.inc |
| 2 | 2 | ||
| 3 | SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ | 3 | SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ |
| 4 | file://0001-padsp-Make-it-compile-on-musl.patch \ | ||
| 4 | file://volatiles.04_pulse \ | 5 | file://volatiles.04_pulse \ |
| 5 | " | 6 | " |
| 6 | SRC_URI[md5sum] = "b691e83b7434c678dffacfa3a027750e" | 7 | SRC_URI[md5sum] = "b691e83b7434c678dffacfa3a027750e" |
