[gentoo-commits] repo/gentoo:master commit in: sci-libs/rtabmap/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/rtabmap/
Date: Thu, 29 Dec 2016 14:08:17 +0000 (UTC)	[thread overview]
Message-ID: <1483020489.8e34bc6370f7e1e0f0fc22b01b83e2e6a269e605.aballier@gentoo> (raw)

commit:     8e34bc6370f7e1e0f0fc22b01b83e2e6a269e605
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 14:07:57 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 14:08:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e34bc63

sci-libs/rtabmap: bump to 0.11.12 and update live ebuild

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/rtabmap/Manifest                          |  1 +
 ...{rtabmap-9999.ebuild => rtabmap-0.11.12.ebuild} | 22 +++++++---------------
 sci-libs/rtabmap/rtabmap-9999.ebuild               | 22 +++++++---------------
 3 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 0231742..cce9fc8 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1 +1,2 @@
 DIST rtabmap-0.10.10.tar.gz 17111390 SHA256 9c0a2c31b56f9e7162ae032da6c55b8781788b00ffdb2f474d8fd6fa870d7ffc SHA512 3267d60d0ad3554ebd543304c782f09f363dd0e77280e6ccbf459c569a5037efe41f7d981f4e64263329dd777f8ec6d9a3d56bfc8b94b48c11d008cc6c695aef WHIRLPOOL e12f0b3c7f9c22b07d3ba56860ec25e4b47a13bae3ebc2793243d17a0e11e2053515efb0cd37a2f7e4eb959aeba7f3ce2fa4a39e26ecb5349f0d4dbe3dd7be25
+DIST rtabmap-0.11.12.tar.gz 17734430 SHA256 92368a8409522efbb36271180c96815a2751c1698fe666d52a814a69c43063f2 SHA512 28ae35761bd878cc480fcc91f67d8c2142808fa0157a368436db9f91931256c14be40042d732491d4c26b8cfb3b9d72366f88ec652b66890ab538b5020e66f46 WHIRLPOOL acabcf01b0ad897d790b6bc5082ad7dd7e86f7df75797faafdf7b07b6ab4ff6b0456f75e3726bd47edc9465d4e1a8ae7036214f8191d4750022204430f938ca3

diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-0.11.12.ebuild
similarity index 73%
copy from sci-libs/rtabmap/rtabmap-9999.ebuild
copy to sci-libs/rtabmap/rtabmap-0.11.12.ebuild
index 8fdd408..8bd1ed2 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-0.11.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,29 +24,21 @@ DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
 HOMEPAGE="http://introlab.github.io/rtabmap/"
 LICENSE="BSD"
 SLOT="0"
-IUSE="ieee1394 openni2 qt4 qt5"
+IUSE="examples ieee1394 openni2 qt5"
 
 RDEPEND="
-	media-libs/opencv:=
+	media-libs/opencv:=[qt5(-)?]
 	sci-libs/pcl[openni,vtk]
-	sci-libs/vtk
+	sci-libs/vtk[qt5(-)?]
 	sys-libs/zlib
+	sci-libs/octomap:=
 	ieee1394? ( media-libs/libdc1394 )
 	openni2? ( dev-libs/OpenNI2 )
-	!qt5? (
-		qt4? (
-			dev-qt/qtgui:4
-			dev-qt/qtsvg:4
-			dev-qt/qtcore:4
-			media-libs/opencv[-qt5(-)]
-		)
-	)
 	qt5? (
 		dev-qt/qtwidgets:5
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtsvg:5
-		media-libs/opencv[qt5(-)]
 	)
 "
 DEPEND="${RDEPEND}
@@ -54,10 +46,10 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		"-DWITH_QT=$(usex qt4 ON "$(usex qt5 ON OFF)")"
-		"-DRTABMAP_QT_VERSION=$(usex qt5 5 4)"
+		"-DWITH_QT=$(usex qt5 ON OFF)"
 		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
 		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
