From b3b61d6cd9e7b3f3b6cc9fb2fd1ad46365751608 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Mon, 28 Nov 2016 15:31:35 +0100 Subject: dev-ros/rviz: stop patching now that rospack returns proper package path Package-Manager: portage-2.3.2 --- dev-ros/rviz/files/install_loc.patch | 30 --- dev-ros/rviz/files/urdfdom1-2.patch | 436 ----------------------------------- dev-ros/rviz/files/urdfdom1.patch | 261 --------------------- dev-ros/rviz/rviz-1.12.4-r1.ebuild | 67 ++++++ dev-ros/rviz/rviz-1.12.4.ebuild | 68 ------ 5 files changed, 67 insertions(+), 795 deletions(-) delete mode 100644 dev-ros/rviz/files/install_loc.patch delete mode 100644 dev-ros/rviz/files/urdfdom1-2.patch delete mode 100644 dev-ros/rviz/files/urdfdom1.patch create mode 100644 dev-ros/rviz/rviz-1.12.4-r1.ebuild delete mode 100644 dev-ros/rviz/rviz-1.12.4.ebuild (limited to 'dev-ros') diff --git a/dev-ros/rviz/files/install_loc.patch b/dev-ros/rviz/files/install_loc.patch deleted file mode 100644 index a77968db860a..000000000000 --- a/dev-ros/rviz/files/install_loc.patch +++ /dev/null @@ -1,30 +0,0 @@ -Install ressources in ros_packages subdir. We force catkin to install packages -there, so move them too. - -Index: rviz-1.12.3/CMakeLists.txt -=================================================================== ---- rviz-1.12.3.orig/CMakeLists.txt -+++ rviz-1.12.3/CMakeLists.txt -@@ -220,17 +220,17 @@ include_directories(src ${catkin_INCLUDE - add_subdirectory(src) - - install(DIRECTORY ogre_media -- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} -+ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME} - ) - install(DIRECTORY icons -- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} -+ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME} - ) - install(DIRECTORY images -- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} -+ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME} - ) - install(FILES default.rviz -- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} -+ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME} - ) - install(FILES plugin_description.xml -- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} -+ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME} - ) diff --git a/dev-ros/rviz/files/urdfdom1-2.patch b/dev-ros/rviz/files/urdfdom1-2.patch deleted file mode 100644 index c671584e4007..000000000000 --- a/dev-ros/rviz/files/urdfdom1-2.patch +++ /dev/null @@ -1,436 +0,0 @@ -commit cd741b86ecc8bdd14906e83b11a3d14dfc3c9871 -Author: Alexis Ballier -Date: Thu Oct 20 12:53:48 2016 +0200 - - Revert "Revert "Use urdf::*ShredPtr instead of boost::shared_ptr" (#1060)" - - This reverts commit f54f04d560bedb0620368d8583ec7af4114fd78e. - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b8c7381..597aecb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,6 +17,8 @@ find_package(Boost REQUIRED - thread - ) - -+find_package(urdfdom_headers REQUIRED) -+ - find_package(PkgConfig REQUIRED) - - find_package(ASSIMP QUIET) -@@ -131,6 +133,7 @@ find_package(catkin REQUIRED - tf - urdf - visualization_msgs -+ urdfdom_headers - ) - - if(${tf_VERSION} VERSION_LESS "1.11.3") -@@ -203,6 +206,7 @@ include_directories(SYSTEM - ${OGRE_OV_INCLUDE_DIRS} - ${OPENGL_INCLUDE_DIR} - ${PYTHON_INCLUDE_PATH} -+ ${urdfdom_headers_INCLUDE_DIRS} - ) - include_directories(src ${catkin_INCLUDE_DIRS}) - -diff --git a/package.xml b/package.xml -index d9c8bf8..76b9873 100644 ---- a/package.xml -+++ b/package.xml -@@ -48,6 +48,7 @@ - visualization_msgs - yaml-cpp - opengl -+ liburdfdom-headers-dev - - assimp - eigen -@@ -81,6 +82,7 @@ - visualization_msgs - yaml-cpp - opengl -+ liburdfdom-headers-dev - - - -diff --git a/src/rviz/default_plugin/effort_display.cpp b/src/rviz/default_plugin/effort_display.cpp -index a5574de..e9b595b 100644 ---- a/src/rviz/default_plugin/effort_display.cpp -+++ b/src/rviz/default_plugin/effort_display.cpp -@@ -208,11 +208,11 @@ namespace rviz - return; - } - setStatus(rviz::StatusProperty::Ok, "URDF", "Robot model parserd Ok"); -- for (std::map >::iterator it = robot_model_->joints_.begin(); it != robot_model_->joints_.end(); it ++ ) { -- boost::shared_ptr joint = it->second; -+ for (std::map::iterator it = robot_model_->joints_.begin(); it != robot_model_->joints_.end(); it ++ ) { -+ urdf::JointSharedPtr joint = it->second; - if ( joint->type == urdf::Joint::REVOLUTE ) { - std::string joint_name = it->first; -- boost::shared_ptr limit = joint->limits; -+ urdf::JointLimitsSharedPtr limit = joint->limits; - joints_[joint_name] = createJoint(joint_name); - //joints_[joint_name]->max_effort_property_->setFloat(limit->effort); - //joints_[joint_name]->max_effort_property_->setReadOnly( true ); -diff --git a/src/rviz/default_plugin/effort_visual.cpp b/src/rviz/default_plugin/effort_visual.cpp -index c33716e..922110b 100644 ---- a/src/rviz/default_plugin/effort_visual.cpp -+++ b/src/rviz/default_plugin/effort_visual.cpp -@@ -8,6 +8,7 @@ - #include - - #include -+#include - #include "effort_visual.h" - - namespace rviz -@@ -31,7 +32,7 @@ namespace rviz - - // We create the arrow object within the frame node so that we can - // set its position and direction relative to its header frame. -- for (std::map >::iterator it = urdf_model_->joints_.begin(); it != urdf_model_->joints_.end(); it ++ ) { -+ for (std::map::iterator it = urdf_model_->joints_.begin(); it != urdf_model_->joints_.end(); it ++ ) { - if ( it->second->type == urdf::Joint::REVOLUTE ) { - std::string joint_name = it->first; - effort_enabled_[joint_name] = true; -@@ -103,7 +104,7 @@ namespace rviz - if ( ! effort_enabled_[joint_name] ) continue; - - //tf::Transform offset = poseFromJoint(joint); -- boost::shared_ptr limit = joint->limits; -+ urdf::JointLimitsSharedPtr limit = joint->limits; - double max_effort = limit->effort, effort_value = 0.05; - - if ( max_effort != 0.0 ) -diff --git a/src/rviz/robot/robot.cpp b/src/rviz/robot/robot.cpp -index 506a8bd..c1a87f0 100644 ---- a/src/rviz/robot/robot.cpp -+++ b/src/rviz/robot/robot.cpp -@@ -236,7 +236,7 @@ void Robot::clear() - - RobotLink* Robot::LinkFactory::createLink( - Robot* robot, -- const boost::shared_ptr& link, -+ const urdf::LinkConstSharedPtr& link, - const std::string& parent_joint_name, - bool visual, - bool collision) -@@ -246,7 +246,7 @@ RobotLink* Robot::LinkFactory::createLink( - - RobotJoint* Robot::LinkFactory::createJoint( - Robot* robot, -- const boost::shared_ptr& joint) -+ const urdf::JointConstSharedPtr& joint) - { - return new RobotJoint(robot, joint); - } -@@ -265,12 +265,12 @@ void Robot::load( const urdf::ModelInterface &urdf, bool visual, bool collision - // Create properties for each link. - // Properties are not added to display until changedLinkTreeStyle() is called (below). - { -- typedef std::map > M_NameToUrdfLink; -+ typedef std::map M_NameToUrdfLink; - M_NameToUrdfLink::const_iterator link_it = urdf.links_.begin(); - M_NameToUrdfLink::const_iterator link_end = urdf.links_.end(); - for( ; link_it != link_end; ++link_it ) - { -- const boost::shared_ptr& urdf_link = link_it->second; -+ const urdf::LinkConstSharedPtr& urdf_link = link_it->second; - std::string parent_joint_name; - - if (urdf_link != urdf.getRoot() && urdf_link->parent_joint) -@@ -298,12 +298,12 @@ void Robot::load( const urdf::ModelInterface &urdf, bool visual, bool collision - // Create properties for each joint. - // Properties are not added to display until changedLinkTreeStyle() is called (below). - { -- typedef std::map > M_NameToUrdfJoint; -+ typedef std::map M_NameToUrdfJoint; - M_NameToUrdfJoint::const_iterator joint_it = urdf.joints_.begin(); - M_NameToUrdfJoint::const_iterator joint_end = urdf.joints_.end(); - for( ; joint_it != joint_end; ++joint_it ) - { -- const boost::shared_ptr& urdf_joint = joint_it->second; -+ const urdf::JointConstSharedPtr& urdf_joint = joint_it->second; - RobotJoint* joint = link_factory_->createJoint( this, urdf_joint ); - - joints_[urdf_joint->name] = joint; -diff --git a/src/rviz/robot/robot.h b/src/rviz/robot/robot.h -index d529177..ff0afa7 100644 ---- a/src/rviz/robot/robot.h -+++ b/src/rviz/robot/robot.h -@@ -39,6 +39,9 @@ - #include - #include - -+#include -+#include -+ - namespace Ogre - { - class SceneManager; -@@ -62,13 +65,6 @@ namespace tf - class TransformListener; - } - --namespace urdf --{ --class ModelInterface; --class Link; --class Joint; --} -- - namespace rviz - { - -@@ -173,12 +169,12 @@ public: - { - public: - virtual RobotLink* createLink( Robot* robot, -- const boost::shared_ptr& link, -+ const urdf::LinkConstSharedPtr& link, - const std::string& parent_joint_name, - bool visual, - bool collision); - virtual RobotJoint* createJoint( Robot* robot, -- const boost::shared_ptr& joint); -+ const urdf::JointConstSharedPtr& joint); - }; - - /** Call this before load() to subclass the RobotLink or RobotJoint class used in the link property. -diff --git a/src/rviz/robot/robot_joint.cpp b/src/rviz/robot/robot_joint.cpp -index 6538fd0..eade172 100644 ---- a/src/rviz/robot/robot_joint.cpp -+++ b/src/rviz/robot/robot_joint.cpp -@@ -38,15 +38,13 @@ - #include "rviz/ogre_helpers/axes.h" - #include "rviz/load_resource.h" - --#include --#include --#include -+#include - - - namespace rviz - { - --RobotJoint::RobotJoint( Robot* robot, const boost::shared_ptr& joint ) -+RobotJoint::RobotJoint( Robot* robot, const urdf::JointConstSharedPtr& joint ) - : robot_( robot ) - , name_( joint->name ) - , child_link_name_( joint->child_link_name ) -diff --git a/src/rviz/robot/robot_joint.h b/src/rviz/robot/robot_joint.h -index ba8a832..f9242a0 100644 ---- a/src/rviz/robot/robot_joint.h -+++ b/src/rviz/robot/robot_joint.h -@@ -42,6 +42,10 @@ - #include - #endif - -+#include -+#include -+#include -+ - #include "rviz/ogre_helpers/object.h" - #include "rviz/selection/forwards.h" - -@@ -57,15 +61,6 @@ class Any; - class RibbonTrail; - } - --namespace urdf --{ --class ModelInterface; --class Link; --class Joint; --class Geometry; --class Pose; --} -- - namespace rviz - { - class Shape; -@@ -89,7 +84,7 @@ class RobotJoint: public QObject - { - Q_OBJECT - public: -- RobotJoint( Robot* robot, const boost::shared_ptr& joint ); -+ RobotJoint( Robot* robot, const urdf::JointConstSharedPtr& joint ); - virtual ~RobotJoint(); - - -diff --git a/src/rviz/robot/robot_link.cpp b/src/rviz/robot/robot_link.cpp -index b1e3789..4d9a4ca 100644 ---- a/src/rviz/robot/robot_link.cpp -+++ b/src/rviz/robot/robot_link.cpp -@@ -154,7 +154,7 @@ void RobotLinkSelectionHandler::postRenderPass(uint32_t pass) - - - RobotLink::RobotLink( Robot* robot, -- const urdf::LinkConstPtr& link, -+ const urdf::LinkConstSharedPtr& link, - const std::string& parent_joint_name, - bool visual, - bool collision) -@@ -261,8 +261,8 @@ RobotLink::RobotLink( Robot* robot, - desc << " child joint: "; - } - -- std::vector >::const_iterator child_it = link->child_joints.begin(); -- std::vector >::const_iterator child_end = link->child_joints.end(); -+ std::vector::const_iterator child_it = link->child_joints.begin(); -+ std::vector::const_iterator child_end = link->child_joints.end(); - for ( ; child_it != child_end ; ++child_it ) - { - urdf::Joint *child_joint = child_it->get(); -@@ -441,7 +441,7 @@ void RobotLink::updateVisibility() - } - } - --Ogre::MaterialPtr RobotLink::getMaterialForLink( const urdf::LinkConstPtr& link) -+Ogre::MaterialPtr RobotLink::getMaterialForLink( const urdf::LinkConstSharedPtr& link) - { - if (!link->visual || !link->visual->material) - { -@@ -509,7 +509,7 @@ Ogre::MaterialPtr RobotLink::getMaterialForLink( const urdf::LinkConstPtr& link) - return mat; - } - --void RobotLink::createEntityForGeometryElement(const urdf::LinkConstPtr& link, const urdf::Geometry& geom, const urdf::Pose& origin, Ogre::SceneNode* scene_node, Ogre::Entity*& entity) -+void RobotLink::createEntityForGeometryElement(const urdf::LinkConstSharedPtr& link, const urdf::Geometry& geom, const urdf::Pose& origin, Ogre::SceneNode* scene_node, Ogre::Entity*& entity) - { - entity = NULL; // default in case nothing works. - Ogre::SceneNode* offset_node = scene_node->createChildSceneNode(); -@@ -646,19 +646,19 @@ void RobotLink::createEntityForGeometryElement(const urdf::LinkConstPtr& link, c - } - } - --void RobotLink::createCollision(const urdf::LinkConstPtr& link) -+void RobotLink::createCollision(const urdf::LinkConstSharedPtr& link) - { - bool valid_collision_found = false; - #if URDF_MAJOR_VERSION == 0 && URDF_MINOR_VERSION == 2 -- std::map > > >::const_iterator mi; -+ std::map > >::const_iterator mi; - for( mi = link->collision_groups.begin(); mi != link->collision_groups.end(); mi++ ) - { - if( mi->second ) - { -- std::vector >::const_iterator vi; -+ std::vector::const_iterator vi; - for( vi = mi->second->begin(); vi != mi->second->end(); vi++ ) - { -- boost::shared_ptr collision = *vi; -+ urdf::CollisionSharedPtr collision = *vi; - if( collision && collision->geometry ) - { - Ogre::Entity* collision_mesh = NULL; -@@ -673,10 +673,10 @@ void RobotLink::createCollision(const urdf::LinkConstPtr& link) - } - } - #else -- std::vector >::const_iterator vi; -+ std::vector::const_iterator vi; - for( vi = link->collision_array.begin(); vi != link->collision_array.end(); vi++ ) - { -- boost::shared_ptr collision = *vi; -+ urdf::CollisionSharedPtr collision = *vi; - if( collision && collision->geometry ) - { - Ogre::Entity* collision_mesh = NULL; -@@ -703,19 +703,19 @@ void RobotLink::createCollision(const urdf::LinkConstPtr& link) - collision_node_->setVisible( getEnabled() ); - } - --void RobotLink::createVisual(const urdf::LinkConstPtr& link ) -+void RobotLink::createVisual(const urdf::LinkConstSharedPtr& link ) - { - bool valid_visual_found = false; - #if URDF_MAJOR_VERSION == 0 && URDF_MINOR_VERSION == 2 -- std::map > > >::const_iterator mi; -+ std::map > >::const_iterator mi; - for( mi = link->visual_groups.begin(); mi != link->visual_groups.end(); mi++ ) - { - if( mi->second ) - { -- std::vector >::const_iterator vi; -+ std::vector::const_iterator vi; - for( vi = mi->second->begin(); vi != mi->second->end(); vi++ ) - { -- boost::shared_ptr visual = *vi; -+ urdf::VisualSharedPtr visual = *vi; - if( visual && visual->geometry ) - { - Ogre::Entity* visual_mesh = NULL; -@@ -730,10 +730,10 @@ void RobotLink::createVisual(const urdf::LinkConstPtr& link ) - } - } - #else -- std::vector >::const_iterator vi; -+ std::vector::const_iterator vi; - for( vi = link->visual_array.begin(); vi != link->visual_array.end(); vi++ ) - { -- boost::shared_ptr visual = *vi; -+ urdf::VisualSharedPtr visual = *vi; - if( visual && visual->geometry ) - { - Ogre::Entity* visual_mesh = NULL; -diff --git a/src/rviz/robot/robot_link.h b/src/rviz/robot/robot_link.h -index 31e8e6f..d0014fb 100644 ---- a/src/rviz/robot/robot_link.h -+++ b/src/rviz/robot/robot_link.h -@@ -43,6 +43,9 @@ - #include - #endif - -+#include -+#include -+ - #include "rviz/ogre_helpers/object.h" - #include "rviz/selection/forwards.h" - -@@ -58,16 +61,6 @@ class Any; - class RibbonTrail; - } - --namespace urdf --{ --class ModelInterface; --class Link; --typedef boost::shared_ptr LinkConstPtr; --class Geometry; --typedef boost::shared_ptr GeometryConstPtr; --class Pose; --} -- - namespace rviz - { - class Shape; -@@ -93,7 +86,7 @@ class RobotLink: public QObject - Q_OBJECT - public: - RobotLink( Robot* robot, -- const urdf::LinkConstPtr& link, -+ const urdf::LinkConstSharedPtr& link, - const std::string& parent_joint_name, - bool visual, - bool collision); -@@ -162,12 +155,12 @@ private Q_SLOTS: - private: - void setRenderQueueGroup( Ogre::uint8 group ); - bool getEnabled() const; -- void createEntityForGeometryElement( const urdf::LinkConstPtr& link, const urdf::Geometry& geom, const urdf::Pose& origin, Ogre::SceneNode* scene_node, Ogre::Entity*& entity ); -+ void createEntityForGeometryElement( const urdf::LinkConstSharedPtr& link, const urdf::Geometry& geom, const urdf::Pose& origin, Ogre::SceneNode* scene_node, Ogre::Entity*& entity ); - -- void createVisual( const urdf::LinkConstPtr& link); -- void createCollision( const urdf::LinkConstPtr& link); -+ void createVisual( const urdf::LinkConstSharedPtr& link); -+ void createCollision( const urdf::LinkConstSharedPtr& link); - void createSelection(); -- Ogre::MaterialPtr getMaterialForLink( const urdf::LinkConstPtr& link ); -+ Ogre::MaterialPtr getMaterialForLink( const urdf::LinkConstSharedPtr& link ); - - - protected: diff --git a/dev-ros/rviz/files/urdfdom1.patch b/dev-ros/rviz/files/urdfdom1.patch deleted file mode 100644 index d7f152c15581..000000000000 --- a/dev-ros/rviz/files/urdfdom1.patch +++ /dev/null @@ -1,261 +0,0 @@ -Index: rviz-1.12.1/src/rviz/default_plugin/effort_display.cpp -=================================================================== ---- rviz-1.12.1.orig/src/rviz/default_plugin/effort_display.cpp -+++ rviz-1.12.1/src/rviz/default_plugin/effort_display.cpp -@@ -200,7 +200,7 @@ namespace rviz - robot_description_ = content; - - -- robot_model_ = boost::shared_ptr(new urdf::Model()); -+ robot_model_ = std::shared_ptr(new urdf::Model()); - if (!robot_model_->initString(content)) - { - ROS_ERROR("Unable to parse URDF description!"); -@@ -208,11 +208,11 @@ namespace rviz - return; - } - setStatus(rviz::StatusProperty::Ok, "URDF", "Robot model parserd Ok"); -- for (std::map >::iterator it = robot_model_->joints_.begin(); it != robot_model_->joints_.end(); it ++ ) { -- boost::shared_ptr joint = it->second; -+ for (std::map >::iterator it = robot_model_->joints_.begin(); it != robot_model_->joints_.end(); it ++ ) { -+ std::shared_ptr joint = it->second; - if ( joint->type == urdf::Joint::REVOLUTE ) { - std::string joint_name = it->first; -- boost::shared_ptr limit = joint->limits; -+ std::shared_ptr limit = joint->limits; - joints_[joint_name] = createJoint(joint_name); - //joints_[joint_name]->max_effort_property_->setFloat(limit->effort); - //joints_[joint_name]->max_effort_property_->setReadOnly( true ); -Index: rviz-1.12.1/src/rviz/default_plugin/effort_display.h -=================================================================== ---- rviz-1.12.1.orig/src/rviz/default_plugin/effort_display.h -+++ rviz-1.12.1/src/rviz/default_plugin/effort_display.h -@@ -36,13 +36,13 @@ namespace tf - # undef TF_MESSAGEFILTER_DEBUG - #endif - #define TF_MESSAGEFILTER_DEBUG(fmt, ...) \ -- ROS_DEBUG_NAMED("message_filter", "MessageFilter [target=%s]: "fmt, getTargetFramesString().c_str(), __VA_ARGS__) -+ ROS_DEBUG_NAMED("message_filter", "MessageFilter [target=%s]: " fmt, getTargetFramesString().c_str(), __VA_ARGS__) - - #ifdef TF_MESSAGEFILTER_WARN - # undef TF_MESSAGEFILTER_WARN - #endif - #define TF_MESSAGEFILTER_WARN(fmt, ...) \ -- ROS_WARN_NAMED("message_filter", "MessageFilter [target=%s]: "fmt, getTargetFramesString().c_str(), __VA_ARGS__) -+ ROS_WARN_NAMED("message_filter", "MessageFilter [target=%s]: " fmt, getTargetFramesString().c_str(), __VA_ARGS__) - - class MessageFilterJointState : public MessageFilter - { -@@ -706,7 +706,7 @@ namespace rviz - void clear(); - - // The object for urdf model -- boost::shared_ptr robot_model_; -+ std::shared_ptr robot_model_; - - // - std::string robot_description_; -Index: rviz-1.12.1/src/rviz/default_plugin/effort_visual.cpp -=================================================================== ---- rviz-1.12.1.orig/src/rviz/default_plugin/effort_visual.cpp -+++ rviz-1.12.1/src/rviz/default_plugin/effort_visual.cpp -@@ -13,7 +13,7 @@ - namespace rviz - { - -- EffortVisual::EffortVisual( Ogre::SceneManager* scene_manager, Ogre::SceneNode* parent_node, boost::shared_ptr urdf_model ) -+ EffortVisual::EffortVisual( Ogre::SceneManager* scene_manager, Ogre::SceneNode* parent_node, std::shared_ptr urdf_model ) - { - scene_manager_ = scene_manager; - -@@ -31,7 +31,7 @@ namespace rviz - - // We create the arrow object within the frame node so that we can - // set its position and direction relative to its header frame. -- for (std::map >::iterator it = urdf_model_->joints_.begin(); it != urdf_model_->joints_.end(); it ++ ) { -+ for (std::map >::iterator it = urdf_model_->joints_.begin(); it != urdf_model_->joints_.end(); it ++ ) { - if ( it->second->type == urdf::Joint::REVOLUTE ) { - std::string joint_name = it->first; - effort_enabled_[joint_name] = true; -@@ -103,7 +103,7 @@ namespace rviz - if ( ! effort_enabled_[joint_name] ) continue; - - //tf::Transform offset = poseFromJoint(joint); -- boost::shared_ptr limit = joint->limits; -+ std::shared_ptr limit = joint->limits; - double max_effort = limit->effort, effort_value = 0.05; - - if ( max_effort != 0.0 ) -Index: rviz-1.12.1/src/rviz/default_plugin/effort_visual.h -=================================================================== ---- rviz-1.12.1.orig/src/rviz/default_plugin/effort_visual.h -+++ rviz-1.12.1/src/rviz/default_plugin/effort_visual.h -@@ -33,7 +33,7 @@ class EffortVisual - public: - // Constructor. Creates the visual stuff and puts it into the - // scene, but in an unconfigured state. -- EffortVisual( Ogre::SceneManager* scene_manager, Ogre::SceneNode* parent_node, boost::shared_ptr urdf_model ); -+ EffortVisual( Ogre::SceneManager* scene_manager, Ogre::SceneNode* parent_node, std::shared_ptr urdf_model ); - - // Destructor. Removes the visual stuff from the scene. - virtual ~EffortVisual(); -@@ -85,7 +85,7 @@ private: - float width_, scale_; - - // The object for urdf model -- boost::shared_ptr urdf_model_; -+ std::shared_ptr urdf_model_; - }; - - } // end namespace rviz -Index: rviz-1.12.1/src/rviz/robot/robot.cpp -=================================================================== ---- rviz-1.12.1.orig/src/rviz/robot/robot.cpp -+++ rviz-1.12.1/src/rviz/robot/robot.cpp -@@ -236,7 +236,7 @@ void Robot::clear() - - RobotLink* Robot::LinkFactory::createLink( - Robot* robot, -- const boost::shared_ptr& link, -+ const std::shared_ptr& link, - const std::string& parent_joint_name, - bool visual, - bool collision) -@@ -246,7 +246,7 @@ RobotLink* Robot::LinkFactory::createLin - - RobotJoint* Robot::LinkFactory::createJoint( - Robot* robot, -- const boost::shared_ptr& joint) -+ const std::shared_ptr& joint) - { - return new RobotJoint(robot, joint); - } -@@ -265,12 +265,12 @@ void Robot::load( const urdf::ModelInter - // Create properties for each link. - // Properties are not added to display until changedLinkTreeStyle() is called (below). - { -- typedef std::map > M_NameToUrdfLink; -+ typedef std::map > M_NameToUrdfLink; - M_NameToUrdfLink::const_iterator link_it = urdf.links_.begin(); - M_NameToUrdfLink::const_iterator link_end = urdf.links_.end(); - for( ; link_it != link_end; ++link_it ) - { -- const boost::shared_ptr& urdf_link = link_it->second; -+ const std::shared_ptr& urdf_link = link_it->second; - std::string parent_joint_name; - - if (urdf_link != urdf.getRoot() && urdf_link->parent_joint) -@@ -298,12 +298,12 @@ void Robot::load( const urdf::ModelInter - // Create properties for each joint. - // Properties are not added to display until changedLinkTreeStyle() is called (below). - { -- typedef std::map > M_NameToUrdfJoint; -+ typedef std::map > M_NameToUrdfJoint; - M_NameToUrdfJoint::const_iterator joint_it = urdf.joints_.begin(); - M_NameToUrdfJoint::const_iterator joint_end = urdf.joints_.end(); - for( ; joint_it != joint_end; ++joint_it ) - { -- const boost::shared_ptr& urdf_joint = joint_it->second; -+ const std::shared_ptr& urdf_joint = joint_it->second; - RobotJoint* joint = link_factory_->createJoint( this, urdf_joint ); - - joints_[urdf_joint->name] = joint; -Index: rviz-1.12.1/src/rviz/robot/robot.h -=================================================================== ---- rviz-1.12.1.orig/src/rviz/robot/robot.h -+++ rviz-1.12.1/src/rviz/robot/robot.h -@@ -173,12 +173,12 @@ public: - { - public: - virtual RobotLink* createLink( Robot* robot, -- const boost::shared_ptr& link, -+ const std::shared_ptr& link, - const std::string& parent_joint_name, - bool visual, - bool collision); - virtual RobotJoint* createJoint( Robot* robot, -- const boost::shared_ptr& joint); -+ const std::shared_ptr& joint); - }; - - /** Call this before load() to subclass the RobotLink or RobotJoint class used in the link property. -Index: rviz-1.12.1/src/rviz/robot/robot_joint.cpp -=================================================================== ---- rviz-1.12.1.orig/src/rviz/robot/robot_joint.cpp -+++ rviz-1.12.1/src/rviz/robot/robot_joint.cpp -@@ -46,7 +46,7 @@ - namespace rviz - { - --RobotJoint::RobotJoint( Robot* robot, const boost::shared_ptr& joint ) -+RobotJoint::RobotJoint( Robot* robot, const std::shared_ptr& joint ) - : robot_( robot ) - , name_( joint->name ) - , child_link_name_( joint->child_link_name ) -Index: rviz-1.12.1/src/rviz/robot/robot_joint.h -=================================================================== ---- rviz-1.12.1.orig/src/rviz/robot/robot_joint.h -+++ rviz-1.12.1/src/rviz/robot/robot_joint.h -@@ -89,7 +89,7 @@ class RobotJoint: public QObject - { - Q_OBJECT - public: -- RobotJoint( Robot* robot, const boost::shared_ptr& joint ); -+ RobotJoint( Robot* robot, const std::shared_ptr& joint ); - virtual ~RobotJoint(); - - -Index: rviz-1.12.1/src/rviz/robot/robot_link.cpp -=================================================================== ---- rviz-1.12.1.orig/src/rviz/robot/robot_link.cpp -+++ rviz-1.12.1/src/rviz/robot/robot_link.cpp -@@ -262,8 +262,8 @@ RobotLink::RobotLink( Robot* robot, - desc << " child joint: "; - } - -- std::vector >::const_iterator child_it = link->child_joints.begin(); -- std::vector >::const_iterator child_end = link->child_joints.end(); -+ std::vector >::const_iterator child_it = link->child_joints.begin(); -+ std::vector >::const_iterator child_end = link->child_joints.end(); - for ( ; child_it != child_end ; ++child_it ) - { - urdf::Joint *child_joint = child_it->get(); -@@ -674,10 +674,10 @@ void RobotLink::createCollision(const ur - } - } - #else -- std::vector >::const_iterator vi; -+ std::vector >::const_iterator vi; - for( vi = link->collision_array.begin(); vi != link->collision_array.end(); vi++ ) - { -- boost::shared_ptr collision = *vi; -+ std::shared_ptr collision = *vi; - if( collision && collision->geometry ) - { - Ogre::Entity* collision_mesh = NULL; -@@ -731,10 +731,10 @@ void RobotLink::createVisual(const urdf: - } - } - #else -- std::vector >::const_iterator vi; -+ std::vector >::const_iterator vi; - for( vi = link->visual_array.begin(); vi != link->visual_array.end(); vi++ ) - { -- boost::shared_ptr visual = *vi; -+ std::shared_ptr visual = *vi; - if( visual && visual->geometry ) - { - Ogre::Entity* visual_mesh = NULL; -Index: rviz-1.12.1/src/rviz/robot/robot_link.h -=================================================================== ---- rviz-1.12.1.orig/src/rviz/robot/robot_link.h -+++ rviz-1.12.1/src/rviz/robot/robot_link.h -@@ -62,7 +62,7 @@ namespace urdf - { - class ModelInterface; - class Link; --typedef boost::shared_ptr LinkConstPtr; -+typedef std::shared_ptr LinkConstPtr; - class Geometry; - typedef boost::shared_ptr GeometryConstPtr; - class Pose; diff --git a/dev-ros/rviz/rviz-1.12.4-r1.ebuild b/dev-ros/rviz/rviz-1.12.4-r1.ebuild new file mode 100644 index 000000000000..5586067d8012 --- /dev/null +++ b/dev-ros/rviz/rviz-1.12.4-r1.ebuild @@ -0,0 +1,67 @@ +# 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-visualization/rviz" +KEYWORDS="~amd64" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin flag-o-matic + +DESCRIPTION="3D visualization tool for ROS" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-libs/boost:=[threads] + media-libs/assimp + dev-games/ogre + virtual/opengl + dev-qt/qtwidgets:5 + dev-qt/qtcore:5 + dev-qt/qtopengl:5 + dev-cpp/eigen:3 + dev-cpp/yaml-cpp + dev-libs/urdfdom:= + >=dev-libs/urdfdom_headers-1 + + dev-ros/angles + dev-ros/image_geometry + dev-ros/image_transport + dev-ros/interactive_markers + dev-ros/laser_geometry + dev-ros/message_filters + dev-ros/pluginlib + >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}] + dev-ros/resource_retriever + dev-ros/rosbag[${PYTHON_USEDEP}] + dev-ros/rosconsole + dev-ros/roscpp + dev-ros/roslib[${PYTHON_USEDEP}] + dev-ros/rospy[${PYTHON_USEDEP}] + dev-ros/tf + >=dev-ros/urdf-1.12.3-r1 + + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND} + dev-ros/cmake_modules + virtual/pkgconfig + test? ( + dev-ros/rostest[${PYTHON_USEDEP}] + dev-cpp/gtest + )" + +src_configure() { + local mycatkincmakeargs=( "-DUseQt5=ON" ) + ros-catkin_src_configure +} diff --git a/dev-ros/rviz/rviz-1.12.4.ebuild b/dev-ros/rviz/rviz-1.12.4.ebuild deleted file mode 100644 index 27cd22e9f2a9..000000000000 --- a/dev-ros/rviz/rviz-1.12.4.ebuild +++ /dev/null @@ -1,68 +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-visualization/rviz" -KEYWORDS="~amd64" -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin flag-o-matic - -DESCRIPTION="3D visualization tool for ROS" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-libs/boost:=[threads] - media-libs/assimp - dev-games/ogre - virtual/opengl - dev-qt/qtwidgets:5 - dev-qt/qtcore:5 - dev-qt/qtopengl:5 - dev-cpp/eigen:3 - dev-cpp/yaml-cpp - dev-libs/urdfdom:= - >=dev-libs/urdfdom_headers-1 - - dev-ros/angles - dev-ros/image_geometry - dev-ros/image_transport - dev-ros/interactive_markers - dev-ros/laser_geometry - dev-ros/message_filters - dev-ros/pluginlib - >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}] - dev-ros/resource_retriever - dev-ros/rosbag[${PYTHON_USEDEP}] - dev-ros/rosconsole - dev-ros/roscpp - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-ros/tf - >=dev-ros/urdf-1.12.3-r1 - - dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] -" -DEPEND="${RDEPEND} - dev-ros/cmake_modules - virtual/pkgconfig - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-cpp/gtest - )" -PATCHES=( "${FILESDIR}/install_loc.patch" ) - -src_configure() { - local mycatkincmakeargs=( "-DUseQt5=ON" ) - ros-catkin_src_configure -} -- cgit v1.2.3-65-gdbad