summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2017-11-27 18:39:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-10 22:45:18 +0000
commit7e1ee95d1aca9320090912e88a606fb4815a8d08 (patch)
tree0561added34ddd1623a9adf4bf602ac91a444a00
parent10865f77b97ef023eed63e2c459b57bc6f4ba279 (diff)
downloadpoky-7e1ee95d1aca9320090912e88a606fb4815a8d08.tar.gz
pulseaudio: 10.0 -> 11.1
11.0 release notes: https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/11.0/ Additional changes in 11.1: * Fix a crash in filter modules related to flat volumes and volume sharing * Fix a crash when the bluetooth adapter reports weird MTU size * Disable bluetooth MTU autodetection by default * Add mixer handling back for hardware that doesn't have any alsa-lib configuration * Prioritize USB devices over built-in sound cards (11.0 was supposed to have this feature, but the implementation turned out to be incomplete) Dropped backported patch: pulseaudio-discuss-iochannel-don-t-use-variable-length-array-in-union.patch (From OE-Core rev: c6d7d89d9a6bbe2de62fa1a91b833bf1c03693ac) Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio-discuss-iochannel-don-t-use-variable-length-array-in-union.patch59
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb (renamed from meta/recipes-multimedia/pulseaudio/pulseaudio_10.0.bb)5
2 files changed, 2 insertions, 62 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio-discuss-iochannel-don-t-use-variable-length-array-in-union.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio-discuss-iochannel-don-t-use-variable-length-array-in-union.patch
deleted file mode 100644
index 11b56abd26..0000000000
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio-discuss-iochannel-don-t-use-variable-length-array-in-union.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1From patchwork Sat Feb 4 12:19:01 2017
2Content-Type: text/plain; charset="utf-8"
3MIME-Version: 1.0
4Content-Transfer-Encoding: 7bit
5Subject: [pulseaudio-discuss] iochannel: don't use variable length array in
6 union
7From: Tanu Kaskinen <tanuk@iki.fi>
8X-Patchwork-Id: 136885
9Message-Id: <20170204121901.17428-1-tanuk@iki.fi>
10To: pulseaudio-discuss@lists.freedesktop.org
11Date: Sat, 4 Feb 2017 14:19:01 +0200
12
13Clang didn't like the variable length array:
14
15pulsecore/iochannel.c:358:17: error: fields must have a constant size:
16'variable length array in structure' extension will never be supported
17 uint8_t data[CMSG_SPACE(sizeof(int) * nfd)];
18 ^
19
20Commit 451d1d6762 introduced the variable length array in order to have
21the correct value in msg_controllen. This patch reverts that commit and
22uses a different way to achieve the same goal.
23
24BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=99458
25---
26Upstream-Status: Backport
27Signed-off-by: Khem Raj <raj.khem@gmail.com>
28
29 src/pulsecore/iochannel.c | 10 ++++++++--
30 1 file changed, 8 insertions(+), 2 deletions(-)
31
32diff --git a/src/pulsecore/iochannel.c b/src/pulsecore/iochannel.c
33index 8ace297ff..897337522 100644
34--- a/src/pulsecore/iochannel.c
35+++ b/src/pulsecore/iochannel.c
36@@ -355,7 +355,7 @@ ssize_t pa_iochannel_write_with_fds(pa_iochannel*io, const void*data, size_t l,
37 struct iovec iov;
38 union {
39 struct cmsghdr hdr;
40- uint8_t data[CMSG_SPACE(sizeof(int) * nfd)];
41+ uint8_t data[CMSG_SPACE(sizeof(int) * MAX_ANCIL_DATA_FDS)];
42 } cmsg;
43
44 pa_assert(io);
45@@ -382,7 +382,13 @@ ssize_t pa_iochannel_write_with_fds(pa_iochannel*io, const void*data, size_t l,
46 mh.msg_iov = &iov;
47 mh.msg_iovlen = 1;
48 mh.msg_control = &cmsg;
49- mh.msg_controllen = sizeof(cmsg);
50+
51+ /* If we followed the example on the cmsg man page, we'd use
52+ * sizeof(cmsg.data) here, but if nfd < MAX_ANCIL_DATA_FDS, then the data
53+ * buffer is larger than needed, and the kernel doesn't like it if we set
54+ * msg_controllen to a larger than necessary value. The commit message for
55+ * commit 451d1d6762 contains a longer explanation. */
56+ mh.msg_controllen = CMSG_SPACE(sizeof(int) * nfd);
57
58 if ((r = sendmsg(io->ofd, &mh, MSG_NOSIGNAL)) >= 0) {
59 io->writable = io->hungup = false;
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_10.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb
index 9a34afaa7e..a50b5a08ae 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_10.0.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb
@@ -3,11 +3,10 @@ require pulseaudio.inc
3SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ 3SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \
4 file://0001-padsp-Make-it-compile-on-musl.patch \ 4 file://0001-padsp-Make-it-compile-on-musl.patch \
5 file://0001-client-conf-Add-allow-autospawn-for-root.patch \ 5 file://0001-client-conf-Add-allow-autospawn-for-root.patch \
6 file://pulseaudio-discuss-iochannel-don-t-use-variable-length-array-in-union.patch \
7 file://volatiles.04_pulse \ 6 file://volatiles.04_pulse \
8" 7"
9SRC_URI[md5sum] = "4950d2799bf55ab91f6b7f990b7f0971" 8SRC_URI[md5sum] = "390de38231d5cdd6b43ada8939eb74f1"
10SRC_URI[sha256sum] = "a3186824de9f0d2095ded5d0d0db0405dc73133983c2fbb37291547e37462f57" 9SRC_URI[sha256sum] = "f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e"
11 10
12do_compile_prepend() { 11do_compile_prepend() {
13 mkdir -p ${S}/libltdl 12 mkdir -p ${S}/libltdl