Skip to content

Commit

Permalink
dev-ros/urdf: fix build with urdfdom 1, add := dep on it.
Browse files Browse the repository at this point in the history
Package-Manager: portage-2.3.0
  • Loading branch information
aballier committed Jul 26, 2016
1 parent a1c55aa commit 291d58b
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
13 changes: 13 additions & 0 deletions dev-ros/urdf/files/urdfdom1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Index: urdf/src/model.cpp
===================================================================
--- urdf.orig/src/model.cpp
+++ urdf/src/model.cpp
@@ -136,7 +136,7 @@ bool Model::initXml(TiXmlElement *robot_

bool Model::initString(const std::string& xml_string)
{
- boost::shared_ptr<ModelInterface> model;
+ std::shared_ptr<ModelInterface> model;

// necessary for COLLADA compatibility
if( IsColladaData(xml_string) ) {
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
PYTHON_COMPAT=( python2_7 )

inherit ros-catkin
inherit ros-catkin flag-o-matic

DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
LICENSE="BSD"
Expand All @@ -17,9 +17,9 @@ IUSE=""

RDEPEND="
dev-libs/boost:=[threads]
dev-libs/urdfdom
>=dev-libs/urdfdom-1
dev-libs/urdfdom_headers
dev-ros/urdf_parser_plugin
>=dev-ros/urdf_parser_plugin-1.12.3-r1
dev-ros/pluginlib
dev-ros/rosconsole_bridge
dev-ros/roscpp
Expand All @@ -28,3 +28,9 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-ros/cmake_modules
test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
PATCHES=( "${FILESDIR}/urdfdom1.patch" )

src_configure() {
append-cxxflags -std=c++11
ros-catkin_src_configure
}

0 comments on commit 291d58b

Please sign in to comment.