+		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
 	)
 	cmake-utils_src_configure
 }

diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild
index 8fdd408..8bd1ed2 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,29 +24,21 @@ DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
 HOMEPAGE="http://introlab.github.io/rtabmap/"
 LICENSE="BSD"
 SLOT="0"
-IUSE="ieee1394 openni2 qt4 qt5"
+IUSE="examples ieee1394 openni2 qt5"
 
 RDEPEND="
-	media-libs/opencv:=
+	media-libs/opencv:=[qt5(-)?]
 	sci-libs/pcl[openni,vtk]
-	sci-libs/vtk
+	sci-libs/vtk[qt5(-)?]
 	sys-libs/zlib
+	sci-libs/octomap:=
 	ieee1394? ( media-libs/libdc1394 )
 	openni2? ( dev-libs/OpenNI2 )
-	!qt5? (
-		qt4? (
-			dev-qt/qtgui:4
-			dev-qt/qtsvg:4
-			dev-qt/qtcore:4
-			media-libs/opencv[-qt5(-)]
-		)
-	)
 	qt5? (
 		dev-qt/qtwidgets:5
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtsvg:5
-		media-libs/opencv[qt5(-)]
 	)
 "
 DEPEND="${RDEPEND}
@@ -54,10 +46,10 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		"-DWITH_QT=$(usex qt4 ON "$(usex qt5 ON OFF)")"
-		"-DRTABMAP_QT_VERSION=$(usex qt5 5 4)"
+		"-DWITH_QT=$(usex qt5 ON OFF)"
 		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
 		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
+		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
 	)
 	cmake-utils_src_configure
 }

next             reply	other threads:[~2016-12-29 14:08 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-29 14:08 Alexis Ballier [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-06-06 12:51 [gentoo-commits] repo/gentoo:master commit in: sci-libs/rtabmap/ Alexis Ballier
2024-11-25 15:32 Andreas Sturmlechner
2024-11-25 15:32 Andreas Sturmlechner
2024-01-15  8:01 Alexis Ballier
2023-02-23 16:34 Alexis Ballier
2023-02-01 19:27 Andreas Sturmlechner
2021-02-15  0:32 Sam James
2020-08-31  9:10 Alexis Ballier
2020-08-25 14:29 Alexis Ballier
2019-12-10 17:35 Alexis Ballier
2019-12-10 17:35 Alexis Ballier
2019-08-28 17:02 Alexis Ballier
2019-08-28 17:02 Alexis Ballier
2018-12-05 14:50 Alexis Ballier
2018-05-28  8:14 Alexis Ballier
2018-01-13 12:16 Alexis Ballier
2017-10-04 11:09 Alexis Ballier
2017-09-12 11:23 Alexis Ballier
2017-09-12 11:23 Alexis Ballier
2017-08-15  6:25 Alexis Ballier
2017-08-15  6:25 Alexis Ballier
2017-06-27 11:22 Alexis Ballier
2017-05-25 14:50 Alexis Ballier
2017-04-06  8:21 Alexis Ballier
2017-04-06  8:21 Alexis Ballier
2017-03-04 13:37 Alexis Ballier
2017-02-28 11:27 Alexis Ballier
2017-02-28 11:27 Alexis Ballier
2017-01-31  8:56 Alexis Ballier
2017-01-26 23:10 Alexis Ballier
2017-01-07 14:40 Alexis Ballier
2017-01-07 14:40 Alexis Ballier
2016-12-29 14:08 Alexis Ballier
2015-11-02  9:23 Alexis Ballier
2015-09-18 13:49 Alexis Ballier
2015-08-29 17:41 Alexis Ballier

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:0231742 dfblob:cce9fc8 dfblob:8fdd408 dfblob:8bd1ed2
dfblob:8fdd408 dfblob:8bd1ed2 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sci-libs/rtabmap/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1483020489.8e34bc6370f7e1e0f0fc22b01b83e2e6a269e605.aballier@gentoo \
    --to=aballier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox