summaryrefslogtreecommitdiff
path: root/media-sound/bluez-alsa
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-06-17 00:09:46 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-06-17 00:09:46 +0100
commit74e526c590f52d24a213e25f77858ae0b34ec2c8 (patch)
tree0f6f22133ae9cc04958f6df6d39a02d90ffb1aaf /media-sound/bluez-alsa
parent0a3feeaba4dbc58966dccdbbfcd7fb14deef0831 (diff)
gentoo auto-resync : 17:06:2024 - 00:09:46
Diffstat (limited to 'media-sound/bluez-alsa')
-rw-r--r--media-sound/bluez-alsa/Manifest13
-rw-r--r--media-sound/bluez-alsa/bluez-alsa-3.1.0.ebuild95
-rw-r--r--media-sound/bluez-alsa/bluez-alsa-4.2.0.ebuild (renamed from media-sound/bluez-alsa/bluez-alsa-4.0.0.ebuild)50
-rw-r--r--media-sound/bluez-alsa/bluez-alsa-9999.ebuild42
-rw-r--r--media-sound/bluez-alsa/files/bluez-alsa-4.2.0-fix-include-freeaptx.patch31
-rw-r--r--media-sound/bluez-alsa/files/bluez-alsa-4.2.0-ldpreload.patch164
-rw-r--r--media-sound/bluez-alsa/files/bluez-alsa-4.2.0-test-alsa-midi-checkdev.patch23
-rw-r--r--media-sound/bluez-alsa/metadata.xml1
8 files changed, 286 insertions, 133 deletions
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index 187392a17ead..3a3b9385efa0 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -2,11 +2,12 @@ AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fc
AUX bluealsa-conf.d-2-r1 124 BLAKE2B 577733fefb88cb5b9e0b48fe9eefa6d08044d90645ee1c8f9ddfcde1c02041a83b8cfe8f97d0551aa2fe55ff3b2335b994f3b4522f31853c4cde924ecea35821 SHA512 0fb0435403ff0b76a4d03573c16699d8730b7ceb3ed19a8d9cd947fc3b4198f24da2ea0c4cd5a6f536d3b8172eeca74d2dd6d933ce0f2f821a88746248184f8b
AUX bluealsa-init.d 357 BLAKE2B cca746c0370c728fcf4e5ca977fb358bbc54fa1bc74df4cdf2b790dfa63e03c039cd507b7e6d254a8109bcfda9d82dc3b9d0b42b404c375f73431d701c1ae380 SHA512 b268dea4662dcd8488a7c787d5e14a6bdb2208fa3db573ae6c71ff96906be4d1b43f98c8a7fd0f8bbe2b95b9493cf1306aac48e675c0635ce03c267c2abd63c1
AUX bluealsa.service 184 BLAKE2B 94d33842a6d677b6e6078e2159e13198daede77be2e5ac435836f5b20056deac75cbfd9828bd2fe22ea30e544e2846f61be1194c555a166303514bbb48e4107a SHA512 108a86070b215d16e092c0f8fb869c969bc99b6aa479cb81c894fc6ae0c9e16655b14da27ee49c7f50549e4de7aa43a855954cc0dfe7430cdcf8822a97a4d889
-DIST bluez-alsa-3.1.0.tar.gz 179984 BLAKE2B b0bd5008d1bcc972577d8626970834934cc9424b4dff5c9ede1b1bfb0ac6c62c50dd8a7b94bdaa8884354379fb4fe06d758f620b2f42207d85f68da5064b3499 SHA512 8b2644cb2114569cc896869f22352386a9362eeacae823423a63d9b21198f561d4af796700fcd3267556bb69ff2575569474a1da8e3a645b5a2e779882c27cbf
-DIST bluez-alsa-4.0.0.tar.gz 230879 BLAKE2B 998127cb4e03afc019679b80fc1ac7d56351aeb8274efe76a74d6c5600c4b8527d5463e864cc8f68c1fa82c1729ef38d8168e90e7092dfe5eaf5a7cf25ba4bfa SHA512 8a79e5a1189db2d39b2d772cb8f8cd51ebb96b9bd91489556195e83dfd16f40a581dce68c5ad9e886b66cec8a03ae7f959e8288bb4c5c87ea5a2bbd6aee9c5f0
+AUX bluez-alsa-4.2.0-fix-include-freeaptx.patch 698 BLAKE2B 63d4e16a0bca7764d0f7d53484cc0375522e56e1310b72961aaf5d2f5e289275ae29fd64fc7f06845d617d60cbec4e8bcd96d8612b73a0dd7589dffb26d63d58 SHA512 82a9316b60f0e5158ca33ad610cf491f525004cc7cccbeefac33c00b7f718fcfec020747dafc9ee8934645c244af3ef80f420f4e2a74cad3df120d6d600d7e16
+AUX bluez-alsa-4.2.0-ldpreload.patch 4991 BLAKE2B 7f5d8ce13eb909d44f51e6928dd74a76dde9673fd5e9b901144530d3bcf3babc022640d78bf132b24ded2fb66bca71a0d508f11ca682f55a86e882fad1a95930 SHA512 06b387cf292f24254b09adc59fce318a3c086efd15d3b88df4d8b7f19df2f3a9926ec62e233a849ee8fd5c227d7d6583b63bd75ecb3ddb9c698b665b68d601b1
+AUX bluez-alsa-4.2.0-test-alsa-midi-checkdev.patch 878 BLAKE2B 262f03e5594197b4118504c4a527dacef750e30883d3ac041e5f43dd9b35d6f4d55e9d8774f07aa13ae0040e67d964c01564799843a1eba4af418bfae64eceb4 SHA512 84c74fc556806855827ee217d8bf32ec71354c291eca4287d8f18519fc75d82064afef84de3f9ff862ff8c95ccf6ae034194704ff903b0083e3483bd46158a2f
DIST bluez-alsa-4.1.1.tar.gz 284244 BLAKE2B a46d22cd86e6b7483f95e0f60c9f23421d2c48e0c4741e3107da3800180b16a47dcf897bfa579796cfb84ecc16812f545844dbb77c768f094c5cfd46e1101835 SHA512 5e43846af5c7c30a3d81a704514076a73b1d8994db5ee8925a59b1b328f684c15188d45caf9358f59e57a0c200d644dc673bd1c44f7d48a51452776e01f022f8
-EBUILD bluez-alsa-3.1.0.ebuild 2615 BLAKE2B 4c8c85ddcecead2e8abc477fd2307120f7f8348fce8974a8995cf198fec21d6e346fb16c323fb7365895d14c6b0d72fcbc8e757b090fb8a00248ec80889f7d59 SHA512 dbdb4c4fcdb178b8a81fcb1758c59a33cc8422af78cd36036f497f1f06c38acc00190af971379f7d0744624d64dab53b8c3271099d994177013335a0e9689ab3
-EBUILD bluez-alsa-4.0.0.ebuild 2800 BLAKE2B d5d15d66fd419a59169f9ae55fd4bb10546b79d627e7eb1f04e7cd74a658779caa558c6dc839025d5e5884ff3c547302de4c89c1bbcb4f91fe147ff8cf2ea394 SHA512 3490bbd1876f5b95202049afec87e4b182b93e9210d8c4fb59a8fa7f5169194a6ac40ea3eb11a3665eec62f9056fd776cea4f1795c90cafc855b8ee3052861bd
+DIST bluez-alsa-4.2.0.tar.gz 326233 BLAKE2B 7bea22d45e9897dd8dc62ee31bba381fb2e2dc616673d711ffb2144f9d03ff8312342f175256946cac828cc1ad04fc263ea11e0c0685e3e28e72c80357914f33 SHA512 1c8816d0baf031c5823fb49fac1409f4034f2f5cc8506ba1f377260cfc6437baa3f6ff1611eac72751f9d56c08f525dc43db05d30820baf394c75f3537d65162
EBUILD bluez-alsa-4.1.1-r1.ebuild 2830 BLAKE2B 538538525975c6f7dde15f5fb8cdceda7f783f3e99726b4f8430e117c1fa2ad5044ba4089d9d4eca735645d1460b91d9b40fc7605ba9f331aaaadd1b99ded965 SHA512 7b150439c05d3bc4feb80ae2f831d429c9503fb1631f448d4952741ed83c7964f8d6d8a673f9a30228968197269255791ef534b6b66f5b62c49e39733b3c087d
-EBUILD bluez-alsa-9999.ebuild 2800 BLAKE2B d5d15d66fd419a59169f9ae55fd4bb10546b79d627e7eb1f04e7cd74a658779caa558c6dc839025d5e5884ff3c547302de4c89c1bbcb4f91fe147ff8cf2ea394 SHA512 3490bbd1876f5b95202049afec87e4b182b93e9210d8c4fb59a8fa7f5169194a6ac40ea3eb11a3665eec62f9056fd776cea4f1795c90cafc855b8ee3052861bd
-MISC metadata.xml 690 BLAKE2B e0d390bd64b6250bc9df327a59938c60e6e19bfc019e395277443e60dfcff948ae6582154825cbad55d6ffdf39bcd7af2b115eda1bdb9c041aa529889761f9ef SHA512 1a088f9c50127bb606a109acd990bbee0a368a03e39b2f9954b2e0526a212f04b0a705d98f08576173c79b48fbccb20f975712e3a511ea00fd98aa33971ca268
+EBUILD bluez-alsa-4.2.0.ebuild 3281 BLAKE2B 2e728057f3891a907df9848889f6b1cfbb82648cbebeb2b6ba63d978754ded7e81017e2e8098776feaf3893cb747495162b0751acca123514f6031f97fc8ccaf SHA512 5f477242cbe108fb088358c62468fae6fb7939568a49b45232def8417b89e08962c363ae1338436c718f75ecdc97e3d952f65f3e9b5d15894b4134afc79ac9de
+EBUILD bluez-alsa-9999.ebuild 3037 BLAKE2B f1a66d212a1a1daed0b40a670a8990bed8c99a1413692059c6e3fb69d74131b8b29cbe6977fbca49a3ba6639e247d3cbf678ce56ac4bf566cf558561d65e97d6 SHA512 cac27948f9bc84b0eb9d0e89800f627398cc0f4ebb319961271e008cc8bca8fe879617cbffc0a1cdfc34d9b3f2a65e4d5cbc8b755f516c53965c166be93adf10
+MISC metadata.xml 740 BLAKE2B 2b32648c6e7207c9d95084e4d9fd22f6b054d9e8098c2fcbf7ccbfabfa580a9dfe1828f78b807d469f3511f5bbf51dc680990dc0c6caf1e3208363cc6a10ffca SHA512 1f7cbb832ceac0fd78b7d749e4cf1d51e5fdfbc70a76ae42eae41cb78b315bcf64aa4f0958f657029f27559c9aabf7e0c2567c8926f5ff6e9d3a2cb9e21cbe27
diff --git a/media-sound/bluez-alsa/bluez-alsa-3.1.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-3.1.0.ebuild
deleted file mode 100644
index 2dbdfb8ee917..000000000000
--- a/media-sound/bluez-alsa/bluez-alsa-3.1.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1 multilib-minimal systemd
-
-DESCRIPTION="Bluetooth Audio ALSA Backend"
-HOMEPAGE="https://github.com/Arkq/bluez-alsa"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/Arkq/${PN}"
-else
- SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs test unwind upower"
-RESTRICT="!test? ( test )"
-
-# bluez-alsa does not directly link to upower but
-# is using the upower interface via dbus calls.
-RDEPEND="
- >=dev-libs/glib-2.26[${MULTILIB_USEDEP}]
- >=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
- >=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
- >=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
- sys-apps/dbus[${MULTILIB_USEDEP}]
- sys-libs/readline:0=
- aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
- aptx? ( media-libs/libopenaptx )
- lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
- mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
- hcitop? (
- dev-libs/libbsd
- sys-libs/ncurses:0=
- )
- ldac? ( >=media-libs/libldac-2.0.0 )
- ofono? ( net-misc/ofono )
- unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
- upower? ( sys-power/upower )
-"
-DEPEND="${RDEPEND}
- test? ( dev-libs/check )"
-BDEPEND="
- virtual/pkgconfig
- man? ( virtual/pandoc )
-"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-cli
- --enable-rfcomm
- --with-bash-completion="$(get_bashcompdir)"
- $(use_enable aac)
- $(use_enable debug)
- $(use_enable lame mp3lame)
- $(use_enable man manpages)
- $(use_enable mpg123)
- $(use_enable static-libs static)
- $(use_enable test)
- $(multilib_native_use_enable aptx)
- $(multilib_native_use_enable hcitop)
- $(multilib_native_use_enable ldac)
- $(multilib_native_use_enable ofono)
- $(multilib_native_use_enable upower)
- $(multilib_native_use_with aptx libopenaptx)
- $(use_with unwind libunwind)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- default
- find "${ED}" -type f -name "*.la" -delete || die
-
- newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
- newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
- systemd_dounit "${FILESDIR}"/bluealsa.service
-
- # Add config file to alsa datadir as well to preserve changes in /etc
- insinto "/usr/share/alsa/alsa.conf.d/"
- doins "src/asound/20-bluealsa.conf"
-}
-
-pkg_postinst() {
- elog "Users can use this service when they are members of the \"audio\" group."
-}
diff --git a/media-sound/bluez-alsa/bluez-alsa-4.0.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-4.2.0.ebuild
index 0bea02fbc86b..03b8563b31e2 100644
--- a/media-sound/bluez-alsa/bluez-alsa-4.0.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-4.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit autotools bash-completion-r1 multilib-minimal systemd
+inherit autotools bash-completion-r1 multilib-minimal readme.gentoo-r1 systemd
DESCRIPTION="Bluetooth Audio ALSA Backend"
HOMEPAGE="https://github.com/Arkq/bluez-alsa"
@@ -17,27 +17,29 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs systemd test unwind upower"
+IUSE="aac aptx debug hcitop lame ldac liblc3 man mpg123 ofono static-libs systemd test unwind upower"
+
RESTRICT="!test? ( test )"
# bluez-alsa does not directly link to upower but
# is using the upower interface via dbus calls.
RDEPEND="
- >=dev-libs/glib-2.32[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.58.2[${MULTILIB_USEDEP}]
>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
- >=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
- >=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
+ >=media-libs/sbc-1.5[${MULTILIB_USEDEP}]
+ >=net-wireless/bluez-5.51[${MULTILIB_USEDEP}]
sys-apps/dbus[${MULTILIB_USEDEP}]
sys-libs/readline:0=
aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
- aptx? ( media-libs/libopenaptx )
- lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
- mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+ aptx? ( >=media-libs/libfreeaptx-0.1.1 )
hcitop? (
dev-libs/libbsd
sys-libs/ncurses:0=
)
+ lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
ldac? ( >=media-libs/libldac-2.0.0 )
+ liblc3? ( >=media-sound/liblc3-1.0.0 )
+ mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
ofono? ( net-misc/ofono )
systemd? ( sys-apps/systemd )
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
@@ -45,14 +47,26 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? (
- dev-libs/check
+ >=dev-libs/check-0.11.0
media-libs/libsndfile
- )"
+ )
+"
BDEPEND="
+ dev-util/gdbus-codegen
virtual/pkgconfig
man? ( virtual/pandoc )
"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-include-freeaptx.patch"
+ # https://github.com/arkq/bluez-alsa/issues/718
+ "${FILESDIR}/${P}-test-alsa-midi-checkdev.patch"
+ # https://github.com/arkq/bluez-alsa/issues/717
+ "${FILESDIR}/${P}-ldpreload.patch"
+)
+
+DOC_CONTENTS="Users can use this service when they are members of the \"audio\" group."
+
src_prepare() {
default
eautoreconf
@@ -62,6 +76,7 @@ multilib_src_configure() {
local myeconfargs=(
--enable-cli
--enable-faststream
+ --enable-midi
--enable-rfcomm
--with-bash-completion="$(get_bashcompdir)"
$(use_enable aac)
@@ -74,11 +89,13 @@ multilib_src_configure() {
$(use_enable test)
$(use_with systemd systemdsystemunitdir $(systemd_get_systemunitdir))
$(multilib_native_use_enable aptx)
+ $(multilib_native_use_enable aptx aptx-hd)
+ $(multilib_native_use_with aptx libfreeaptx)
$(multilib_native_use_enable hcitop)
$(multilib_native_use_enable ldac)
+ $(multilib_native_use_enable liblc3 lc3-swb)
$(multilib_native_use_enable ofono)
$(multilib_native_use_enable upower)
- $(multilib_native_use_with aptx libopenaptx)
$(use_with unwind libunwind)
)
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
@@ -89,14 +106,15 @@ multilib_src_install_all() {
find "${ED}" -type f -name "*.la" -delete || die
newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
- newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
- #systemd_dounit "${FILESDIR}"/bluealsa.service
+ newconfd "${FILESDIR}"/bluealsa-conf.d-2-r1 bluealsa
# Add config file to alsa datadir as well to preserve changes in /etc
insinto "/usr/share/alsa/alsa.conf.d/"
- doins "src/asound/20-bluealsa.conf"
+ doins "src/asound/20-bluealsa.conf.in"
+
+ readme.gentoo_create_doc
}
pkg_postinst() {
- elog "Users can use this service when they are members of the \"audio\" group."
+ readme.gentoo_print_elog
}
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index 0bea02fbc86b..188dc69cbacd 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit autotools bash-completion-r1 multilib-minimal systemd
+inherit autotools bash-completion-r1 multilib-minimal readme.gentoo-r1 systemd
DESCRIPTION="Bluetooth Audio ALSA Backend"
HOMEPAGE="https://github.com/Arkq/bluez-alsa"
@@ -17,27 +17,29 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE="aac aptx debug hcitop lame ldac man mpg123 ofono static-libs systemd test unwind upower"
+IUSE="aac aptx debug hcitop lame ldac liblc3 man mpg123 ofono static-libs systemd test unwind upower"
+
RESTRICT="!test? ( test )"
# bluez-alsa does not directly link to upower but
# is using the upower interface via dbus calls.
RDEPEND="
- >=dev-libs/glib-2.32[${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.58.2[${MULTILIB_USEDEP}]
>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
- >=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
- >=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
+ >=media-libs/sbc-1.5[${MULTILIB_USEDEP}]
+ >=net-wireless/bluez-5.51[${MULTILIB_USEDEP}]
sys-apps/dbus[${MULTILIB_USEDEP}]
sys-libs/readline:0=
aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
- aptx? ( media-libs/libopenaptx )
- lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
- mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
+ aptx? ( >=media-libs/libfreeaptx-0.1.1 )
hcitop? (
dev-libs/libbsd
sys-libs/ncurses:0=
)
+ lame? ( media-sound/lame[${MULTILIB_USEDEP}] )
ldac? ( >=media-libs/libldac-2.0.0 )
+ liblc3? ( >=media-sound/liblc3-1.0.0 )
+ mpg123? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
ofono? ( net-misc/ofono )
systemd? ( sys-apps/systemd )
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
@@ -45,14 +47,18 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? (
- dev-libs/check
+ >=dev-libs/check-0.11.0
media-libs/libsndfile
- )"
+ )
+"
BDEPEND="
+ dev-util/gdbus-codegen
virtual/pkgconfig
man? ( virtual/pandoc )
"
+DOC_CONTENTS="Users can use this service when they are members of the \"audio\" group."
+
src_prepare() {
default
eautoreconf
@@ -62,6 +68,7 @@ multilib_src_configure() {
local myeconfargs=(
--enable-cli
--enable-faststream
+ --enable-midi
--enable-rfcomm
--with-bash-completion="$(get_bashcompdir)"
$(use_enable aac)
@@ -74,11 +81,13 @@ multilib_src_configure() {
$(use_enable test)
$(use_with systemd systemdsystemunitdir $(systemd_get_systemunitdir))
$(multilib_native_use_enable aptx)
+ $(multilib_native_use_enable aptx aptx-hd)
+ $(multilib_native_use_with aptx libfreeaptx)
$(multilib_native_use_enable hcitop)
$(multilib_native_use_enable ldac)
+ $(multilib_native_use_enable liblc3 lc3-swb)
$(multilib_native_use_enable ofono)
$(multilib_native_use_enable upower)
- $(multilib_native_use_with aptx libopenaptx)
$(use_with unwind libunwind)
)
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
@@ -89,14 +98,15 @@ multilib_src_install_all() {
find "${ED}" -type f -name "*.la" -delete || die
newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
- newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
- #systemd_dounit "${FILESDIR}"/bluealsa.service
+ newconfd "${FILESDIR}"/bluealsa-conf.d-2-r1 bluealsa
# Add config file to alsa datadir as well to preserve changes in /etc
insinto "/usr/share/alsa/alsa.conf.d/"
- doins "src/asound/20-bluealsa.conf"
+ doins "src/asound/20-bluealsa.conf.in"
+
+ readme.gentoo_create_doc
}
pkg_postinst() {
- elog "Users can use this service when they are members of the \"audio\" group."
+ readme.gentoo_print_elog
}
diff --git a/media-sound/bluez-alsa/files/bluez-alsa-4.2.0-fix-include-freeaptx.patch b/media-sound/bluez-alsa/files/bluez-alsa-4.2.0-fix-include-freeaptx.patch
new file mode 100644
index 000000000000..5930b2b838ab
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluez-alsa-4.2.0-fix-include-freeaptx.patch
@@ -0,0 +1,31 @@
+https://github.com/arkq/bluez-alsa/commit/14a02d1b06d0ba34c5b61516d7a3c1d6fc467567
+
+From 14a02d1b06d0ba34c5b61516d7a3c1d6fc467567 Mon Sep 17 00:00:00 2001
+From: Jochen Sprickerhof <jspricke@debian.org>
+Date: Wed, 15 May 2024 08:37:53 +0200
+Subject: [PATCH] Fix include for freeaptx library
+
+---
+ src/codec-aptx.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/codec-aptx.c b/src/codec-aptx.c
+index a3f056f..e69858d 100644
+--- a/src/codec-aptx.c
++++ b/src/codec-aptx.c
+@@ -21,7 +21,11 @@
+ # include <stdlib.h>
+ #endif
+
+-#include <openaptx.h>
++#if WITH_LIBFREEAPTX
++# include <freeaptx.h>
++#else
++# include <openaptx.h>
++#endif
+
+ #include "shared/log.h"
+
+--
+2.42.2
+
diff --git a/media-sound/bluez-alsa/files/bluez-alsa-4.2.0-ldpreload.patch b/media-sound/bluez-alsa/files/bluez-alsa-4.2.0-ldpreload.patch
new file mode 100644
index 000000000000..addb8cf614b3
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluez-alsa-4.2.0-ldpreload.patch
@@ -0,0 +1,164 @@
+From a51e0603c3c9657dbddc6f2d5e92b51209ed2d13 Mon Sep 17 00:00:00 2001
+From: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com>
+Date: Mon, 10 Jun 2024 17:36:32 +0200
+Subject: [PATCH] Fix LD_PRELOAD environment variable overwrite
+
+Fixes #717
+---
+ test/Makefile.am | 8 ++++----
+ test/inc/preload.inc | 17 ++++-------------
+ test/inc/spawn.inc | 3 +--
+ test/{aloader.c => libaloader.c} | 0
+ test/test-alsa-ctl.c | 4 ++--
+ test/test-alsa-pcm.c | 4 ++--
+ test/test-utils-aplay.c | 4 ++--
+ test/test-utils-cli.c | 4 ++--
+ 8 files changed, 17 insertions(+), 27 deletions(-)
+ rename test/{aloader.c => libaloader.c} (100%)
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index c120c29a6..cf844472c 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -57,12 +57,12 @@ check_PROGRAMS += test-msbc
+ endif
+
+ check_LTLIBRARIES = \
+- aloader.la
+-aloader_la_LDFLAGS = \
++ libaloader.la
++libaloader_la_LDFLAGS = \
+ -rpath /nowhere \
+ -avoid-version \
+- -shared -module
+-aloader_la_LIBADD = \
++ -shared
++libaloader_la_LIBADD = \
+ @ALSA_LIBS@
+
+ test_a2dp_SOURCES = \
+diff --git a/test/inc/preload.inc b/test/inc/preload.inc
+index 3dbb1522d..a6d0b9f09 100644
+--- a/test/inc/preload.inc
++++ b/test/inc/preload.inc
+@@ -2,7 +2,7 @@
+ * preload.inc
+ * vim: ft=c
+ *
+- * Copyright (c) 2016-2022 Arkadiusz Bokowy
++ * Copyright (c) 2016-2024 Arkadiusz Bokowy
+ *
+ * This file is a part of bluez-alsa.
+ *
+@@ -16,12 +16,10 @@
+ #include <string.h>
+ #include <unistd.h>
+
+-#include "shared/defs.h"
+-
+ #define LD_PRELOAD "LD_PRELOAD"
+ #define LD_PRELOAD_SANITIZER "LD_PRELOAD_SANITIZER"
+
+-int preload(int argc, char * const argv[], char * const envp[], const char *filename) {
++int preload(int argc, char * const argv[], const char *filename) {
+ (void)argc;
+
+ const char *env_preload;
+@@ -40,17 +38,10 @@ int preload(int argc, char * const argv[], char * const envp[], const char *file
+
+ char app[1024];
+ char preload[1024];
+- char *envp2[256] = { preload, NULL };
+-
+ char *dir = dirname(strncpy(app, argv[0], sizeof(app) - 1));
+ snprintf(preload, sizeof(preload), "%s=%s:%s/%s:%s",
+ LD_PRELOAD, env_preload_sanitizer, dir, filename, env_preload);
+
+- size_t i = 1, j = 0;
+- while (i < ARRAYSIZE(envp2) - 1 && envp[j] != NULL)
+- envp2[i++] = envp[j++];
+- if (i == ARRAYSIZE(envp2) - 1 && envp[j] != NULL)
+- fprintf(stderr, "WARNING: Couldn't forward ENV variables\n");
+-
+- return execve(argv[0], argv, envp2);
++ putenv(preload);
++ return execv(argv[0], argv);
+ }
+diff --git a/test/inc/spawn.inc b/test/inc/spawn.inc
+index 4ac1b531d..14eac6a19 100644
+--- a/test/inc/spawn.inc
++++ b/test/inc/spawn.inc
+@@ -97,8 +97,7 @@ int spawn(struct spawn_process *sp, char *argv[], FILE *f_stdin, int flags) {
+ close(pipe_stderr[1]);
+ }
+
+- execv(argv[0], argv);
+- return -1;
++ return execv(argv[0], argv);
+ }
+
+ close(pipe_stdout[1]);
+diff --git a/test/aloader.c b/test/libaloader.c
+similarity index 100%
+rename from test/aloader.c
+rename to test/libaloader.c
+diff --git a/test/test-alsa-ctl.c b/test/test-alsa-ctl.c
+index 2d3d03453..b0c0f3350 100644
+--- a/test/test-alsa-ctl.c
++++ b/test/test-alsa-ctl.c
+@@ -576,8 +576,8 @@ CK_START_TEST(test_alsa_high_level_control_interface) {
+
+ } CK_END_TEST
+
+-int main(int argc, char *argv[], char *envp[]) {
+- preload(argc, argv, envp, ".libs/aloader.so");
++int main(int argc, char *argv[]) {
++ preload(argc, argv, ".libs/libaloader.so");
+
+ char *argv_0 = strdup(argv[0]);
+ snprintf(bluealsa_mock_path, sizeof(bluealsa_mock_path),
+diff --git a/test/test-alsa-pcm.c b/test/test-alsa-pcm.c
+index aaff9d1bf..724316869 100644
+--- a/test/test-alsa-pcm.c
++++ b/test/test-alsa-pcm.c
+@@ -1100,8 +1100,8 @@ CK_START_TEST(ba_test_playback_device_unplug) {
+
+ } CK_END_TEST
+
+-int main(int argc, char *argv[], char *envp[]) {
+- preload(argc, argv, envp, ".libs/aloader.so");
++int main(int argc, char *argv[]) {
++ preload(argc, argv, ".libs/libaloader.so");
+
+ int opt;
+ const char *opts = "hD:c:f:r:";
+diff --git a/test/test-utils-aplay.c b/test/test-utils-aplay.c
+index e3a492851..7925a2710 100644
+--- a/test/test-utils-aplay.c
++++ b/test/test-utils-aplay.c
+@@ -307,8 +307,8 @@ CK_START_TEST(test_play_dbus_signals) {
+
+ } CK_END_TEST
+
+-int main(int argc, char *argv[], char *envp[]) {
+- preload(argc, argv, envp, ".libs/aloader.so");
++int main(int argc, char *argv[]) {
++ preload(argc, argv, ".libs/libaloader.so");
+
+ char *argv_0 = strdup(argv[0]);
+ char *argv_0_dir = dirname(argv_0);
+diff --git a/test/test-utils-cli.c b/test/test-utils-cli.c
+index 53510e02e..378c6f2f3 100644
+--- a/test/test-utils-cli.c
++++ b/test/test-utils-cli.c
+@@ -461,8 +461,8 @@ CK_START_TEST(test_open) {
+
+ } CK_END_TEST
+
+-int main(int argc, char *argv[], char *envp[]) {
+- preload(argc, argv, envp, ".libs/aloader.so");
++int main(int argc, char *argv[]) {
++ preload(argc, argv, ".libs/libaloader.so");
+
+ char *argv_0 = strdup(argv[0]);
+ char *argv_0_dir = dirname(argv_0);
diff --git a/media-sound/bluez-alsa/files/bluez-alsa-4.2.0-test-alsa-midi-checkdev.patch b/media-sound/bluez-alsa/files/bluez-alsa-4.2.0-test-alsa-midi-checkdev.patch
new file mode 100644
index 000000000000..ffb3dc6d09d8
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluez-alsa-4.2.0-test-alsa-midi-checkdev.patch
@@ -0,0 +1,23 @@
+From 4b0ec2e0e36b839161a4ef15da1c2a39ee325af4 Mon Sep 17 00:00:00 2001
+From: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com>
+Date: Wed, 5 Jun 2024 22:30:17 +0200
+Subject: [PATCH] Check for sequencer read/write access before test
+
+Fixes #718
+---
+ test/test-alsa-midi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test-alsa-midi.c b/test/test-alsa-midi.c
+index 45e09d73..7ee80f96 100644
+--- a/test/test-alsa-midi.c
++++ b/test/test-alsa-midi.c
+@@ -161,7 +161,7 @@ int main(int argc, char *argv[]) {
+
+ /* Check whether current host supports ALSA sequencer. If not, then
+ * there is no point in running this test, because it will fail. */
+- if (access("/dev/snd/seq", F_OK) != 0) {
++ if (access("/dev/snd/seq", F_OK | R_OK | W_OK) != 0) {
+ warn("ALSA sequencer not available, skipping test!");
+ return 77 /* magic number for skipping tests */;
+ }
diff --git a/media-sound/bluez-alsa/metadata.xml b/media-sound/bluez-alsa/metadata.xml
index 5533720929d0..9159f5db1c7a 100644
--- a/media-sound/bluez-alsa/metadata.xml
+++ b/media-sound/bluez-alsa/metadata.xml
@@ -9,6 +9,7 @@
<flag name="aptx">aptX (HD) over Bluetooth (many Android compatible headphones)</flag>
<flag name="hcitop">Enable top-like monitoring tool for HCI</flag>
<flag name="ldac">Enable support for AOSP <pkg>media-libs/libldac</pkg> dispatcher</flag>
+ <flag name="liblc3">Enable LC3 support</flag>
<flag name="mpg123">Enable support for MPEG audio playback via <pkg>media-sound/mpg123</pkg></flag>
<flag name="ofono">Enable ofono elephony support</flag>
</use>