Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/rtabmap/
Date: Sat, 29 Aug 2015 17:42:04
Message-Id: 1440870106.3ba53f346d90d522629262ed7ec73ec09b7672ae.aballier@gentoo
1 commit: 3ba53f346d90d522629262ed7ec73ec09b7672ae
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 29 17:41:33 2015 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 29 17:41:46 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba53f34
7
8 sci-libs/rtabmap: Bump to 0.10.5 and update live ebuild.
9
10 Package-Manager: portage-2.2.20.1
11
12 sci-libs/rtabmap/Manifest | 1 +
13 .../{rtabmap-9999.ebuild => rtabmap-0.10.5.ebuild} | 15 +++++++++------
14 sci-libs/rtabmap/rtabmap-9999.ebuild | 15 +++++++++------
15 3 files changed, 19 insertions(+), 12 deletions(-)
16
17 diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
18 index 7ce03fd..62bd318 100644
19 --- a/sci-libs/rtabmap/Manifest
20 +++ b/sci-libs/rtabmap/Manifest
21 @@ -1,3 +1,4 @@
22 +DIST rtabmap-0.10.5.tar.gz 16975400 SHA256 2c783d7a3c872b084bde18466863fda6d8c8247ff279dbee40f1d3da69b1667a SHA512 a144387d6cbe4ad9b656216c269505768a60408ae9486b41d85c8ed0f8a1212b8f598d392c147d042f8b3ade57974b2b8ae6e5ec8c47e6a18f11d53ce8a086e9 WHIRLPOOL 76faf97da79a5c7693b6ca41422c92d5bb47b6c1cc6ccec6658df2721ad1219ba41be3a6c15bf3c9f9d7c7b9e384141d04c1c996fe604edab2b3e03506c7f8c5
23 DIST rtabmap-0.8.2.tar.gz 16314234 SHA256 058006a00e550187ca382308985723573735e64bc7bb833357a47929949ef6b0 SHA512 fc2f3152c9651fc847881d773b788d0845a0c842ee3dd8508f395de0954072a0aeb0d37bf55389e29bcc4d14027845218dbda7ef346f2161669be6570eb785f5 WHIRLPOOL 5ac7b2b30742ff360d7755c016735f59542fe828c80689686a449f3ab4d2e40ad568ae9a0ad8d148cfd221e43da463e0409238b5a94ce600970a9d0162f97368
24 DIST rtabmap-0.8.3.tar.gz 16331307 SHA256 cc19a57fc50f5bccd25dda2383993f04164074348f6a75b1f83b8ae152b88ff8 SHA512 a326d3704bc4f1eeb1cc102919192b2999c49b1a5460ccb9c39721829a80e7889a4549b203f5aafeacdbe482e114de275508e3b22cb0a466cfa831e736766a30 WHIRLPOOL 7a338f58c0731b3ae9e2793432a720099cd84634b2115fa8d97b31066afa2fc8ec348a6c9e25fba691f6051d52ab1af62dddbac00dffc27c99a9658b52154011
25 DIST rtabmap-0.9.0.tar.gz 16871134 SHA256 d64afbf4075e249665a0d19259f40c587c8cebb11b70d60ad8c48b6822066ba1 SHA512 86002dbdbca917901b0a17c1eca948d012c5bd4b29bf334b093478b740a07b3bce6699340df41f64e477be19dad3be757bca6dba962939fba1ecb3c8462f9891 WHIRLPOOL 06d1201a4d7339df4941b45ce6785781659da96e8b2ab9f281bd13a23fa4f68b0f5e70b23e6479300cc128044e44159f8b9c73ac14cd631c704e9a66ad496a1e
26
27 diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-0.10.5.ebuild
28 similarity index 75%
29 copy from sci-libs/rtabmap/rtabmap-9999.ebuild
30 copy to sci-libs/rtabmap/rtabmap-0.10.5.ebuild
31 index c3183be..8fdd408 100644
32 --- a/sci-libs/rtabmap/rtabmap-9999.ebuild
33 +++ b/sci-libs/rtabmap/rtabmap-0.10.5.ebuild
34 @@ -28,7 +28,7 @@ IUSE="ieee1394 openni2 qt4 qt5"
35
36 RDEPEND="
37 media-libs/opencv:=
38 - sci-libs/pcl[openni]
39 + sci-libs/pcl[openni,vtk]
40 sci-libs/vtk
41 sys-libs/zlib
42 ieee1394? ( media-libs/libdc1394 )
43 @@ -38,6 +38,7 @@ RDEPEND="
44 dev-qt/qtgui:4
45 dev-qt/qtsvg:4
46 dev-qt/qtcore:4
47 + media-libs/opencv[-qt5(-)]
48 )
49 )
50 qt5? (
51 @@ -45,16 +46,18 @@ RDEPEND="
52 dev-qt/qtcore:5
53 dev-qt/qtgui:5
54 dev-qt/qtsvg:5
55 + media-libs/opencv[qt5(-)]
56 )
57 "
58 DEPEND="${RDEPEND}
59 virtual/pkgconfig"
60
61 src_configure() {
62 - local mycmakeargs=()
63 - use ieee1394 || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_DC1394=TRUE" )
64 - use openni2 || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_OpenNI2=TRUE" )
65 - use qt4 || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=TRUE" )
66 - use qt5 && mycmakeargs+=( "-DRTABMAP_QT_VERSION=5" )
67 + local mycmakeargs=(
68 + "-DWITH_QT=$(usex qt4 ON "$(usex qt5 ON OFF)")"
69 + "-DRTABMAP_QT_VERSION=$(usex qt5 5 4)"
70 + "-DWITH_DC1394=$(usex ieee1394 ON OFF)"
71 + "-DWITH_OPENNI2=$(usex openni2 ON OFF)"
72 + )
73 cmake-utils_src_configure
74 }
75
76 diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild
77 index c3183be..8fdd408 100644
78 --- a/sci-libs/rtabmap/rtabmap-9999.ebuild
79 +++ b/sci-libs/rtabmap/rtabmap-9999.ebuild
80 @@ -28,7 +28,7 @@ IUSE="ieee1394 openni2 qt4 qt5"
81
82 RDEPEND="
83 media-libs/opencv:=
84 - sci-libs/pcl[openni]
85 + sci-libs/pcl[openni,vtk]
86 sci-libs/vtk
87 sys-libs/zlib
88 ieee1394? ( media-libs/libdc1394 )
89 @@ -38,6 +38,7 @@ RDEPEND="
90 dev-qt/qtgui:4
91 dev-qt/qtsvg:4
92 dev-qt/qtcore:4
93 + media-libs/opencv[-qt5(-)]
94 )
95 )
96 qt5? (
97 @@ -45,16 +46,18 @@ RDEPEND="
98 dev-qt/qtcore:5
99 dev-qt/qtgui:5
100 dev-qt/qtsvg:5
101 + media-libs/opencv[qt5(-)]
102 )
103 "
104 DEPEND="${RDEPEND}
105 virtual/pkgconfig"
106
107 src_configure() {
108 - local mycmakeargs=()
109 - use ieee1394 || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_DC1394=TRUE" )
110 - use openni2 || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_OpenNI2=TRUE" )
111 - use qt4 || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=TRUE" )
112 - use qt5 && mycmakeargs+=( "-DRTABMAP_QT_VERSION=5" )
113 + local mycmakeargs=(
114 + "-DWITH_QT=$(usex qt4 ON "$(usex qt5 ON OFF)")"
115 + "-DRTABMAP_QT_VERSION=$(usex qt5 5 4)"
116 + "-DWITH_DC1394=$(usex ieee1394 ON OFF)"
117 + "-DWITH_OPENNI2=$(usex openni2 ON OFF)"
118 + )
119 cmake-utils_src_configure
120 }