Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/kdl_parser/, dev-ros/kdl_parser/files/
Date: Tue, 26 Jul 2016 09:25:25
Message-Id: 1469524710.17c0e37c8f6f3f7482d802ff823c5a84c35a1ad7.aballier@gentoo
1 commit: 17c0e37c8f6f3f7482d802ff823c5a84c35a1ad7
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 26 08:13:41 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=17c0e37c
7
8 dev-ros/kdl_parser: fix build with urdfdom1.
9
10 Package-Manager: portage-2.3.0
11
12 dev-ros/kdl_parser/files/urdfdom1.patch | 34 ++++++++++++++++++++++
13 ...r-1.12.3.ebuild => kdl_parser-1.12.3-r1.ebuild} | 10 +++++--
14 2 files changed, 42 insertions(+), 2 deletions(-)
15
16 diff --git a/dev-ros/kdl_parser/files/urdfdom1.patch b/dev-ros/kdl_parser/files/urdfdom1.patch
17 new file mode 100644
18 index 0000000..c4b1d5c
19 --- /dev/null
20 +++ b/dev-ros/kdl_parser/files/urdfdom1.patch
21 @@ -0,0 +1,34 @@
22 +Index: kdl_parser/src/kdl_parser.cpp
23 +===================================================================
24 +--- kdl_parser.orig/src/kdl_parser.cpp
25 ++++ kdl_parser/src/kdl_parser.cpp
26 +@@ -64,7 +64,7 @@ Frame toKdl(urdf::Pose p)
27 + }
28 +
29 + // construct joint
30 +-Joint toKdl(boost::shared_ptr<urdf::Joint> jnt)
31 ++Joint toKdl(std::shared_ptr<urdf::Joint> jnt)
32 + {
33 + Frame F_parent_jnt = toKdl(jnt->parent_to_joint_origin_transform);
34 +
35 +@@ -93,7 +93,7 @@ Joint toKdl(boost::shared_ptr<urdf::Join
36 + }
37 +
38 + // construct inertia
39 +-RigidBodyInertia toKdl(boost::shared_ptr<urdf::Inertial> i)
40 ++RigidBodyInertia toKdl(std::shared_ptr<urdf::Inertial> i)
41 + {
42 + Frame origin = toKdl(i->origin);
43 +
44 +@@ -124,9 +124,9 @@ RigidBodyInertia toKdl(boost::shared_ptr
45 +
46 +
47 + // recursive function to walk through tree
48 +-bool addChildrenToTree(boost::shared_ptr<const urdf::Link> root, Tree& tree)
49 ++bool addChildrenToTree(std::shared_ptr<const urdf::Link> root, Tree& tree)
50 + {
51 +- std::vector<boost::shared_ptr<urdf::Link> > children = root->child_links;
52 ++ std::vector<std::shared_ptr<urdf::Link> > children = root->child_links;
53 + ROS_DEBUG("Link %s had %i children", root->name.c_str(), (int)children.size());
54 +
55 + // constructs the optional inertia
56
57 diff --git a/dev-ros/kdl_parser/kdl_parser-1.12.3.ebuild b/dev-ros/kdl_parser/kdl_parser-1.12.3-r1.ebuild
58 similarity index 74%
59 rename from dev-ros/kdl_parser/kdl_parser-1.12.3.ebuild
60 rename to dev-ros/kdl_parser/kdl_parser-1.12.3-r1.ebuild
61 index 372f508..7e6a2bd 100644
62 --- a/dev-ros/kdl_parser/kdl_parser-1.12.3.ebuild
63 +++ b/dev-ros/kdl_parser/kdl_parser-1.12.3-r1.ebuild
64 @@ -8,7 +8,7 @@ KEYWORDS="~amd64 ~arm"
65 ROS_SUBDIR=${PN}
66 PYTHON_COMPAT=( python2_7 )
67
68 -inherit ros-catkin
69 +inherit ros-catkin flag-o-matic
70
71 DESCRIPTION="Constructs a KDL tree from an XML robot representation in URDF"
72 LICENSE="BSD"
73 @@ -19,9 +19,15 @@ RDEPEND="
74 dev-libs/boost:=
75 dev-ros/roscpp
76 dev-ros/rosconsole
77 - dev-ros/urdf
78 + >=dev-ros/urdf-1.12.3-r1
79 sci-libs/orocos_kdl
80 dev-libs/tinyxml
81 "
82 DEPEND="${RDEPEND}
83 test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
84 +PATCHES=( "${FILESDIR}/urdfdom1.patch" )
85 +
86 +src_configure() {
87 + append-cxxflags -std=gnu++11
88 + ros-catkin_src_configure
89 +}