gentoo resync : 13.06.2020

3 files changed, 84 insertions, 3 deletions

diff --git a/media-sound/pulseaudio-modules-bt/Manifest b/media-sound/pulseaudio-modules-bt/Manifest
index e8b5a03f6674..29b54336ad7c 100644
--- a/media-sound/pulseaudio-modules-bt/Manifest
+++ b/media-sound/pulseaudio-modules-bt/Manifest
@@ -1,5 +1,7 @@
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
 DIST pulseaudio-modules-bt-1.3.tar.gz 85802 BLAKE2B ea7e5141d07c1d3b19372cbae2aa9a5b6049509a12bb2470f47f231f85cc66ef4a74e70bdc91d3554d57e9c26b64129f87b2a3a55e16fbf0c6fe1b5ce7721074 SHA512 094c4205c1c71326efd42053a1bc9f131633c9e28fde177f1c08a290395864b76b8f60f79ffec2fbb8445186aa5c85aafabc47908fd302beb5b278ebcac98558
+DIST pulseaudio-modules-bt-1.4.tar.gz 87558 BLAKE2B 98b21d8fced5b88d59e45ca4fa2505d3606616a8a09dd95eb91e30b0d31c8a0ec7e52e4c2fd1b601130f69a997871064849fa0c8847ec0686fb42a2ccd7ac43b SHA512 390b6ad0931b464a546c6624bec38cc5b6da7084e4defe2045f4164b0c910a9dd6d4327466eb0e53fcfbc78c995cf2e3634a75b67ee2a14f38ed18e31b5d2bce
 EBUILD pulseaudio-modules-bt-1.3-r2.ebuild 2228 BLAKE2B 8c21f34108dfcc888e92784ea0d8e648214b1ba3abf78265e9ed501d03fcdb473a0543c5c93c02028e5d00c36b654e237fc9ce5d362b13f1933e2ef6f25802a3 SHA512 65166145c85b9337d75e3b1cb1ea75cd68945aa0859d092a6373b9dd610de641ecfe92abd9182949e11f8d4027b0487458e85f91178b76c47c81e6df890df411
-EBUILD pulseaudio-modules-bt-9999.ebuild 2097 BLAKE2B 4a441e062fbb3dadc239f9e258e7882cd2650a86ca893b9ea54e10f4ac5926ad15ad113ca712e950710d352691c9fd0cf92356ed539a64b8ab9945391ce4afea SHA512 3fb96278f148298f3c959b7d80c7e5436a8466931f66850efa7ee2d23c4e7b0db3b3a6706fa4c1f652354c56671026fa9d79cd8cb8261c1dcfe61d6410befe3a
+EBUILD pulseaudio-modules-bt-1.4.ebuild 2194 BLAKE2B 389cd211299f30b3fa4634bcdec0eb6f1b7152bede7558bcd516b1a80d05a8cdebddfc0904cfffd233eccae54292bf75d5a85ddc7ba335c87bdd1f932390e32f SHA512 a34e4f1956670b72b80712c49dfab5325cb916594e71a9f7c4fc0eedbe8a318a427f12947a771ed83ec065dbbd1deb69b49e366ead93c5f3e817de92e564e550
+EBUILD pulseaudio-modules-bt-9999.ebuild 2063 BLAKE2B b45bfc09796b5c9614ec159ab0f79481009b850aecfe840c94789ac32fd8eac21e9143e2959bfbe1f6e099cf106e4edbbc2dac1f8137ff80d6dbbfc016f8b8fb SHA512 1003a535a6a01464f85ca06cfe9eb20519ed78e0855bc86afc16634f4e3582976738b4d333bf41efcfacde7c8733b363f8cd42dd314468dfa7a0f9ac9cf2c993
 MISC metadata.xml 766 BLAKE2B 3fc16e24b2ecb5212c32ada629f2e8c19c91921333db4de169f0848b6bc63b2001c8e68d7c82765e064f8ecbed10e25bc926ea7c598c09d88d5e474df63ab9bb SHA512 c14a460ddba2b09ecddd6a5f12ca8a888b22bac2b9f606249d466473bde3e6ae5c64ee899e74c5ca10c3708d9a39874dfcbbce84c3ccc383c274ac8cfbde43bc
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
new file mode 100644
index 000000000000..56a66ff8e9e3
--- /dev/null
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils 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="13.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_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-utils_src_configure
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# pulseaudio headers needed to build
+	rmdir pa/ || die
+	ln -s ../pulseaudio-${PULSE_VER}/ pa || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
index 4847cdac7273..5363d6d475a6 100644
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
@@ -34,8 +34,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
-CMAKE_MAKEFILE_GENERATOR="emake"
-
 DISABLE_AUTOFORMATTING="no"
 DOC_CONTENTS="
 After getting media-sound/pulseaudio merged without its bluetooth