2 files changed, 113 insertions, 13 deletions

diff --git a/meta-multimedia/recipes-multimedia/bluealsa/bluealsa/0001-Use-basename-implementation-from-glib-2.0.patch b/meta-multimedia/recipes-multimedia/bluealsa/bluealsa/0001-Use-basename-implementation-from-glib-2.0.patch
new file mode 100644
index 0000000000..fbd145e6b5
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/bluealsa/bluealsa/0001-Use-basename-implementation-from-glib-2.0.patch
@@ -0,0 +1,88 @@
+From 070ed35ac5cef8138ed4760582bb72e8d3e136e2 Mon Sep 17 00:00:00 2001
+From: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com>
+Date: Sun, 25 Aug 2024 08:42:39 +0200
+Subject: [PATCH] Fix compilation on strict POSIX platforms
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Submitted [https://github.com/arkq/bluez-alsa/commit/070ed35ac5cef8138ed4760582bb72e8d3e136e2]
+---
+ src/main.c            | 2 +-
+ test/mock/mock.c      | 2 +-
+ utils/aplay/aplay.c   | 1 +
+ utils/cli/cli.c       | 1 +
+ utils/rfcomm/rfcomm.c | 1 +
+ 5 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 96a66aee..eeb80165 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -13,13 +13,13 @@
+ #endif
+ 
+ #include <getopt.h>
++#include <libgen.h>
+ #include <sched.h>
+ #include <signal.h>
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <string.h>
+ #include <strings.h>
+ #include <syslog.h>
+ #include <time.h>
+diff --git a/test/mock/mock.c b/test/mock/mock.c
+index 947211a3..0a2f6091 100644
+--- a/test/mock/mock.c
++++ b/test/mock/mock.c
+@@ -20,12 +20,12 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <getopt.h>
++#include <libgen.h>
+ #include <signal.h>
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <string.h>
+ #include <strings.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+diff --git a/utils/aplay/aplay.c b/utils/aplay/aplay.c
+index 3de77902..36843e95 100644
+--- a/utils/aplay/aplay.c
++++ b/utils/aplay/aplay.c
+@@ -15,6 +15,7 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <getopt.h>
++#include <libgen.h>
+ #include <math.h>
+ #include <poll.h>
+ #include <pthread.h>
+diff --git a/utils/cli/cli.c b/utils/cli/cli.c
+index aeeabe58..0338b9e2 100644
+--- a/utils/cli/cli.c
++++ b/utils/cli/cli.c
+@@ -13,6 +13,7 @@
+ #endif
+ 
+ #include <getopt.h>
++#include <libgen.h>
+ #include <stdarg.h>
+ #include <stdbool.h>
+ #include <stdint.h>
+diff --git a/utils/rfcomm/rfcomm.c b/utils/rfcomm/rfcomm.c
+index d01f0810..3dacfd67 100644
+--- a/utils/rfcomm/rfcomm.c
++++ b/utils/rfcomm/rfcomm.c
+@@ -15,6 +15,7 @@
+ #include <ctype.h>
+ #include <errno.h>
+ #include <getopt.h>
++#include <libgen.h>
+ #include <poll.h>
+ #include <stdbool.h>
+ #include <stdint.h>
diff --git a/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_git.bb b/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_4.3.0.bb
index 5007c88fff..162a51284e 100644
--- a/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_git.bb
+++ b/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_4.3.0.bb
@@ -1,22 +1,30 @@
 SUMMARY = "Bluetooth Audio ALSA Backend"
+DESCRIPTION = "\
+    BlueALSA is a replacement for BlueZ >= 5, with which one can achieve the \
+    same Bluetooth audio profile support as with PulseAudio, but with fewer \
+    dependencies and at a lower level in the software stack. It is designed \
+    specifically for use on small, low-powered, dedicated audio or audio/visual \
+    systems where the high-level audio management features of PulseAudio or \
+    PipeWire are not required. \
+"
 HOMEPAGE = "https://github.com/Arkq/bluez-alsa"
+BUGTRACKER = "https://github.com/arkq/bluez-alsa/issues"
 SECTION = "libs"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8449a4f133a93f6254b496d4fb476e83"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=143bc4e73f39cc5e89d6e096ac0315ba"
 
-SRC_URI = "git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master"
+DEPENDS += "alsa-lib bluez5 dbus glib-2.0-native python3-packaging-native sbc"
 
-SRCREV = "dd05a1baa261b94da9ba977b5e3392c8b4dc7a5e"
-PV = "4.0.0+git"
+SRC_URI = "git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master \
+           file://0001-Use-basename-implementation-from-glib-2.0.patch"
 
-S  = "${WORKDIR}/git"
+SRCREV = "959573c2cccef5cf074f5b2fa7941abbd699c5f4"
 
-DEPENDS += "alsa-lib bluez5 dbus glib-2.0 sbc"
 
 PACKAGECONFIG ??= "aplay cli hcitop ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-PACKAGECONFIG[a2dpconf]  = "--enable-a2dpconf,--disable-a2dpconf"
-PACKAGECONFIG[aac]  = "--enable-aac,--disable-aac,fdk-aac"
+PACKAGECONFIG[a2dpconf] = "--enable-a2dpconf,--disable-a2dpconf"
+PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,fdk-aac"
 PACKAGECONFIG[aplay] = "--enable-aplay,--disable-aplay"
 PACKAGECONFIG[cli] = "--enable-cli,--disable-cli"
 PACKAGECONFIG[coverage] = "--with-coverage,--without-coverage,lcov-native"
@@ -25,8 +33,10 @@ PACKAGECONFIG[debug-time] = "--enable-debug-time,--disable-debug-time"
 PACKAGECONFIG[faststream] = "--enable-faststream,--disable-faststream"
 PACKAGECONFIG[hcitop] = "--enable-hcitop,--disable-hcitop,libbsd ncurses"
 PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind"
+PACKAGECONFIG[midi] = "--enable-midi,--disable-midi"
 PACKAGECONFIG[mp3lame] = "--enable-mp3lame,--disable-mp3lame,lame"
 PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123,mpg123"
+PACKAGECONFIG[msbc] = "--enable-msbc,--disable-msbc,spandsp"
 PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono,ofono"
 PACKAGECONFIG[payloadcheck] = "--enable-payloadcheck,--disable-payloadcheck"
 PACKAGECONFIG[rfcomm] = "--enable-rfcomm,--disable-rfcomm"
@@ -35,9 +45,10 @@ PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd
 PACKAGECONFIG[test] = "--enable-test,--disable-test,libcheck libsndfile1"
 PACKAGECONFIG[upower] = "--enable-upower,--disable-upower,,upower"
 
-inherit autotools pkgconfig systemd
+inherit autotools pkgconfig python3native systemd
 
-EXTRA_OECONF = " \
+# These proprietary codecs are not available in Yocto
+EXTRA_OECONF = "\
     --disable-aptx \
     --disable-lc3plus \
     --disable-ldac \
@@ -45,10 +56,11 @@ EXTRA_OECONF = " \
 "
 
 PACKAGE_BEFORE_PN = "${PN}-aplay"
-RRECOMMENDS:${PN} = "${PN}-aplay"
 
-FILES:${PN}-aplay = "${bindir}/bluealsa-aplay"
-FILES:${PN} += "${libdir}/alsa-lib/*"
+FILES:${PN}-aplay += "${bindir}/bluealsa-aplay"
+FILES:${PN} += "${libdir}/alsa-lib/* ${datadir}/dbus-1/system.d"
+
+RRECOMMENDS:${PN} = "${PN}-aplay"
 
 SYSTEMD_PACKAGES += "${PN}-aplay"
 SYSTEMD_SERVICE:${PN} = "bluealsa.service"