Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-ros/collada_parser/Manifest3
-rw-r--r--dev-ros/collada_parser/collada_parser-1.12.3-r1.ebuild31
-rw-r--r--dev-ros/collada_parser/collada_parser-1.12.4.ebuild31
-rw-r--r--dev-ros/collada_parser/collada_parser-1.12.5.ebuild31
-rw-r--r--dev-ros/collada_parser/files/urdfdom1.patch224
5 files changed, 0 insertions, 320 deletions
diff --git a/dev-ros/collada_parser/Manifest b/dev-ros/collada_parser/Manifest
index 9496381de2a6..f74e8633029b 100644
--- a/dev-ros/collada_parser/Manifest
+++ b/dev-ros/collada_parser/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/collada_parser/collada_parser-1.12.3-r1.ebuild b/dev-ros/collada_parser/collada_parser-1.12.3-r1.ebuild
deleted file mode 100644
index 88716c5be513..000000000000
--- a/dev-ros/collada_parser/collada_parser-1.12.3-r1.ebuild
+++ /dev/null
@@ -1,31 +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}
-
-inherit ros-catkin flag-o-matic
-
-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.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/collada_parser-1.12.4.ebuild b/dev-ros/collada_parser/collada_parser-1.12.4.ebuild
deleted file mode 100644
index 88716c5be513..000000000000
--- a/dev-ros/collada_parser/collada_parser-1.12.4.ebuild
+++ /dev/null
@@ -1,31 +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}
-
-inherit ros-catkin flag-o-matic
-
-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.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/collada_parser-1.12.5.ebuild b/dev-ros/collada_parser/collada_parser-1.12.5.ebuild
deleted file mode 100644
index 88716c5be513..000000000000
--- a/dev-ros/collada_parser/collada_parser-1.12.5.ebuild
+++ /dev/null
@@ -1,31 +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}
-
-inherit ros-catkin flag-o-matic
-
-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.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
deleted file mode 100644
index 139137256a8a..000000000000
--- a/dev-ros/collada_parser/files/urdfdom1.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-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);
- }