From 87c4ac3e7b69fa9b6141f93d38461ce846431ab2 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Thu, 20 Oct 2016 14:02:04 +0200 Subject: dev-ros/rviz: install ressources in /usr/share/ros_packages since they are expected here. Package-Manager: portage-2.3.2 --- dev-ros/rviz/files/install_loc.patch | 30 ++++++++++++++++ dev-ros/rviz/rviz-1.12.3-r1.ebuild | 68 ++++++++++++++++++++++++++++++++++++ dev-ros/rviz/rviz-1.12.3.ebuild | 68 ------------------------------------ 3 files changed, 98 insertions(+), 68 deletions(-) create mode 100644 dev-ros/rviz/files/install_loc.patch create mode 100644 dev-ros/rviz/rviz-1.12.3-r1.ebuild delete mode 100644 dev-ros/rviz/rviz-1.12.3.ebuild (limited to 'dev-ros') diff --git a/dev-ros/rviz/files/install_loc.patch b/dev-ros/rviz/files/install_loc.patch new file mode 100644 index 00000000000..a77968db860 --- /dev/null +++ b/dev-ros/rviz/files/install_loc.patch @@ -0,0 +1,30 @@ +Install ressources in ros_packages subdir. We force catkin to install packages +there, so move them too. + +Index: rviz-1.12.3/CMakeLists.txt +=================================================================== +--- rviz-1.12.3.orig/CMakeLists.txt ++++ rviz-1.12.3/CMakeLists.txt +@@ -220,17 +220,17 @@ include_directories(src ${catkin_INCLUDE + add_subdirectory(src) + + install(DIRECTORY ogre_media +- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ++ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME} + ) + install(DIRECTORY icons +- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ++ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME} + ) + install(DIRECTORY images +- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ++ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME} + ) + install(FILES default.rviz +- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ++ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME} + ) + install(FILES plugin_description.xml +- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ++ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME} + ) diff --git a/dev-ros/rviz/rviz-1.12.3-r1.ebuild b/dev-ros/rviz/rviz-1.12.3-r1.ebuild new file mode 100644 index 00000000000..9a57761fbe3 --- /dev/null +++ b/dev-ros/rviz/rviz-1.12.3-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros-visualization/rviz" +KEYWORDS="~amd64" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin flag-o-matic + +DESCRIPTION="3D visualization tool for ROS" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-libs/boost:=[threads] + media-libs/assimp + dev-games/ogre + virtual/opengl + dev-qt/qtwidgets:5 + dev-qt/qtcore:5 + dev-qt/qtopengl:5 + dev-cpp/eigen:3 + dev-cpp/yaml-cpp + dev-libs/urdfdom:= + >=dev-libs/urdfdom_headers-1 + + dev-ros/angles + dev-ros/image_geometry + dev-ros/image_transport + dev-ros/interactive_markers + dev-ros/laser_geometry + dev-ros/message_filters + dev-ros/pluginlib + >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}] + dev-ros/resource_retriever + dev-ros/rosbag[${PYTHON_USEDEP}] + dev-ros/rosconsole + dev-ros/roscpp + dev-ros/roslib[${PYTHON_USEDEP}] + dev-ros/rospy[${PYTHON_USEDEP}] + dev-ros/tf + >=dev-ros/urdf-1.12.3-r1 + + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND} + dev-ros/cmake_modules + virtual/pkgconfig + test? ( + dev-ros/rostest[${PYTHON_USEDEP}] + dev-cpp/gtest + )" +PATCHES=( "${FILESDIR}/urdfdom1-2.patch" "${FILESDIR}/install_loc.patch" ) + +src_configure() { + local mycatkincmakeargs=( "-DUseQt5=ON" ) + ros-catkin_src_configure +} diff --git a/dev-ros/rviz/rviz-1.12.3.ebuild b/dev-ros/rviz/rviz-1.12.3.ebuild deleted file mode 100644 index 91649dd6264..00000000000 --- a/dev-ros/rviz/rviz-1.12.3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros-visualization/rviz" -KEYWORDS="~amd64" -PYTHON_COMPAT=( python2_7 ) - -inherit ros-catkin flag-o-matic - -DESCRIPTION="3D visualization tool for ROS" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-libs/boost:=[threads] - media-libs/assimp - dev-games/ogre - virtual/opengl - dev-qt/qtwidgets:5 - dev-qt/qtcore:5 - dev-qt/qtopengl:5 - dev-cpp/eigen:3 - dev-cpp/yaml-cpp - dev-libs/urdfdom:= - >=dev-libs/urdfdom_headers-1 - - dev-ros/angles - dev-ros/image_geometry - dev-ros/image_transport - dev-ros/interactive_markers - dev-ros/laser_geometry - dev-ros/message_filters - dev-ros/pluginlib - >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}] - dev-ros/resource_retriever - dev-ros/rosbag[${PYTHON_USEDEP}] - dev-ros/rosconsole - dev-ros/roscpp - dev-ros/roslib[${PYTHON_USEDEP}] - dev-ros/rospy[${PYTHON_USEDEP}] - dev-ros/tf - >=dev-ros/urdf-1.12.3-r1 - - dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] -" -DEPEND="${RDEPEND} - dev-ros/cmake_modules - virtual/pkgconfig - test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-cpp/gtest - )" -PATCHES=( "${FILESDIR}/urdfdom1-2.patch" ) - -src_configure() { - local mycatkincmakeargs=( "-DUseQt5=ON" ) - ros-catkin_src_configure -} -- cgit v1.2.1