commit: 66368851c2cd9ec6b2451e18463048bea601ec2f Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Sat Jan 7 14:25:01 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=66368851
dev-ros/collada_urdf: remove old Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-ros/collada_urdf/Manifest | 3 - dev-ros/collada_urdf/collada_urdf-1.12.3-r2.ebuild | 36 ---- dev-ros/collada_urdf/collada_urdf-1.12.4.ebuild | 38 ----- dev-ros/collada_urdf/collada_urdf-1.12.5.ebuild | 38 ----- dev-ros/collada_urdf/files/urdfdom1.patch | 185 --------------------- 5 files changed, 300 deletions(-) diff --git a/dev-ros/collada_urdf/Manifest b/dev-ros/collada_urdf/Manifest index 9496381..f74e863 100644 --- a/dev-ros/collada_urdf/Manifest +++ b/dev-ros/collada_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/collada_urdf/collada_urdf-1.12.3-r2.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.3-r2.ebuild deleted file mode 100644 index ce9c64e..00000000 --- a/dev-ros/collada_urdf/collada_urdf-1.12.3-r2.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} - -inherit ros-catkin flag-o-matic - -DESCRIPTION="Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-libs/boost:= - dev-ros/angles - dev-ros/collada_parser - dev-ros/resource_retriever - >=dev-ros/urdf-1.12.3-r1 - dev-ros/geometric_shapes - dev-ros/tf - media-libs/assimp - dev-libs/tinyxml - dev-libs/collada-dom - >=dev-libs/urdfdom-1:= -" -DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/urdfdom1.patch" ) - -src_configure() { - append-cxxflags -std=gnu++11 - ros-catkin_src_configure -} diff --git a/dev-ros/collada_urdf/collada_urdf-1.12.4.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.4.ebuild deleted file mode 100644 index ccf46f3..00000000 --- a/dev-ros/collada_urdf/collada_urdf-1.12.4.ebuild +++ /dev/null @@ -1,38 +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="Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-libs/boost:= - dev-ros/angles - dev-ros/collada_parser - dev-ros/resource_retriever - >=dev-ros/urdf-1.12.3-r1 - dev-ros/geometric_shapes - dev-ros/tf - media-libs/assimp - dev-libs/tinyxml - dev-libs/collada-dom - >=dev-libs/urdfdom-1:= - dev-cpp/eigen:3 -" -DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/urdfdom1.patch" ) - -src_configure() { - append-cppflags `pkg-config --cflags eigen3` - append-cxxflags -std=gnu++11 - ros-catkin_src_configure -} diff --git a/dev-ros/collada_urdf/collada_urdf-1.12.5.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.5.ebuild deleted file mode 100644 index ccf46f3..00000000 --- a/dev-ros/collada_urdf/collada_urdf-1.12.5.ebuild +++ /dev/null @@ -1,38 +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="Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-libs/boost:= - dev-ros/angles - dev-ros/collada_parser - dev-ros/resource_retriever - >=dev-ros/urdf-1.12.3-r1 - dev-ros/geometric_shapes - dev-ros/tf - media-libs/assimp - dev-libs/tinyxml - dev-libs/collada-dom - >=dev-libs/urdfdom-1:= - dev-cpp/eigen:3 -" -DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/urdfdom1.patch" ) - -src_configure() { - append-cppflags `pkg-config --cflags eigen3` - append-cxxflags -std=gnu++11 - ros-catkin_src_configure -} diff --git a/dev-ros/collada_urdf/files/urdfdom1.patch b/dev-ros/collada_urdf/files/urdfdom1.patch deleted file mode 100644 index dd47d87..00000000 --- a/dev-ros/collada_urdf/files/urdfdom1.patch +++ /dev/null @@ -1,185 +0,0 @@ -Index: collada_urdf/src/collada_urdf.cpp -=================================================================== ---- collada_urdf.orig/src/collada_urdf.cpp -+++ collada_urdf/src/collada_urdf.cpp -@@ -538,7 +538,7 @@ private: - domInstance_with_extraRef piscene; - }; - -- typedef std::map< boost::shared_ptr<const urdf::Link>, urdf::Pose > MAPLINKPOSES; -+ typedef std::map< std::shared_ptr<const urdf::Link>, urdf::Pose > MAPLINKPOSES; - struct LINKOUTPUT - { - list<pair<int,string> > listusedlinks; -@@ -562,7 +562,7 @@ private: - axis_output() : iaxis(0) { - } - string sid, nodesid; -- boost::shared_ptr<const urdf::Joint> pjoint; -+ std::shared_ptr<const urdf::Joint> pjoint; - int iaxis; - string jointnodesid; - }; -@@ -788,7 +788,7 @@ protected: - - for(size_t idof = 0; idof < _ikmout->vaxissids.size(); ++idof) { - string axis_infosid = _ComputeId(str(boost::format("axis_info_inst%d")%idof)); -- boost::shared_ptr<const urdf::Joint> pjoint = _ikmout->kmout->vaxissids.at(idof).pjoint; -+ std::shared_ptr<const urdf::Joint> pjoint = _ikmout->kmout->vaxissids.at(idof).pjoint; - BOOST_ASSERT(_mapjointindices[pjoint] == (int)idof); - //int iaxis = _ikmout->kmout->vaxissids.at(idof).iaxis; - -@@ -966,7 +966,7 @@ protected: - kmout->vlinksids.resize(_robot.links_.size()); - - FOREACHC(itjoint, _robot.joints_) { -- boost::shared_ptr<urdf::Joint> pjoint = itjoint->second; -+ std::shared_ptr<urdf::Joint> pjoint = itjoint->second; - int index = _mapjointindices[itjoint->second]; - domJointRef pdomjoint = daeSafeCast<domJoint>(ktec->add(COLLADA_ELEMENT_JOINT)); - string jointid = _ComputeId(pjoint->name); //str(boost::format("joint%d")%index); -@@ -1039,7 +1039,7 @@ protected: - // create the formulas for all mimic joints - FOREACHC(itjoint, _robot.joints_) { - string jointsid = _ComputeId(itjoint->second->name); -- boost::shared_ptr<urdf::Joint> pjoint = itjoint->second; -+ std::shared_ptr<urdf::Joint> pjoint = itjoint->second; - if( !pjoint->mimic ) { - continue; - } -@@ -1125,7 +1125,7 @@ protected: - /// \param pkinparent Kinbody parent - /// \param pnodeparent Node parent - /// \param strModelUri -- virtual LINKOUTPUT _WriteLink(boost::shared_ptr<const urdf::Link> plink, daeElementRef pkinparent, domNodeRef pnodeparent, const string& strModelUri) -+ virtual LINKOUTPUT _WriteLink(std::shared_ptr<const urdf::Link> plink, daeElementRef pkinparent, domNodeRef pnodeparent, const string& strModelUri) - { - LINKOUTPUT out; - int linkindex = _maplinkindices[plink]; -@@ -1141,8 +1141,8 @@ protected: - pnode->setSid(nodesid.c_str()); - pnode->setName(plink->name.c_str()); - -- boost::shared_ptr<urdf::Geometry> geometry; -- boost::shared_ptr<urdf::Material> material; -+ std::shared_ptr<urdf::Geometry> geometry; -+ std::shared_ptr<urdf::Material> material; - urdf::Pose geometry_origin; - if( !!plink->visual ) { - geometry = plink->visual->geometry; -@@ -1161,7 +1161,7 @@ protected: - if ( !!plink->visual ) { - if (plink->visual_array.size() > 1) { - int igeom = 0; -- for (std::vector<boost::shared_ptr<urdf::Visual > >::const_iterator it = plink->visual_array.begin(); -+ for (std::vector<std::shared_ptr<urdf::Visual > >::const_iterator it = plink->visual_array.begin(); - it != plink->visual_array.end(); it++) { - // geom - string geomid = _ComputeId(str(boost::format("g%s_%s_geom%d")%strModelUri%linksid%igeom)); -@@ -1208,7 +1208,7 @@ protected: - - // process all children - FOREACHC(itjoint, plink->child_joints) { -- boost::shared_ptr<urdf::Joint> pjoint = *itjoint; -+ std::shared_ptr<urdf::Joint> pjoint = *itjoint; - int index = _mapjointindices[pjoint]; - - // <attachment_full joint="k1/joint0"> -@@ -1269,7 +1269,7 @@ protected: - return out; - } - -- domGeometryRef _WriteGeometry(boost::shared_ptr<urdf::Geometry> geometry, const std::string& geometry_id, urdf::Pose *org_trans = NULL) -+ domGeometryRef _WriteGeometry(std::shared_ptr<urdf::Geometry> geometry, const std::string& geometry_id, urdf::Pose *org_trans = NULL) - { - domGeometryRef cgeometry = daeSafeCast<domGeometry>(_geometriesLib->add(COLLADA_ELEMENT_GEOMETRY)); - cgeometry->setId(geometry_id.c_str()); -@@ -1308,7 +1308,7 @@ protected: - return cgeometry; - } - -- void _WriteMaterial(const string& geometry_id, boost::shared_ptr<urdf::Material> material) -+ void _WriteMaterial(const string& geometry_id, std::shared_ptr<urdf::Material> material) - { - string effid = geometry_id+string("_eff"); - string matid = geometry_id+string("_mat"); -@@ -1386,7 +1386,7 @@ protected: - rigid_body->setSid(rigidsid.c_str()); - rigid_body->setName(itlink->second->name.c_str()); - domRigid_body::domTechnique_commonRef ptec = daeSafeCast<domRigid_body::domTechnique_common>(rigid_body->add(COLLADA_ELEMENT_TECHNIQUE_COMMON)); -- boost::shared_ptr<urdf::Inertial> inertial = itlink->second->inertial; -+ std::shared_ptr<urdf::Inertial> inertial = itlink->second->inertial; - if( !!inertial ) { - daeSafeCast<domRigid_body::domTechnique_common::domDynamic>(ptec->add(COLLADA_ELEMENT_DYNAMIC))->setValue(xsBoolean(true)); //!!inertial)); - domTargetable_floatRef mass = daeSafeCast<domTargetable_float>(ptec->add(COLLADA_ELEMENT_MASS)); -@@ -1916,9 +1916,9 @@ private: - - boost::shared_ptr<instance_kinematics_model_output> _ikmout; - boost::shared_ptr<instance_articulated_system_output> _iasout; -- std::map< boost::shared_ptr<const urdf::Joint>, int > _mapjointindices; -- std::map< boost::shared_ptr<const urdf::Link>, int > _maplinkindices; -- std::map< boost::shared_ptr<const urdf::Material>, int > _mapmaterialindices; -+ std::map< std::shared_ptr<const urdf::Joint>, int > _mapjointindices; -+ std::map< std::shared_ptr<const urdf::Link>, int > _maplinkindices; -+ std::map< std::shared_ptr<const urdf::Material>, int > _mapmaterialindices; - Assimp::Importer _importer; - }; - -Index: collada_urdf/src/collada_to_urdf.cpp -=================================================================== ---- collada_urdf.orig/src/collada_to_urdf.cpp -+++ collada_urdf/src/collada_to_urdf.cpp -@@ -188,7 +188,7 @@ void assimp_calc_bbox(string fname, floa - } - } - --void addChildLinkNamesXML(boost::shared_ptr<const Link> link, ofstream& os) -+void addChildLinkNamesXML(std::shared_ptr<const Link> link, ofstream& os) - { - os << " <link name=\"" << link->name << "\">" << endl; - if ( !!link->visual ) { -@@ -405,14 +405,14 @@ void addChildLinkNamesXML(boost::shared_ - } - #endif - -- for (std::vector<boost::shared_ptr<Link> >::const_iterator child = link->child_links.begin(); child != link->child_links.end(); child++) -+ for (std::vector<std::shared_ptr<Link> >::const_iterator child = link->child_links.begin(); child != link->child_links.end(); child++) - addChildLinkNamesXML(*child, os); - } - --void addChildJointNamesXML(boost::shared_ptr<const Link> link, ofstream& os) -+void addChildJointNamesXML(std::shared_ptr<const Link> link, ofstream& os) - { - double r, p, y; -- for (std::vector<boost::shared_ptr<Link> >::const_iterator child = link->child_links.begin(); child != link->child_links.end(); child++){ -+ for (std::vector<std::shared_ptr<Link> >::const_iterator child = link->child_links.begin(); child != link->child_links.end(); child++){ - (*child)->parent_joint->parent_to_joint_origin_transform.rotation.getRPY(r,p,y); - std::string jtype; - if ( (*child)->parent_joint->type == urdf::Joint::UNKNOWN ) { -@@ -443,7 +443,7 @@ void addChildJointNamesXML(boost::shared - os << " <axis xyz=\"" << (*child)->parent_joint->axis.x << " "; - os << (*child)->parent_joint->axis.y << " " << (*child)->parent_joint->axis.z << "\"/>" << endl; - { -- boost::shared_ptr<urdf::Joint> jt((*child)->parent_joint); -+ std::shared_ptr<urdf::Joint> jt((*child)->parent_joint); - - if ( !!jt->limits ) { - os << " <limit "; -@@ -501,7 +501,7 @@ void addChildJointNamesXML(boost::shared - } - } - --void printTreeXML(boost::shared_ptr<const Link> link, string name, string file) -+void printTreeXML(std::shared_ptr<const Link> link, string name, string file) - { - std::ofstream os; - os.open(file.c_str()); -@@ -667,7 +667,7 @@ int main(int argc, char** argv) - } - xml_file.close(); - -- boost::shared_ptr<ModelInterface> robot; -+ std::shared_ptr<ModelInterface> robot; - if( xml_string.find("<COLLADA") != std::string::npos ) - { - ROS_DEBUG("Parsing robot collada xml string");
