From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AFBBF158092 for ; Sat, 18 Jun 2022 00:18:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93D99E0B0A; Sat, 18 Jun 2022 00:18:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7340BE0B0A for ; Sat, 18 Jun 2022 00:18:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 417F4341DF3 for ; Sat, 18 Jun 2022 00:18:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD90750B for ; Sat, 18 Jun 2022 00:18:26 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1655511497.18059c099d4073d0708d9e40c16ebc974df86aff.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio-daemon/files/, media-sound/pulseaudio-daemon/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild X-VCS-Directories: media-sound/pulseaudio-daemon/ media-sound/pulseaudio-daemon/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 18059c099d4073d0708d9e40c16ebc974df86aff X-VCS-Branch: master Date: Sat, 18 Jun 2022 00:18:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dd61fced-af27-4581-b25f-ef4c698b6096 X-Archives-Hash: e2c4c235d4dc59edd01719cd327711cf commit: 18059c099d4073d0708d9e40c16ebc974df86aff Author: Igor V. Kovalenko gmail com> AuthorDate: Fri Jun 17 23:37:30 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jun 18 00:18:17 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18059c09 media-sound/pulseaudio-daemon: Fix gstreamer bluetooth crash on 32-bit ARM Upstream commit dd4dc5e8bce2c03631c3613dbddee1a691bdd17d Fixes pulseaudio crash on ARM 32-bit when pulseaudio is compiled with gstreamer and either LDAC or aptX support is available. Signed-off-by: Igor V. Kovalenko gmail.com> Signed-off-by: Sam James gentoo.org> ...io-16.0-fix-gstreamer-bluetooth-arm-crash.patch | 43 ++++++++++++++++++++++ .../pulseaudio-daemon-16.0-r5.ebuild | 1 + 2 files changed, 44 insertions(+) diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch new file mode 100644 index 000000000000..a2efaf37b381 --- /dev/null +++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch @@ -0,0 +1,43 @@ +https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/dd4dc5e8bce2c03631c3613dbddee1a691bdd17d + +From dd4dc5e8bce2c03631c3613dbddee1a691bdd17d Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Fri, 17 Jun 2022 14:36:36 +0200 +Subject: [PATCH] bluetooth/gst: Correct var type for GST_TYPE_BITMASK + +GST_TYPE_BITMASK is 64-bit bit mask while corresponding channel_mask in +pulseaudio is int therefore usually 32-bit. Switch to uint64_t instead +to match internal representation in gstreamer. + +Fixes pulseaudio crash on ARM 32-bit when pulseaudio is compiled with +gstreamer and either LDAC or aptX support is available. + +Part-of: +--- + src/modules/bluetooth/a2dp-codec-gst.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/modules/bluetooth/a2dp-codec-gst.c b/src/modules/bluetooth/a2dp-codec-gst.c +index 8ef74be9c..11839c580 100644 +--- a/src/modules/bluetooth/a2dp-codec-gst.c ++++ b/src/modules/bluetooth/a2dp-codec-gst.c +@@ -22,6 +22,7 @@ + #endif + + #include ++#include + + #include + #include +@@ -82,7 +83,7 @@ fail: + static GstCaps *gst_create_caps_from_sample_spec(const pa_sample_spec *ss) { + gchar *sample_format; + GstCaps *caps; +- int channel_mask; ++ uint64_t channel_mask; + + switch (ss->format) { + case PA_SAMPLE_S16LE: +-- +GitLab + diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild index c6b1b5a0b623..25e717a28ffa 100644 --- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild +++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r5.ebuild @@ -166,6 +166,7 @@ PATCHES=( "${FILESDIR}"/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch "${FILESDIR}"/pulseaudio-16.0-optional-module-console-kit.patch "${FILESDIR}"/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch + "${FILESDIR}"/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch ) src_prepare() {