summaryrefslogtreecommitdiff
path: root/dev-ros/libmavconn
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-09-06 10:28:05 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-09-06 10:28:05 +0100
commitf1af93971b7490792d8541bc790e0d8c6d787059 (patch)
treea38046712bbc3a3844d77452d16c84e716caa3d4 /dev-ros/libmavconn
parentfc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff)
gentoo resync : 06.08.2019
Diffstat (limited to 'dev-ros/libmavconn')
-rw-r--r--dev-ros/libmavconn/Manifest3
-rw-r--r--dev-ros/libmavconn/files/boost170.patch98
-rw-r--r--dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild7
3 files changed, 105 insertions, 3 deletions
diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest
index 3bf8d4d18fce..c1431707e56c 100644
--- a/dev-ros/libmavconn/Manifest
+++ b/dev-ros/libmavconn/Manifest
@@ -1,5 +1,6 @@
+AUX boost170.patch 3754 BLAKE2B 7e4d5be1898f70f7075cc51b36d143f3fd4feeceab6658926d6b0ba9030b0cc3d5ccbbfe624f914698eda0bcfdc748543e35f8de2cda59133b1d0cfe813bb119 SHA512 f3d0f1bdd19f08077e5650d02997028ad044594c185994e8df08903602199bb9b063d1623a807920b8d07c91b468c1b3ac34a806aec7b40ed15e9b70a0eb60c4
AUX logging.patch 16008 BLAKE2B ac82381998cfc3b204f745b79cba6128751dd511b0d89d50f5317c82138cd06d51e627706ce533f205a731202e32838a8c7a7b3bb7c85011d6e9c698a4d1f792 SHA512 08e64047cbc613982be4bd34c07916df2e90a96f9f6873969be7dfd265f2d6ce4956669be7c57c38f23314fd4634b5569aec17618d412d0662ae5baf8f590433
DIST mavros-0.19.0.tar.gz 219739 BLAKE2B 4e9a47fa4cdbf11b530bdc39a8048b1834689039af3005d30ffcc2b626651612db12ecc1929ecaf994c5a887224bcf2b0469d1e15ed5b353be4132fb0f523a96 SHA512 87b1b77505d3606196d609a016bcb89b3831e982f8352a13f69f5c2580f46ac603edb2d3c2ce4df5cdd1424172145b88d2b35d149c2be507eb0f23039e7e45a7
-EBUILD libmavconn-0.19.0-r1.ebuild 471 BLAKE2B 41b2e29199232ef6b987afcb6f98d892d61577b6423443148c40120ede225fe304dd1c397391d806f58f14879f26a101cb460f69e9f613161271964d3134cafb SHA512 cb723c1dc318517da33d1554b663e2bef35df7a3a3dd0ced92dd698baf33a374a1db59ea8566a146a5e09c4689b553312bb1bb28c2ed664ae1097ea6b147fdba
+EBUILD libmavconn-0.19.0-r1.ebuild 499 BLAKE2B 3c0d8430aa3e771ad35d32d4d4970e950a82d3390129d3f17853d5f39c1479f72483d8f9311ff6229c4becc587e865304aff22374e85b54bf90c339f45be7979 SHA512 cf6f5d7ed4972f115f374993a04bdb5e2c855a592133e47ba684bd2c54ce7e6d5cf0678093a34e5a81475c55ca8d95be838c86718862107d502d9fd08af6ab92
EBUILD libmavconn-9999.ebuild 431 BLAKE2B a98c07058726ca23ea9c93d4d072b51d94dbe9472f78caccd72b3e857250f18737981a4cfa2fc48c1c1c75db9313a4b129cd66320b9e82ccee04dc28616b905f SHA512 5d0ade0e7b70ff32b9fb2fed6041e2e9610a03deac57205a5e7136bc8ef9f27aa5a98a07e76e5d362784f37b4d5eb98a03184ededbd6dd39bd50f93531ace235
MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/libmavconn/files/boost170.patch b/dev-ros/libmavconn/files/boost170.patch
new file mode 100644
index 000000000000..357025d90af5
--- /dev/null
+++ b/dev-ros/libmavconn/files/boost170.patch
@@ -0,0 +1,98 @@
+Index: libmavconn/src/tcp.cpp
+===================================================================
+--- libmavconn.orig/src/tcp.cpp
++++ libmavconn/src/tcp.cpp
+@@ -41,13 +41,19 @@ static bool resolve_address_tcp(io_servi
+ error_code ec;
+
+ tcp::resolver::query query(host, "");
+- std::for_each(resolver.resolve(query, ec), tcp::resolver::iterator(),
+- [&](const tcp::endpoint & q_ep) {
+- ep = q_ep;
+- ep.port(port);
+- result = true;
+- CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
+- });
++
++ auto fn = [&](const tcp::endpoint & q_ep) {
++ ep = q_ep;
++ ep.port(port);
++ result = true;
++ CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
++ };
++
++#if BOOST_ASIO_VERSION >= 101200
++ for (auto q_ep : resolver.resolve(query, ec)) fn(q_ep);
++#else
++ std::for_each(resolver.resolve(query, ec), tcp::resolver::iterator(), fn);
++#endif
+
+ if (ec) {
+ CONSOLE_BRIDGE_logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
+@@ -112,7 +118,7 @@ void MAVConnTCPClient::client_connected(
+ server_channel, conn_id, to_string_ss(server_ep).c_str());
+
+ // start recv
+- socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_recv, shared_from_this()));
++ static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_recv, shared_from_this()));
+ }
+
+ MAVConnTCPClient::~MAVConnTCPClient()
+@@ -152,7 +158,7 @@ void MAVConnTCPClient::send_bytes(const
+
+ tx_q.emplace_back(bytes, length);
+ }
+- socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
++ static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
+ }
+
+ void MAVConnTCPClient::send_message(const mavlink_message_t *message)
+@@ -174,7 +180,7 @@ void MAVConnTCPClient::send_message(cons
+
+ tx_q.emplace_back(message);
+ }
+- socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
++ static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
+ }
+
+ void MAVConnTCPClient::send_message(const mavlink::Message &message)
+@@ -194,7 +200,7 @@ void MAVConnTCPClient::send_message(cons
+
+ tx_q.emplace_back(message, get_status_p(), sys_id, comp_id);
+ }
+- socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
++ static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
+ }
+
+ void MAVConnTCPClient::do_recv()
+Index: libmavconn/src/udp.cpp
+===================================================================
+--- libmavconn.orig/src/udp.cpp
++++ libmavconn/src/udp.cpp
+@@ -41,13 +41,19 @@ static bool resolve_address_udp(io_servi
+ error_code ec;
+
+ udp::resolver::query query(host, "");
+- std::for_each(resolver.resolve(query, ec), udp::resolver::iterator(),
+- [&](const udp::endpoint & q_ep) {
+- ep = q_ep;
+- ep.port(port);
+- result = true;
+- CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
+- });
++
++ auto fn = [&](const udp::endpoint & q_ep) {
++ ep = q_ep;
++ ep.port(port);
++ result = true;
++ CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
++ };
++
++#if BOOST_ASIO_VERSION >= 101200
++ for (auto q_ep : resolver.resolve(query, ec)) fn(q_ep);
++#else
++ std::for_each(resolver.resolve(query, ec), udp::resolver::iterator(), fn);
++#endif
+
+ if (ec) {
+ CONSOLE_BRIDGE_logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
diff --git a/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild b/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild
index dddbbe6be4df..d42a92fd0e64 100644
--- a/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild
+++ b/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,4 +19,7 @@ RDEPEND="
dev-libs/console_bridge:=
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/logging.patch" )
+PATCHES=(
+ "${FILESDIR}/logging.patch"
+ "${FILESDIR}/boost170.patch"
+)