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