From 1f16d9ad0faa5616917d83e943f35bc111c45acd Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Thu, 9 Jun 2022 14:28:00 +0200 Subject: bluez-alsa: drop recipe Use bluealsa recipe from meta-openembedded layer. Related-to: ELB-4505 Signed-off-by: Ming Liu --- recipes-connectivity/bluez-alsa/bluez-alsa_git.bb | 47 ---------------- ...-linkage-mark-external-variable-as-extern.patch | 65 ---------------------- .../bluez-alsa/files/bluez-alsa.service | 11 ---- recipes-images/images/packagegroup-tdx-cli.bb | 2 +- 4 files changed, 1 insertion(+), 124 deletions(-) delete mode 100644 recipes-connectivity/bluez-alsa/bluez-alsa_git.bb delete mode 100644 recipes-connectivity/bluez-alsa/files/0001-Fix-linkage-mark-external-variable-as-extern.patch delete mode 100644 recipes-connectivity/bluez-alsa/files/bluez-alsa.service diff --git a/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb b/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb deleted file mode 100644 index c9021bd..0000000 --- a/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Bluetooth Audio ALSA Backend" -HOMEPAGE = "https://github.com/Arkq/bluez-alsa" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bb3e99e80c5d718213f35ae1def4c106" - -SRC_URI = " \ - git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master \ - file://0001-Fix-linkage-mark-external-variable-as-extern.patch \ -" - -SRCREV = "9045edb436ea755f395a2e09e4525b5defad286a" - -SRC_URI += "file://bluez-alsa.service" - -S = "${WORKDIR}/git" - -DEPENDS += "alsa-lib bluez5 systemd glib-2.0 sbc" - -PACKAGECONFIG[aac] = "--enable-aac, --disable-aac, " -PACKAGECONFIG[aptx] = "--enable-aptx,--disable-aptx," -PACKAGECONFIG[hcitop] = "--enable-hcitop, --disable-hcitop, libbsd ncurses" - -inherit autotools pkgconfig -inherit systemd - -SYSTEMD_AUTO_ENABLE = "enable" -SYSTEMD_SERVICE:${PN} = "bluez-alsa.service" - -PACKAGECONFIG += "hcitop" - -do_install:append () { - install -d ${D}${base_libdir}/systemd/system - install -m 0644 ${WORKDIR}/bluez-alsa.service ${D}${base_libdir}/systemd/system -} - -FILES:${PN} += "\ - ${datadir}/alsa/alsa.conf.d/20-bluealsa.conf\ - ${libdir}/alsa-lib/libasound_module_ctl_bluealsa.so\ - ${libdir}/alsa-lib/libasound_module_pcm_bluealsa.so\ -" - -FILES:${PN}-staticdev += "\ - ${libdir}/alsa-lib/libasound_module_ctl_bluealsa.a\ - ${libdir}/alsa-lib/libasound_module_pcm_bluealsa.a\ -" diff --git a/recipes-connectivity/bluez-alsa/files/0001-Fix-linkage-mark-external-variable-as-extern.patch b/recipes-connectivity/bluez-alsa/files/0001-Fix-linkage-mark-external-variable-as-extern.patch deleted file mode 100644 index d366e18..0000000 --- a/recipes-connectivity/bluez-alsa/files/0001-Fix-linkage-mark-external-variable-as-extern.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 3b7b70fbb70131adf0c0451c95b9a5313ddc8e53 Mon Sep 17 00:00:00 2001 -From: Arkadiusz Bokowy -Date: Sun, 9 Feb 2020 22:26:16 +0100 -Subject: [PATCH] Fix linkage - mark external variable as extern - -(cherry picked from commit 30a23dd7ce9b00c702fa48545f6b03038f9e17c6) - -Conflicts: - src/bluealsa-iface.h - src/bluez-a2dp.h - src/bluez-iface.h - src/ofono-iface.h - test/server-mock.c - test/test-ba.c - test/test-io.c - test/test-rfcomm.c - -Upstream-Status: Backport [master after tag v2.1.0] -Signed-off-by: Max Krummenacher ---- - src/bluez-a2dp.h | 8 ++++---- - src/bluez-iface.h | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/bluez-a2dp.h b/src/bluez-a2dp.h -index 4826a6f..715fd89 100644 ---- a/src/bluez-a2dp.h -+++ b/src/bluez-a2dp.h -@@ -17,15 +17,15 @@ - - #include "a2dp-codecs.h" - --const a2dp_sbc_t bluez_a2dp_sbc; -+extern const a2dp_sbc_t bluez_a2dp_sbc; - #if ENABLE_MP3 --const a2dp_mpeg_t bluez_a2dp_mpeg; -+extern const a2dp_mpeg_t bluez_a2dp_mpeg; - #endif - #if ENABLE_AAC --const a2dp_aac_t bluez_a2dp_aac; -+extern const a2dp_aac_t bluez_a2dp_aac; - #endif - #if ENABLE_APTX --const a2dp_aptx_t bluez_a2dp_aptx; -+extern const a2dp_aptx_t bluez_a2dp_aptx; - #endif - - #endif -diff --git a/src/bluez-iface.h b/src/bluez-iface.h -index 7d61638..a86a1bd 100644 ---- a/src/bluez-iface.h -+++ b/src/bluez-iface.h -@@ -13,7 +13,7 @@ - - #include - --const GDBusInterfaceInfo bluez_iface_endpoint; --const GDBusInterfaceInfo bluez_iface_profile; -+extern const GDBusInterfaceInfo bluez_iface_endpoint; -+extern const GDBusInterfaceInfo bluez_iface_profile; - - #endif --- -2.20.1 - diff --git a/recipes-connectivity/bluez-alsa/files/bluez-alsa.service b/recipes-connectivity/bluez-alsa/files/bluez-alsa.service deleted file mode 100644 index 671815e..0000000 --- a/recipes-connectivity/bluez-alsa/files/bluez-alsa.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Bluetooth Audio ALSA Backend -After=bluetooth.service -Requires=bluetooth.service - -[Service] -Type=simple -ExecStart=/usr/bin/bluealsa - -[Install] -WantedBy=multi-user.target diff --git a/recipes-images/images/packagegroup-tdx-cli.bb b/recipes-images/images/packagegroup-tdx-cli.bb index 50934ab..5238e56 100644 --- a/recipes-images/images/packagegroup-tdx-cli.bb +++ b/recipes-images/images/packagegroup-tdx-cli.bb @@ -138,7 +138,7 @@ RRECOMMENDS:packagegroup-utils-tdx-cli = "\ alsa-utils \ alsa-utils-aplay \ alsa-utils-amixer \ - bluez-alsa \ + bluealsa \ bzip2 \ e2fsprogs \ e2fsprogs-resize2fs \ -- cgit v1.2.3