gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-10 06:57:08 -08:00
Code Issues Projects Releases Wiki Activity

dev-ros/gazebo_ros_control: fix build with urdfdom1 and add := dep on it

Browse Source 
Package-Manager: portage-2.3.0
This commit is contained in:
Alexis Ballier
2016-07-26 11:18:30 +02:00
parent 68f1a7d004
commit dd1ea63ab7
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-ros/gazebo_ros_control/files/urdfdom1.patch
+13
View File
@@ -0,0 +1,13 @@
Index: gazebo_ros_control/src/default_robot_hw_sim.cpp
===================================================================
--- gazebo_ros_control.orig/src/default_robot_hw_sim.cpp
+++ gazebo_ros_control/src/default_robot_hw_sim.cpp
@@ -381,7 +381,7 @@ void DefaultRobotHWSim::registerJointLim
if (urdf_model != NULL)
{
- const boost::shared_ptr<const urdf::Joint> urdf_joint = urdf_model->getJoint(joint_name);
+ const std::shared_ptr<const urdf::Joint> urdf_joint = urdf_model->getJoint(joint_name);
if (urdf_joint != NULL)
{
*joint_type = urdf_joint->type;
dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7.ebuild → dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7-r1.ebuild
+4 -2
View File
@@ -22,8 +22,10 @@ RDEPEND="
dev-ros/hardware_interface
dev-ros/transmission_interface
dev-ros/pluginlib
dev-ros/joint_limits_interface
dev-ros/urdf
>=dev-ros/joint_limits_interface-0.11.0
>=dev-ros/urdf-1.12.3-r1
dev-libs/urdfdom:=
sci-electronics/gazebo
"
DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}/urdfdom1.patch" )
dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
+2 -1
View File
@@ -1,4 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -25,5 +25,6 @@ RDEPEND="
dev-ros/joint_limits_interface
dev-ros/urdf
sci-electronics/gazebo
dev-libs/urdfdom:=
"
DEPEND="${RDEPEND}"