From c6d7d89d9a6bbe2de62fa1a91b833bf1c03693ac Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Mon, 27 Nov 2017 18:39:29 +0200 Subject: 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 Signed-off-by: Tanu Kaskinen Signed-off-by: Ross Burton --- ...-don-t-use-variable-length-array-in-union.patch | 59 ---------------------- .../pulseaudio/pulseaudio_10.0.bb | 15 ------ .../pulseaudio/pulseaudio_11.1.bb | 14 +++++ 3 files changed, 14 insertions(+), 74 deletions(-) delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio-discuss-iochannel-don-t-use-variable-length-array-in-union.patch delete mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio_10.0.bb create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb 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 @@ -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 -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 - - 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; diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_10.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_10.0.bb deleted file mode 100644 index 9a34afaa7e..0000000000 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_10.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -require pulseaudio.inc - -SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ - file://0001-padsp-Make-it-compile-on-musl.patch \ - file://0001-client-conf-Add-allow-autospawn-for-root.patch \ - file://pulseaudio-discuss-iochannel-don-t-use-variable-length-array-in-union.patch \ - file://volatiles.04_pulse \ -" -SRC_URI[md5sum] = "4950d2799bf55ab91f6b7f990b7f0971" -SRC_URI[sha256sum] = "a3186824de9f0d2095ded5d0d0db0405dc73133983c2fbb37291547e37462f57" - -do_compile_prepend() { - mkdir -p ${S}/libltdl - cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl -} diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb new file mode 100644 index 0000000000..a50b5a08ae --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb @@ -0,0 +1,14 @@ +require pulseaudio.inc + +SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ + file://0001-padsp-Make-it-compile-on-musl.patch \ + file://0001-client-conf-Add-allow-autospawn-for-root.patch \ + file://volatiles.04_pulse \ +" +SRC_URI[md5sum] = "390de38231d5cdd6b43ada8939eb74f1" +SRC_URI[sha256sum] = "f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e" + +do_compile_prepend() { + mkdir -p ${S}/libltdl + cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl +} -- cgit 1.2.3-korg