* [gentoo-commits] repo/gentoo:master commit in: dev-ros/urdf/files/, dev-ros/urdf/
@ 2016-07-26 9:24 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2016-07-26 9:24 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/urdf/files/, dev-ros/urdf/
@ 2016-11-01 14:54 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2016-11-01 14:54 UTC (permalink / raw
To: gentoo-commits
commit: 8d9c9f21d37199f0b7a93bd51cfe8259e4723089
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 1 14:43:12 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Nov 1 14:54:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d9c9f21
dev-ros/urdf: forward port urdfdom1 fix.
Package-Manager: portage-2.3.2
dev-ros/urdf/files/ns.patch | 17 +++++++++++++++++
dev-ros/urdf/urdf-1.12.5.ebuild | 12 +++++++++---
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/dev-ros/urdf/files/ns.patch b/dev-ros/urdf/files/ns.patch
new file mode 100644
index 00000000..b8d482b
--- /dev/null
+++ b/dev-ros/urdf/files/ns.patch
@@ -0,0 +1,17 @@
+Index: urdf/urdfdom_compatibility.h.in
+===================================================================
+--- urdf.orig/urdfdom_compatibility.h.in
++++ urdf/urdfdom_compatibility.h.in
+@@ -75,9 +75,9 @@ URDF_TYPEDEF_CLASS_POINTER(ModelInterfac
+
+ #else // urdfdom <= 0.4
+
+-typedef std::shared_ptr<ModelInterface> ModelInterfaceSharedPtr;
+-typedef std::shared_ptr<const ModelInterface> ModelInterfaceConstSharedPtr;
+-typedef std::weak_ptr<ModelInterface> ModelInterfaceWeakPtr;
++typedef std::shared_ptr<urdf::ModelInterface> ModelInterfaceSharedPtr;
++typedef std::shared_ptr<const urdf::ModelInterface> ModelInterfaceConstSharedPtr;
++typedef std::weak_ptr<urdf::ModelInterface> ModelInterfaceWeakPtr;
+
+ #endif // urdfdom > 0.4
+
diff --git a/dev-ros/urdf/urdf-1.12.5.ebuild b/dev-ros/urdf/urdf-1.12.5.ebuild
index e6cb39f..5e70f56 100644
--- a/dev-ros/urdf/urdf-1.12.5.ebuild
+++ b/dev-ros/urdf/urdf-1.12.5.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" "${FILESDIR}/ns.patch" )
+
+src_configure() {
+ append-cxxflags -std=c++11
+ ros-catkin_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/urdf/files/, dev-ros/urdf/
@ 2017-01-07 14:40 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-01-07 14:40 UTC (permalink / raw
To: gentoo-commits
commit: 0944e2bccd709ad262bf18bed7e686e0e069d34e
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 14:24:12 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 14:39:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0944e2bc
dev-ros/urdf: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-ros/urdf/Manifest | 3 ---
dev-ros/urdf/files/ns.patch | 17 -----------------
dev-ros/urdf/files/urdfdom1.patch | 13 -------------
dev-ros/urdf/urdf-1.12.3-r1.ebuild | 36 ------------------------------------
dev-ros/urdf/urdf-1.12.4.ebuild | 36 ------------------------------------
dev-ros/urdf/urdf-1.12.5.ebuild | 36 ------------------------------------
6 files changed, 141 deletions(-)
diff --git a/dev-ros/urdf/Manifest b/dev-ros/urdf/Manifest
index 9496381..f74e863 100644
--- a/dev-ros/urdf/Manifest
+++ b/dev-ros/urdf/Manifest
@@ -1,4 +1 @@
-DIST robot_model-1.12.3.tar.gz 1292139 SHA256 4b2bf070e4d07450fd9977a62c260e8abb40645ff9fcf5f5781f505a8b61b194 SHA512 eae18db87bdd7fc867868493f54f1812358f1a301c88fc7eae611fa75bc2418165b5cb2f5c5839f3cb644d4c1f560f85d84b635ffbecaa631c78a3176d1fb6db WHIRLPOOL c555faee5282942db894866a08aa3a675c6db618fce2acdd1f67d622cf1c0a8e5747f5f9a5217b4fc83997f9bb9125f1c7f2ca6b77e9fd75244f121b48a77f66
-DIST robot_model-1.12.4.tar.gz 1293354 SHA256 e40bd4519fd4010bcde0cb179611a19c04c3a32073830a675090671b4cea0ee5 SHA512 f78bfd9a72d795e301836a7946d87250f4c8be2082593f7a0fb282831152bc8125885f30408ff99823c4dd1d606060b71695c1cc3097dee8870efe0fe862ab0d WHIRLPOOL cff984eec217cd4615f1bf316eaa255f0d7f2c531fede6d4764edd57a11277980b0aad87bee4af7e89b2fc56394c7d457a0bb50b103b22afc4f5f449824293e9
-DIST robot_model-1.12.5.tar.gz 1294607 SHA256 c0784cebf4b5ef38c9bf7a0f6e66f5350aa7e12460d46e2e8c4c9420b40217cc SHA512 4e1952bf9218a1ee1c09c1ff3ad607a9546675874f2d97052a1015fa1c221829e42d95c735dd136e5406fdccdbf969d55a43b318db1fed206c86c2c7a5c5ab86 WHIRLPOOL 38f0150bc4b991c7fef829e0c02c015e603d6162a3986a28433adc1d496d9098efc97f0da15cae32b8316d8677b5e156c64e36304af82f8a94a3b231a027e59c
DIST robot_model-1.12.6.tar.gz 1295666 SHA256 ac335cec5a3706a104411222a2f89ef1862c0ac8caa5ddadd390e9c25641bf27 SHA512 60270b3ec20c0473e9c8d02d661794e253405c836b06cf5c15b65dddf104bfb5e4865463e12232e94548d68eead2b5499eb04c71aee3f851fa9f85dbe733ee12 WHIRLPOOL 6cec339181a6570fbe4e61415d341f5f7404ea69d8d2a4058d5c837fa15f74c7c95a4ee3f74a78fcca624d272995f09aae4ad3a6027178b2c25daa466754adc4
diff --git a/dev-ros/urdf/files/ns.patch b/dev-ros/urdf/files/ns.patch
deleted file mode 100644
index b8d482b..00000000
--- a/dev-ros/urdf/files/ns.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: urdf/urdfdom_compatibility.h.in
-===================================================================
---- urdf.orig/urdfdom_compatibility.h.in
-+++ urdf/urdfdom_compatibility.h.in
-@@ -75,9 +75,9 @@ URDF_TYPEDEF_CLASS_POINTER(ModelInterfac
-
- #else // urdfdom <= 0.4
-
--typedef std::shared_ptr<ModelInterface> ModelInterfaceSharedPtr;
--typedef std::shared_ptr<const ModelInterface> ModelInterfaceConstSharedPtr;
--typedef std::weak_ptr<ModelInterface> ModelInterfaceWeakPtr;
-+typedef std::shared_ptr<urdf::ModelInterface> ModelInterfaceSharedPtr;
-+typedef std::shared_ptr<const urdf::ModelInterface> ModelInterfaceConstSharedPtr;
-+typedef std::weak_ptr<urdf::ModelInterface> ModelInterfaceWeakPtr;
-
- #endif // urdfdom > 0.4
-
diff --git a/dev-ros/urdf/files/urdfdom1.patch b/dev-ros/urdf/files/urdfdom1.patch
deleted file mode 100644
index aa1d31c..00000000
--- a/dev-ros/urdf/files/urdfdom1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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-r1.ebuild b/dev-ros/urdf/urdf-1.12.3-r1.ebuild
deleted file mode 100644
index eb2263d..00000000
--- a/dev-ros/urdf/urdf-1.12.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin flag-o-matic
-
-DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=[threads]
- >=dev-libs/urdfdom-1
- dev-libs/urdfdom_headers
- >=dev-ros/urdf_parser_plugin-1.12.3-r1
- dev-ros/pluginlib
- dev-ros/rosconsole_bridge
- dev-ros/roscpp
- dev-libs/tinyxml
-"
-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
-}
diff --git a/dev-ros/urdf/urdf-1.12.4.ebuild b/dev-ros/urdf/urdf-1.12.4.ebuild
deleted file mode 100644
index eb2263d..00000000
--- a/dev-ros/urdf/urdf-1.12.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin flag-o-matic
-
-DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=[threads]
- >=dev-libs/urdfdom-1
- dev-libs/urdfdom_headers
- >=dev-ros/urdf_parser_plugin-1.12.3-r1
- dev-ros/pluginlib
- dev-ros/rosconsole_bridge
- dev-ros/roscpp
- dev-libs/tinyxml
-"
-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
-}
diff --git a/dev-ros/urdf/urdf-1.12.5.ebuild b/dev-ros/urdf/urdf-1.12.5.ebuild
deleted file mode 100644
index 5e70f56..00000000
--- a/dev-ros/urdf/urdf-1.12.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin flag-o-matic
-
-DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=[threads]
- >=dev-libs/urdfdom-1
- dev-libs/urdfdom_headers
- >=dev-ros/urdf_parser_plugin-1.12.3-r1
- dev-ros/pluginlib
- dev-ros/rosconsole_bridge
- dev-ros/roscpp
- dev-libs/tinyxml
-"
-DEPEND="${RDEPEND}
- dev-ros/cmake_modules
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/urdfdom1.patch" "${FILESDIR}/ns.patch" )
-
-src_configure() {
- append-cxxflags -std=c++11
- ros-catkin_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/urdf/files/, dev-ros/urdf/
@ 2017-06-27 10:01 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-06-27 10:01 UTC (permalink / raw
To: gentoo-commits
commit: 6f0405341f1ce0f33a085827bd26965cae25aabb
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 09:58:54 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 10:01:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f040534
dev-ros/urdf: avoid forward declaration of class
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-ros/urdf/files/forward_decl.patch | 17 +++++++++++++++++
dev-ros/urdf/urdf-1.12.10.ebuild | 2 ++
2 files changed, 19 insertions(+)
diff --git a/dev-ros/urdf/files/forward_decl.patch b/dev-ros/urdf/files/forward_decl.patch
new file mode 100644
index 00000000000..8aef13eb92d
--- /dev/null
+++ b/dev-ros/urdf/files/forward_decl.patch
@@ -0,0 +1,17 @@
+Index: urdf/urdfdom_compatibility.h.in
+===================================================================
+--- urdf.orig/urdfdom_compatibility.h.in
++++ urdf/urdfdom_compatibility.h.in
+@@ -85,10 +85,12 @@ URDF_TYPEDEF_CLASS_POINTER(Model);
+ #include <urdf_world/types.h>
+
+ namespace urdf {
++class ModelInterface;
+ typedef std::shared_ptr<ModelInterface> ModelInterfaceSharedPtr;
+ typedef std::shared_ptr<const ModelInterface> ModelInterfaceConstSharedPtr;
+ typedef std::weak_ptr<ModelInterface> ModelInterfaceWeakPtr;
+
++class Model;
+ typedef std::shared_ptr<Model> ModelSharedPtr;
+ typedef std::shared_ptr<const Model> ModelConstSharedPtr;
+ typedef std::weak_ptr<Model> ModelWeakPtr;
diff --git a/dev-ros/urdf/urdf-1.12.10.ebuild b/dev-ros/urdf/urdf-1.12.10.ebuild
index 7e228f156c7..260fee45fc0 100644
--- a/dev-ros/urdf/urdf-1.12.10.ebuild
+++ b/dev-ros/urdf/urdf-1.12.10.ebuild
@@ -27,3 +27,5 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-ros/cmake_modules
test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
+
+PATCHES=( "${FILESDIR}/forward_decl.patch" )
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-27 10:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-01 14:54 [gentoo-commits] repo/gentoo:master commit in: dev-ros/urdf/files/, dev-ros/urdf/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2017-06-27 10:01 Alexis Ballier
2017-01-07 14:40 Alexis Ballier
2016-07-26 9:24 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox