[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b0e0c69fd10587c6abb19285fbf7c7ca38ec4503
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Mar 9 13:19:15 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Mar 9 13:19:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e0c69f
dev-ros/rviz: properly find assimp
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 +
dev-ros/rviz/rviz-1.14.14.ebuild | 5 -
dev-ros/rviz/rviz-.ebuild| 5 -
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
new file mode 100644
index ..0e0eb3ed3384
--- /dev/null
+++ b/dev-ros/rviz/files/assimp.patch
@@ -0,0 +1,13 @@
+Index: rviz-1.14.14/src/rviz/CMakeLists.txt
+===
+--- rviz-1.14.14.orig/src/rviz/CMakeLists.txt
rviz-1.14.14/src/rviz/CMakeLists.txt
+@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
+ ${rviz_ADDITIONAL_LIBRARIES}
+ ${TinyXML2_LIBRARIES}
+ ${X11_X11_LIB}
+- ${ASSIMP_LIBRARIES}
++ ${assimp_LIBRARIES}
+ ${YAML_CPP_LIBRARIES}
+ )
+
diff --git a/dev-ros/rviz/rviz-1.14.14.ebuild b/dev-ros/rviz/rviz-1.14.14.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-1.14.14.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: e3b9cd7edf8a35dc2c32abaf1a3bec7ae8b34a36
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Jun 8 15:09:27 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Jun 8 15:16:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b9cd7e
dev-ros/rviz: remove assimp patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 -
dev-ros/rviz/rviz-1.14.14-r1.ebuild | 1 -
dev-ros/rviz/rviz-.ebuild | 1 -
3 files changed, 15 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
deleted file mode 100644
index 0e0eb3ed3384..
--- a/dev-ros/rviz/files/assimp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rviz-1.14.14/src/rviz/CMakeLists.txt
-===
rviz-1.14.14.orig/src/rviz/CMakeLists.txt
-+++ rviz-1.14.14/src/rviz/CMakeLists.txt
-@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
- ${rviz_ADDITIONAL_LIBRARIES}
- ${TinyXML2_LIBRARIES}
- ${X11_X11_LIB}
-- ${ASSIMP_LIBRARIES}
-+ ${assimp_LIBRARIES}
- ${YAML_CPP_LIBRARIES}
- )
-
diff --git a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: 153f91288573e1f1a23a8fd1916584a00dc007bd
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Jul 26 08:52:03 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Jul 26 09:18:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=153f9128
dev-ros/rviz: fix build with urdfdom1 and add := dep on it.
Package-Manager: portage-2.3.0
dev-ros/rviz/files/urdfdom1.patch | 261 +
.../{rviz-1.12.1.ebuild => rviz-1.12.1-r1.ebuild} | 9 +-
dev-ros/rviz/rviz-.ebuild | 3 +-
3 files changed, 269 insertions(+), 4 deletions(-)
diff --git a/dev-ros/rviz/files/urdfdom1.patch
b/dev-ros/rviz/files/urdfdom1.patch
new file mode 100644
index 000..d7f152c
--- /dev/null
+++ b/dev-ros/rviz/files/urdfdom1.patch
@@ -0,0 +1,261 @@
+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);
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b3b61d6cd9e7b3f3b6cc9fb2fd1ad46365751608
Author: Alexis Ballier gentoo org>
AuthorDate: Mon Nov 28 14:31:35 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Mon Nov 28 15:04:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b61d6c
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
.../{rviz-1.12.4.ebuild => rviz-1.12.4-r1.ebuild} | 1 -
4 files changed, 728 deletions(-)
diff --git a/dev-ros/rviz/files/install_loc.patch
b/dev-ros/rviz/files/install_loc.patch
deleted file mode 100644
index a77968d..
--- 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 c671584..
--- 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/
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: 153f91288573e1f1a23a8fd1916584a00dc007bd
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Jul 26 08:52:03 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Jul 26 09:18:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=153f9128
dev-ros/rviz: fix build with urdfdom1 and add := dep on it.
Package-Manager: portage-2.3.0
dev-ros/rviz/files/urdfdom1.patch | 261 +
.../{rviz-1.12.1.ebuild => rviz-1.12.1-r1.ebuild} | 9 +-
dev-ros/rviz/rviz-.ebuild | 3 +-
3 files changed, 269 insertions(+), 4 deletions(-)
diff --git a/dev-ros/rviz/files/urdfdom1.patch
b/dev-ros/rviz/files/urdfdom1.patch
new file mode 100644
index 000..d7f152c
--- /dev/null
+++ b/dev-ros/rviz/files/urdfdom1.patch
@@ -0,0 +1,261 @@
+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);
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b3b61d6cd9e7b3f3b6cc9fb2fd1ad46365751608
Author: Alexis Ballier gentoo org>
AuthorDate: Mon Nov 28 14:31:35 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Mon Nov 28 15:04:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b61d6c
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
.../{rviz-1.12.4.ebuild => rviz-1.12.4-r1.ebuild} | 1 -
4 files changed, 728 deletions(-)
diff --git a/dev-ros/rviz/files/install_loc.patch
b/dev-ros/rviz/files/install_loc.patch
deleted file mode 100644
index a77968d..
--- 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 c671584..
--- 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/
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b0e0c69fd10587c6abb19285fbf7c7ca38ec4503
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Mar 9 13:19:15 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Mar 9 13:19:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e0c69f
dev-ros/rviz: properly find assimp
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 +
dev-ros/rviz/rviz-1.14.14.ebuild | 5 -
dev-ros/rviz/rviz-.ebuild| 5 -
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
new file mode 100644
index ..0e0eb3ed3384
--- /dev/null
+++ b/dev-ros/rviz/files/assimp.patch
@@ -0,0 +1,13 @@
+Index: rviz-1.14.14/src/rviz/CMakeLists.txt
+===
+--- rviz-1.14.14.orig/src/rviz/CMakeLists.txt
rviz-1.14.14/src/rviz/CMakeLists.txt
+@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
+ ${rviz_ADDITIONAL_LIBRARIES}
+ ${TinyXML2_LIBRARIES}
+ ${X11_X11_LIB}
+- ${ASSIMP_LIBRARIES}
++ ${assimp_LIBRARIES}
+ ${YAML_CPP_LIBRARIES}
+ )
+
diff --git a/dev-ros/rviz/rviz-1.14.14.ebuild b/dev-ros/rviz/rviz-1.14.14.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-1.14.14.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: e3b9cd7edf8a35dc2c32abaf1a3bec7ae8b34a36
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Jun 8 15:09:27 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Jun 8 15:16:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b9cd7e
dev-ros/rviz: remove assimp patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 -
dev-ros/rviz/rviz-1.14.14-r1.ebuild | 1 -
dev-ros/rviz/rviz-.ebuild | 1 -
3 files changed, 15 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
deleted file mode 100644
index 0e0eb3ed3384..
--- a/dev-ros/rviz/files/assimp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rviz-1.14.14/src/rviz/CMakeLists.txt
-===
rviz-1.14.14.orig/src/rviz/CMakeLists.txt
-+++ rviz-1.14.14/src/rviz/CMakeLists.txt
-@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
- ${rviz_ADDITIONAL_LIBRARIES}
- ${TinyXML2_LIBRARIES}
- ${X11_X11_LIB}
-- ${ASSIMP_LIBRARIES}
-+ ${assimp_LIBRARIES}
- ${YAML_CPP_LIBRARIES}
- )
-
diff --git a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: 153f91288573e1f1a23a8fd1916584a00dc007bd
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Jul 26 08:52:03 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Jul 26 09:18:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=153f9128
dev-ros/rviz: fix build with urdfdom1 and add := dep on it.
Package-Manager: portage-2.3.0
dev-ros/rviz/files/urdfdom1.patch | 261 +
.../{rviz-1.12.1.ebuild => rviz-1.12.1-r1.ebuild} | 9 +-
dev-ros/rviz/rviz-.ebuild | 3 +-
3 files changed, 269 insertions(+), 4 deletions(-)
diff --git a/dev-ros/rviz/files/urdfdom1.patch
b/dev-ros/rviz/files/urdfdom1.patch
new file mode 100644
index 000..d7f152c
--- /dev/null
+++ b/dev-ros/rviz/files/urdfdom1.patch
@@ -0,0 +1,261 @@
+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);
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: e3b9cd7edf8a35dc2c32abaf1a3bec7ae8b34a36
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Jun 8 15:09:27 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Jun 8 15:16:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b9cd7e
dev-ros/rviz: remove assimp patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 -
dev-ros/rviz/rviz-1.14.14-r1.ebuild | 1 -
dev-ros/rviz/rviz-.ebuild | 1 -
3 files changed, 15 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
deleted file mode 100644
index 0e0eb3ed3384..
--- a/dev-ros/rviz/files/assimp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rviz-1.14.14/src/rviz/CMakeLists.txt
-===
rviz-1.14.14.orig/src/rviz/CMakeLists.txt
-+++ rviz-1.14.14/src/rviz/CMakeLists.txt
-@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
- ${rviz_ADDITIONAL_LIBRARIES}
- ${TinyXML2_LIBRARIES}
- ${X11_X11_LIB}
-- ${ASSIMP_LIBRARIES}
-+ ${assimp_LIBRARIES}
- ${YAML_CPP_LIBRARIES}
- )
-
diff --git a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b3b61d6cd9e7b3f3b6cc9fb2fd1ad46365751608
Author: Alexis Ballier gentoo org>
AuthorDate: Mon Nov 28 14:31:35 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Mon Nov 28 15:04:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b61d6c
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
.../{rviz-1.12.4.ebuild => rviz-1.12.4-r1.ebuild} | 1 -
4 files changed, 728 deletions(-)
diff --git a/dev-ros/rviz/files/install_loc.patch
b/dev-ros/rviz/files/install_loc.patch
deleted file mode 100644
index a77968d..
--- 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 c671584..
--- 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/
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b0e0c69fd10587c6abb19285fbf7c7ca38ec4503
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Mar 9 13:19:15 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Mar 9 13:19:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e0c69f
dev-ros/rviz: properly find assimp
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 +
dev-ros/rviz/rviz-1.14.14.ebuild | 5 -
dev-ros/rviz/rviz-.ebuild| 5 -
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
new file mode 100644
index ..0e0eb3ed3384
--- /dev/null
+++ b/dev-ros/rviz/files/assimp.patch
@@ -0,0 +1,13 @@
+Index: rviz-1.14.14/src/rviz/CMakeLists.txt
+===
+--- rviz-1.14.14.orig/src/rviz/CMakeLists.txt
rviz-1.14.14/src/rviz/CMakeLists.txt
+@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
+ ${rviz_ADDITIONAL_LIBRARIES}
+ ${TinyXML2_LIBRARIES}
+ ${X11_X11_LIB}
+- ${ASSIMP_LIBRARIES}
++ ${assimp_LIBRARIES}
+ ${YAML_CPP_LIBRARIES}
+ )
+
diff --git a/dev-ros/rviz/rviz-1.14.14.ebuild b/dev-ros/rviz/rviz-1.14.14.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-1.14.14.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b3b61d6cd9e7b3f3b6cc9fb2fd1ad46365751608
Author: Alexis Ballier gentoo org>
AuthorDate: Mon Nov 28 14:31:35 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Mon Nov 28 15:04:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b61d6c
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
.../{rviz-1.12.4.ebuild => rviz-1.12.4-r1.ebuild} | 1 -
4 files changed, 728 deletions(-)
diff --git a/dev-ros/rviz/files/install_loc.patch
b/dev-ros/rviz/files/install_loc.patch
deleted file mode 100644
index a77968d..
--- 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 c671584..
--- 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/
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: 153f91288573e1f1a23a8fd1916584a00dc007bd
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Jul 26 08:52:03 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Jul 26 09:18:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=153f9128
dev-ros/rviz: fix build with urdfdom1 and add := dep on it.
Package-Manager: portage-2.3.0
dev-ros/rviz/files/urdfdom1.patch | 261 +
.../{rviz-1.12.1.ebuild => rviz-1.12.1-r1.ebuild} | 9 +-
dev-ros/rviz/rviz-.ebuild | 3 +-
3 files changed, 269 insertions(+), 4 deletions(-)
diff --git a/dev-ros/rviz/files/urdfdom1.patch
b/dev-ros/rviz/files/urdfdom1.patch
new file mode 100644
index 000..d7f152c
--- /dev/null
+++ b/dev-ros/rviz/files/urdfdom1.patch
@@ -0,0 +1,261 @@
+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);
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b0e0c69fd10587c6abb19285fbf7c7ca38ec4503
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Mar 9 13:19:15 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Mar 9 13:19:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e0c69f
dev-ros/rviz: properly find assimp
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 +
dev-ros/rviz/rviz-1.14.14.ebuild | 5 -
dev-ros/rviz/rviz-.ebuild| 5 -
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
new file mode 100644
index ..0e0eb3ed3384
--- /dev/null
+++ b/dev-ros/rviz/files/assimp.patch
@@ -0,0 +1,13 @@
+Index: rviz-1.14.14/src/rviz/CMakeLists.txt
+===
+--- rviz-1.14.14.orig/src/rviz/CMakeLists.txt
rviz-1.14.14/src/rviz/CMakeLists.txt
+@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
+ ${rviz_ADDITIONAL_LIBRARIES}
+ ${TinyXML2_LIBRARIES}
+ ${X11_X11_LIB}
+- ${ASSIMP_LIBRARIES}
++ ${assimp_LIBRARIES}
+ ${YAML_CPP_LIBRARIES}
+ )
+
diff --git a/dev-ros/rviz/rviz-1.14.14.ebuild b/dev-ros/rviz/rviz-1.14.14.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-1.14.14.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: e3b9cd7edf8a35dc2c32abaf1a3bec7ae8b34a36
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Jun 8 15:09:27 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Jun 8 15:16:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b9cd7e
dev-ros/rviz: remove assimp patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 -
dev-ros/rviz/rviz-1.14.14-r1.ebuild | 1 -
dev-ros/rviz/rviz-.ebuild | 1 -
3 files changed, 15 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
deleted file mode 100644
index 0e0eb3ed3384..
--- a/dev-ros/rviz/files/assimp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rviz-1.14.14/src/rviz/CMakeLists.txt
-===
rviz-1.14.14.orig/src/rviz/CMakeLists.txt
-+++ rviz-1.14.14/src/rviz/CMakeLists.txt
-@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
- ${rviz_ADDITIONAL_LIBRARIES}
- ${TinyXML2_LIBRARIES}
- ${X11_X11_LIB}
-- ${ASSIMP_LIBRARIES}
-+ ${assimp_LIBRARIES}
- ${YAML_CPP_LIBRARIES}
- )
-
diff --git a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b0e0c69fd10587c6abb19285fbf7c7ca38ec4503
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Mar 9 13:19:15 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Mar 9 13:19:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e0c69f
dev-ros/rviz: properly find assimp
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 +
dev-ros/rviz/rviz-1.14.14.ebuild | 5 -
dev-ros/rviz/rviz-.ebuild| 5 -
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
new file mode 100644
index ..0e0eb3ed3384
--- /dev/null
+++ b/dev-ros/rviz/files/assimp.patch
@@ -0,0 +1,13 @@
+Index: rviz-1.14.14/src/rviz/CMakeLists.txt
+===
+--- rviz-1.14.14.orig/src/rviz/CMakeLists.txt
rviz-1.14.14/src/rviz/CMakeLists.txt
+@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
+ ${rviz_ADDITIONAL_LIBRARIES}
+ ${TinyXML2_LIBRARIES}
+ ${X11_X11_LIB}
+- ${ASSIMP_LIBRARIES}
++ ${assimp_LIBRARIES}
+ ${YAML_CPP_LIBRARIES}
+ )
+
diff --git a/dev-ros/rviz/rviz-1.14.14.ebuild b/dev-ros/rviz/rviz-1.14.14.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-1.14.14.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: e3b9cd7edf8a35dc2c32abaf1a3bec7ae8b34a36
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Jun 8 15:09:27 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Jun 8 15:16:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b9cd7e
dev-ros/rviz: remove assimp patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 -
dev-ros/rviz/rviz-1.14.14-r1.ebuild | 1 -
dev-ros/rviz/rviz-.ebuild | 1 -
3 files changed, 15 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
deleted file mode 100644
index 0e0eb3ed3384..
--- a/dev-ros/rviz/files/assimp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rviz-1.14.14/src/rviz/CMakeLists.txt
-===
rviz-1.14.14.orig/src/rviz/CMakeLists.txt
-+++ rviz-1.14.14/src/rviz/CMakeLists.txt
-@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
- ${rviz_ADDITIONAL_LIBRARIES}
- ${TinyXML2_LIBRARIES}
- ${X11_X11_LIB}
-- ${ASSIMP_LIBRARIES}
-+ ${assimp_LIBRARIES}
- ${YAML_CPP_LIBRARIES}
- )
-
diff --git a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: 153f91288573e1f1a23a8fd1916584a00dc007bd
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Jul 26 08:52:03 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Jul 26 09:18:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=153f9128
dev-ros/rviz: fix build with urdfdom1 and add := dep on it.
Package-Manager: portage-2.3.0
dev-ros/rviz/files/urdfdom1.patch | 261 +
.../{rviz-1.12.1.ebuild => rviz-1.12.1-r1.ebuild} | 9 +-
dev-ros/rviz/rviz-.ebuild | 3 +-
3 files changed, 269 insertions(+), 4 deletions(-)
diff --git a/dev-ros/rviz/files/urdfdom1.patch
b/dev-ros/rviz/files/urdfdom1.patch
new file mode 100644
index 000..d7f152c
--- /dev/null
+++ b/dev-ros/rviz/files/urdfdom1.patch
@@ -0,0 +1,261 @@
+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);
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: e3b9cd7edf8a35dc2c32abaf1a3bec7ae8b34a36
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Jun 8 15:09:27 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Jun 8 15:16:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b9cd7e
dev-ros/rviz: remove assimp patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 -
dev-ros/rviz/rviz-1.14.14-r1.ebuild | 1 -
dev-ros/rviz/rviz-.ebuild | 1 -
3 files changed, 15 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
deleted file mode 100644
index 0e0eb3ed3384..
--- a/dev-ros/rviz/files/assimp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rviz-1.14.14/src/rviz/CMakeLists.txt
-===
rviz-1.14.14.orig/src/rviz/CMakeLists.txt
-+++ rviz-1.14.14/src/rviz/CMakeLists.txt
-@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
- ${rviz_ADDITIONAL_LIBRARIES}
- ${TinyXML2_LIBRARIES}
- ${X11_X11_LIB}
-- ${ASSIMP_LIBRARIES}
-+ ${assimp_LIBRARIES}
- ${YAML_CPP_LIBRARIES}
- )
-
diff --git a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b3b61d6cd9e7b3f3b6cc9fb2fd1ad46365751608
Author: Alexis Ballier gentoo org>
AuthorDate: Mon Nov 28 14:31:35 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Mon Nov 28 15:04:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b61d6c
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
.../{rviz-1.12.4.ebuild => rviz-1.12.4-r1.ebuild} | 1 -
4 files changed, 728 deletions(-)
diff --git a/dev-ros/rviz/files/install_loc.patch
b/dev-ros/rviz/files/install_loc.patch
deleted file mode 100644
index a77968d..
--- 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 c671584..
--- 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/
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: 153f91288573e1f1a23a8fd1916584a00dc007bd
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Jul 26 08:52:03 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Jul 26 09:18:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=153f9128
dev-ros/rviz: fix build with urdfdom1 and add := dep on it.
Package-Manager: portage-2.3.0
dev-ros/rviz/files/urdfdom1.patch | 261 +
.../{rviz-1.12.1.ebuild => rviz-1.12.1-r1.ebuild} | 9 +-
dev-ros/rviz/rviz-.ebuild | 3 +-
3 files changed, 269 insertions(+), 4 deletions(-)
diff --git a/dev-ros/rviz/files/urdfdom1.patch
b/dev-ros/rviz/files/urdfdom1.patch
new file mode 100644
index 000..d7f152c
--- /dev/null
+++ b/dev-ros/rviz/files/urdfdom1.patch
@@ -0,0 +1,261 @@
+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);
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b3b61d6cd9e7b3f3b6cc9fb2fd1ad46365751608
Author: Alexis Ballier gentoo org>
AuthorDate: Mon Nov 28 14:31:35 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Mon Nov 28 15:04:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b61d6c
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
.../{rviz-1.12.4.ebuild => rviz-1.12.4-r1.ebuild} | 1 -
4 files changed, 728 deletions(-)
diff --git a/dev-ros/rviz/files/install_loc.patch
b/dev-ros/rviz/files/install_loc.patch
deleted file mode 100644
index a77968d..
--- 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 c671584..
--- 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/
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: 153f91288573e1f1a23a8fd1916584a00dc007bd
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Jul 26 08:52:03 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Jul 26 09:18:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=153f9128
dev-ros/rviz: fix build with urdfdom1 and add := dep on it.
Package-Manager: portage-2.3.0
dev-ros/rviz/files/urdfdom1.patch | 261 +
.../{rviz-1.12.1.ebuild => rviz-1.12.1-r1.ebuild} | 9 +-
dev-ros/rviz/rviz-.ebuild | 3 +-
3 files changed, 269 insertions(+), 4 deletions(-)
diff --git a/dev-ros/rviz/files/urdfdom1.patch
b/dev-ros/rviz/files/urdfdom1.patch
new file mode 100644
index 000..d7f152c
--- /dev/null
+++ b/dev-ros/rviz/files/urdfdom1.patch
@@ -0,0 +1,261 @@
+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);
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b0e0c69fd10587c6abb19285fbf7c7ca38ec4503
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Mar 9 13:19:15 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Mar 9 13:19:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e0c69f
dev-ros/rviz: properly find assimp
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 +
dev-ros/rviz/rviz-1.14.14.ebuild | 5 -
dev-ros/rviz/rviz-.ebuild| 5 -
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
new file mode 100644
index ..0e0eb3ed3384
--- /dev/null
+++ b/dev-ros/rviz/files/assimp.patch
@@ -0,0 +1,13 @@
+Index: rviz-1.14.14/src/rviz/CMakeLists.txt
+===
+--- rviz-1.14.14.orig/src/rviz/CMakeLists.txt
rviz-1.14.14/src/rviz/CMakeLists.txt
+@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
+ ${rviz_ADDITIONAL_LIBRARIES}
+ ${TinyXML2_LIBRARIES}
+ ${X11_X11_LIB}
+- ${ASSIMP_LIBRARIES}
++ ${assimp_LIBRARIES}
+ ${YAML_CPP_LIBRARIES}
+ )
+
diff --git a/dev-ros/rviz/rviz-1.14.14.ebuild b/dev-ros/rviz/rviz-1.14.14.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-1.14.14.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b0e0c69fd10587c6abb19285fbf7c7ca38ec4503
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Mar 9 13:19:15 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Mar 9 13:19:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e0c69f
dev-ros/rviz: properly find assimp
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 +
dev-ros/rviz/rviz-1.14.14.ebuild | 5 -
dev-ros/rviz/rviz-.ebuild| 5 -
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
new file mode 100644
index ..0e0eb3ed3384
--- /dev/null
+++ b/dev-ros/rviz/files/assimp.patch
@@ -0,0 +1,13 @@
+Index: rviz-1.14.14/src/rviz/CMakeLists.txt
+===
+--- rviz-1.14.14.orig/src/rviz/CMakeLists.txt
rviz-1.14.14/src/rviz/CMakeLists.txt
+@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
+ ${rviz_ADDITIONAL_LIBRARIES}
+ ${TinyXML2_LIBRARIES}
+ ${X11_X11_LIB}
+- ${ASSIMP_LIBRARIES}
++ ${assimp_LIBRARIES}
+ ${YAML_CPP_LIBRARIES}
+ )
+
diff --git a/dev-ros/rviz/rviz-1.14.14.ebuild b/dev-ros/rviz/rviz-1.14.14.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-1.14.14.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: e3b9cd7edf8a35dc2c32abaf1a3bec7ae8b34a36
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Jun 8 15:09:27 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Jun 8 15:16:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b9cd7e
dev-ros/rviz: remove assimp patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 -
dev-ros/rviz/rviz-1.14.14-r1.ebuild | 1 -
dev-ros/rviz/rviz-.ebuild | 1 -
3 files changed, 15 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
deleted file mode 100644
index 0e0eb3ed3384..
--- a/dev-ros/rviz/files/assimp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rviz-1.14.14/src/rviz/CMakeLists.txt
-===
rviz-1.14.14.orig/src/rviz/CMakeLists.txt
-+++ rviz-1.14.14/src/rviz/CMakeLists.txt
-@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
- ${rviz_ADDITIONAL_LIBRARIES}
- ${TinyXML2_LIBRARIES}
- ${X11_X11_LIB}
-- ${ASSIMP_LIBRARIES}
-+ ${assimp_LIBRARIES}
- ${YAML_CPP_LIBRARIES}
- )
-
diff --git a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b3b61d6cd9e7b3f3b6cc9fb2fd1ad46365751608
Author: Alexis Ballier gentoo org>
AuthorDate: Mon Nov 28 14:31:35 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Mon Nov 28 15:04:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b61d6c
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
.../{rviz-1.12.4.ebuild => rviz-1.12.4-r1.ebuild} | 1 -
4 files changed, 728 deletions(-)
diff --git a/dev-ros/rviz/files/install_loc.patch
b/dev-ros/rviz/files/install_loc.patch
deleted file mode 100644
index a77968d..
--- 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 c671584..
--- 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/
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b3b61d6cd9e7b3f3b6cc9fb2fd1ad46365751608
Author: Alexis Ballier gentoo org>
AuthorDate: Mon Nov 28 14:31:35 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Mon Nov 28 15:04:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b61d6c
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
.../{rviz-1.12.4.ebuild => rviz-1.12.4-r1.ebuild} | 1 -
4 files changed, 728 deletions(-)
diff --git a/dev-ros/rviz/files/install_loc.patch
b/dev-ros/rviz/files/install_loc.patch
deleted file mode 100644
index a77968d..
--- 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 c671584..
--- 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/
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: 153f91288573e1f1a23a8fd1916584a00dc007bd
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Jul 26 08:52:03 2016 +
Commit: Alexis Ballier gentoo org>
CommitDate: Tue Jul 26 09:18:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=153f9128
dev-ros/rviz: fix build with urdfdom1 and add := dep on it.
Package-Manager: portage-2.3.0
dev-ros/rviz/files/urdfdom1.patch | 261 +
.../{rviz-1.12.1.ebuild => rviz-1.12.1-r1.ebuild} | 9 +-
dev-ros/rviz/rviz-.ebuild | 3 +-
3 files changed, 269 insertions(+), 4 deletions(-)
diff --git a/dev-ros/rviz/files/urdfdom1.patch
b/dev-ros/rviz/files/urdfdom1.patch
new file mode 100644
index 000..d7f152c
--- /dev/null
+++ b/dev-ros/rviz/files/urdfdom1.patch
@@ -0,0 +1,261 @@
+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);
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: e3b9cd7edf8a35dc2c32abaf1a3bec7ae8b34a36
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Jun 8 15:09:27 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Jun 8 15:16:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b9cd7e
dev-ros/rviz: remove assimp patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 -
dev-ros/rviz/rviz-1.14.14-r1.ebuild | 1 -
dev-ros/rviz/rviz-.ebuild | 1 -
3 files changed, 15 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
deleted file mode 100644
index 0e0eb3ed3384..
--- a/dev-ros/rviz/files/assimp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rviz-1.14.14/src/rviz/CMakeLists.txt
-===
rviz-1.14.14.orig/src/rviz/CMakeLists.txt
-+++ rviz-1.14.14/src/rviz/CMakeLists.txt
-@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
- ${rviz_ADDITIONAL_LIBRARIES}
- ${TinyXML2_LIBRARIES}
- ${X11_X11_LIB}
-- ${ASSIMP_LIBRARIES}
-+ ${assimp_LIBRARIES}
- ${YAML_CPP_LIBRARIES}
- )
-
diff --git a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-1.14.14-r1.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14-r1.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 918be539f8bc..95d1d0a86982 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -70,7 +70,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/yamlcpp.patch"
- "${FILESDIR}/assimp.patch"
)
src_test() {
[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/files/, dev-ros/rviz/
commit: b0e0c69fd10587c6abb19285fbf7c7ca38ec4503
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Mar 9 13:19:15 2022 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Mar 9 13:19:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e0c69f
dev-ros/rviz: properly find assimp
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier gentoo.org>
dev-ros/rviz/files/assimp.patch | 13 +
dev-ros/rviz/rviz-1.14.14.ebuild | 5 -
dev-ros/rviz/rviz-.ebuild| 5 -
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dev-ros/rviz/files/assimp.patch b/dev-ros/rviz/files/assimp.patch
new file mode 100644
index ..0e0eb3ed3384
--- /dev/null
+++ b/dev-ros/rviz/files/assimp.patch
@@ -0,0 +1,13 @@
+Index: rviz-1.14.14/src/rviz/CMakeLists.txt
+===
+--- rviz-1.14.14.orig/src/rviz/CMakeLists.txt
rviz-1.14.14/src/rviz/CMakeLists.txt
+@@ -145,7 +145,7 @@ target_link_libraries(${PROJECT_NAME}
+ ${rviz_ADDITIONAL_LIBRARIES}
+ ${TinyXML2_LIBRARIES}
+ ${X11_X11_LIB}
+- ${ASSIMP_LIBRARIES}
++ ${assimp_LIBRARIES}
+ ${YAML_CPP_LIBRARIES}
+ )
+
diff --git a/dev-ros/rviz/rviz-1.14.14.ebuild b/dev-ros/rviz/rviz-1.14.14.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-1.14.14.ebuild
+++ b/dev-ros/rviz/rviz-1.14.14.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
diff --git a/dev-ros/rviz/rviz-.ebuild b/dev-ros/rviz/rviz-.ebuild
index 7e06028e57f5..3772a4e7299a 100644
--- a/dev-ros/rviz/rviz-.ebuild
+++ b/dev-ros/rviz/rviz-.ebuild
@@ -68,7 +68,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/yamlcpp.patch" )
+PATCHES=(
+ "${FILESDIR}/yamlcpp.patch"
+ "${FILESDIR}/assimp.patch"
+)
src_test() {
virtx ros-catkin_src_test
