diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /net-wireless/bluez | |
parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) |
gentoo resync : 03.11.2019
Diffstat (limited to 'net-wireless/bluez')
-rw-r--r-- | net-wireless/bluez/Manifest | 5 | ||||
-rw-r--r-- | net-wireless/bluez/bluez-5.51-r1.ebuild | 294 | ||||
-rw-r--r-- | net-wireless/bluez/bluez-5.51.ebuild | 7 | ||||
-rw-r--r-- | net-wireless/bluez/files/bluez-5.51-disconnect-timeout.patch | 104 | ||||
-rw-r--r-- | net-wireless/bluez/files/bluez-5.51-include-limits-h.patch | 64 |
5 files changed, 472 insertions, 2 deletions
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 1a08840a6ac3..873f26986134 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -7,6 +7,8 @@ AUX bluetooth-init.d-r4 280 BLAKE2B ecb807dec050b7c754e87b43848292ffd68afb364657 AUX bluez-5.39-systemd-quote.patch 1298 BLAKE2B c06a96ffee4f40d574765f7f5b58ba3544fe9862bf4d64d45be0dcbfe1446cb8cdca150402e44117f44b973d7041fd66f01088d843d35d0d6538ccf169551923 SHA512 a31a93934b3ad5d55633ab8ac0878f3cd8bda0ca7836a8912b444f88fe8c71183d25a6e3f36d962cc68da6d2776837b4bf660efb17d379c4003a092c313e69ba AUX bluez-5.50-btpclient-header.patch 345 BLAKE2B 0418270a696b9a682a3f74f35af64152fbf005dd3abf0230b03d673632f2e5a8b2874c11b9adbfd1733fb601eb5aea02da9028894041e200f99121e41dff855a SHA512 eba5462c20a37905ab8491b6812cd5dd8229280a56fcf24b3a2624a871d14a0377697f93588d02fa03ed422f953072109ea76b544173b97d874b9190de060a97 AUX bluez-5.50-sink-connect.patch 2275 BLAKE2B ae03cc1c04774867d72602735554cdb377f3aa25165cd6a681a1996d30a9d0c51463d3d2a366049840ced9d805c1c3827ceaa69d619b5357fb21c1a708950064 SHA512 7fbb45e37b842cc6e8bbc98f19d5582c697c01c42000deacee6ea5554699669bd5ec23acba33cff994edd2b7d2865274905e074117b9a04334e9670bc8d6a386 +AUX bluez-5.51-disconnect-timeout.patch 3053 BLAKE2B 3a9d503c688731931627df00e04c0e6f14ac71fe00d72cc3926d8fea1ee63a3034d87a706766b64c08680a0e15d96b812d0f3b12058ab05c5c14dd43f5be2771 SHA512 b7eb3e9205a37a34d7334078dee2580f5159319bf03c5d4601ff39c403d5e3e641bbf250da6622e10d0b059c9223d590e1935166bd66420d2dc6a32a420263a8 +AUX bluez-5.51-include-limits-h.patch 1490 BLAKE2B 084d0780638497594088f374da7a7f4c790eb5c4a539031e7b5e282a4ec49c44b6fb60ebbb636629d333463386d8da353012863ddc08804775a81285fa18ba54 SHA512 f23475af0d9641ed2ae2b62b8cc186a123d6f1f26556caa51e5615fe6b544a60c6dee425c05facfe3a881afecc8f22c7f370b8cdf25e09c4690c22202705a677 AUX bluez-plugdev.patch 469 BLAKE2B 611a9971e4614ab32ab62e8d2dc23e4a98b59c02ad8303ed0dc10831ab9023665436cfa9c47f8ccab7f83ab2b46ca8369ce53c5084ba7bf649c3ea89779882af SHA512 b7e23b6f52e6f638e6d5deed4e901136c40bc1cbfb302ada8d85873e1792b4e3605802a2c5f786d5d6d53bf4651fc5b611396aaafe5eff90578650c448a5a7a2 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6 AUX bluez-udevadm-path.patch 568 BLAKE2B 7c9d6fad4779cec9ee110c9f0723fe669e5990750674cfdf6fd7395db3c0bf4520f4d81896d802cf62a25d1abbf46784f09c581a1fb0b72ef8a27131d4cf65d8 SHA512 a1af572809ec71a1796ec66fa1d2fcea6fb7624bdb9a629791707b182310bf41d1a109cc19e0fe034f4b4ae5e5816d809ece2eb4410e7f47827ec1b86c82b3a1 @@ -16,5 +18,6 @@ DIST bluez-5.50-fedora-backports.tar.xz 32232 BLAKE2B 35244036bbe18481e32bef2dcd DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45 DIST bluez-5.51.tar.xz 1941904 BLAKE2B e8580388961c99305c6f723160e726232a097067815a88a056c1569c55c2ea410004cf92572afbef9b782807d8a940503b4501f9c6046cacac35136fbbe580a8 SHA512 8b14eea98f541b981162abce728e0f917654ad3c990721ec398fe41bdd68069fe55ff64b61bc3c3b9f813facf42c995b07619f6d5d153965de27154b1a7b578f EBUILD bluez-5.50-r3.ebuild 8001 BLAKE2B 53a60e148a3db4c9eaff57ea07b0b1b5d12fb758e520569d0e553c28006826fe855771a2dd8e36ce32a5fb2c8e5002ff8a670e3cfe7e5ef7f70420c17b129db2 SHA512 6e9937151b6514d2ddb34426400a4f4a96c983b0996588bc3b82073e188c34419f70a1d78bbb34d68ac8e7d369fa111a9e5c27647b3cb6322fe0123803afb0a1 -EBUILD bluez-5.51.ebuild 9082 BLAKE2B 1e5ba81fa700f4fc6ae4aa538d4113f36852ea3f890777e05d3d61ad99d3def6eb00be9f789529f555f21e9d83818c2f2d3c0e5e42ec1ac93db40af2b46a3aad SHA512 81fbae889430f555b3d208529abddb5214565ca34de56e68418a0806487237ac2b151ef7c37b55fc7a889d0724ff3990b98a128a257ab097c51fa0dce76b69e2 +EBUILD bluez-5.51-r1.ebuild 9434 BLAKE2B b8e40bb9cc3957cdf5e108cf63e65b41f76c8da6e1d3aab12993cdd37e35cefc0eb8a3229fc47f67e5a414e596d69f4063d491a6c61bc38382cb4a0eab861ba7 SHA512 689e1eb8767450445196b30b5c0c8549b4fd92ade581362f62e9a0516a58c8d5f7134478aa2d37a7f3f56eb47f465df4d241cd135d1b6e9cfdc3eab7025e132e +EBUILD bluez-5.51.ebuild 9260 BLAKE2B a78010b25abe822fa29daaa7bdb2fc750291ae967d4b369648b0c6f70fcab7ab60e1a610842f5304c5be2a3f64d84a7bec1a9e8abe9ada41e565ace6cb28c59e SHA512 42dfce2e99346621955ad32e19307e7f9b303a14e5f89b77a9d581133e73881260633acb6a0d8fb9b8e32192eac8a13efdb30e4cdc03d4bcd169760139f428d6 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f diff --git a/net-wireless/bluez/bluez-5.51-r1.ebuild b/net-wireless/bluez/bluez-5.51-r1.ebuild new file mode 100644 index 000000000000..1bf47c399e05 --- /dev/null +++ b/net-wireless/bluez/bluez-5.51-r1.ebuild @@ -0,0 +1,294 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 ) + +inherit autotools python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal + +DESCRIPTION="Bluetooth Tools and System Daemons for Linux" +HOMEPAGE="http://www.bluez.org" +SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0/3" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86" +IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session" + +# Since this release all remaining extra-tools need readline support, but this could +# change in the future, hence, this REQUIRED_USE constraint could be dropped +# again in the future. +REQUIRED_USE=" + extra-tools? ( deprecated readline ) + test? ( ${PYTHON_REQUIRED_USE} ) + test-programs? ( ${PYTHON_REQUIRED_USE} ) +" + +TEST_DEPS="${PYTHON_DEPS} + >=dev-python/dbus-python-1[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] +" +BDEPEND=" + virtual/pkgconfig + test? ( ${TEST_DEPS} ) +" +DEPEND=" + >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] + >=sys-apps/hwids-20121202.2 + btpclient? ( >=dev-libs/ell-0.14 ) + cups? ( net-print/cups:= ) + mesh? ( + >=dev-libs/ell-0.14 + dev-libs/json-c:= + sys-libs/readline:0= + ) + midi? ( media-libs/alsa-lib ) + obex? ( dev-libs/libical:= ) + readline? ( sys-libs/readline:0= ) + systemd? ( + >=sys-apps/dbus-1.6:=[user-session=] + sys-apps/systemd + ) + !systemd? ( >=sys-apps/dbus-1.6:= ) + udev? ( >=virtual/udev-172 ) +" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-bluetooth ) + test-programs? ( ${TEST_DEPS} ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) + # http://www.spinics.net/lists/linux-bluetooth/msg58739.html + # https://bugs.gentoo.org/539844 + "${FILESDIR}"/${PN}-udevadm-path-r1.patch + + # build: Quote systemd variable names, bug #527432 + # http://article.gmane.org/gmane.linux.bluez.kernel/67230 + "${FILESDIR}"/${PN}-5.39-systemd-quote.patch + + # Include limits.h for PATH_MAX + # https://marc.info/?l=linux-bluetooth&m=157156119320950&w=2 + # https://bugs.gentoo.org/695940 + "${FILESDIR}"/${PN}-5.51-include-limits-h.patch + + # audio: Fix cancelling disconnect timeout (from 'master') + # https://marc.info/?l=linux-bluetooth&m=157047663920714&w=2 + "${FILESDIR}"/${P}-disconnect-timeout.patch + + # Fedora patches + # http://www.spinics.net/lists/linux-bluetooth/msg40136.html + "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch +) + +pkg_setup() { + if use test || use test-programs; then + python-single-r1_pkg_setup + fi + + if ! use udev; then + ewarn + ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth" + ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work," + ewarn "and hid2hci will not be available." + ewarn + fi +} + +src_prepare() { + default + + # http://www.spinics.net/lists/linux-bluetooth/msg38490.html + if ! use user-session || ! use systemd; then + eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch + fi + + if use cups; then + sed -i \ + -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \ + Makefile.{in,tools} || die + fi + + # Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621 + # https://bugs.gentoo.org/618548 + sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die + + eautoreconf + + multilib_copy_sources +} + +multilib_src_configure() { + local myconf=( + # readline is automagic when client is enabled + # --enable-client always needs readline, bug #504038 + # --enable-mesh is handled in the same way + ac_cv_header_readline_readline_h=$(multilib_native_usex readline) + ac_cv_header_readline_readline_h=$(multilib_native_usex mesh) + ) + + if ! multilib_is_native_abi; then + myconf+=( + # deps not used for the library + {DBUS,GLIB}_{CFLAGS,LIBS}=' ' + ) + fi + + econf \ + --localstatedir=/var \ + --disable-android \ + --enable-datafiles \ + --enable-optimization \ + $(use_enable debug) \ + --enable-pie \ + --enable-threads \ + --enable-library \ + --enable-tools \ + --enable-manpages \ + --enable-monitor \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ + --with-systemduserunitdir="$(systemd_get_userunitdir)" \ + $(multilib_native_use_enable btpclient) \ + $(multilib_native_use_enable btpclient external-ell) \ + $(multilib_native_use_enable cups) \ + $(multilib_native_use_enable deprecated) \ + $(multilib_native_use_enable experimental) \ + $(multilib_native_use_enable mesh) \ + $(multilib_native_use_enable mesh external-ell) \ + $(multilib_native_use_enable midi) \ + $(multilib_native_use_enable obex) \ + $(multilib_native_use_enable readline client) \ + $(multilib_native_use_enable systemd) \ + $(multilib_native_use_enable test-programs test) \ + $(multilib_native_use_enable udev) \ + $(multilib_native_use_enable udev sixaxis) +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + emake -f Makefile -f - libs \ + <<<'libs: $(lib_LTLIBRARIES)' + fi +} + +multilib_src_test() { + multilib_is_native_abi && default +} + +multilib_src_install() { + if multilib_is_native_abi; then + emake DESTDIR="${D}" install + + # Only install extra-tools when relevant USE flag is enabled + if use extra-tools; then + ewarn "Upstream doesn't support using this tools and their bugs are" + ewarn "likely to be ignored forever, also that tools can break" + ewarn "without previous announcement." + ewarn "Upstream also states all this tools are not really needed," + ewarn "then, if you still need to rely on them, you must ask them" + ewarn "to either install that tool by default or add the needed" + ewarn "functionality to the existing 'official' tools." + ewarn "Please report this issues to:" + ewarn "http://www.bluez.org/development/lists/" + + # Upstream doesn't install this, bug #524640 + # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115 + # http://comments.gmane.org/gmane.linux.bluez.kernel/54564 + dobin tools/btmgmt + # gatttool is only built with readline, bug #530776 + # https://bugzilla.redhat.com/show_bug.cgi?id=1141909 + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486 + # https://bugs.archlinux.org/task/37686 + dobin attrib/gatttool + # https://bugzilla.redhat.com/show_bug.cgi?id=1699680 + dobin tools/avinfo + fi + + # Not installed by default after being built, bug #666756 + use btpclient && dobin tools/btpclient + + # Unittests are not that useful once installed, so make them optional + if use test-programs; then + # Few are needing python3, the others are python2 only. Remove + # until we see how to pull in python2 and python3 for runtime + rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die + rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die + rm "${ED}"/usr/$(get_libdir)/bluez/test/agent.py || die + rm "${ED}"/usr/$(get_libdir)/bluez/test/test-mesh || die + + python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test + + for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do + dosym "${i}" /usr/bin/bluez-"${i##*/}" + done + fi + else + emake DESTDIR="${D}" \ + install-pkgincludeHEADERS \ + install-libLTLIBRARIES \ + install-pkgconfigDATA + fi +} + +multilib_src_install_all() { + # We need to ensure obexd can be spawned automatically by systemd + # when user-session is enabled: + # http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2 + # https://bugs.gentoo.org/show_bug.cgi?id=577842 + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908 + # https://bugs.archlinux.org/task/45816 + # https://bugzilla.redhat.com/show_bug.cgi?id=1318441 + # https://bugzilla.redhat.com/show_bug.cgi?id=1389347 + if use user-session && use systemd; then + ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service + fi + + find "${D}" -name '*.la' -type f -delete || die + + keepdir /var/lib/bluetooth + + # Upstream don't want people to play with them + # But we keep installing them due to 'historical' reasons + insinto /etc/bluetooth + local d + for d in input network; do + doins profiles/${d}/${d}.conf + done + # Setup auto enable as Fedora does for allowing to use + # keyboards/mouse as soon as possible + sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die + doins src/main.conf + + newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth + + einstalldocs + use doc && dodoc doc/*.txt + # Install .json files as examples to be used by meshctl + if use mesh; then + dodoc tools/mesh/*.json + local DOC_CONTENTS="Some example .json files were installed into + /usr/share/doc/${PF} to be used with meshctl. Feel free to + uncompress and copy them to ~/.config/meshctl to use them." + readme.gentoo_create_doc + fi + + # From Fedora: + # Scripts for automatically btattach-ing serial ports connected to Broadcom HCIs + # as found on some Atom based x86 hardware + udev_dorules "${FILESDIR}/69-btattach-bcm.rules" + systemd_newunit "${FILESDIR}/btattach-bcm_at.service" "btattach-bcm@.service" + exeinto /usr/libexec/bluetooth + doexe "${FILESDIR}/btattach-bcm-service.sh" +} + +pkg_postinst() { + use udev && udev_reload + systemd_reenable bluetooth.service + + has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp" + use mesh && readme.gentoo_print_elog +} diff --git a/net-wireless/bluez/bluez-5.51.ebuild b/net-wireless/bluez/bluez-5.51.ebuild index 00a51cb60471..eff855210bfb 100644 --- a/net-wireless/bluez/bluez-5.51.ebuild +++ b/net-wireless/bluez/bluez-5.51.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0/3" -KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86" +KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86" IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session" # Since this release all remaining extra-tools need readline support, but this could @@ -69,6 +69,11 @@ PATCHES=( # http://article.gmane.org/gmane.linux.bluez.kernel/67230 "${FILESDIR}"/${PN}-5.39-systemd-quote.patch + # Include limits.h for PATH_MAX + # https://marc.info/?l=linux-bluetooth&m=157156119320950&w=2 + # https://bugs.gentoo.org/695940 + "${FILESDIR}"/${PN}-5.51-include-limits-h.patch + # Fedora patches # http://www.spinics.net/lists/linux-bluetooth/msg40136.html "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch diff --git a/net-wireless/bluez/files/bluez-5.51-disconnect-timeout.patch b/net-wireless/bluez/files/bluez-5.51-disconnect-timeout.patch new file mode 100644 index 000000000000..2f6e7c8c4d95 --- /dev/null +++ b/net-wireless/bluez/files/bluez-5.51-disconnect-timeout.patch @@ -0,0 +1,104 @@ +From 52faac4648500dd45c06b6aa41f1be426c43a125 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> +Date: Fri, 11 Oct 2019 15:40:04 +0300 +Subject: audio: Fix cancelling disconnect timeout + +If AVDTP session has been connected but no stream has been setup calls +to service->connect would return -EBUSY to avoid stream setup collision +but it also takes a reference to the session cancelling the disconnect +timeout and disabling the stream_setup logic that would attempt to +estabilish a stream. +--- + profiles/audio/sink.c | 25 ++++++++++++------------- + profiles/audio/source.c | 25 ++++++++++++------------- + 2 files changed, 24 insertions(+), 26 deletions(-) + +diff --git a/profiles/audio/sink.c b/profiles/audio/sink.c +index 7cac21034..966440534 100644 +--- a/profiles/audio/sink.c ++++ b/profiles/audio/sink.c +@@ -256,11 +256,18 @@ gboolean sink_setup_stream(struct btd_service *service, struct avdtp *session) + if (sink->connect_id > 0 || sink->disconnect_id > 0) + return FALSE; + +- if (session && !sink->session) +- sink->session = avdtp_ref(session); +- +- if (!sink->session) +- return FALSE; ++ if (!sink->session) { ++ if (session) ++ sink->session = avdtp_ref(session); ++ else ++ sink->session = a2dp_avdtp_get( ++ btd_service_get_device(service)); ++ ++ if (!sink->session) { ++ DBG("Unable to get a session"); ++ return FALSE; ++ } ++ } + + sink->connect_id = a2dp_discover(sink->session, discovery_complete, + sink); +@@ -274,14 +281,6 @@ int sink_connect(struct btd_service *service) + { + struct sink *sink = btd_service_get_user_data(service); + +- if (!sink->session) +- sink->session = a2dp_avdtp_get(btd_service_get_device(service)); +- +- if (!sink->session) { +- DBG("Unable to get a session"); +- return -EIO; +- } +- + if (sink->connect_id > 0 || sink->disconnect_id > 0) + return -EBUSY; + +diff --git a/profiles/audio/source.c b/profiles/audio/source.c +index 4081e1970..0ac20fe40 100644 +--- a/profiles/audio/source.c ++++ b/profiles/audio/source.c +@@ -257,11 +257,18 @@ gboolean source_setup_stream(struct btd_service *service, + if (source->connect_id > 0 || source->disconnect_id > 0) + return FALSE; + +- if (session && !source->session) +- source->session = avdtp_ref(session); +- +- if (!source->session) +- return FALSE; ++ if (!source->session) { ++ if (session) ++ source->session = avdtp_ref(session); ++ else ++ source->session = a2dp_avdtp_get( ++ btd_service_get_device(service)); ++ ++ if (!source->session) { ++ DBG("Unable to get a session"); ++ return FALSE; ++ } ++ } + + source->connect_id = a2dp_discover(source->session, discovery_complete, + source); +@@ -275,14 +282,6 @@ int source_connect(struct btd_service *service) + { + struct source *source = btd_service_get_user_data(service); + +- if (!source->session) +- source->session = a2dp_avdtp_get(btd_service_get_device(service)); +- +- if (!source->session) { +- DBG("Unable to get a session"); +- return -EIO; +- } +- + if (source->connect_id > 0 || source->disconnect_id > 0) + return -EBUSY; + +-- +cgit 1.2-0.3.lf.el7 + diff --git a/net-wireless/bluez/files/bluez-5.51-include-limits-h.patch b/net-wireless/bluez/files/bluez-5.51-include-limits-h.patch new file mode 100644 index 000000000000..ccbc152a4ee1 --- /dev/null +++ b/net-wireless/bluez/files/bluez-5.51-include-limits-h.patch @@ -0,0 +1,64 @@ +From 20128c5c95fbae93c9fd996d5ad2584cf6ad8032 Mon Sep 17 00:00:00 2001 +From: Jory Pratt <anarchy@gentoo.org> +Date: Mon, 30 Sep 2019 18:35:56 -0500 +Subject: [PATCH] Include limits.h for PATH_MAX + +Signed-off-by: Jory Pratt <anarchy@gentoo.org> +--- + mesh/keyring.c | 1 + + mesh/mesh-config-json.c | 1 + + mesh/node.c | 1 + + mesh/util.c | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/mesh/keyring.c b/mesh/keyring.c +index 3a7f92f..9fa7d6b 100644 +--- a/mesh/keyring.c ++++ b/mesh/keyring.c +@@ -24,6 +24,7 @@ + #define _GNU_SOURCE + #include <fcntl.h> + #include <dirent.h> ++#include <limits.h> + #include <stdio.h> + #include <unistd.h> + #include <dirent.h> +diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c +index cafa2fd..74ca495 100644 +--- a/mesh/mesh-config-json.c ++++ b/mesh/mesh-config-json.c +@@ -27,6 +27,7 @@ + #include <fcntl.h> + #include <ftw.h> + #include <libgen.h> ++#include <limits.h> + #include <stdio.h> + #include <string.h> + #include <unistd.h> +diff --git a/mesh/node.c b/mesh/node.c +index b6824f5..15dcb97 100644 +--- a/mesh/node.c ++++ b/mesh/node.c +@@ -23,6 +23,7 @@ + + #define _GNU_SOURCE + #include <dirent.h> ++#include <limits.h> + #include <stdio.h> + #include <sys/time.h> + +diff --git a/mesh/util.c b/mesh/util.c +index 1455bde..986ba4b 100644 +--- a/mesh/util.c ++++ b/mesh/util.c +@@ -25,6 +25,7 @@ + #include <dirent.h> + #include <ftw.h> + #include <stdio.h> ++#include <limits.h> + #include <time.h> + #include <sys/time.h> + +-- +2.23.0 + |