diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2016-10-20 14:02:04 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2016-10-20 14:12:19 +0200 |
| commit | 87c4ac3e7b69fa9b6141f93d38461ce846431ab2 (patch) | |
| tree | 2c6027eca856e033ba537e5669ad78f9422b6943 /dev-ros/rviz | |
| parent | dev-ros/rviz: bump to 1.12.3 (diff) | |
| download | gentoo-87c4ac3e7b69fa9b6141f93d38461ce846431ab2.tar.gz gentoo-87c4ac3e7b69fa9b6141f93d38461ce846431ab2.tar.bz2 gentoo-87c4ac3e7b69fa9b6141f93d38461ce846431ab2.zip | |
dev-ros/rviz: install ressources in /usr/share/ros_packages since they are expected here.
Package-Manager: portage-2.3.2
Diffstat (limited to 'dev-ros/rviz')
| -rw-r--r-- | dev-ros/rviz/files/install_loc.patch | 30 | ||||
| -rw-r--r-- | dev-ros/rviz/rviz-1.12.3-r1.ebuild (renamed from dev-ros/rviz/rviz-1.12.3.ebuild) | 2 |
2 files changed, 31 insertions, 1 deletions
diff --git a/dev-ros/rviz/files/install_loc.patch b/dev-ros/rviz/files/install_loc.patch new file mode 100644 index 000000000000..a77968db860a --- /dev/null +++ b/dev-ros/rviz/files/install_loc.patch @@ -0,0 +1,30 @@ +Install ressources in ros_packages subdir. We force catkin to install packages +there, so move them too. + +Index: rviz-1.12.3/CMakeLists.txt +=================================================================== +--- rviz-1.12.3.orig/CMakeLists.txt ++++ rviz-1.12.3/CMakeLists.txt +@@ -220,17 +220,17 @@ include_directories(src ${catkin_INCLUDE + add_subdirectory(src) + + install(DIRECTORY ogre_media +- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ++ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME} + ) + install(DIRECTORY icons +- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ++ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME} + ) + install(DIRECTORY images +- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ++ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME} + ) + install(FILES default.rviz +- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ++ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME} + ) + install(FILES plugin_description.xml +- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ++ DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME} + ) diff --git a/dev-ros/rviz/rviz-1.12.3.ebuild b/dev-ros/rviz/rviz-1.12.3-r1.ebuild index 91649dd6264e..9a57761fbe3e 100644 --- a/dev-ros/rviz/rviz-1.12.3.ebuild +++ b/dev-ros/rviz/rviz-1.12.3-r1.ebuild @@ -60,7 +60,7 @@ DEPEND="${RDEPEND} dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )" -PATCHES=( "${FILESDIR}/urdfdom1-2.patch" ) +PATCHES=( "${FILESDIR}/urdfdom1-2.patch" "${FILESDIR}/install_loc.patch" ) src_configure() { local mycatkincmakeargs=( "-DUseQt5=ON" ) |