Skip to content

Commit 4da05e7

Browse files
committed
pulseaudio-modules-droid: Replace with pulseaudio-modules-droid-jb2q
Upstream has removed support for Android <= 10. All our ports target older Android, so replace with the legacy version of this module.
1 parent ee21ec8 commit 4da05e7

4 files changed

Lines changed: 12 additions & 83 deletions

File tree

recipes-multimedia/pulseaudio/pulseaudio-modules-droid/0001-Fix-build.patch renamed to recipes-multimedia/pulseaudio/pulseaudio-modules-droid-jb2q/0001-Fix-build.patch

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
1-
From 8f1af26815a2613ebdd739147ad19e3a87c6bf1b Mon Sep 17 00:00:00 2001
1+
From 9cdb0fc5e4f85c6a63c1e27c13b5ffdd9a8f42f4 Mon Sep 17 00:00:00 2001
22
From: casept <davids.paskevics@gmail.com>
3-
Date: Thu, 26 Feb 2026 12:56:00 +0100
3+
Date: Thu, 12 Mar 2026 15:05:31 +0100
44
Subject: [PATCH] Fix build
5-
65
Upstream-Status: Inappropriate
76

8-
Without this patch, configuration fails with an error:
9-
10-
../../../../../../workspace/sources/pulseaudio-modules-droid/meson.build:38:42: ERROR: Index 2 out of bounds of array of size 2.
117
---
12-
meson.build | 2 +-
13-
1 file changed, 1 insertion(+), 1 deletion(-)
8+
meson.build | 3 ++-
9+
1 file changed, 2 insertions(+), 1 deletion(-)
1410

1511
diff --git a/meson.build b/meson.build
16-
index 13c8ca7..1094cb8 100644
12+
index e66e05b..a15f882 100644
1713
--- a/meson.build
1814
+++ b/meson.build
19-
@@ -33,7 +33,7 @@ pa_version_minor = version_split[1]
15+
@@ -35,7 +35,8 @@ pa_version_minor = version_split[1]
2016
pa_version_major_minor = pa_version_major + '.' + pa_version_minor
2117
project_version_str = meson.project_version()
2218
project_version_split = project_version_str.split('-')[0].split('.')
2319
-pa_version_module = project_version_split[2].split('+')[0]
2420
+pa_version_module = project_version_split[0]
21+
+
2522

2623
modlibexecdir = get_option('modlibexecdir')
2724
if modlibexecdir == ''

recipes-multimedia/pulseaudio/pulseaudio-modules-droid_git.bb renamed to recipes-multimedia/pulseaudio/pulseaudio-modules-droid-jb2q_qit.bb

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1-
SUMMARY = "Android/hybris plugin for PulseAudio"
2-
HOMEPAGE = "https://github.com/mer-hybris/pulseaudio-modules-droid"
1+
SUMMARY = "Android/hybris plugin for PulseAudio (legacy <= Android 10)"
2+
HOMEPAGE = "https://github.com/mer-hybris/pulseaudio-modules-droid-jb2q"
33
LICENSE = "LGPL-2.1-only"
44
LIC_FILES_CHKSUM = "file://COPYING;md5=f294906e6e4eac9d917503a0bbd139b4"
55

6-
SRC_URI = "git://github.com/mer-hybris/pulseaudio-modules-droid;protocol=https;branch=master \
7-
file://0002-Remove-audio-sources-that-don-t-exist-for-some-reaso.patch \
6+
SRC_URI = "git://github.com/mer-hybris/pulseaudio-modules-droid-jb2q;protocol=https;branch=master \
87
file://0001-Fix-build.patch \
98
"
10-
SRCREV = "ab05b2e592b8308585814d7180d1e7c88d3ca4bb"
9+
SRCREV = "bafbe2ec91d77deb1a8bdea321f374d85bd75b01"
1110
PR = "r1"
1211
PV = "+git${SRCPV}"
1312
S = "${WORKDIR}/git"
1413
DEPENDS += "pulseaudio libhybris"
1514
RDEPENDS:${PN} += "pulseaudio-module-keepalive"
1615

1716
inherit meson pkgconfig
18-
#B = "${S}"
1917

2018
require pulseaudio-module.inc

recipes-multimedia/pulseaudio/pulseaudio-modules-droid/0002-Remove-audio-sources-that-don-t-exist-for-some-reaso.patch

Lines changed: 0 additions & 66 deletions
This file was deleted.

recipes-multimedia/pulseaudio/pulseaudio_%.bbappend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
RDEPENDS:pulseaudio-server:append = " pulseaudio-modules-nemo pulseaudio-module-dbus-protocol pulseaudio-module-match pulseaudio-module-switch-on-connect pulseaudio-module-bluetooth-discover pulseaudio-module-bluetooth-policy pulseaudio-module-bluez5-discover pulseaudio-module-bluez5-device "
2-
RDEPENDS:pulseaudio-server:append:hybris-machine = " pulseaudio-modules-droid "
2+
RDEPENDS:pulseaudio-server:append:hybris-machine = " pulseaudio-modules-droid-jb2q "
33

44
FILESEXTRAPATHS:prepend := "${THISDIR}/pulseaudio:"
55
SRC_URI += "file://1002-build-Install-pulsecore-headers.patch \

0 commit comments

Comments
 (0)