| 1 |
commit: 8e34bc6370f7e1e0f0fc22b01b83e2e6a269e605 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 29 14:07:57 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 29 14:08:09 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e34bc63 |
| 7 |
|
| 8 |
sci-libs/rtabmap: bump to 0.11.12 and update live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
sci-libs/rtabmap/Manifest | 1 + |
| 13 |
...{rtabmap-9999.ebuild => rtabmap-0.11.12.ebuild} | 22 +++++++--------------- |
| 14 |
sci-libs/rtabmap/rtabmap-9999.ebuild | 22 +++++++--------------- |
| 15 |
3 files changed, 15 insertions(+), 30 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest |
| 18 |
index 0231742..cce9fc8 100644 |
| 19 |
--- a/sci-libs/rtabmap/Manifest |
| 20 |
+++ b/sci-libs/rtabmap/Manifest |
| 21 |
@@ -1 +1,2 @@ |
| 22 |
DIST rtabmap-0.10.10.tar.gz 17111390 SHA256 9c0a2c31b56f9e7162ae032da6c55b8781788b00ffdb2f474d8fd6fa870d7ffc SHA512 3267d60d0ad3554ebd543304c782f09f363dd0e77280e6ccbf459c569a5037efe41f7d981f4e64263329dd777f8ec6d9a3d56bfc8b94b48c11d008cc6c695aef WHIRLPOOL e12f0b3c7f9c22b07d3ba56860ec25e4b47a13bae3ebc2793243d17a0e11e2053515efb0cd37a2f7e4eb959aeba7f3ce2fa4a39e26ecb5349f0d4dbe3dd7be25 |
| 23 |
+DIST rtabmap-0.11.12.tar.gz 17734430 SHA256 92368a8409522efbb36271180c96815a2751c1698fe666d52a814a69c43063f2 SHA512 28ae35761bd878cc480fcc91f67d8c2142808fa0157a368436db9f91931256c14be40042d732491d4c26b8cfb3b9d72366f88ec652b66890ab538b5020e66f46 WHIRLPOOL acabcf01b0ad897d790b6bc5082ad7dd7e86f7df75797faafdf7b07b6ab4ff6b0456f75e3726bd47edc9465d4e1a8ae7036214f8191d4750022204430f938ca3 |
| 24 |
|
| 25 |
diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-0.11.12.ebuild |
| 26 |
similarity index 73% |
| 27 |
copy from sci-libs/rtabmap/rtabmap-9999.ebuild |
| 28 |
copy to sci-libs/rtabmap/rtabmap-0.11.12.ebuild |
| 29 |
index 8fdd408..8bd1ed2 100644 |
| 30 |
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild |
| 31 |
+++ b/sci-libs/rtabmap/rtabmap-0.11.12.ebuild |
| 32 |
@@ -1,4 +1,4 @@ |
| 33 |
-# Copyright 1999-2015 Gentoo Foundation |
| 34 |
+# Copyright 1999-2016 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
# $Id$ |
| 37 |
|
| 38 |
@@ -24,29 +24,21 @@ DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)" |
| 39 |
HOMEPAGE="http://introlab.github.io/rtabmap/" |
| 40 |
LICENSE="BSD" |
| 41 |
SLOT="0" |
| 42 |
-IUSE="ieee1394 openni2 qt4 qt5" |
| 43 |
+IUSE="examples ieee1394 openni2 qt5" |
| 44 |
|
| 45 |
RDEPEND=" |
| 46 |
- media-libs/opencv:= |
| 47 |
+ media-libs/opencv:=[qt5(-)?] |
| 48 |
sci-libs/pcl[openni,vtk] |
| 49 |
- sci-libs/vtk |
| 50 |
+ sci-libs/vtk[qt5(-)?] |
| 51 |
sys-libs/zlib |
| 52 |
+ sci-libs/octomap:= |
| 53 |
ieee1394? ( media-libs/libdc1394 ) |
| 54 |
openni2? ( dev-libs/OpenNI2 ) |
| 55 |
- !qt5? ( |
| 56 |
- qt4? ( |
| 57 |
- dev-qt/qtgui:4 |
| 58 |
- dev-qt/qtsvg:4 |
| 59 |
- dev-qt/qtcore:4 |
| 60 |
- media-libs/opencv[-qt5(-)] |
| 61 |
- ) |
| 62 |
- ) |
| 63 |
qt5? ( |
| 64 |
dev-qt/qtwidgets:5 |
| 65 |
dev-qt/qtcore:5 |
| 66 |
dev-qt/qtgui:5 |
| 67 |
dev-qt/qtsvg:5 |
| 68 |
- media-libs/opencv[qt5(-)] |
| 69 |
) |
| 70 |
" |
| 71 |
DEPEND="${RDEPEND} |
| 72 |
@@ -54,10 +46,10 @@ DEPEND="${RDEPEND} |
| 73 |
|
| 74 |
src_configure() { |
| 75 |
local mycmakeargs=( |
| 76 |
- "-DWITH_QT=$(usex qt4 ON "$(usex qt5 ON OFF)")" |
| 77 |
- "-DRTABMAP_QT_VERSION=$(usex qt5 5 4)" |
| 78 |
+ "-DWITH_QT=$(usex qt5 ON OFF)" |
| 79 |
"-DWITH_DC1394=$(usex ieee1394 ON OFF)" |
| 80 |
"-DWITH_OPENNI2=$(usex openni2 ON OFF)" |
| 81 |
+ "-DBUILD_EXAMPLES=$(usex examples ON OFF)" |
| 82 |
) |
| 83 |
cmake-utils_src_configure |
| 84 |
} |
| 85 |
|
| 86 |
diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild |
| 87 |
index 8fdd408..8bd1ed2 100644 |
| 88 |
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild |
| 89 |
+++ b/sci-libs/rtabmap/rtabmap-9999.ebuild |
| 90 |
@@ -1,4 +1,4 @@ |
| 91 |
-# Copyright 1999-2015 Gentoo Foundation |
| 92 |
+# Copyright 1999-2016 Gentoo Foundation |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
# $Id$ |
| 95 |
|
| 96 |
@@ -24,29 +24,21 @@ DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)" |
| 97 |
HOMEPAGE="http://introlab.github.io/rtabmap/" |
| 98 |
LICENSE="BSD" |
| 99 |
SLOT="0" |
| 100 |
-IUSE="ieee1394 openni2 qt4 qt5" |
| 101 |
+IUSE="examples ieee1394 openni2 qt5" |
| 102 |
|
| 103 |
RDEPEND=" |
| 104 |
- media-libs/opencv:= |
| 105 |
+ media-libs/opencv:=[qt5(-)?] |
| 106 |
sci-libs/pcl[openni,vtk] |
| 107 |
- sci-libs/vtk |
| 108 |
+ sci-libs/vtk[qt5(-)?] |
| 109 |
sys-libs/zlib |
| 110 |
+ sci-libs/octomap:= |
| 111 |
ieee1394? ( media-libs/libdc1394 ) |
| 112 |
openni2? ( dev-libs/OpenNI2 ) |
| 113 |
- !qt5? ( |
| 114 |
- qt4? ( |
| 115 |
- dev-qt/qtgui:4 |
| 116 |
- dev-qt/qtsvg:4 |
| 117 |
- dev-qt/qtcore:4 |
| 118 |
- media-libs/opencv[-qt5(-)] |
| 119 |
- ) |
| 120 |
- ) |
| 121 |
qt5? ( |
| 122 |
dev-qt/qtwidgets:5 |
| 123 |
dev-qt/qtcore:5 |
| 124 |
dev-qt/qtgui:5 |
| 125 |
dev-qt/qtsvg:5 |
| 126 |
- media-libs/opencv[qt5(-)] |
| 127 |
) |
| 128 |
" |
| 129 |
DEPEND="${RDEPEND} |
| 130 |
@@ -54,10 +46,10 @@ DEPEND="${RDEPEND} |
| 131 |
|
| 132 |
src_configure() { |
| 133 |
local mycmakeargs=( |
| 134 |
- "-DWITH_QT=$(usex qt4 ON "$(usex qt5 ON OFF)")" |
| 135 |
- "-DRTABMAP_QT_VERSION=$(usex qt5 5 4)" |
| 136 |
+ "-DWITH_QT=$(usex qt5 ON OFF)" |
| 137 |
"-DWITH_DC1394=$(usex ieee1394 ON OFF)" |
| 138 |
"-DWITH_OPENNI2=$(usex openni2 ON OFF)" |
| 139 |
+ "-DBUILD_EXAMPLES=$(usex examples ON OFF)" |
| 140 |
) |
| 141 |
cmake-utils_src_configure |
| 142 |
} |
Archives