diff options
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio/pulseaudio')
2 files changed, 0 insertions, 136 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch deleted file mode 100644 index 0391f3785b..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | From 0cb66c0c5aafd48b63a755860746e70afb332c8d Mon Sep 17 00:00:00 2001 | ||
2 | From: Tanu Kaskinen <tanuk@iki.fi> | ||
3 | Date: Wed, 24 Jan 2018 03:51:49 +0200 | ||
4 | Subject: [PATCH] memfd-wrappers: only define memfd_create() if not already | ||
5 | defined | ||
6 | |||
7 | glibc 2.27 is to be released soon, and it will provide memfd_create(). | ||
8 | If glibc provides the function, we must not define it ourselves, | ||
9 | otherwise building fails due to conflict between the two implementations | ||
10 | of the same function. | ||
11 | |||
12 | BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=104733 | ||
13 | --- | ||
14 | Upstream-Status: Submitted [https://bugs.freedesktop.org/attachment.cgi?id=136927] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | |||
17 | configure.ac | 3 +++ | ||
18 | src/pulsecore/memfd-wrappers.h | 7 ++++--- | ||
19 | 2 files changed, 7 insertions(+), 3 deletions(-) | ||
20 | |||
21 | diff --git a/configure.ac b/configure.ac | ||
22 | index 77b5ff5..3a71fd8 100644 | ||
23 | --- a/configure.ac | ||
24 | +++ b/configure.ac | ||
25 | @@ -607,6 +607,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && test "x$HAVE_MEMFD" = "x0"], | ||
26 | [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory. | ||
27 | *** Use linux v3.17 or higher for such a feature.])]) | ||
28 | |||
29 | +AS_IF([test "x$HAVE_MEMFD" = "x1"], | ||
30 | + AC_CHECK_FUNCS([memfd_create])) | ||
31 | + | ||
32 | AC_SUBST(HAVE_MEMFD) | ||
33 | AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1]) | ||
34 | AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.])) | ||
35 | diff --git a/src/pulsecore/memfd-wrappers.h b/src/pulsecore/memfd-wrappers.h | ||
36 | index 3bed9b2..c7aadfd 100644 | ||
37 | --- a/src/pulsecore/memfd-wrappers.h | ||
38 | +++ b/src/pulsecore/memfd-wrappers.h | ||
39 | @@ -20,13 +20,14 @@ | ||
40 | License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. | ||
41 | ***/ | ||
42 | |||
43 | -#ifdef HAVE_MEMFD | ||
44 | +#if defined(HAVE_MEMFD) && !defined(HAVE_MEMFD_CREATE) | ||
45 | |||
46 | #include <sys/syscall.h> | ||
47 | #include <fcntl.h> | ||
48 | |||
49 | /* | ||
50 | - * No glibc wrappers exist for memfd_create(2), so provide our own. | ||
51 | + * Before glibc version 2.27 there was no wrapper for memfd_create(2), | ||
52 | + * so we have to provide our own. | ||
53 | * | ||
54 | * Also define memfd fcntl sealing macros. While they are already | ||
55 | * defined in the kernel header file <linux/fcntl.h>, that file as | ||
56 | @@ -63,6 +64,6 @@ static inline int memfd_create(const char *name, unsigned int flags) { | ||
57 | #define F_SEAL_WRITE 0x0008 /* prevent writes */ | ||
58 | #endif | ||
59 | |||
60 | -#endif /* HAVE_MEMFD */ | ||
61 | +#endif /* HAVE_MEMFD && !HAVE_MEMFD_CREATE */ | ||
62 | |||
63 | #endif | ||
64 | -- | ||
65 | 2.16.1 | ||
66 | |||
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 deleted file mode 100644 index 85559950e8..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
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 | |||