| 1 |
commit: 78c02e67b9ed68ec6ae1b1b083e7ee4ef115e757 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 14 13:04:08 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 14 13:04:14 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c02e67 |
| 7 |
|
| 8 |
dev-ros/rosserial_server: backport upstream patch to build with boost 1.62, bug #594830 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
dev-ros/rosserial_server/files/boost162.patch | 61 ++++++++++++++++++++++ |
| 13 |
.../rosserial_server/rosserial_server-0.7.4.ebuild | 1 + |
| 14 |
2 files changed, 62 insertions(+) |
| 15 |
|
| 16 |
diff --git a/dev-ros/rosserial_server/files/boost162.patch b/dev-ros/rosserial_server/files/boost162.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..d644d40 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-ros/rosserial_server/files/boost162.patch |
| 21 |
@@ -0,0 +1,61 @@ |
| 22 |
+commit f8a46f3142444c854233a85f7a5ec7b91b5378a6 |
| 23 |
+Author: Malte Splietker <splietker@××××××××××××××××××××.com> |
| 24 |
+Date: Wed Oct 5 04:26:00 2016 +0200 |
| 25 |
+ |
| 26 |
+ Fixing build errors for boost >=1.60 (#226) (#250) |
| 27 |
+ |
| 28 |
+ Signed-off-by: Malte Splietker <maltespl@××××××××.de> |
| 29 |
+ |
| 30 |
+diff --git a/rosserial_server/include/rosserial_server/session.h b/rosserial_server/include/rosserial_server/session.h |
| 31 |
+index 86b9baa..ebd109a 100644 |
| 32 |
+--- a/rosserial_server/include/rosserial_server/session.h |
| 33 |
++++ b/rosserial_server/include/rosserial_server/session.h |
| 34 |
+@@ -499,7 +499,7 @@ private: |
| 35 |
+ boost::asio::deadline_timer ros_spin_timer_; |
| 36 |
+ std::string require_param_name_; |
| 37 |
+ |
| 38 |
+- std::map<uint16_t, boost::function<void(ros::serialization::IStream)> > callbacks_; |
| 39 |
++ std::map<uint16_t, boost::function<void(ros::serialization::IStream&)> > callbacks_; |
| 40 |
+ std::map<uint16_t, PublisherPtr> publishers_; |
| 41 |
+ std::map<uint16_t, SubscriberPtr> subscribers_; |
| 42 |
+ std::map<std::string, ServiceClientPtr> services_; |
| 43 |
+diff --git a/rosserial_server/include/rosserial_server/topic_handlers.h b/rosserial_server/include/rosserial_server/topic_handlers.h |
| 44 |
+index 666f3fc..2f367c3 100644 |
| 45 |
+--- a/rosserial_server/include/rosserial_server/topic_handlers.h |
| 46 |
++++ b/rosserial_server/include/rosserial_server/topic_handlers.h |
| 47 |
+@@ -93,7 +93,7 @@ typedef boost::shared_ptr<Publisher> PublisherPtr; |
| 48 |
+ class Subscriber { |
| 49 |
+ public: |
| 50 |
+ Subscriber(ros::NodeHandle& nh, rosserial_msgs::TopicInfo& topic_info, |
| 51 |
+- boost::function<void(std::vector<uint8_t> buffer)> write_fn) |
| 52 |
++ boost::function<void(std::vector<uint8_t>& buffer)> write_fn) |
| 53 |
+ : write_fn_(write_fn) { |
| 54 |
+ ros::SubscribeOptions opts; |
| 55 |
+ opts.init<topic_tools::ShapeShifter>( |
| 56 |
+@@ -119,7 +119,7 @@ private: |
| 57 |
+ } |
| 58 |
+ |
| 59 |
+ ros::Subscriber subscriber_; |
| 60 |
+- boost::function<void(std::vector<uint8_t> buffer)> write_fn_; |
| 61 |
++ boost::function<void(std::vector<uint8_t>& buffer)> write_fn_; |
| 62 |
+ }; |
| 63 |
+ |
| 64 |
+ typedef boost::shared_ptr<Subscriber> SubscriberPtr; |
| 65 |
+@@ -127,7 +127,7 @@ typedef boost::shared_ptr<Subscriber> SubscriberPtr; |
| 66 |
+ class ServiceClient { |
| 67 |
+ public: |
| 68 |
+ ServiceClient(ros::NodeHandle& nh, rosserial_msgs::TopicInfo& topic_info, |
| 69 |
+- boost::function<void(std::vector<uint8_t> buffer, const uint16_t topic_id)> write_fn) |
| 70 |
++ boost::function<void(std::vector<uint8_t>& buffer, const uint16_t topic_id)> write_fn) |
| 71 |
+ : write_fn_(write_fn) { |
| 72 |
+ topic_id_ = -1; |
| 73 |
+ if (!service_info_service_.isValid()) { |
| 74 |
+@@ -185,7 +185,7 @@ private: |
| 75 |
+ topic_tools::ShapeShifter response_message_; |
| 76 |
+ ros::ServiceClient service_client_; |
| 77 |
+ static ros::ServiceClient service_info_service_; |
| 78 |
+- boost::function<void(std::vector<uint8_t> buffer, const uint16_t topic_id)> write_fn_; |
| 79 |
++ boost::function<void(std::vector<uint8_t>& buffer, const uint16_t topic_id)> write_fn_; |
| 80 |
+ std::string service_md5_; |
| 81 |
+ std::string request_message_md5_; |
| 82 |
+ std::string response_message_md5_; |
| 83 |
|
| 84 |
diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild |
| 85 |
index 5ff8dba..dcba1b4 100644 |
| 86 |
--- a/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild |
| 87 |
+++ b/dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild |
| 88 |
@@ -21,3 +21,4 @@ RDEPEND=" |
| 89 |
dev-libs/boost:=[threads] |
| 90 |
" |
| 91 |
DEPEND="${RDEPEND}" |
| 92 |
+PATCHES=( "${FILESDIR}/boost162.patch" ) |
Archives