diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2018-08-27 21:16:39 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-29 10:42:48 +0100 |
commit | 855e73c613620a188984db69ad780add7bc04eb4 (patch) | |
tree | e6d8900ddf274ecb9f074988ab01958f67f03958 /meta/recipes-multimedia/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch | |
parent | a53b5dc5eba5a56c776cc5c23f909fc7a854ee74 (diff) | |
download | poky-855e73c613620a188984db69ad780add7bc04eb4.tar.gz |
pulseaudio: 11.1 -> 12.2
Release notes for 12.0:
https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/12.0/
12.1 contains a few regression fixes:
https://lists.freedesktop.org/archives/pulseaudio-discuss/2018-July/030259.html
12.2 is just a fixup for the configure script brokenness in the 12.1 tarball.
qpaeq changed license from AGPL to LGPL, so now there's no AGPL licensed
code any more. This removes the excuse to not enable fftw support (i.e.
module-equalizer-sink and qpaeq). I'll enable fftw in a separate patch.
There's a new gsettings module that should be enabled, but I'll do
that in a separate patch. It's not particularly important, because the
module is only used by the paprefs GUI application that doesn't seem to
be packaged for OE at the moment.
Removed upstreamed patches:
0001-padsp-Make-it-compile-on-musl.patch
0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch
License-Update: qpaeq changed license from AGPL to LGPL:
https://gitlab.freedesktop.org/pulseaudio/pulseaudio/commit/61217528a1cb5043ca3fa1051a73ad3268cfb3d8
(From OE-Core rev: 9bc3a8ec4a007fe75dc8f44faf6357517b1fb020)
Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch | 66 |
1 files changed, 0 insertions, 66 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 | |||