* [gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/, dev-ros/rviz/files/
@ 2016-10-20 12:12 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2016-10-20 12:12 UTC (permalink / raw
To: gentoo-commits
commit: 76f1394f8f0a9f5f3f7f992e4604cb16e1961b52
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 11:07:48 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 12:12:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76f1394f
dev-ros/rviz: bump to 1.12.3
Package-Manager: portage-2.3.2
dev-ros/rviz/Manifest | 1 +
dev-ros/rviz/files/urdfdom1-2.patch | 436 ++++++++++++++++++++++++++++++++++++
dev-ros/rviz/rviz-1.12.3.ebuild | 68 ++++++
3 files changed, 505 insertions(+)
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index 2348e6b..8d8904a 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1 +1,2 @@
DIST rviz-1.12.1.tar.gz 4532138 SHA256 194a387de5afd53b7b6de2cde06c81ae3a94d4d410545ea5bf62ef38ea2b03f0 SHA512 64ff0cb00a1be2e845b8619f9aea7c7268b6d5ca42002fafb20a3c86b44dcce46ef7951883c51fea099763f0974675e1c24ac0f3fc5b93ae5795508443cd634c WHIRLPOOL 1e65f2977337e73b5fbcf85ff633de2e6db4ce60f71be1601f06992595848c297d4048b6b1d83f0bae8bfbcf0b092783c2bdb89fd1a695f40817bf11cfa0b3a9
+DIST rviz-1.12.3.tar.gz 4536760 SHA256 9fa74c86411efd9b60387cc2968ca39208d31f2a82f5ad7f8dcefae779a72283 SHA512 dd8a59e73b5f145f418d36de3d196aae7d439d017a16cc0133dd6f9d4b9376b81c9e6ba5edb9c56bfc42095cce2e82292978bbafc3c767d1e7f13ab81a9a798b WHIRLPOOL cc0ed1ed2cbe7eee6eb15806313fd5fd8f070ab390104c2300bec3c34baf724982deb1f1f3231c58a2a3c594182fc64e1fad6f68bade9d8d60a338a3b435a3c6
diff --git a/dev-ros/rviz/files/urdfdom1-2.patch b/dev-ros/rviz/files/urdfdom1-2.patch
new file mode 100644
index 00000000..c671584
--- /dev/null
+++ b/dev-ros/rviz/files/urdfdom1-2.patch
@@ -0,0 +1,436 @@
+commit cd741b86ecc8bdd14906e83b11a3d14dfc3c9871
+Author: Alexis Ballier <aballier@gentoo.org>
+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 @@
+ <build_depend>visualization_msgs</build_depend>
+ <build_depend>yaml-cpp</build_depend>
+ <build_depend>opengl</build_depend>
++ <build_depend>liburdfdom-headers-dev</build_depend>
+
+ <run_depend>assimp</run_depend>
+ <run_depend>eigen</run_depend>
+@@ -81,6 +82,7 @@
+ <run_depend>visualization_msgs</run_depend>
+ <run_depend>yaml-cpp</run_depend>
+ <run_depend>opengl</run_depend>
++ <run_depend>liburdfdom-headers-dev</run_depend>
+
+ <export>
+ <rviz plugin="${prefix}/plugin_description.xml"/>
+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<std::string, boost::shared_ptr<urdf::Joint> >::iterator it = robot_model_->joints_.begin(); it != robot_model_->joints_.end(); it ++ ) {
+- boost::shared_ptr<urdf::Joint> joint = it->second;
++ for (std::map<std::string, urdf::JointSharedPtr >::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<urdf::JointLimits> 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 <ros/ros.h>
+
+ #include <urdf/model.h>
++#include <urdf_model/types.h>
+ #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<std::string, boost::shared_ptr<urdf::Joint> >::iterator it = urdf_model_->joints_.begin(); it != urdf_model_->joints_.end(); it ++ ) {
++ for (std::map<std::string, urdf::JointSharedPtr >::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<urdf::JointLimits> 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<const urdf::Link>& 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<const urdf::Joint>& 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<std::string, boost::shared_ptr<urdf::Link> > M_NameToUrdfLink;
++ typedef std::map<std::string, urdf::LinkSharedPtr > 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<const urdf::Link>& 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<std::string, boost::shared_ptr<urdf::Joint> > M_NameToUrdfJoint;
++ typedef std::map<std::string, urdf::JointSharedPtr > 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<const urdf::Joint>& 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 <OgreQuaternion.h>
+ #include <OgreAny.h>
+
++#include <urdf_model/types.h>
++#include <urdf_world/types.h>
++
+ 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<const urdf::Link>& link,
++ const urdf::LinkConstSharedPtr& link,
+ const std::string& parent_joint_name,
+ bool visual,
+ bool collision);
+ virtual RobotJoint* createJoint( Robot* robot,
+- const boost::shared_ptr<const urdf::Joint>& 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 <urdf_model/model.h>
+-#include <urdf_model/link.h>
+-#include <urdf_model/joint.h>
++#include <urdf_world/types.h>
+
+
+ namespace rviz
+ {
+
+-RobotJoint::RobotJoint( Robot* robot, const boost::shared_ptr<const urdf::Joint>& 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 <OgreMaterial.h>
+ #endif
+
++#include <urdf/model.h>
++#include <urdf_model/pose.h>
++#include <urdf_world/types.h>
++
+ #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<const urdf::Joint>& 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<boost::shared_ptr<urdf::Joint> >::const_iterator child_it = link->child_joints.begin();
+- std::vector<boost::shared_ptr<urdf::Joint> >::const_iterator child_end = link->child_joints.end();
++ std::vector<urdf::JointSharedPtr >::const_iterator child_it = link->child_joints.begin();
++ std::vector<urdf::JointSharedPtr >::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<std::string, boost::shared_ptr<std::vector<boost::shared_ptr<urdf::Collision> > > >::const_iterator mi;
++ std::map<std::string, boost::shared_ptr<std::vector<urdf::CollisionSharedPtr > > >::const_iterator mi;
+ for( mi = link->collision_groups.begin(); mi != link->collision_groups.end(); mi++ )
+ {
+ if( mi->second )
+ {
+- std::vector<boost::shared_ptr<urdf::Collision> >::const_iterator vi;
++ std::vector<urdf::CollisionSharedPtr >::const_iterator vi;
+ for( vi = mi->second->begin(); vi != mi->second->end(); vi++ )
+ {
+- boost::shared_ptr<urdf::Collision> 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<boost::shared_ptr<urdf::Collision> >::const_iterator vi;
++ std::vector<urdf::CollisionSharedPtr >::const_iterator vi;
+ for( vi = link->collision_array.begin(); vi != link->collision_array.end(); vi++ )
+ {
+- boost::shared_ptr<urdf::Collision> 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<std::string, boost::shared_ptr<std::vector<boost::shared_ptr<urdf::Visual> > > >::const_iterator mi;
++ std::map<std::string, boost::shared_ptr<std::vector<urdf::VisualSharedPtr > > >::const_iterator mi;
+ for( mi = link->visual_groups.begin(); mi != link->visual_groups.end(); mi++ )
+ {
+ if( mi->second )
+ {
+- std::vector<boost::shared_ptr<urdf::Visual> >::const_iterator vi;
++ std::vector<urdf::VisualSharedPtr >::const_iterator vi;
+ for( vi = mi->second->begin(); vi != mi->second->end(); vi++ )
+ {
+- boost::shared_ptr<urdf::Visual> 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<boost::shared_ptr<urdf::Visual> >::const_iterator vi;
++ std::vector<urdf::VisualSharedPtr >::const_iterator vi;
+ for( vi = link->visual_array.begin(); vi != link->visual_array.end(); vi++ )
+ {
+- boost::shared_ptr<urdf::Visual> 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 <OgreSharedPtr.h>
+ #endif
+
++#include <urdf_model/types.h>
++#include <urdf_model/pose.h>
++
+ #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<const Link> LinkConstPtr;
+-class Geometry;
+-typedef boost::shared_ptr<const Geometry> 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/rviz-1.12.3.ebuild b/dev-ros/rviz/rviz-1.12.3.ebuild
new file mode 100644
index 00000000..91649dd
--- /dev/null
+++ b/dev-ros/rviz/rviz-1.12.3.ebuild
@@ -0,0 +1,68 @@
+# 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}/urdfdom1-2.patch" )
+
+src_configure() {
+ local mycatkincmakeargs=( "-DUseQt5=ON" )
+ ros-catkin_src_configure
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/, dev-ros/rviz/files/
@ 2021-08-11 10:58 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2021-08-11 10:58 UTC (permalink / raw
To: gentoo-commits
commit: 83065463cdd8afe86cb99bd81280ce64258def7f
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 11 10:44:09 2021 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Aug 11 10:58:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83065463
dev-ros/rviz: fix yaml-cpp detection
Closes: https://bugs.gentoo.org/show_bug.cgi?id=804678
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ros/rviz/files/yamlcpp.patch | 14 ++++++++++++++
dev-ros/rviz/rviz-1.14.8.ebuild | 2 ++
dev-ros/rviz/rviz-9999.ebuild | 2 ++
3 files changed, 18 insertions(+)
diff --git a/dev-ros/rviz/files/yamlcpp.patch b/dev-ros/rviz/files/yamlcpp.patch
new file mode 100644
index 00000000000..a0c9151d0cd
--- /dev/null
+++ b/dev-ros/rviz/files/yamlcpp.patch
@@ -0,0 +1,14 @@
+Index: rviz-1.14.8/src/rviz/CMakeLists.txt
+===================================================================
+--- rviz-1.14.8.orig/src/rviz/CMakeLists.txt
++++ rviz-1.14.8/src/rviz/CMakeLists.txt
+@@ -1,4 +1,8 @@
+-find_package(yaml-cpp REQUIRED)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(YAML_CPP yaml-cpp)
++if(NOT YAML_CPP_FOUND)
++ find_package(yaml-cpp REQUIRED)
++endif()
+
+ include_directories(${YAML_CPP_INCLUDE_DIR})
+
diff --git a/dev-ros/rviz/rviz-1.14.8.ebuild b/dev-ros/rviz/rviz-1.14.8.ebuild
index e25c75bee05..9440781bb3c 100644
--- a/dev-ros/rviz/rviz-1.14.8.ebuild
+++ b/dev-ros/rviz/rviz-1.14.8.ebuild
@@ -69,6 +69,8 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+
src_test() {
virtx ros-catkin_src_test
}
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index e25c75bee05..9440781bb3c 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -69,6 +69,8 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+
src_test() {
virtx ros-catkin_src_test
}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/, dev-ros/rviz/files/
@ 2016-10-20 12:12 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2016-10-20 12:12 UTC (permalink / raw
To: gentoo-commits
commit: 87c4ac3e7b69fa9b6141f93d38461ce846431ab2
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 12:02:04 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 12:12:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87c4ac3e
dev-ros/rviz: install ressources in /usr/share/ros_packages since they are expected here.
Package-Manager: portage-2.3.2
dev-ros/rviz/files/install_loc.patch | 30 ++++++++++++++++++++++
.../{rviz-1.12.3.ebuild => rviz-1.12.3-r1.ebuild} | 2 +-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/dev-ros/rviz/files/install_loc.patch b/dev-ros/rviz/files/install_loc.patch
new file mode 100644
index 00000000..a77968d
--- /dev/null
+++ b/dev-ros/rviz/files/install_loc.patch
@@ -0,0 +1,30 @@
+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/rviz-1.12.3.ebuild b/dev-ros/rviz/rviz-1.12.3-r1.ebuild
similarity index 95%
rename from dev-ros/rviz/rviz-1.12.3.ebuild
rename to dev-ros/rviz/rviz-1.12.3-r1.ebuild
index 91649dd..9a57761 100644
--- a/dev-ros/rviz/rviz-1.12.3.ebuild
+++ b/dev-ros/rviz/rviz-1.12.3-r1.ebuild
@@ -60,7 +60,7 @@ DEPEND="${RDEPEND}
dev-ros/rostest[${PYTHON_USEDEP}]
dev-cpp/gtest
)"
-PATCHES=( "${FILESDIR}/urdfdom1-2.patch" )
+PATCHES=( "${FILESDIR}/urdfdom1-2.patch" "${FILESDIR}/install_loc.patch" )
src_configure() {
local mycatkincmakeargs=( "-DUseQt5=ON" )
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/, dev-ros/rviz/files/
@ 2016-03-24 11:18 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2016-03-24 11:18 UTC (permalink / raw
To: gentoo-commits
commit: 5e35ea4b4bef36c3fcc98e191f8459bcc7377618
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 11:00:18 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 11:18:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e35ea4b
dev-ros/rviz: remove old
Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ros/rviz/Manifest | 1 -
dev-ros/rviz/files/libdir.patch | 26 -----------------
dev-ros/rviz/rviz-1.11.9.ebuild | 62 -----------------------------------------
3 files changed, 89 deletions(-)
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index a079cba..87d1cc3 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,2 +1 @@
DIST rviz-1.11.10.tar.gz 4526836 SHA256 0b1f91042d9e4c90c7c40602a2f479632f432c7ce40801e5508a0077281eadbe SHA512 552a7482f90ce70933bbf93aa7dc29e6ef1685998b508dfd60af2c8e60f43d88ae6c1b5a8585494248d79c5ac7c1c1ade784acd1260ef3aea62ee61050fecafe WHIRLPOOL 47dbd86a3f07e6a78808e5abd0f7a5a17c75839e025479f036def64be042b266adb758426f02bde2c0c0c3fd9a764150a742ad0ed42cc90cddcf6bfc0f2b5a0e
-DIST rviz-1.11.9.tar.gz 4525317 SHA256 b62320ff757f3768240821555df1756cfe59014037d560d7fbc1df61fb6d5c4f SHA512 b9a65dd0727ea9b4d9185d96b8ce2a0b98d581634d87b9e0a725788260fcd910b0a5a5899329b57074894ecfa5d65909cc997653fda6adb626b92c2042124da2 WHIRLPOOL 1d4932c322c08ea098fa9351c76d5a2ea6533325af9a0524f4910984ffd5a91196068546a2f693b2259dd730ee82125bdc6ea8cc239d809f9a410594a12fb8e1
diff --git a/dev-ros/rviz/files/libdir.patch b/dev-ros/rviz/files/libdir.patch
deleted file mode 100644
index 9044ded..0000000
--- a/dev-ros/rviz/files/libdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/ros-visualization/rviz/pull/922
-
-commit 2f93b132a63e25e3cece330ebaf16de7a8aa9517
-Author: Alexis Ballier <aballier@gentoo.org>
-Date: Sat Sep 26 11:39:39 2015 +0200
-
- python_bindings: sip: Use CATKIN_PACKAGE_LIB_DESTINATION instead of hardcoded lib.
-
- Fixes build with libdir != lib.
- https://bugs.gentoo.org/show_bug.cgi?id=561480
-
-diff --git a/src/python_bindings/sip/CMakeLists.txt b/src/python_bindings/sip/CMakeLists.txt
-index 6b0c939..c91a6be 100644
---- a/src/python_bindings/sip/CMakeLists.txt
-+++ b/src/python_bindings/sip/CMakeLists.txt
-@@ -42,8 +42,8 @@ include(${python_qt_binding_EXTRAS_DIR}/sip_helper.cmake)
- # maintain context for different named target
- set(rviz_sip_INCLUDE_DIRS ${rviz_INCLUDE_DIRS} "${PROJECT_SOURCE_DIR}/src" ${catkin_INCLUDE_DIRS})
- set(rviz_sip_LIBRARIES ${rviz_LIBRARIES} ${PROJECT_NAME})
--set(rviz_sip_LIBRARY_DIRS ${rviz_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/lib)
--set(rviz_sip_LDFLAGS_OTHER ${rviz_LDFLAGS_OTHER} -Wl,-rpath,\\"${CATKIN_DEVEL_PREFIX}/lib\\")
-+set(rviz_sip_LIBRARY_DIRS ${rviz_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION})
-+set(rviz_sip_LDFLAGS_OTHER ${rviz_LDFLAGS_OTHER} -Wl,-rpath,\\"${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}\\")
-
- if(sip_helper_FOUND)
- list(APPEND rviz_BINDINGS "sip")
diff --git a/dev-ros/rviz/rviz-1.11.9.ebuild b/dev-ros/rviz/rviz-1.11.9.ebuild
deleted file mode 100644
index c801bb9..0000000
--- a/dev-ros/rviz/rviz-1.11.9.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 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
-
-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/qtgui:4
- dev-qt/qtopengl:4
- dev-qt/qtcore:4
- dev-cpp/eigen:3
- dev-cpp/yaml-cpp
-
- 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[${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
-
- 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}/libdir.patch" )
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/, dev-ros/rviz/files/
@ 2015-09-26 9:50 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2015-09-26 9:50 UTC (permalink / raw
To: gentoo-commits
commit: b3f1ee6b4589cfaad2e2224517aab46926d1da72
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 09:50:01 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 09:50:14 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3f1ee6b
dev-ros/rviz: Fix build of python bindings if rviz was not previously installed. Bug #561480 by Eric Timmons.
Package-Manager: portage-2.2.22
dev-ros/rviz/files/libdir.patch | 26 ++++++++++++++++++++++++++
dev-ros/rviz/rviz-1.11.9.ebuild | 2 ++
2 files changed, 28 insertions(+)
diff --git a/dev-ros/rviz/files/libdir.patch b/dev-ros/rviz/files/libdir.patch
new file mode 100644
index 0000000..9044ded
--- /dev/null
+++ b/dev-ros/rviz/files/libdir.patch
@@ -0,0 +1,26 @@
+https://github.com/ros-visualization/rviz/pull/922
+
+commit 2f93b132a63e25e3cece330ebaf16de7a8aa9517
+Author: Alexis Ballier <aballier@gentoo.org>
+Date: Sat Sep 26 11:39:39 2015 +0200
+
+ python_bindings: sip: Use CATKIN_PACKAGE_LIB_DESTINATION instead of hardcoded lib.
+
+ Fixes build with libdir != lib.
+ https://bugs.gentoo.org/show_bug.cgi?id=561480
+
+diff --git a/src/python_bindings/sip/CMakeLists.txt b/src/python_bindings/sip/CMakeLists.txt
+index 6b0c939..c91a6be 100644
+--- a/src/python_bindings/sip/CMakeLists.txt
++++ b/src/python_bindings/sip/CMakeLists.txt
+@@ -42,8 +42,8 @@ include(${python_qt_binding_EXTRAS_DIR}/sip_helper.cmake)
+ # maintain context for different named target
+ set(rviz_sip_INCLUDE_DIRS ${rviz_INCLUDE_DIRS} "${PROJECT_SOURCE_DIR}/src" ${catkin_INCLUDE_DIRS})
+ set(rviz_sip_LIBRARIES ${rviz_LIBRARIES} ${PROJECT_NAME})
+-set(rviz_sip_LIBRARY_DIRS ${rviz_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/lib)
+-set(rviz_sip_LDFLAGS_OTHER ${rviz_LDFLAGS_OTHER} -Wl,-rpath,\\"${CATKIN_DEVEL_PREFIX}/lib\\")
++set(rviz_sip_LIBRARY_DIRS ${rviz_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION})
++set(rviz_sip_LDFLAGS_OTHER ${rviz_LDFLAGS_OTHER} -Wl,-rpath,\\"${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_LIB_DESTINATION}\\")
+
+ if(sip_helper_FOUND)
+ list(APPEND rviz_BINDINGS "sip")
diff --git a/dev-ros/rviz/rviz-1.11.9.ebuild b/dev-ros/rviz/rviz-1.11.9.ebuild
index 0bb062d..c801bb9 100644
--- a/dev-ros/rviz/rviz-1.11.9.ebuild
+++ b/dev-ros/rviz/rviz-1.11.9.ebuild
@@ -58,3 +58,5 @@ DEPEND="${RDEPEND}
dev-ros/rostest[${PYTHON_USEDEP}]
dev-cpp/gtest
)"
+
+PATCHES=( "${FILESDIR}/libdir.patch" )
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-08-11 10:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-20 12:12 [gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/, dev-ros/rviz/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2021-08-11 10:58 Alexis Ballier
2016-10-20 12:12 Alexis Ballier
2016-03-24 11:18 Alexis Ballier
2015-09-26 9:50 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox