[gentoo-commits] repo/gentoo:master commit in: dev-ros/urdf/files/, dev-ros/urdf/

[Alexis Ballier]

commit:     291d58be3f46b4c15ba54f5e53a189676e3b73a1
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 07:08:24 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=291d58be

dev-ros/urdf: fix build with urdfdom 1, add := dep on it.

Package-Manager: portage-2.3.0

 dev-ros/urdf/files/urdfdom1.patch                          | 13 +++++++++++++
 dev-ros/urdf/{urdf-1.12.3.ebuild => urdf-1.12.3-r1.ebuild} | 12 +++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/dev-ros/urdf/files/urdfdom1.patch b/dev-ros/urdf/files/urdfdom1.patch
new file mode 100644
index 0000000..aa1d31c
--- /dev/null
+++ b/dev-ros/urdf/files/urdfdom1.patch
@@ -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) ) {

diff --git a/dev-ros/urdf/urdf-1.12.3.ebuild b/dev-ros/urdf/urdf-1.12.3-r1.ebuild
similarity index 73%
rename from dev-ros/urdf/urdf-1.12.3.ebuild
rename to dev-ros/urdf/urdf-1.12.3-r1.ebuild
index e6cb39f..eb2263d 100644
--- a/dev-ros/urdf/urdf-1.12.3.ebuild
+++ b/dev-ros/urdf/urdf-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="C++ parser for the Unified Robot Description Format (URDF)"
 LICENSE="BSD"
@@ -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
@@ -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
+}