From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-893698-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 5A6EA13832E
for <garchives@archives.gentoo.org>; Tue, 26 Jul 2016 09:25:25 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D9C63E0B3F;
Tue, 26 Jul 2016 09:24:59 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 940B4E0B3A
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Jul 2016 09:24:56 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id DC169340CCE
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Jul 2016 09:24:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B47D22450
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Jul 2016 09:24:49 +0000 (UTC)
From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" <aballier@gentoo.org>
Message-ID: <1469524710.17c0e37c8f6f3f7482d802ff823c5a84c35a1ad7.aballier@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/kdl_parser/, dev-ros/kdl_parser/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-ros/kdl_parser/files/urdfdom1.patch dev-ros/kdl_parser/kdl_parser-1.12.3-r1.ebuild dev-ros/kdl_parser/kdl_parser-1.12.3.ebuild
X-VCS-Directories: dev-ros/kdl_parser/files/ dev-ros/kdl_parser/
X-VCS-Committer: aballier
X-VCS-Committer-Name: Alexis Ballier
X-VCS-Revision: 17c0e37c8f6f3f7482d802ff823c5a84c35a1ad7
X-VCS-Branch: master
Date: Tue, 26 Jul 2016 09:24:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 01e93271-19ce-42b8-9bcb-bb4c46ec805b
X-Archives-Hash: 9d9e695dbe92a9f6f74114e4fdc6284a
commit: 17c0e37c8f6f3f7482d802ff823c5a84c35a1ad7
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 08:13:41 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 09:18:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17c0e37c
dev-ros/kdl_parser: fix build with urdfdom1.
Package-Manager: portage-2.3.0
dev-ros/kdl_parser/files/urdfdom1.patch | 34 ++++++++++++++++++++++
...r-1.12.3.ebuild => kdl_parser-1.12.3-r1.ebuild} | 10 +++++--
2 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/dev-ros/kdl_parser/files/urdfdom1.patch b/dev-ros/kdl_parser/files/urdfdom1.patch
new file mode 100644
index 0000000..c4b1d5c
--- /dev/null
+++ b/dev-ros/kdl_parser/files/urdfdom1.patch
@@ -0,0 +1,34 @@
+Index: kdl_parser/src/kdl_parser.cpp
+===================================================================
+--- kdl_parser.orig/src/kdl_parser.cpp
++++ kdl_parser/src/kdl_parser.cpp
+@@ -64,7 +64,7 @@ Frame toKdl(urdf::Pose p)
+ }
+
+ // construct joint
+-Joint toKdl(boost::shared_ptr<urdf::Joint> jnt)
++Joint toKdl(std::shared_ptr<urdf::Joint> jnt)
+ {
+ Frame F_parent_jnt = toKdl(jnt->parent_to_joint_origin_transform);
+
+@@ -93,7 +93,7 @@ Joint toKdl(boost::shared_ptr<urdf::Join
+ }
+
+ // construct inertia
+-RigidBodyInertia toKdl(boost::shared_ptr<urdf::Inertial> i)
++RigidBodyInertia toKdl(std::shared_ptr<urdf::Inertial> i)
+ {
+ Frame origin = toKdl(i->origin);
+
+@@ -124,9 +124,9 @@ RigidBodyInertia toKdl(boost::shared_ptr
+
+
+ // recursive function to walk through tree
+-bool addChildrenToTree(boost::shared_ptr<const urdf::Link> root, Tree& tree)
++bool addChildrenToTree(std::shared_ptr<const urdf::Link> root, Tree& tree)
+ {
+- std::vector<boost::shared_ptr<urdf::Link> > children = root->child_links;
++ std::vector<std::shared_ptr<urdf::Link> > children = root->child_links;
+ ROS_DEBUG("Link %s had %i children", root->name.c_str(), (int)children.size());
+
+ // constructs the optional inertia
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
similarity index 74%
rename from dev-ros/kdl_parser/kdl_parser-1.12.3.ebuild
rename to dev-ros/kdl_parser/kdl_parser-1.12.3-r1.ebuild
index 372f508..7e6a2bd 100644
--- a/dev-ros/kdl_parser/kdl_parser-1.12.3.ebuild
+++ b/dev-ros/kdl_parser/kdl_parser-1.12.3-r1.ebuild
@@ -8,7 +8,7 @@ KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
PYTHON_COMPAT=( python2_7 )
-inherit ros-catkin
+inherit ros-catkin flag-o-matic
DESCRIPTION="Constructs a KDL tree from an XML robot representation in URDF"
LICENSE="BSD"
@@ -19,9 +19,15 @@ RDEPEND="
dev-libs/boost:=
dev-ros/roscpp
dev-ros/rosconsole
- dev-ros/urdf
+ >=dev-ros/urdf-1.12.3-r1
sci-libs/orocos_kdl
dev-libs/tinyxml
"
DEPEND="${RDEPEND}
test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/urdfdom1.patch" )
+
+src_configure() {
+ append-cxxflags -std=gnu++11
+ ros-catkin_src_configure
+}