1 |
commit: dc88877a2411735d828da371cd8b72b2173625f5 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 23 07:52:09 2021 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 23 07:53:39 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc88877a |
7 |
|
8 |
net-wireless/bluez: Drop old |
9 |
|
10 |
Bug: https://bugs.gentoo.org/797712 |
11 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
12 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
13 |
|
14 |
net-wireless/bluez/Manifest | 2 - |
15 |
net-wireless/bluez/bluez-5.55.ebuild | 299 --------------------- |
16 |
net-wireless/bluez/bluez-5.56-r1.ebuild | 296 -------------------- |
17 |
.../bluez/files/bluez-5.56-avdtp-disconnects.patch | 41 --- |
18 |
4 files changed, 638 deletions(-) |
19 |
|
20 |
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest |
21 |
index 30a5ca30ec7..4bc25fa2af7 100644 |
22 |
--- a/net-wireless/bluez/Manifest |
23 |
+++ b/net-wireless/bluez/Manifest |
24 |
@@ -1,4 +1,2 @@ |
25 |
-DIST bluez-5.55.tar.xz 2041428 BLAKE2B 7eee44063ea53188d35324bcc5b5f0539cf92a5934632743677bbf41822b8b79a899a82a93fd79887fe058e6f0c0e66ed8d5da46e5585682613bc1847cb009a8 SHA512 9423cb60d15a6f068838497a1eaea9f5a32d70c07191c313ba821a6919d6e0c436ada4f547cc5f2db5eacc0123429ad54851f57df2554f61fa293743ec14a033 |
26 |
-DIST bluez-5.56.tar.xz 2053080 BLAKE2B b901deae4047ebe96c034c20c9d7e6c275d3c1fd311dc57ed2f1f927d6e778b213af3e09caaeebbb11110f1733fc9bf341cf8f7c63a37aaa6b896607c0026d92 SHA512 b320ee9d49a516f5cecb5fbc410ba42e9127f44ebcfb95647f68bd5d300147d0eaf633f8e8d0678631a2184ea3afae7b01b5f228157328874fa2a87832ed0ae1 |
27 |
DIST bluez-5.58.tar.xz 2060368 BLAKE2B 157780f83181d89fb126face5e9794bc0de8196f43d57d079fc09ae7e45e7ef21bf404e834d844da28d06f9a29cb92f11c310dbbcb7f60e845a335a558d7190c SHA512 159b554e0afd56af5da6f8333383f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3 |
28 |
DIST bluez-5.59.tar.xz 2123104 BLAKE2B 59e063ffc0cd810a151f49c2d8b3e1dca46eef038dfe112bfc0524e111e00cfea78557f3d1ccf657882b76158ee9249291f9fc6e6a4cce851e0e6dc43f707398 SHA512 506ce28459a82614e5f6c55235b84e5780a9bfa821904fd40ee2928a503978248368069c57a283db9dd81f48d78f45e00d95a7c52d1538d3f5c858a29424304f |
29 |
|
30 |
diff --git a/net-wireless/bluez/bluez-5.55.ebuild b/net-wireless/bluez/bluez-5.55.ebuild |
31 |
deleted file mode 100644 |
32 |
index e374716a186..00000000000 |
33 |
--- a/net-wireless/bluez/bluez-5.55.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,299 +0,0 @@ |
36 |
-# Copyright 1999-2020 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=7 |
40 |
-PYTHON_COMPAT=( python3_{7..9} ) |
41 |
- |
42 |
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal |
43 |
- |
44 |
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux" |
45 |
-HOMEPAGE="http://www.bluez.org" |
46 |
-SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz" |
47 |
- |
48 |
-LICENSE="GPL-2+ LGPL-2.1+" |
49 |
-SLOT="0/3" |
50 |
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86" |
51 |
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session" |
52 |
- |
53 |
-# Since this release all remaining extra-tools need readline support, but this could |
54 |
-# change in the future, hence, this REQUIRED_USE constraint could be dropped |
55 |
-# again in the future. |
56 |
-REQUIRED_USE=" |
57 |
- extra-tools? ( deprecated readline ) |
58 |
- test? ( ${PYTHON_REQUIRED_USE} ) |
59 |
- test-programs? ( ${PYTHON_REQUIRED_USE} ) |
60 |
-" |
61 |
- |
62 |
-TEST_DEPS="${PYTHON_DEPS} |
63 |
- $(python_gen_cond_dep ' |
64 |
- >=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}] |
65 |
- dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] |
66 |
- ') |
67 |
-" |
68 |
-BDEPEND=" |
69 |
- virtual/pkgconfig |
70 |
- test? ( ${TEST_DEPS} ) |
71 |
-" |
72 |
-DEPEND=" |
73 |
- >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] |
74 |
- >=sys-apps/hwids-20121202.2 |
75 |
- btpclient? ( >=dev-libs/ell-0.28 ) |
76 |
- cups? ( net-print/cups:= ) |
77 |
- mesh? ( |
78 |
- >=dev-libs/ell-0.28 |
79 |
- >=dev-libs/json-c-0.13:= |
80 |
- sys-libs/readline:0= |
81 |
- ) |
82 |
- midi? ( media-libs/alsa-lib ) |
83 |
- obex? ( dev-libs/libical:= ) |
84 |
- readline? ( sys-libs/readline:0= ) |
85 |
- systemd? ( |
86 |
- >=sys-apps/dbus-1.6:=[user-session=] |
87 |
- sys-apps/systemd |
88 |
- ) |
89 |
- !systemd? ( >=sys-apps/dbus-1.6:= ) |
90 |
- udev? ( >=virtual/udev-172 ) |
91 |
-" |
92 |
-RDEPEND="${DEPEND} |
93 |
- selinux? ( sec-policy/selinux-bluetooth ) |
94 |
- test-programs? ( ${TEST_DEPS} ) |
95 |
-" |
96 |
- |
97 |
-RESTRICT="!test? ( test )" |
98 |
- |
99 |
-PATCHES=( |
100 |
- # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) |
101 |
- # http://www.spinics.net/lists/linux-bluetooth/msg58739.html |
102 |
- # https://bugs.gentoo.org/539844 |
103 |
- "${FILESDIR}"/${PN}-udevadm-path-r1.patch |
104 |
- |
105 |
- # Fedora patches |
106 |
- # http://www.spinics.net/lists/linux-bluetooth/msg40136.html |
107 |
- "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch |
108 |
-) |
109 |
- |
110 |
-pkg_setup() { |
111 |
- # From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html |
112 |
- # to prevent bugs like: |
113 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=196621 |
114 |
- CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER |
115 |
- ~BT_BNEP_PROTO_FILTER ~BT_HIDP ~RFKILL" |
116 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=196621 |
117 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=206815 |
118 |
- if use mesh || use test; then |
119 |
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER |
120 |
- ~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_USER_API_HASH |
121 |
- ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC" |
122 |
- fi |
123 |
- if use test; then |
124 |
- # http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html |
125 |
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER" |
126 |
- fi |
127 |
- linux-info_pkg_setup |
128 |
- |
129 |
- if use test || use test-programs; then |
130 |
- python-single-r1_pkg_setup |
131 |
- fi |
132 |
- |
133 |
- if ! use udev; then |
134 |
- ewarn |
135 |
- ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth" |
136 |
- ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work," |
137 |
- ewarn "and hid2hci will not be available." |
138 |
- ewarn |
139 |
- fi |
140 |
-} |
141 |
- |
142 |
-src_prepare() { |
143 |
- default |
144 |
- |
145 |
- # http://www.spinics.net/lists/linux-bluetooth/msg38490.html |
146 |
- if ! use user-session || ! use systemd; then |
147 |
- eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch |
148 |
- fi |
149 |
- |
150 |
- if use cups; then |
151 |
- sed -i \ |
152 |
- -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \ |
153 |
- Makefile.{in,tools} || die |
154 |
- fi |
155 |
- |
156 |
- eautoreconf |
157 |
- |
158 |
- multilib_copy_sources |
159 |
-} |
160 |
- |
161 |
-multilib_src_configure() { |
162 |
- local myconf=( |
163 |
- # readline is automagic when client is enabled |
164 |
- # --enable-client always needs readline, bug #504038 |
165 |
- # --enable-mesh is handled in the same way |
166 |
- ac_cv_header_readline_readline_h=$(multilib_native_usex readline) |
167 |
- ac_cv_header_readline_readline_h=$(multilib_native_usex mesh) |
168 |
- ) |
169 |
- |
170 |
- if ! multilib_is_native_abi; then |
171 |
- myconf+=( |
172 |
- # deps not used for the library |
173 |
- {DBUS,GLIB}_{CFLAGS,LIBS}=' ' |
174 |
- ) |
175 |
- fi |
176 |
- |
177 |
- econf \ |
178 |
- --localstatedir=/var \ |
179 |
- --disable-android \ |
180 |
- --enable-datafiles \ |
181 |
- --enable-optimization \ |
182 |
- $(use_enable debug) \ |
183 |
- --enable-pie \ |
184 |
- --enable-threads \ |
185 |
- --enable-library \ |
186 |
- --enable-tools \ |
187 |
- --enable-manpages \ |
188 |
- --enable-monitor \ |
189 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ |
190 |
- --with-systemduserunitdir="$(systemd_get_userunitdir)" \ |
191 |
- $(multilib_native_use_enable btpclient) \ |
192 |
- $(multilib_native_use_enable btpclient external-ell) \ |
193 |
- $(multilib_native_use_enable cups) \ |
194 |
- $(multilib_native_use_enable deprecated) \ |
195 |
- $(multilib_native_use_enable experimental) \ |
196 |
- $(multilib_native_use_enable mesh) \ |
197 |
- $(multilib_native_use_enable mesh external-ell) \ |
198 |
- $(multilib_native_use_enable midi) \ |
199 |
- $(multilib_native_use_enable obex) \ |
200 |
- $(multilib_native_use_enable readline client) \ |
201 |
- $(multilib_native_use_enable systemd) \ |
202 |
- $(multilib_native_use_enable test-programs test) \ |
203 |
- $(multilib_native_use_enable udev) \ |
204 |
- $(multilib_native_use_enable udev hid2hci) \ |
205 |
- $(multilib_native_use_enable udev sixaxis) |
206 |
-} |
207 |
- |
208 |
-multilib_src_compile() { |
209 |
- if multilib_is_native_abi; then |
210 |
- default |
211 |
- else |
212 |
- emake -f Makefile -f - libs \ |
213 |
- <<<'libs: $(lib_LTLIBRARIES)' |
214 |
- fi |
215 |
-} |
216 |
- |
217 |
-multilib_src_test() { |
218 |
- multilib_is_native_abi && default |
219 |
-} |
220 |
- |
221 |
-multilib_src_install() { |
222 |
- if multilib_is_native_abi; then |
223 |
- emake DESTDIR="${D}" install |
224 |
- |
225 |
- # Only install extra-tools when relevant USE flag is enabled |
226 |
- if use extra-tools; then |
227 |
- ewarn "Upstream doesn't support using this tools and their bugs are" |
228 |
- ewarn "likely to be ignored forever, also they can break without" |
229 |
- ewarn "previous announcement." |
230 |
- ewarn "Upstream also states all this tools are not really needed," |
231 |
- ewarn "then, if you still need to rely on them, you must ask them" |
232 |
- ewarn "to either install that tool by default or add the needed" |
233 |
- ewarn "functionality to the existing 'official' tools." |
234 |
- ewarn "Please report this issues to:" |
235 |
- ewarn "http://www.bluez.org/development/lists/" |
236 |
- |
237 |
- # Upstream doesn't install this, bug #524640 |
238 |
- # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115 |
239 |
- # http://comments.gmane.org/gmane.linux.bluez.kernel/54564 |
240 |
- dobin tools/btmgmt |
241 |
- # gatttool is only built with readline, bug #530776 |
242 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1141909 |
243 |
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486 |
244 |
- # https://bugs.archlinux.org/task/37686 |
245 |
- dobin attrib/gatttool |
246 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1699680 |
247 |
- dobin tools/avinfo |
248 |
- fi |
249 |
- |
250 |
- # Not installed by default after being built, bug #666756 |
251 |
- use btpclient && dobin tools/btpclient |
252 |
- |
253 |
- # Unittests are not that useful once installed, so make them optional |
254 |
- if use test-programs; then |
255 |
- # Drop python2 only test tools |
256 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=206819 |
257 |
- rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die |
258 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=206821 |
259 |
- rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die |
260 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=206823 |
261 |
- rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server || die |
262 |
- |
263 |
- python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test |
264 |
- |
265 |
- for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do |
266 |
- dosym "${i}" /usr/bin/bluez-"${i##*/}" |
267 |
- done |
268 |
- fi |
269 |
- else |
270 |
- emake DESTDIR="${D}" \ |
271 |
- install-pkgincludeHEADERS \ |
272 |
- install-libLTLIBRARIES \ |
273 |
- install-pkgconfigDATA |
274 |
- fi |
275 |
-} |
276 |
- |
277 |
-multilib_src_install_all() { |
278 |
- # We need to ensure obexd can be spawned automatically by systemd |
279 |
- # when user-session is enabled: |
280 |
- # http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2 |
281 |
- # https://bugs.gentoo.org/show_bug.cgi?id=577842 |
282 |
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908 |
283 |
- # https://bugs.archlinux.org/task/45816 |
284 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1318441 |
285 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1389347 |
286 |
- if use user-session && use systemd; then |
287 |
- ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service |
288 |
- fi |
289 |
- |
290 |
- find "${D}" -name '*.la' -type f -delete || die |
291 |
- |
292 |
- keepdir /var/lib/bluetooth |
293 |
- |
294 |
- # Upstream don't want people to play with them |
295 |
- # But we keep installing them due to 'historical' reasons |
296 |
- insinto /etc/bluetooth |
297 |
- local d |
298 |
- for d in input network; do |
299 |
- doins profiles/${d}/${d}.conf |
300 |
- done |
301 |
- # Setup auto enable as Fedora does for allowing to use |
302 |
- # keyboards/mouse as soon as possible |
303 |
- sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die |
304 |
- doins src/main.conf |
305 |
- |
306 |
- newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth |
307 |
- |
308 |
- einstalldocs |
309 |
- use doc && dodoc doc/*.txt |
310 |
- # Install .json files as examples to be used by meshctl |
311 |
- if use mesh; then |
312 |
- dodoc tools/mesh-gatt/*.json |
313 |
- local DOC_CONTENTS="Some example .json files were installed into |
314 |
- /usr/share/doc/${PF} to be used with meshctl. Feel free to |
315 |
- uncompress and copy them to ~/.config/meshctl to use them." |
316 |
- readme.gentoo_create_doc |
317 |
- fi |
318 |
- |
319 |
- # From Fedora: |
320 |
- # Scripts for automatically btattach-ing serial ports connected to Broadcom HCIs |
321 |
- # as found on some Atom based x86 hardware |
322 |
- udev_dorules "${FILESDIR}/69-btattach-bcm.rules" |
323 |
- systemd_newunit "${FILESDIR}/btattach-bcm_at.service" "btattach-bcm@.service" |
324 |
- exeinto /usr/libexec/bluetooth |
325 |
- doexe "${FILESDIR}/btattach-bcm-service.sh" |
326 |
-} |
327 |
- |
328 |
-pkg_postinst() { |
329 |
- use udev && udev_reload |
330 |
- systemd_reenable bluetooth.service |
331 |
- |
332 |
- has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp" |
333 |
- use mesh && readme.gentoo_print_elog |
334 |
-} |
335 |
|
336 |
diff --git a/net-wireless/bluez/bluez-5.56-r1.ebuild b/net-wireless/bluez/bluez-5.56-r1.ebuild |
337 |
deleted file mode 100644 |
338 |
index 928432949d1..00000000000 |
339 |
--- a/net-wireless/bluez/bluez-5.56-r1.ebuild |
340 |
+++ /dev/null |
341 |
@@ -1,296 +0,0 @@ |
342 |
-# Copyright 1999-2021 Gentoo Authors |
343 |
-# Distributed under the terms of the GNU General Public License v2 |
344 |
- |
345 |
-EAPI=7 |
346 |
-PYTHON_COMPAT=( python3_{7..9} ) |
347 |
- |
348 |
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal |
349 |
- |
350 |
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux" |
351 |
-HOMEPAGE="http://www.bluez.org" |
352 |
-SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz" |
353 |
- |
354 |
-LICENSE="GPL-2+ LGPL-2.1+" |
355 |
-SLOT="0/3" |
356 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86" |
357 |
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session" |
358 |
- |
359 |
-# Since this release all remaining extra-tools need readline support, but this could |
360 |
-# change in the future, hence, this REQUIRED_USE constraint could be dropped |
361 |
-# again in the future. |
362 |
-REQUIRED_USE=" |
363 |
- extra-tools? ( deprecated readline ) |
364 |
- test? ( ${PYTHON_REQUIRED_USE} ) |
365 |
- test-programs? ( ${PYTHON_REQUIRED_USE} ) |
366 |
-" |
367 |
- |
368 |
-TEST_DEPS="${PYTHON_DEPS} |
369 |
- $(python_gen_cond_dep ' |
370 |
- >=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}] |
371 |
- dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] |
372 |
- ') |
373 |
-" |
374 |
-BDEPEND=" |
375 |
- virtual/pkgconfig |
376 |
- test? ( ${TEST_DEPS} ) |
377 |
-" |
378 |
-DEPEND=" |
379 |
- >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] |
380 |
- >=sys-apps/hwids-20121202.2 |
381 |
- btpclient? ( >=dev-libs/ell-0.28 ) |
382 |
- cups? ( net-print/cups:= ) |
383 |
- mesh? ( |
384 |
- >=dev-libs/ell-0.37 |
385 |
- >=dev-libs/json-c-0.13:= |
386 |
- sys-libs/readline:0= |
387 |
- ) |
388 |
- midi? ( media-libs/alsa-lib ) |
389 |
- obex? ( dev-libs/libical:= ) |
390 |
- readline? ( sys-libs/readline:0= ) |
391 |
- systemd? ( |
392 |
- >=sys-apps/dbus-1.6:=[user-session=] |
393 |
- sys-apps/systemd |
394 |
- ) |
395 |
- !systemd? ( >=sys-apps/dbus-1.6:= ) |
396 |
- udev? ( >=virtual/udev-172 ) |
397 |
-" |
398 |
-RDEPEND="${DEPEND} |
399 |
- selinux? ( sec-policy/selinux-bluetooth ) |
400 |
- test-programs? ( ${TEST_DEPS} ) |
401 |
-" |
402 |
- |
403 |
-RESTRICT="!test? ( test )" |
404 |
- |
405 |
-PATCHES=( |
406 |
- # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) |
407 |
- # http://www.spinics.net/lists/linux-bluetooth/msg58739.html |
408 |
- # https://bugs.gentoo.org/539844 |
409 |
- "${FILESDIR}"/${PN}-udevadm-path-r1.patch |
410 |
- |
411 |
- # Fedora patches |
412 |
- # http://www.spinics.net/lists/linux-bluetooth/msg40136.html |
413 |
- "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch |
414 |
- |
415 |
- # avdtp: Fix removing all remote SEPs when loading from cache (from 'master') |
416 |
- "${FILESDIR}"/${P}-avdtp-disconnects.patch |
417 |
-) |
418 |
- |
419 |
-pkg_setup() { |
420 |
- # From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html |
421 |
- # to prevent bugs like: |
422 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=196621 |
423 |
- CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER |
424 |
- ~BT_BNEP_PROTO_FILTER ~BT_HIDP ~RFKILL" |
425 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=196621 |
426 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=206815 |
427 |
- if use mesh || use test; then |
428 |
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER |
429 |
- ~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_USER_API_HASH |
430 |
- ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC" |
431 |
- fi |
432 |
- if use test; then |
433 |
- # http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html |
434 |
- CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER" |
435 |
- fi |
436 |
- linux-info_pkg_setup |
437 |
- |
438 |
- if use test || use test-programs; then |
439 |
- python-single-r1_pkg_setup |
440 |
- fi |
441 |
- |
442 |
- if ! use udev; then |
443 |
- ewarn |
444 |
- ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth" |
445 |
- ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work," |
446 |
- ewarn "and hid2hci will not be available." |
447 |
- ewarn |
448 |
- fi |
449 |
-} |
450 |
- |
451 |
-src_prepare() { |
452 |
- default |
453 |
- |
454 |
- # http://www.spinics.net/lists/linux-bluetooth/msg38490.html |
455 |
- if ! use user-session || ! use systemd; then |
456 |
- eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch |
457 |
- fi |
458 |
- |
459 |
- eautoreconf |
460 |
- |
461 |
- if use cups; then |
462 |
- # Only not .am to not need to run eautoreconf only because of this |
463 |
- sed -i \ |
464 |
- -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \ |
465 |
- Makefile.{in,tools} || die |
466 |
- fi |
467 |
- |
468 |
- multilib_copy_sources |
469 |
-} |
470 |
- |
471 |
-multilib_src_configure() { |
472 |
- local myconf=( |
473 |
- # readline is automagic when client is enabled |
474 |
- # --enable-client always needs readline, bug #504038 |
475 |
- # --enable-mesh is handled in the same way |
476 |
- ac_cv_header_readline_readline_h=$(multilib_native_usex readline) |
477 |
- ac_cv_header_readline_readline_h=$(multilib_native_usex mesh) |
478 |
- ) |
479 |
- |
480 |
- if ! multilib_is_native_abi; then |
481 |
- myconf+=( |
482 |
- # deps not used for the library |
483 |
- {DBUS,GLIB}_{CFLAGS,LIBS}=' ' |
484 |
- ) |
485 |
- fi |
486 |
- |
487 |
- econf \ |
488 |
- --localstatedir=/var \ |
489 |
- --disable-android \ |
490 |
- --enable-datafiles \ |
491 |
- --enable-optimization \ |
492 |
- $(use_enable debug) \ |
493 |
- --enable-pie \ |
494 |
- --enable-threads \ |
495 |
- --enable-library \ |
496 |
- --enable-tools \ |
497 |
- --enable-manpages \ |
498 |
- --enable-monitor \ |
499 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ |
500 |
- --with-systemduserunitdir="$(systemd_get_userunitdir)" \ |
501 |
- $(multilib_native_use_enable btpclient) \ |
502 |
- $(multilib_native_use_enable btpclient external-ell) \ |
503 |
- $(multilib_native_use_enable cups) \ |
504 |
- $(multilib_native_use_enable deprecated) \ |
505 |
- $(multilib_native_use_enable experimental) \ |
506 |
- $(multilib_native_use_enable mesh) \ |
507 |
- $(multilib_native_use_enable mesh external-ell) \ |
508 |
- $(multilib_native_use_enable midi) \ |
509 |
- $(multilib_native_use_enable obex) \ |
510 |
- $(multilib_native_use_enable readline client) \ |
511 |
- $(multilib_native_use_enable systemd) \ |
512 |
- $(multilib_native_use_enable test-programs test) \ |
513 |
- $(multilib_native_use_enable udev) \ |
514 |
- $(multilib_native_use_enable udev hid2hci) \ |
515 |
- $(multilib_native_use_enable udev sixaxis) |
516 |
-} |
517 |
- |
518 |
-multilib_src_compile() { |
519 |
- if multilib_is_native_abi; then |
520 |
- default |
521 |
- else |
522 |
- emake -f Makefile -f - libs \ |
523 |
- <<<'libs: $(lib_LTLIBRARIES)' |
524 |
- fi |
525 |
-} |
526 |
- |
527 |
-multilib_src_test() { |
528 |
- multilib_is_native_abi && default |
529 |
-} |
530 |
- |
531 |
-multilib_src_install() { |
532 |
- if multilib_is_native_abi; then |
533 |
- emake DESTDIR="${D}" install |
534 |
- |
535 |
- # Only install extra-tools when relevant USE flag is enabled |
536 |
- if use extra-tools; then |
537 |
- ewarn "Upstream doesn't support using this tools and their bugs are" |
538 |
- ewarn "likely to be ignored forever, also they can break without" |
539 |
- ewarn "previous announcement." |
540 |
- ewarn "Upstream also states all this tools are not really needed," |
541 |
- ewarn "then, if you still need to rely on them, you must ask them" |
542 |
- ewarn "to either install that tool by default or add the needed" |
543 |
- ewarn "functionality to the existing 'official' tools." |
544 |
- ewarn "Please report this issues to:" |
545 |
- ewarn "http://www.bluez.org/development/lists/" |
546 |
- |
547 |
- # Upstream doesn't install this, bug #524640 |
548 |
- # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115 |
549 |
- # http://comments.gmane.org/gmane.linux.bluez.kernel/54564 |
550 |
- dobin tools/btmgmt |
551 |
- # gatttool is only built with readline, bug #530776 |
552 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1141909 |
553 |
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486 |
554 |
- # https://bugs.archlinux.org/task/37686 |
555 |
- dobin attrib/gatttool |
556 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1699680 |
557 |
- dobin tools/avinfo |
558 |
- fi |
559 |
- |
560 |
- # Not installed by default after being built, bug #666756 |
561 |
- use btpclient && dobin tools/btpclient |
562 |
- |
563 |
- # Unittests are not that useful once installed, so make them optional |
564 |
- if use test-programs; then |
565 |
- # Drop python2 only test tools |
566 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=206819 |
567 |
- rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die |
568 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=206821 |
569 |
- rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die |
570 |
- # https://bugzilla.kernel.org/show_bug.cgi?id=206823 |
571 |
- rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server || die |
572 |
- |
573 |
- python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test |
574 |
- |
575 |
- for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do |
576 |
- dosym "${i}" /usr/bin/bluez-"${i##*/}" |
577 |
- done |
578 |
- fi |
579 |
- else |
580 |
- emake DESTDIR="${D}" \ |
581 |
- install-pkgincludeHEADERS \ |
582 |
- install-libLTLIBRARIES \ |
583 |
- install-pkgconfigDATA |
584 |
- fi |
585 |
-} |
586 |
- |
587 |
-multilib_src_install_all() { |
588 |
- # We need to ensure obexd can be spawned automatically by systemd |
589 |
- # when user-session is enabled: |
590 |
- # http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2 |
591 |
- # https://bugs.gentoo.org/show_bug.cgi?id=577842 |
592 |
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908 |
593 |
- # https://bugs.archlinux.org/task/45816 |
594 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1318441 |
595 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=1389347 |
596 |
- if use user-session && use systemd; then |
597 |
- ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service |
598 |
- fi |
599 |
- |
600 |
- find "${D}" -name '*.la' -type f -delete || die |
601 |
- |
602 |
- keepdir /var/lib/bluetooth |
603 |
- |
604 |
- # Upstream don't want people to play with them |
605 |
- # But we keep installing them due to 'historical' reasons |
606 |
- insinto /etc/bluetooth |
607 |
- local d |
608 |
- for d in input network; do |
609 |
- doins profiles/${d}/${d}.conf |
610 |
- done |
611 |
- # Setup auto enable as Fedora does for allowing to use |
612 |
- # keyboards/mouse as soon as possible |
613 |
- sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die |
614 |
- doins src/main.conf |
615 |
- |
616 |
- newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth |
617 |
- newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth |
618 |
- |
619 |
- einstalldocs |
620 |
- use doc && dodoc doc/*.txt |
621 |
- # Install .json files as examples to be used by meshctl |
622 |
- if use mesh; then |
623 |
- dodoc tools/mesh-gatt/*.json |
624 |
- local DOC_CONTENTS="Some example .json files were installed into |
625 |
- /usr/share/doc/${PF} to be used with meshctl. Feel free to |
626 |
- uncompress and copy them to ~/.config/meshctl to use them." |
627 |
- readme.gentoo_create_doc |
628 |
- fi |
629 |
-} |
630 |
- |
631 |
-pkg_postinst() { |
632 |
- use udev && udev_reload |
633 |
- systemd_reenable bluetooth.service |
634 |
- |
635 |
- has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp" |
636 |
- use mesh && readme.gentoo_print_elog |
637 |
-} |
638 |
|
639 |
diff --git a/net-wireless/bluez/files/bluez-5.56-avdtp-disconnects.patch b/net-wireless/bluez/files/bluez-5.56-avdtp-disconnects.patch |
640 |
deleted file mode 100644 |
641 |
index c2e34152748..00000000000 |
642 |
--- a/net-wireless/bluez/files/bluez-5.56-avdtp-disconnects.patch |
643 |
+++ /dev/null |
644 |
@@ -1,41 +0,0 @@ |
645 |
-From 28ddec8d6b829e002fa268c07b71e4c564ba9e16 Mon Sep 17 00:00:00 2001 |
646 |
-From: Luiz Augusto von Dentz <luiz.von.dentz@×××××.com> |
647 |
-Date: Thu, 11 Mar 2021 07:36:07 -0800 |
648 |
-Subject: [PATCH] avdtp: Fix removing all remote SEPs when loading from cache |
649 |
- |
650 |
-If avdtp_discover is called after cache has been loaded it end up |
651 |
-removing all remote SEPs as they have not been discovered yet. |
652 |
- |
653 |
-Fixes: https://github.com/bluez/bluez/issues/102 |
654 |
---- |
655 |
- profiles/audio/avdtp.c | 16 ++++++++++++---- |
656 |
- 1 file changed, 12 insertions(+), 4 deletions(-) |
657 |
- |
658 |
-diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c |
659 |
-index 088ca58b3..1d5871c62 100644 |
660 |
---- a/profiles/audio/avdtp.c |
661 |
-+++ b/profiles/audio/avdtp.c |
662 |
-@@ -3381,10 +3381,18 @@ int avdtp_discover(struct avdtp *session, avdtp_discover_cb_t cb, |
663 |
- session->discover = g_new0(struct discover_callback, 1); |
664 |
- |
665 |
- if (session->seps) { |
666 |
-- session->discover->cb = cb; |
667 |
-- session->discover->user_data = user_data; |
668 |
-- session->discover->id = g_idle_add(process_discover, session); |
669 |
-- return 0; |
670 |
-+ struct avdtp_remote_sep *sep = session->seps->data; |
671 |
-+ |
672 |
-+ /* Check that SEP have been discovered as it may be loaded from |
673 |
-+ * cache. |
674 |
-+ */ |
675 |
-+ if (sep->discovered) { |
676 |
-+ session->discover->cb = cb; |
677 |
-+ session->discover->user_data = user_data; |
678 |
-+ session->discover->id = g_idle_add(process_discover, |
679 |
-+ session); |
680 |
-+ return 0; |
681 |
-+ } |
682 |
- } |
683 |
- |
684 |
- err = send_request(session, FALSE, NULL, AVDTP_DISCOVER, NULL, 0); |
685 |
- |