1 |
commit: 8d9c9f21d37199f0b7a93bd51cfe8259e4723089 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 1 14:43:12 2016 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 1 14:54:20 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d9c9f21 |
7 |
|
8 |
dev-ros/urdf: forward port urdfdom1 fix. |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
dev-ros/urdf/files/ns.patch | 17 +++++++++++++++++ |
13 |
dev-ros/urdf/urdf-1.12.5.ebuild | 12 +++++++++--- |
14 |
2 files changed, 26 insertions(+), 3 deletions(-) |
15 |
|
16 |
diff --git a/dev-ros/urdf/files/ns.patch b/dev-ros/urdf/files/ns.patch |
17 |
new file mode 100644 |
18 |
index 00000000..b8d482b |
19 |
--- /dev/null |
20 |
+++ b/dev-ros/urdf/files/ns.patch |
21 |
@@ -0,0 +1,17 @@ |
22 |
+Index: urdf/urdfdom_compatibility.h.in |
23 |
+=================================================================== |
24 |
+--- urdf.orig/urdfdom_compatibility.h.in |
25 |
++++ urdf/urdfdom_compatibility.h.in |
26 |
+@@ -75,9 +75,9 @@ URDF_TYPEDEF_CLASS_POINTER(ModelInterfac |
27 |
+ |
28 |
+ #else // urdfdom <= 0.4 |
29 |
+ |
30 |
+-typedef std::shared_ptr<ModelInterface> ModelInterfaceSharedPtr; |
31 |
+-typedef std::shared_ptr<const ModelInterface> ModelInterfaceConstSharedPtr; |
32 |
+-typedef std::weak_ptr<ModelInterface> ModelInterfaceWeakPtr; |
33 |
++typedef std::shared_ptr<urdf::ModelInterface> ModelInterfaceSharedPtr; |
34 |
++typedef std::shared_ptr<const urdf::ModelInterface> ModelInterfaceConstSharedPtr; |
35 |
++typedef std::weak_ptr<urdf::ModelInterface> ModelInterfaceWeakPtr; |
36 |
+ |
37 |
+ #endif // urdfdom > 0.4 |
38 |
+ |
39 |
|
40 |
diff --git a/dev-ros/urdf/urdf-1.12.5.ebuild b/dev-ros/urdf/urdf-1.12.5.ebuild |
41 |
index e6cb39f..5e70f56 100644 |
42 |
--- a/dev-ros/urdf/urdf-1.12.5.ebuild |
43 |
+++ b/dev-ros/urdf/urdf-1.12.5.ebuild |
44 |
@@ -8,7 +8,7 @@ KEYWORDS="~amd64 ~arm" |
45 |
ROS_SUBDIR=${PN} |
46 |
PYTHON_COMPAT=( python2_7 ) |
47 |
|
48 |
-inherit ros-catkin |
49 |
+inherit ros-catkin flag-o-matic |
50 |
|
51 |
DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)" |
52 |
LICENSE="BSD" |
53 |
@@ -17,9 +17,9 @@ IUSE="" |
54 |
|
55 |
RDEPEND=" |
56 |
dev-libs/boost:=[threads] |
57 |
- dev-libs/urdfdom |
58 |
+ >=dev-libs/urdfdom-1 |
59 |
dev-libs/urdfdom_headers |
60 |
- dev-ros/urdf_parser_plugin |
61 |
+ >=dev-ros/urdf_parser_plugin-1.12.3-r1 |
62 |
dev-ros/pluginlib |
63 |
dev-ros/rosconsole_bridge |
64 |
dev-ros/roscpp |
65 |
@@ -28,3 +28,9 @@ RDEPEND=" |
66 |
DEPEND="${RDEPEND} |
67 |
dev-ros/cmake_modules |
68 |
test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )" |
69 |
+PATCHES=( "${FILESDIR}/urdfdom1.patch" "${FILESDIR}/ns.patch" ) |
70 |
+ |
71 |
+src_configure() { |
72 |
+ append-cxxflags -std=c++11 |
73 |
+ ros-catkin_src_configure |
74 |
+} |