From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 B54D413832E for ; Tue, 26 Jul 2016 09:25:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CB3DE0B4D; Tue, 26 Jul 2016 09:25:00 +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 AEA1FE0B3F for ; Tue, 26 Jul 2016 09:24:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 90E37340CF1 for ; Tue, 26 Jul 2016 09:24:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29EAF2456 for ; Tue, 26 Jul 2016 09:24:50 +0000 (UTC) From: "Alexis Ballier" 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" Message-ID: <1469524710.dd1ea63ab7aefc0c374eec50beadc72db2ff481b.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/gazebo_ros_control/, dev-ros/gazebo_ros_control/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/gazebo_ros_control/files/urdfdom1.patch dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7-r1.ebuild dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7.ebuild dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild X-VCS-Directories: dev-ros/gazebo_ros_control/files/ dev-ros/gazebo_ros_control/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: dd1ea63ab7aefc0c374eec50beadc72db2ff481b X-VCS-Branch: master Date: Tue, 26 Jul 2016 09:24:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fee38ab8-a926-4cc3-9dac-6b40d6dd6491 X-Archives-Hash: 0abc39619a4d3d0334069eff471ebb77 commit: dd1ea63ab7aefc0c374eec50beadc72db2ff481b Author: Alexis Ballier gentoo org> AuthorDate: Tue Jul 26 09:01:47 2016 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Tue Jul 26 09:18:30 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd1ea63a dev-ros/gazebo_ros_control: fix build with urdfdom1 and add := dep on it Package-Manager: portage-2.3.0 dev-ros/gazebo_ros_control/files/urdfdom1.patch | 13 +++++++++++++ ...trol-2.5.7.ebuild => gazebo_ros_control-2.5.7-r1.ebuild} | 6 ++++-- dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild | 3 ++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dev-ros/gazebo_ros_control/files/urdfdom1.patch b/dev-ros/gazebo_ros_control/files/urdfdom1.patch new file mode 100644 index 0000000..0da7631 --- /dev/null +++ b/dev-ros/gazebo_ros_control/files/urdfdom1.patch @@ -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 urdf_joint = urdf_model->getJoint(joint_name); ++ const std::shared_ptr urdf_joint = urdf_model->getJoint(joint_name); + if (urdf_joint != NULL) + { + *joint_type = urdf_joint->type; 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 similarity index 80% rename from dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7.ebuild rename to dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7-r1.ebuild index 63ccb13..8f80022 100644 --- 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 @@ -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" ) diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild index a8ee997..edf6468 100644 --- a/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild +++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild @@ -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}"