* [gentoo-commits] repo/gentoo:master commit in: dev-ros/collada_parser/, dev-ros/collada_parser/files/
@ 2016-07-26 9:24 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2016-07-26 9:24 UTC (permalink / raw
To: gentoo-commits
commit: 0d65e8a59fd9297c0afb561bd7536750a6d785e0
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 07:29:35 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=0d65e8a5
dev-ros/collada_parser: fix build with urdfdom 1.
Package-Manager: portage-2.3.0
...12.3.ebuild => collada_parser-1.12.3-r1.ebuild} | 10 +-
dev-ros/collada_parser/files/urdfdom1.patch | 224 +++++++++++++++++++++
2 files changed, 232 insertions(+), 2 deletions(-)
diff --git a/dev-ros/collada_parser/collada_parser-1.12.3.ebuild b/dev-ros/collada_parser/collada_parser-1.12.3-r1.ebuild
similarity index 70%
rename from dev-ros/collada_parser/collada_parser-1.12.3.ebuild
rename to dev-ros/collada_parser/collada_parser-1.12.3-r1.ebuild
index bdf3b89..88716c5 100644
--- a/dev-ros/collada_parser/collada_parser-1.12.3.ebuild
+++ b/dev-ros/collada_parser/collada_parser-1.12.3-r1.ebuild
@@ -7,7 +7,7 @@ ROS_REPO_URI="https://github.com/ros/robot_model"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
-inherit ros-catkin
+inherit ros-catkin flag-o-matic
DESCRIPTION="C++ parser for the Collada robot description format"
LICENSE="BSD"
@@ -16,10 +16,16 @@ IUSE=""
RDEPEND="
dev-libs/boost:=
- dev-ros/urdf_parser_plugin
+ >=dev-ros/urdf_parser_plugin-1.12.3-r1
dev-ros/roscpp
dev-ros/class_loader
dev-libs/urdfdom_headers
dev-libs/collada-dom
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/urdfdom1.patch" )
+
+src_configure() {
+ append-cxxflags -std=gnu++11
+ ros-catkin_src_configure
+}
diff --git a/dev-ros/collada_parser/files/urdfdom1.patch b/dev-ros/collada_parser/files/urdfdom1.patch
new file mode 100644
index 0000000..1391372
--- /dev/null
+++ b/dev-ros/collada_parser/files/urdfdom1.patch
@@ -0,0 +1,224 @@
+Index: collada_parser/include/collada_parser/collada_parser.h
+===================================================================
+--- collada_parser.orig/include/collada_parser/collada_parser.h
++++ collada_parser/include/collada_parser/collada_parser.h
+@@ -47,7 +47,7 @@
+ namespace urdf {
+
+ /// \brief Load Model from string
+-boost::shared_ptr<ModelInterface> parseCollada(const std::string &xml_string );
++std::shared_ptr<ModelInterface> parseCollada(const std::string &xml_string );
+
+ }
+
+Index: collada_parser/include/collada_parser/collada_parser_plugin.h
+===================================================================
+--- collada_parser.orig/include/collada_parser/collada_parser_plugin.h
++++ collada_parser/include/collada_parser/collada_parser_plugin.h
+@@ -46,7 +46,7 @@ class ColladaURDFParser : public URDFPar
+ {
+ public:
+
+- virtual boost::shared_ptr<ModelInterface> parse(const std::string &xml_string);
++ virtual std::shared_ptr<ModelInterface> parse(const std::string &xml_string);
+ };
+
+ }
+Index: collada_parser/src/collada_parser.cpp
+===================================================================
+--- collada_parser.orig/src/collada_parser.cpp
++++ collada_parser/src/collada_parser.cpp
+@@ -176,7 +176,7 @@ public:
+ USERDATA(double scale) : scale(scale) {
+ }
+ double scale;
+- boost::shared_ptr<void> p; ///< custom managed data
++ std::shared_ptr<void> p; ///< custom managed data
+ };
+
+ enum GeomType {
+@@ -409,7 +409,7 @@ public:
+ };
+
+ public:
+- ColladaModelReader(boost::shared_ptr<ModelInterface> model) : _dom(NULL), _nGlobalSensorId(0), _nGlobalManipulatorId(0), _model(model) {
++ ColladaModelReader(std::shared_ptr<ModelInterface> model) : _dom(NULL), _nGlobalSensorId(0), _nGlobalManipulatorId(0), _model(model) {
+ daeErrorHandler::setErrorHandler(this);
+ _resourcedir = ".";
+ }
+@@ -715,7 +715,7 @@ protected:
+ }
+
+ // find the target joint
+- boost::shared_ptr<Joint> pjoint = _getJointFromRef(pf->getTarget()->getParam()->getValue(),pf);
++ std::shared_ptr<Joint> pjoint = _getJointFromRef(pf->getTarget()->getParam()->getValue(),pf);
+ if (!pjoint) {
+ continue;
+ }
+@@ -785,7 +785,7 @@ protected:
+ }
+ BOOST_ASSERT(psymboljoint->hasAttribute("encoding"));
+ BOOST_ASSERT(psymboljoint->getAttribute("encoding")==std::string("COLLADA"));
+- boost::shared_ptr<Joint> pbasejoint = _getJointFromRef(psymboljoint->getCharData().c_str(),pf);
++ std::shared_ptr<Joint> pbasejoint = _getJointFromRef(psymboljoint->getCharData().c_str(),pf);
+ if( !!pbasejoint ) {
+ // set the mimic properties
+ pjoint->mimic.reset(new JointMimic());
+@@ -801,7 +801,7 @@ protected:
+ }
+
+ /// \brief Extract Link info and add it to an existing body
+- boost::shared_ptr<Link> _ExtractLink(const domLinkRef pdomlink,const domNodeRef pdomnode, const Pose& tParentWorldLink, const Pose& tParentLink, const std::vector<domJointRef>& vdomjoints, const KinematicsSceneBindings& bindings) {
++ std::shared_ptr<Link> _ExtractLink(const domLinkRef pdomlink,const domNodeRef pdomnode, const Pose& tParentWorldLink, const Pose& tParentLink, const std::vector<domJointRef>& vdomjoints, const KinematicsSceneBindings& bindings) {
+ const std::list<JointAxisBinding>& listAxisBindings = bindings.listAxisBindings;
+ // Set link name with the name of the COLLADA's Link
+ std::string linkname = _ExtractLinkName(pdomlink);
+@@ -817,7 +817,7 @@ protected:
+ }
+ }
+
+- boost::shared_ptr<Link> plink;
++ LinkSharedPtr plink;
+ _model->getLink(linkname,plink);
+ if( !plink ) {
+ plink.reset(new Link());
+@@ -921,7 +921,7 @@ protected:
+
+ if (!pdomjoint || pdomjoint->typeID() != domJoint::ID()) {
+ ROS_WARN_STREAM(str(boost::format("could not find attached joint %s!\n")%pattfull->getJoint()));
+- return boost::shared_ptr<Link>();
++ return std::shared_ptr<Link>();
+ }
+
+ // get direct child link
+@@ -952,7 +952,7 @@ protected:
+ }
+
+ // create the joints before creating the child links
+- std::vector<boost::shared_ptr<Joint> > vjoints(vdomaxes.getCount());
++ std::vector<std::shared_ptr<Joint> > vjoints(vdomaxes.getCount());
+ for (size_t ic = 0; ic < vdomaxes.getCount(); ++ic) {
+ bool joint_active = true; // if not active, put into the passive list
+ FOREACHC(itaxisbinding,listAxisBindings) {
+@@ -966,7 +966,7 @@ protected:
+ }
+ }
+
+- boost::shared_ptr<Joint> pjoint(new Joint());
++ std::shared_ptr<Joint> pjoint(new Joint());
+ pjoint->limits.reset(new JointLimits());
+ pjoint->limits->velocity = 0.0;
+ pjoint->limits->effort = 0.0;
+@@ -995,12 +995,12 @@ protected:
+ }
+
+ _getUserData(pdomjoint)->p = pjoint;
+- _getUserData(pdomaxis)->p = boost::shared_ptr<int>(new int(_model->joints_.size()));
++ _getUserData(pdomaxis)->p = std::shared_ptr<int>(new int(_model->joints_.size()));
+ _model->joints_[pjoint->name] = pjoint;
+ vjoints[ic] = pjoint;
+ }
+
+- boost::shared_ptr<Link> pchildlink = _ExtractLink(pattfull->getLink(), pchildnode, _poseMult(_poseMult(tParentWorldLink,tlink), tatt), tatt, vdomjoints, bindings);
++ std::shared_ptr<Link> pchildlink = _ExtractLink(pattfull->getLink(), pchildnode, _poseMult(_poseMult(tParentWorldLink,tlink), tatt), tatt, vdomjoints, bindings);
+
+ if (!pchildlink) {
+ ROS_WARN_STREAM(str(boost::format("Link has no child: %s\n")%plink->name));
+@@ -1035,7 +1035,7 @@ protected:
+ }
+
+ ROS_DEBUG_STREAM(str(boost::format("Joint %s assigned %d \n")%vjoints[ic]->name%ic));
+- boost::shared_ptr<Joint> pjoint = vjoints[ic];
++ std::shared_ptr<Joint> pjoint = vjoints[ic];
+ pjoint->child_link_name = pchildlink->name;
+
+ #define PRINT_POSE(pname, apose) ROS_DEBUG(pname" pos: %f %f %f, rot: %f %f %f %f", \
+@@ -1178,7 +1178,7 @@ protected:
+ return plink;
+ }
+
+- boost::shared_ptr<Geometry> _CreateGeometry(const std::string& name, const std::list<GEOMPROPERTIES>& listGeomProperties)
++ urdf::GeometrySharedPtr _CreateGeometry(const std::string& name, const std::list<GEOMPROPERTIES>& listGeomProperties)
+ {
+ std::vector<std::vector<Vector3> > vertices;
+ std::vector<std::vector<int> > indices;
+@@ -1219,12 +1219,12 @@ protected:
+ }
+
+ if (vert_counter == 0) {
+- boost::shared_ptr<Mesh> ret;
++ std::shared_ptr<Mesh> ret;
+ ret.reset();
+ return ret;
+ }
+
+- boost::shared_ptr<Mesh> geometry(new Mesh());
++ std::shared_ptr<Mesh> geometry(new Mesh());
+ geometry->type = Geometry::MESH;
+ geometry->scale.x = 1;
+ geometry->scale.y = 1;
+@@ -2020,7 +2020,7 @@ protected:
+ //std::string aname = pextra->getAttribute("name");
+ domTechniqueRef tec = _ExtractOpenRAVEProfile(pextra->getTechnique_array());
+ if( !!tec ) {
+- boost::shared_ptr<Joint> pjoint;
++ std::shared_ptr<Joint> pjoint;
+ daeElementRef domactuator;
+ {
+ daeElementRef bact = tec->getChild("bind_actuator");
+@@ -2413,7 +2413,7 @@ protected:
+ return name.substr(pos+1)==type;
+ }
+
+- boost::shared_ptr<Joint> _getJointFromRef(xsToken targetref, daeElementRef peltref) {
++ std::shared_ptr<Joint> _getJointFromRef(xsToken targetref, daeElementRef peltref) {
+ daeElement* peltjoint = daeSidRef(targetref, peltref).resolve().elt;
+ domJointRef pdomjoint = daeSafeCast<domJoint> (peltjoint);
+
+@@ -2426,10 +2426,10 @@ protected:
+
+ if (!pdomjoint || pdomjoint->typeID() != domJoint::ID() || !pdomjoint->getName()) {
+ ROS_WARN_STREAM(str(boost::format("could not find collada joint %s!\n")%targetref));
+- return boost::shared_ptr<Joint>();
++ return std::shared_ptr<Joint>();
+ }
+
+- boost::shared_ptr<Joint> pjoint;
++ std::shared_ptr<Joint> pjoint;
+ std::string name(pdomjoint->getName());
+ if (_model->joints_.find(name) == _model->joints_.end()) {
+ pjoint.reset();
+@@ -2797,7 +2797,7 @@ protected:
+ int _nGlobalSensorId, _nGlobalManipulatorId;
+ std::string _filename;
+ std::string _resourcedir;
+- boost::shared_ptr<ModelInterface> _model;
++ std::shared_ptr<ModelInterface> _model;
+ Pose _RootOrigin;
+ Pose _VisualRootOrigin;
+ };
+@@ -2805,9 +2805,9 @@ protected:
+
+
+
+-boost::shared_ptr<ModelInterface> parseCollada(const std::string &xml_str)
++std::shared_ptr<ModelInterface> parseCollada(const std::string &xml_str)
+ {
+- boost::shared_ptr<ModelInterface> model(new ModelInterface);
++ std::shared_ptr<ModelInterface> model(new ModelInterface);
+
+ ColladaModelReader reader(model);
+ if (!reader.InitFromData(xml_str))
+Index: collada_parser/src/collada_parser_plugin.cpp
+===================================================================
+--- collada_parser.orig/src/collada_parser_plugin.cpp
++++ collada_parser/src/collada_parser_plugin.cpp
+@@ -38,7 +38,7 @@
+ #include "collada_parser/collada_parser.h"
+ #include <class_loader/class_loader.h>
+
+-boost::shared_ptr<urdf::ModelInterface> urdf::ColladaURDFParser::parse(const std::string &xml_string)
++std::shared_ptr<urdf::ModelInterface> urdf::ColladaURDFParser::parse(const std::string &xml_string)
+ {
+ return urdf::parseCollada(xml_string);
+ }
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/collada_parser/, dev-ros/collada_parser/files/
@ 2017-03-28 22:18 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2017-03-28 22:18 UTC (permalink / raw
To: gentoo-commits
commit: df000062f06b98b2b11c75b612f4f3475dc67904
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 15:37:40 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 22:18:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df000062
dev-ros/collada_parser: remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-ros/collada_parser/Manifest | 2 --
.../collada_parser/collada_parser-1.12.6.ebuild | 26 ----------------------
.../collada_parser/collada_parser-1.12.7.ebuild | 26 ----------------------
dev-ros/collada_parser/files/c11.patch | 13 -----------
4 files changed, 67 deletions(-)
diff --git a/dev-ros/collada_parser/Manifest b/dev-ros/collada_parser/Manifest
index 27acdba1a05..43cb89d3f67 100644
--- a/dev-ros/collada_parser/Manifest
+++ b/dev-ros/collada_parser/Manifest
@@ -1,3 +1 @@
-DIST robot_model-1.12.6.tar.gz 1295666 SHA256 ac335cec5a3706a104411222a2f89ef1862c0ac8caa5ddadd390e9c25641bf27 SHA512 60270b3ec20c0473e9c8d02d661794e253405c836b06cf5c15b65dddf104bfb5e4865463e12232e94548d68eead2b5499eb04c71aee3f851fa9f85dbe733ee12 WHIRLPOOL 6cec339181a6570fbe4e61415d341f5f7404ea69d8d2a4058d5c837fa15f74c7c95a4ee3f74a78fcca624d272995f09aae4ad3a6027178b2c25daa466754adc4
-DIST robot_model-1.12.7.tar.gz 1296028 SHA256 c9aad0e23970507c30490678fb76514faf1bd577ec2c30b4703fd322543be3bc SHA512 bc1901473f890b7200ef67db891ca9269c867ee1cf67a316948587d27549c6d58ce8c0b4a0d9255a5419a235ead3b19065b135486188efc21cbb6594d1863291 WHIRLPOOL 7575227d3388652eb71c5fd4265fe70c26f44149ee63d793ad87906805dff8938313f2f085edfee82847a4050b8639bc9c0773090b9f0ecbe84e29291f9d7593
DIST robot_model-1.12.8.tar.gz 1297591 SHA256 dd8a6dec56e06bcc84582da4163efe22dcc4bf6badd6011ebb209db342c495a1 SHA512 77770e3ce1fe7c143c15581fa262dc01ccc04dd9313d022b9f0f254451db80415b558f339063debc5712590f846690d957848ba977f2175d2a4cda72b2102914 WHIRLPOOL afaeaee66821165efccc049a0f7972c597dde89f4f6814501694542e8d88d7591945872ca18020ea04742ab96ec133c306bccfddc81dd4f221b1def2f436cfbe
diff --git a/dev-ros/collada_parser/collada_parser-1.12.6.ebuild b/dev-ros/collada_parser/collada_parser-1.12.6.ebuild
deleted file mode 100644
index 1dc9150a470..00000000000
--- a/dev-ros/collada_parser/collada_parser-1.12.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ parser for the Collada robot description format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=
- >=dev-ros/urdf_parser_plugin-1.12.6
- dev-ros/roscpp
- dev-ros/class_loader
- dev-libs/urdfdom_headers
- dev-libs/collada-dom
- >=dev-ros/urdf-1.12.6
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/c11.patch" )
diff --git a/dev-ros/collada_parser/collada_parser-1.12.7.ebuild b/dev-ros/collada_parser/collada_parser-1.12.7.ebuild
deleted file mode 100644
index 1dc9150a470..00000000000
--- a/dev-ros/collada_parser/collada_parser-1.12.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ parser for the Collada robot description format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=
- >=dev-ros/urdf_parser_plugin-1.12.6
- dev-ros/roscpp
- dev-ros/class_loader
- dev-libs/urdfdom_headers
- dev-libs/collada-dom
- >=dev-ros/urdf-1.12.6
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/c11.patch" )
diff --git a/dev-ros/collada_parser/files/c11.patch b/dev-ros/collada_parser/files/c11.patch
deleted file mode 100644
index 0fe4eb0c771..00000000000
--- a/dev-ros/collada_parser/files/c11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: collada_parser/src/collada_parser.cpp
-===================================================================
---- collada_parser.orig/src/collada_parser.cpp
-+++ collada_parser/src/collada_parser.cpp
-@@ -67,7 +67,7 @@
- #include <fcntl.h>
- #endif
-
--#define FOREACH(it, v) for(typeof((v).begin())it = (v).begin(); it != (v).end(); (it)++)
-+#define FOREACH(it, v) for(auto it = (v).begin(); it != (v).end(); (it)++)
- #define FOREACHC FOREACH
-
- namespace ColladaDOM150 { }
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-28 22:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-28 22:18 [gentoo-commits] repo/gentoo:master commit in: dev-ros/collada_parser/, dev-ros/collada_parser/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
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