| 1 |
commit: dd1ea63ab7aefc0c374eec50beadc72db2ff481b |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 26 09:01:47 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 26 09:18:30 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd1ea63a |
| 7 |
|
| 8 |
dev-ros/gazebo_ros_control: fix build with urdfdom1 and add := dep on it |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
dev-ros/gazebo_ros_control/files/urdfdom1.patch | 13 +++++++++++++ |
| 13 |
...trol-2.5.7.ebuild => gazebo_ros_control-2.5.7-r1.ebuild} | 6 ++++-- |
| 14 |
dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild | 3 ++- |
| 15 |
3 files changed, 19 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ros/gazebo_ros_control/files/urdfdom1.patch b/dev-ros/gazebo_ros_control/files/urdfdom1.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..0da7631 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-ros/gazebo_ros_control/files/urdfdom1.patch |
| 22 |
@@ -0,0 +1,13 @@ |
| 23 |
+Index: gazebo_ros_control/src/default_robot_hw_sim.cpp |
| 24 |
+=================================================================== |
| 25 |
+--- gazebo_ros_control.orig/src/default_robot_hw_sim.cpp |
| 26 |
++++ gazebo_ros_control/src/default_robot_hw_sim.cpp |
| 27 |
+@@ -381,7 +381,7 @@ void DefaultRobotHWSim::registerJointLim |
| 28 |
+ |
| 29 |
+ if (urdf_model != NULL) |
| 30 |
+ { |
| 31 |
+- const boost::shared_ptr<const urdf::Joint> urdf_joint = urdf_model->getJoint(joint_name); |
| 32 |
++ const std::shared_ptr<const urdf::Joint> urdf_joint = urdf_model->getJoint(joint_name); |
| 33 |
+ if (urdf_joint != NULL) |
| 34 |
+ { |
| 35 |
+ *joint_type = urdf_joint->type; |
| 36 |
|
| 37 |
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7-r1.ebuild |
| 38 |
similarity index 80% |
| 39 |
rename from dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7.ebuild |
| 40 |
rename to dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7-r1.ebuild |
| 41 |
index 63ccb13..8f80022 100644 |
| 42 |
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7.ebuild |
| 43 |
+++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7-r1.ebuild |
| 44 |
@@ -22,8 +22,10 @@ RDEPEND=" |
| 45 |
dev-ros/hardware_interface |
| 46 |
dev-ros/transmission_interface |
| 47 |
dev-ros/pluginlib |
| 48 |
- dev-ros/joint_limits_interface |
| 49 |
- dev-ros/urdf |
| 50 |
+ >=dev-ros/joint_limits_interface-0.11.0 |
| 51 |
+ >=dev-ros/urdf-1.12.3-r1 |
| 52 |
+ dev-libs/urdfdom:= |
| 53 |
sci-electronics/gazebo |
| 54 |
" |
| 55 |
DEPEND="${RDEPEND}" |
| 56 |
+PATCHES=( "${FILESDIR}/urdfdom1.patch" ) |
| 57 |
|
| 58 |
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild |
| 59 |
index a8ee997..edf6468 100644 |
| 60 |
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild |
| 61 |
+++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild |
| 62 |
@@ -1,4 +1,4 @@ |
| 63 |
-# Copyright 1999-2014 Gentoo Foundation |
| 64 |
+# Copyright 1999-2016 Gentoo Foundation |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
# $Id$ |
| 67 |
|
| 68 |
@@ -25,5 +25,6 @@ RDEPEND=" |
| 69 |
dev-ros/joint_limits_interface |
| 70 |
dev-ros/urdf |
| 71 |
sci-electronics/gazebo |
| 72 |
+ dev-libs/urdfdom:= |
| 73 |
" |
| 74 |
DEPEND="${RDEPEND}" |
Archives