From b02a87b6fe1e3d1edd2f1a957923a733511c6b09 Mon Sep 17 00:00:00 2001 From: Vladimir Shupilov Date: Fri, 2 Feb 2024 16:19:38 +0300 Subject: media-sound/bluez-alsa: fix openrc daemon start Closes: https://bugs.gentoo.org/921681 Signed-off-by: Vladimir Shupilov Closes: https://github.com/gentoo/gentoo/pull/35145 Signed-off-by: Joonas Niilola --- media-sound/bluez-alsa/bluez-alsa-4.1.1-r1.ebuild | 103 ++++++++++++++++++++++ media-sound/bluez-alsa/bluez-alsa-4.1.1.ebuild | 103 ---------------------- media-sound/bluez-alsa/files/bluealsa-conf.d-2-r1 | 4 + 3 files changed, 107 insertions(+), 103 deletions(-) create mode 100644 media-sound/bluez-alsa/bluez-alsa-4.1.1-r1.ebuild delete mode 100644 media-sound/bluez-alsa/bluez-alsa-4.1.1.ebuild create mode 100644 media-sound/bluez-alsa/files/bluealsa-conf.d-2-r1 diff --git a/media-sound/bluez-alsa/bluez-alsa-4.1.1-r1.ebuild b/media-sound/bluez-alsa/bluez-alsa-4.1.1-r1.ebuild new file mode 100644 index 000000000000..cb9a309aedd6 --- /dev/null +++ b/media-sound/bluez-alsa/bluez-alsa-4.1.1-r1.ebuild @@ -0,0 +1,103 @@ +# 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 + +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 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}] + >=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}] + >=media-libs/sbc-1.5[${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 ) + systemd? ( sys-apps/systemd ) + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + upower? ( sys-power/upower ) +" +DEPEND="${RDEPEND} + test? ( + dev-libs/check + media-libs/libsndfile + )" +BDEPEND=" + dev-util/gdbus-codegen + virtual/pkgconfig + man? ( virtual/pandoc ) +" + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --enable-cli + --enable-faststream + --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 systemd) + $(use_enable test) + $(use_with systemd systemdsystemunitdir $(systemd_get_systemunitdir)) + $(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-r1 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.in" +} + +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.1.1.ebuild b/media-sound/bluez-alsa/bluez-alsa-4.1.1.ebuild deleted file mode 100644 index c08d719a53b2..000000000000 --- a/media-sound/bluez-alsa/bluez-alsa-4.1.1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -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 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}] - >=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}] - >=media-libs/sbc-1.5[${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 ) - systemd? ( sys-apps/systemd ) - unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) - upower? ( sys-power/upower ) -" -DEPEND="${RDEPEND} - test? ( - dev-libs/check - media-libs/libsndfile - )" -BDEPEND=" - dev-util/gdbus-codegen - virtual/pkgconfig - man? ( virtual/pandoc ) -" - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --enable-cli - --enable-faststream - --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 systemd) - $(use_enable test) - $(use_with systemd systemdsystemunitdir $(systemd_get_systemunitdir)) - $(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.in" -} - -pkg_postinst() { - elog "Users can use this service when they are members of the \"audio\" group." -} diff --git a/media-sound/bluez-alsa/files/bluealsa-conf.d-2-r1 b/media-sound/bluez-alsa/files/bluealsa-conf.d-2-r1 new file mode 100644 index 000000000000..ff1dd4cb1cd9 --- /dev/null +++ b/media-sound/bluez-alsa/files/bluealsa-conf.d-2-r1 @@ -0,0 +1,4 @@ +# Config file for /etc/init.d/bluealsa + +# Allow additional options to be set +BLUEALSA_CONF="-S -p a2dp-source -p a2dp-sink" -- cgit v1.2.3-65-gdbad