| 1 |
commit: a68e5d8d7ab9dd9cdf6d9f94731386599d699cc3 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 3 10:00:29 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 3 10:00:29 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68e5d8d |
| 7 |
|
| 8 |
dev-ros/robot_state_publisher: fix build with urdfdom1. Bug #590376 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
dev-ros/robot_state_publisher/files/urdfdom1.patch | 39 ++++++++++++++++++++++ |
| 13 |
...uild => robot_state_publisher-1.13.2-r1.ebuild} | 7 ++++ |
| 14 |
.../robot_state_publisher-9999.ebuild | 3 +- |
| 15 |
3 files changed, 48 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/dev-ros/robot_state_publisher/files/urdfdom1.patch b/dev-ros/robot_state_publisher/files/urdfdom1.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..e5c482b |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-ros/robot_state_publisher/files/urdfdom1.patch |
| 22 |
@@ -0,0 +1,39 @@ |
| 23 |
+Index: robot_state_publisher-1.13.2/include/robot_state_publisher/joint_state_listener.h |
| 24 |
+=================================================================== |
| 25 |
+--- robot_state_publisher-1.13.2.orig/include/robot_state_publisher/joint_state_listener.h |
| 26 |
++++ robot_state_publisher-1.13.2/include/robot_state_publisher/joint_state_listener.h |
| 27 |
+@@ -48,7 +48,7 @@ using namespace ros; |
| 28 |
+ using namespace KDL; |
| 29 |
+ |
| 30 |
+ typedef boost::shared_ptr<sensor_msgs::JointState const> JointStateConstPtr; |
| 31 |
+-typedef std::map<std::string, boost::shared_ptr<urdf::JointMimic> > MimicMap; |
| 32 |
++typedef std::map<std::string, std::shared_ptr<urdf::JointMimic> > MimicMap; |
| 33 |
+ |
| 34 |
+ namespace robot_state_publisher{ |
| 35 |
+ |
| 36 |
+Index: robot_state_publisher-1.13.2/src/joint_state_listener.cpp |
| 37 |
+=================================================================== |
| 38 |
+--- robot_state_publisher-1.13.2.orig/src/joint_state_listener.cpp |
| 39 |
++++ robot_state_publisher-1.13.2/src/joint_state_listener.cpp |
| 40 |
+@@ -161,7 +161,7 @@ int main(int argc, char** argv) |
| 41 |
+ |
| 42 |
+ MimicMap mimic; |
| 43 |
+ |
| 44 |
+- for(std::map< std::string, boost::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){ |
| 45 |
++ for(std::map< std::string, std::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){ |
| 46 |
+ if(i->second->mimic){ |
| 47 |
+ mimic.insert(make_pair(i->first, i->second->mimic)); |
| 48 |
+ } |
| 49 |
+Index: robot_state_publisher-1.13.2/test/test_subclass.cpp |
| 50 |
+=================================================================== |
| 51 |
+--- robot_state_publisher-1.13.2.orig/test/test_subclass.cpp |
| 52 |
++++ robot_state_publisher-1.13.2/test/test_subclass.cpp |
| 53 |
+@@ -82,7 +82,7 @@ TEST(TestRobotStatePubSubclass, robot_st |
| 54 |
+ |
| 55 |
+ MimicMap mimic; |
| 56 |
+ |
| 57 |
+- for(std::map< std::string, boost::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){ |
| 58 |
++ for(std::map< std::string, std::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){ |
| 59 |
+ if(i->second->mimic){ |
| 60 |
+ mimic.insert(make_pair(i->first, i->second->mimic)); |
| 61 |
+ } |
| 62 |
|
| 63 |
diff --git a/dev-ros/robot_state_publisher/robot_state_publisher-1.13.2.ebuild b/dev-ros/robot_state_publisher/robot_state_publisher-1.13.2-r1.ebuild |
| 64 |
similarity index 81% |
| 65 |
rename from dev-ros/robot_state_publisher/robot_state_publisher-1.13.2.ebuild |
| 66 |
rename to dev-ros/robot_state_publisher/robot_state_publisher-1.13.2-r1.ebuild |
| 67 |
index f6dd74f..65b8df8 100644 |
| 68 |
--- a/dev-ros/robot_state_publisher/robot_state_publisher-1.13.2.ebuild |
| 69 |
+++ b/dev-ros/robot_state_publisher/robot_state_publisher-1.13.2-r1.ebuild |
| 70 |
@@ -26,7 +26,14 @@ RDEPEND=" |
| 71 |
dev-ros/kdl_conversions |
| 72 |
dev-ros/sensor_msgs |
| 73 |
dev-ros/tf |
| 74 |
+ >=dev-ros/urdf-1.12.3-r1 |
| 75 |
" |
| 76 |
DEPEND="${RDEPEND} |
| 77 |
dev-ros/rostest[${PYTHON_USEDEP}] |
| 78 |
" |
| 79 |
+PATCHES=( "${FILESDIR}/urdfdom1.patch" ) |
| 80 |
+ |
| 81 |
+src_configure() { |
| 82 |
+ append-cxxflags -std=gnu++11 |
| 83 |
+ ros-catkin_src_configure |
| 84 |
+} |
| 85 |
|
| 86 |
diff --git a/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild b/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild |
| 87 |
index 640fe2a..61eed4d 100644 |
| 88 |
--- a/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild |
| 89 |
+++ b/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild |
| 90 |
@@ -1,4 +1,4 @@ |
| 91 |
-# Copyright 1999-2014 Gentoo Foundation |
| 92 |
+# Copyright 1999-2016 Gentoo Foundation |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
# $Id$ |
| 95 |
|
| 96 |
@@ -26,6 +26,7 @@ RDEPEND=" |
| 97 |
dev-ros/kdl_conversions |
| 98 |
dev-ros/sensor_msgs |
| 99 |
dev-ros/tf |
| 100 |
+ dev-ros/urdf |
| 101 |
" |
| 102 |
DEPEND="${RDEPEND} |
| 103 |
dev-ros/rostest[${PYTHON_USEDEP}] |
Archives