diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio')
2 files changed, 66 insertions, 59 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch b/import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch new file mode 100644 index 000000000..0391f3785 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch @@ -0,0 +1,66 @@ +From 0cb66c0c5aafd48b63a755860746e70afb332c8d Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen <tanuk@iki.fi> +Date: Wed, 24 Jan 2018 03:51:49 +0200 +Subject: [PATCH] memfd-wrappers: only define memfd_create() if not already + defined + +glibc 2.27 is to be released soon, and it will provide memfd_create(). +If glibc provides the function, we must not define it ourselves, +otherwise building fails due to conflict between the two implementations +of the same function. + +BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=104733 +--- +Upstream-Status: Submitted [https://bugs.freedesktop.org/attachment.cgi?id=136927] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + + configure.ac | 3 +++ + src/pulsecore/memfd-wrappers.h | 7 ++++--- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 77b5ff5..3a71fd8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -607,6 +607,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && test "x$HAVE_MEMFD" = "x0"], + [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory. + *** Use linux v3.17 or higher for such a feature.])]) + ++AS_IF([test "x$HAVE_MEMFD" = "x1"], ++ AC_CHECK_FUNCS([memfd_create])) ++ + AC_SUBST(HAVE_MEMFD) + AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1]) + AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.])) +diff --git a/src/pulsecore/memfd-wrappers.h b/src/pulsecore/memfd-wrappers.h +index 3bed9b2..c7aadfd 100644 +--- a/src/pulsecore/memfd-wrappers.h ++++ b/src/pulsecore/memfd-wrappers.h +@@ -20,13 +20,14 @@ + License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. + ***/ + +-#ifdef HAVE_MEMFD ++#if defined(HAVE_MEMFD) && !defined(HAVE_MEMFD_CREATE) + + #include <sys/syscall.h> + #include <fcntl.h> + + /* +- * No glibc wrappers exist for memfd_create(2), so provide our own. ++ * Before glibc version 2.27 there was no wrapper for memfd_create(2), ++ * so we have to provide our own. + * + * Also define memfd fcntl sealing macros. While they are already + * defined in the kernel header file <linux/fcntl.h>, that file as +@@ -63,6 +64,6 @@ static inline int memfd_create(const char *name, unsigned int flags) { + #define F_SEAL_WRITE 0x0008 /* prevent writes */ + #endif + +-#endif /* HAVE_MEMFD */ ++#endif /* HAVE_MEMFD && !HAVE_MEMFD_CREATE */ + + #endif +-- +2.16.1 + diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio-discuss-iochannel-don-t-use-variable-length-array-in-union.patch b/import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio-discuss-iochannel-don-t-use-variable-length-array-in-union.patch deleted file mode 100644 index 11b56abd2..000000000 --- a/import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio-discuss-iochannel-don-t-use-variable-length-array-in-union.patch +++ /dev/null @@ -1,59 +0,0 @@ -From patchwork Sat Feb 4 12:19:01 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [pulseaudio-discuss] iochannel: don't use variable length array in - union -From: Tanu Kaskinen <tanuk@iki.fi> -X-Patchwork-Id: 136885 -Message-Id: <20170204121901.17428-1-tanuk@iki.fi> -To: pulseaudio-discuss@lists.freedesktop.org -Date: Sat, 4 Feb 2017 14:19:01 +0200 - -Clang didn't like the variable length array: - -pulsecore/iochannel.c:358:17: error: fields must have a constant size: -'variable length array in structure' extension will never be supported - uint8_t data[CMSG_SPACE(sizeof(int) * nfd)]; - ^ - -Commit 451d1d6762 introduced the variable length array in order to have -the correct value in msg_controllen. This patch reverts that commit and -uses a different way to achieve the same goal. - -BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=99458 ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj <raj.khem@gmail.com> - - src/pulsecore/iochannel.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/pulsecore/iochannel.c b/src/pulsecore/iochannel.c -index 8ace297ff..897337522 100644 ---- a/src/pulsecore/iochannel.c -+++ b/src/pulsecore/iochannel.c -@@ -355,7 +355,7 @@ ssize_t pa_iochannel_write_with_fds(pa_iochannel*io, const void*data, size_t l, - struct iovec iov; - union { - struct cmsghdr hdr; -- uint8_t data[CMSG_SPACE(sizeof(int) * nfd)]; -+ uint8_t data[CMSG_SPACE(sizeof(int) * MAX_ANCIL_DATA_FDS)]; - } cmsg; - - pa_assert(io); -@@ -382,7 +382,13 @@ ssize_t pa_iochannel_write_with_fds(pa_iochannel*io, const void*data, size_t l, - mh.msg_iov = &iov; - mh.msg_iovlen = 1; - mh.msg_control = &cmsg; -- mh.msg_controllen = sizeof(cmsg); -+ -+ /* If we followed the example on the cmsg man page, we'd use -+ * sizeof(cmsg.data) here, but if nfd < MAX_ANCIL_DATA_FDS, then the data -+ * buffer is larger than needed, and the kernel doesn't like it if we set -+ * msg_controllen to a larger than necessary value. The commit message for -+ * commit 451d1d6762 contains a longer explanation. */ -+ mh.msg_controllen = CMSG_SPACE(sizeof(int) * nfd); - - if ((r = sendmsg(io->ofd, &mh, MSG_NOSIGNAL)) >= 0) { - io->writable = io->hungup = false; |