| 1 |
commit: 4e395289d603a579eb9f18fd02975b37e4e3ac87 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 7 16:08:04 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 7 16:16:40 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e395289 |
| 7 |
|
| 8 |
ci-libs/octomap: install package.xml in /usr/share/ros_packages/$PN |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.1 |
| 11 |
|
| 12 |
sci-libs/octomap/files/gentoo.patch | 39 ++++++++++++++++++++++ |
| 13 |
...map-1.8.0-r1.ebuild => octomap-1.8.0-r2.ebuild} | 1 + |
| 14 |
sci-libs/octomap/octomap-9999.ebuild | 1 + |
| 15 |
3 files changed, 41 insertions(+) |
| 16 |
|
| 17 |
diff --git a/sci-libs/octomap/files/gentoo.patch b/sci-libs/octomap/files/gentoo.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000..0fe7426 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sci-libs/octomap/files/gentoo.patch |
| 22 |
@@ -0,0 +1,39 @@ |
| 23 |
+Index: octomap-1.8.0/dynamicEDT3D/CMakeLists.txt |
| 24 |
+=================================================================== |
| 25 |
+--- octomap-1.8.0.orig/dynamicEDT3D/CMakeLists.txt |
| 26 |
++++ octomap-1.8.0/dynamicEDT3D/CMakeLists.txt |
| 27 |
+@@ -62,7 +62,7 @@ file(GLOB dynamicEDT3D_HDRS ${PROJECT_SO |
| 28 |
+ install(FILES ${dynamicEDT3D_HDRS} DESTINATION include/dynamicEDT3D) |
| 29 |
+ |
| 30 |
+ # Install catkin package.xml, attention package.xml names the catkin package "dynamic_edt_3d", so this is also the location where it needs to be installed to (and not "dynamicEDT3D") |
| 31 |
+-install(FILES package.xml DESTINATION share/dynamic_edt_3d) |
| 32 |
++install(FILES package.xml DESTINATION share/ros_packages/dynamic_edt_3d) |
| 33 |
+ |
| 34 |
+ #TODO: this conflicts with the octomap uninstall |
| 35 |
+ #it is not only a target name problem, also both will use the same manifest file |
| 36 |
+Index: octomap-1.8.0/octomap/CMakeLists.txt |
| 37 |
+=================================================================== |
| 38 |
+--- octomap-1.8.0.orig/octomap/CMakeLists.txt |
| 39 |
++++ octomap-1.8.0/octomap/CMakeLists.txt |
| 40 |
+@@ -65,7 +65,7 @@ file(GLOB octomap_math_HDRS ${PROJECT_SO |
| 41 |
+ install(FILES ${octomap_math_HDRS} DESTINATION include/octomap/math) |
| 42 |
+ |
| 43 |
+ # Install catkin package.xml |
| 44 |
+-install(FILES package.xml DESTINATION share/octomap) |
| 45 |
++install(FILES package.xml DESTINATION share/ros_packages/octomap) |
| 46 |
+ |
| 47 |
+ # uninstall target |
| 48 |
+ configure_file( |
| 49 |
+Index: octomap-1.8.0/octovis/CMakeLists.txt |
| 50 |
+=================================================================== |
| 51 |
+--- octomap-1.8.0.orig/octovis/CMakeLists.txt |
| 52 |
++++ octomap-1.8.0/octovis/CMakeLists.txt |
| 53 |
+@@ -126,7 +126,7 @@ IF(BUILD_VIEWER) |
| 54 |
+ install(FILES ${octovis_HDRS} DESTINATION include/octovis) |
| 55 |
+ |
| 56 |
+ # Install catkin package.xml |
| 57 |
+- install(FILES package.xml DESTINATION share/octovis) |
| 58 |
++ install(FILES package.xml DESTINATION share/ros_packages/octovis) |
| 59 |
+ |
| 60 |
+ ELSE() |
| 61 |
+ MESSAGE ( "Unfortunately, the viewer (octovis) can not be built because some requirements are missing.") |
| 62 |
|
| 63 |
diff --git a/sci-libs/octomap/octomap-1.8.0-r1.ebuild b/sci-libs/octomap/octomap-1.8.0-r2.ebuild |
| 64 |
similarity index 97% |
| 65 |
rename from sci-libs/octomap/octomap-1.8.0-r1.ebuild |
| 66 |
rename to sci-libs/octomap/octomap-1.8.0-r2.ebuild |
| 67 |
index 2b3509c..19df370 100644 |
| 68 |
--- a/sci-libs/octomap/octomap-1.8.0-r1.ebuild |
| 69 |
+++ b/sci-libs/octomap/octomap-1.8.0-r2.ebuild |
| 70 |
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND} |
| 71 |
media-gfx/graphviz |
| 72 |
) |
| 73 |
" |
| 74 |
+PATCHES=( "${FILESDIR}/gentoo.patch" ) |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \ |
| 78 |
|
| 79 |
diff --git a/sci-libs/octomap/octomap-9999.ebuild b/sci-libs/octomap/octomap-9999.ebuild |
| 80 |
index 2b3509c..19df370 100644 |
| 81 |
--- a/sci-libs/octomap/octomap-9999.ebuild |
| 82 |
+++ b/sci-libs/octomap/octomap-9999.ebuild |
| 83 |
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND} |
| 84 |
media-gfx/graphviz |
| 85 |
) |
| 86 |
" |
| 87 |
+PATCHES=( "${FILESDIR}/gentoo.patch" ) |
| 88 |
|
| 89 |
src_prepare() { |
| 90 |
sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \ |
Archives