commit: 485901e99316ad34858d84a9dafb17d749fa920c Author: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail <DOT> com> AuthorDate: Sun Feb 27 07:38:43 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Mar 8 13:30:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=485901e9
media-sound/pulseaudio-modules-bt: Adapt to pulseaudio metapackage Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> .../pulseaudio-modules-bt-1.4-r1.ebuild | 81 ---------------------- ....ebuild => pulseaudio-modules-bt-1.4-r4.ebuild} | 5 +- .../pulseaudio-modules-bt-1.4.ebuild | 4 +- 3 files changed, 5 insertions(+), 85 deletions(-) diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r1.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r1.ebuild deleted file mode 100644 index dd8941809a38..000000000000 --- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake readme.gentoo-r1 - -DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth" -HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"; - -PULSE_VER="15.0" -SRC_URI=" - https://github.com/EHfive/pulseaudio-modules-bt/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PULSE_VER}.tar.xz -" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset" - -DEPEND=" - fdk? ( media-libs/fdk-aac:0= ) - ffmpeg? ( media-video/ffmpeg ) - media-libs/sbc - ldac? ( media-libs/libldac ) - >=net-wireless/bluez-5 - >=sys-apps/dbus-1.0.0 - ofono-headset? ( >=net-misc/ofono-1.13 ) - >=media-sound/pulseaudio-${PULSE_VER}[-bluetooth] -" -# Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead. -RDEPEND="${DEPEND}" -BDEPEND="" - -DISABLE_AUTOFORMATTING="no" -DOC_CONTENTS=" -After getting media-sound/pulseaudio merged without its bluetooth -support (to not collide with this) you may have removed the loading -of bluetooth modules in default.pa config file, leading to failure -to use your bluetooth device (see -https://github.com/EHfive/pulseaudio-modules-bt/issues/33). -Please ensure you have this lines present in your /etc/pulse/default.pa -file: - -.ifexists module-bluetooth-policy.so -load-module module-bluetooth-policy -.endif - -.ifexists module-bluetooth-discover.so -load-module module-bluetooth-discover -.endif -" - -src_prepare() { - cmake_src_prepare - - # pulseaudio headers needed to build - rmdir pa/ || die - ln -s ../pulseaudio-${PULSE_VER}/ pa || die -} - -src_configure() { - local mycmakeargs=( - -DCODEC_AAC_FDK=$(usex fdk "ON" "OFF") - -DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF") - -DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF") - -DCODEC_LDAC=$(usex ldac "ON" "OFF") - -DNATIVE_HEADSET=$(usex native-headset "ON" "OFF") - -DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF") - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r3.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r4.ebuild similarity index 92% rename from media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r3.ebuild rename to media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r4.ebuild index f40fc7b8e73d..725cf735ad5c 100644 --- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r3.ebuild +++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r4.ebuild @@ -28,9 +28,10 @@ DEPEND=" ofono-headset? ( >=net-misc/ofono-1.13 ) || ( >=media-sound/pulseaudio-daemon-${PULSE_VER}[-bluetooth] - >=media-sound/pulseaudio-${PULSE_VER}[-bluetooth,daemon(+)] + ( >=media-sound/pulseaudio-${PULSE_VER}[-bluetooth(-),daemon(+)] <media-sound/pulseaudio-15.99.1 ) ) - !media-sound/pulseaudio[bluetooth] + !media-sound/pulseaudio[bluetooth(-)] + !media-sound/pulseaudio-daemon[bluetooth] " # Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead. RDEPEND="${DEPEND}" diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild index 4b41f381f58c..b1b9841188e7 100644 --- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild +++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,7 @@ DEPEND=" >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 ofono-headset? ( >=net-misc/ofono-1.13 ) - >=media-sound/pulseaudio-${PULSE_VER}[-bluetooth] + ( >=media-sound/pulseaudio-${PULSE_VER}[-bluetooth(-)] <media-sound/pulseaudio-15.99.1 ) " # Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead. RDEPEND="${DEPEND}"
