1 |
commit: 7ea8d613021272d4b4cdd0e4e90fae5ebb725044 |
2 |
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 8 16:05:43 2019 +0000 |
4 |
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 8 16:08:30 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ea8d613 |
7 |
|
8 |
media-sound/pulseaudio: import bluetooth extra codecs |
9 |
|
10 |
Upstream produces patches, which work much better than |
11 |
file-collision-inducing separate packages. |
12 |
|
13 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
14 |
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org> |
15 |
|
16 |
media-libs/libldac/libldac-2.0.2.ebuild | 2 +- |
17 |
media-sound/pulseaudio-modules-bt/metadata.xml | 7 ----- |
18 |
.../pulseaudio-modules-bt-9999.ebuild | 34 ---------------------- |
19 |
media-sound/pulseaudio/Manifest | 1 + |
20 |
media-sound/pulseaudio/metadata.xml | 4 +++ |
21 |
media-sound/pulseaudio/pulseaudio-12.2.ebuild | 31 +++++++++++++++----- |
22 |
6 files changed, 30 insertions(+), 49 deletions(-) |
23 |
|
24 |
diff --git a/media-libs/libldac/libldac-2.0.2.ebuild b/media-libs/libldac/libldac-2.0.2.ebuild |
25 |
index bd5b7ac1019..329b71fb3d0 100644 |
26 |
--- a/media-libs/libldac/libldac-2.0.2.ebuild |
27 |
+++ b/media-libs/libldac/libldac-2.0.2.ebuild |
28 |
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/EHfive/ldacBT/releases/download/${PACKAGING_VERSION} |
29 |
|
30 |
LICENSE="Apache-2.0" |
31 |
SLOT="0" |
32 |
-KEYWORDS="~amd64 ~x86" |
33 |
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux" |
34 |
IUSE="" |
35 |
|
36 |
DEPEND="" |
37 |
|
38 |
diff --git a/media-sound/pulseaudio-modules-bt/metadata.xml b/media-sound/pulseaudio-modules-bt/metadata.xml |
39 |
deleted file mode 100644 |
40 |
index 38b28ff6e62..00000000000 |
41 |
--- a/media-sound/pulseaudio-modules-bt/metadata.xml |
42 |
+++ /dev/null |
43 |
@@ -1,7 +0,0 @@ |
44 |
-<?xml version="1.0" encoding="UTF-8"?> |
45 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
46 |
-<pkgmetadata> |
47 |
-<maintainer type="person"> |
48 |
-<email>zx2c4@g.o</email> |
49 |
-</maintainer> |
50 |
-</pkgmetadata> |
51 |
|
52 |
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild |
53 |
deleted file mode 100644 |
54 |
index 23b537c2088..00000000000 |
55 |
--- a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild |
56 |
+++ /dev/null |
57 |
@@ -1,34 +0,0 @@ |
58 |
-# Copyright 2019 Gentoo Authors |
59 |
-# Distributed under the terms of the GNU General Public License v2 |
60 |
- |
61 |
-EAPI=7 |
62 |
- |
63 |
-inherit git-r3 cmake-utils |
64 |
- |
65 |
-DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth (alongside SBC and native+ofono headset)" |
66 |
-HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt" |
67 |
-SRC_URI="" |
68 |
-EGIT_REPO_URI="https://github.com/EHfive/${PN}" |
69 |
- |
70 |
-LICENSE="LGPL-2.1" |
71 |
-SLOT="0" |
72 |
-KEYWORDS="" |
73 |
-IUSE="" |
74 |
- |
75 |
-DEPEND=" |
76 |
- media-libs/fdk-aac |
77 |
- virtual/ffmpeg |
78 |
- media-libs/sbc |
79 |
- media-libs/libldac |
80 |
- >=net-wireless/bluez-5 |
81 |
- >=sys-apps/dbus-1.0.0 |
82 |
- >=net-misc/ofono-1.13 |
83 |
- media-sound/pulseaudio[-bluetooth] |
84 |
-" |
85 |
-# Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead. |
86 |
- |
87 |
-RDEPEND="${DEPEND}" |
88 |
-BDEPEND="" |
89 |
- |
90 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
91 |
-mycmakeargs=( -DFORCE_NOT_BUILD_LDAC=ON ) |
92 |
|
93 |
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest |
94 |
index 51ef3ffb093..49218c62576 100644 |
95 |
--- a/media-sound/pulseaudio/Manifest |
96 |
+++ b/media-sound/pulseaudio/Manifest |
97 |
@@ -1 +1,2 @@ |
98 |
+DIST patch-1.0-pulseaudio-12.2-bluez5-a2dp-extra-codecs.patch 229249 BLAKE2B fc486e5c6deb0097d66f53e21ac4e901d8312ec03062d15b7e907cf48a606851499cb01328fc6c3c9aac4c7f1929f3132bf2da3c9b4c3d7f6db1017c64360a27 SHA512 a4be9367c09d9f51c2ff90ba524b1051858d23a4249a348a7b7913c671819725f135a861ee33e7c0d879d2cbfed1ef5ae225f94808529958f68dc5a05f306188 |
99 |
DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e |
100 |
|
101 |
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml |
102 |
index a0d16e0c781..87d676f99f0 100644 |
103 |
--- a/media-sound/pulseaudio/metadata.xml |
104 |
+++ b/media-sound/pulseaudio/metadata.xml |
105 |
@@ -72,5 +72,9 @@ |
106 |
<flag name="ofono-headset"> |
107 |
Build with oFono HFP backend for bluez 5, requires <pkg>net-misc/ofono</pkg>. |
108 |
</flag> |
109 |
+ <flag name="bluetooth-extra-codecs"> |
110 |
+ Build support for extra Bluetooth codecs, like LDAC, APTX, APTX-HD, and AAC, using: |
111 |
+ https://github.com/EHfive/pulseaudio-modules-bt |
112 |
+ </flag> |
113 |
</use> |
114 |
</pkgmetadata> |
115 |
|
116 |
diff --git a/media-sound/pulseaudio/pulseaudio-12.2.ebuild b/media-sound/pulseaudio/pulseaudio-12.2.ebuild |
117 |
index 9c17d6d71b0..b3877d084c4 100644 |
118 |
--- a/media-sound/pulseaudio/pulseaudio-12.2.ebuild |
119 |
+++ b/media-sound/pulseaudio/pulseaudio-12.2.ebuild |
120 |
@@ -1,12 +1,18 @@ |
121 |
-# Copyright 1999-2018 Gentoo Authors |
122 |
+# Copyright 1999-2019 Gentoo Authors |
123 |
# Distributed under the terms of the GNU General Public License v2 |
124 |
|
125 |
EAPI=6 |
126 |
-inherit bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd user udev multilib-minimal |
127 |
+inherit bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd user udev multilib-minimal autotools |
128 |
+ |
129 |
+EXTRA_CODECS_VERSION="1.0" |
130 |
+EXTRA_CODECS_FILE="patch-${EXTRA_CODECS_VERSION}-pulseaudio-${PV}-bluez5-a2dp-extra-codecs.patch" |
131 |
|
132 |
DESCRIPTION="A networked sound server with an advanced plugin system" |
133 |
HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/" |
134 |
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz" |
135 |
+SRC_URI=" |
136 |
+ https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz |
137 |
+ bluetooth-extra-codecs? ( https://github.com/EHfive/pulseaudio-modules-bt/releases/download/v${EXTRA_CODECS_VERSION}/${EXTRA_CODECS_FILE} ) |
138 |
+" |
139 |
|
140 |
# libpulse-simple and libpulse link to libpulse-core; this is daemon's |
141 |
# library and can link to gdbm and other GPL-only libraries. In this |
142 |
@@ -18,14 +24,15 @@ SLOT="0" |
143 |
KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux" |
144 |
|
145 |
# +alsa-plugin as discussed in bug #519530 |
146 |
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer gconf +gdbm |
147 |
-+glib gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset |
148 |
-+orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev |
149 |
-+webrtc-aec +X zeroconf" |
150 |
+IUSE="+alsa +alsa-plugin +asyncns bluetooth bluetooth-extra-codecs +caps dbus doc |
151 |
+equalizer gconf +gdbm +glib gtk ipv6 jack libsamplerate libressl lirc native-headset |
152 |
+neon ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test |
153 |
++udev +webrtc-aec +X zeroconf" |
154 |
|
155 |
# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac |
156 |
REQUIRED_USE=" |
157 |
bluetooth? ( dbus ) |
158 |
+ bluetooth-extra-codecs? ( bluetooth ) |
159 |
equalizer? ( dbus ) |
160 |
ofono-headset? ( bluetooth ) |
161 |
native-headset? ( bluetooth ) |
162 |
@@ -62,6 +69,11 @@ CDEPEND=" |
163 |
>=net-wireless/bluez-5 |
164 |
>=sys-apps/dbus-1.0.0 |
165 |
media-libs/sbc |
166 |
+ bluetooth-extra-codecs? ( |
167 |
+ media-libs/fdk-aac |
168 |
+ virtual/ffmpeg |
169 |
+ media-libs/libldac |
170 |
+ ) |
171 |
) |
172 |
asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] ) |
173 |
udev? ( >=virtual/udev-143[hwdb(+)] ) |
174 |
@@ -153,6 +165,11 @@ src_prepare() { |
175 |
# Skip test that cannot work with sandbox, bug #501846 |
176 |
sed -i -e '/lock-autospawn-test /d' src/Makefile.am || die |
177 |
sed -i -e 's/lock-autospawn-test$(EXEEXT) //' src/Makefile.in || die |
178 |
+ |
179 |
+ if use bluetooth-extra-codecs; then |
180 |
+ eapply "${DISTDIR}/${EXTRA_CODECS_FILE}" |
181 |
+ eautoreconf |
182 |
+ fi |
183 |
} |
184 |
|
185 |
multilib_src_configure() { |