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

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

From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/rtabmap/
Date: Mon, 25 Nov 2024 15:32:34 +0000 (UTC)	[thread overview]
Message-ID: <1732548442.7d53f76de77ac8c0f716f2451bcca62010c0151f.asturm@gentoo> (raw)

commit:     7d53f76de77ac8c0f716f2451bcca62010c0151f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 13:49:08 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 15:27:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d53f76d

sci-libs/rtabmap: add 0.21.4, switch to Qt6, drop Qt5, unused multilib

Sort dependencies.

Closes: https://bugs.gentoo.org/944815
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/rtabmap/Manifest                          |  1 +
 .../{rtabmap-9999.ebuild => rtabmap-0.21.4.ebuild} | 50 ++++++++++------------
 sci-libs/rtabmap/rtabmap-9999.ebuild               | 50 ++++++++++------------
 3 files changed, 45 insertions(+), 56 deletions(-)

diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 53c3575548ce..f91eb8881fa2 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1 +1,2 @@
 DIST rtabmap-0.21.3.tar.gz 21956462 BLAKE2B 41c3c95715bc165d339a4a63747e40db4357ffd1b5151630689008a6856c4721805ec8def9b47ea487ca428641b5d253dfa5b62b1bbb14027168bbc0e4c350d3 SHA512 0b9b2d2fdcfdef0324fcde54a74ecec75786372f2df0bd8d9383ae71c500098bff016465a68ce2a9328d0a2beee4bf9b0af6b21435589ce1e91503fe2aca5d01
+DIST rtabmap-0.21.4.tar.gz 21963687 BLAKE2B aa1cd455624a5a0ac4529fe6f8cd95500a4e247cc71d40041d813ed551e7f0026ad73b2a7e37869cc600aacaac5d5aea5934ebc8f888bcfa2bb21359451c6f23 SHA512 72a0d2247485008c8656a6806aa0e062759debdf1ce05a6e15e73474f531e4f4d91f77b3f9f21bf01038a6cdee46aecfa2f1728537ac9571f97085b878879172

diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-0.21.4.ebuild
similarity index 62%
copy from sci-libs/rtabmap/rtabmap-9999.ebuild
copy to sci-libs/rtabmap/rtabmap-0.21.4.ebuild
index 88c172c29ffb..89d5ba388dbb 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-0.21.4.ebuild
@@ -3,45 +3,38 @@
 
 EAPI=8
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
-fi
-
-inherit ${SCM} cmake multilib
-
 VER_SUFFIX=noetic
+inherit cmake
 
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
 else
-	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/introlab/rtabmap/archive/refs/tags/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P}-${VER_SUFFIX}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
-HOMEPAGE="http://introlab.github.io/rtabmap/"
+HOMEPAGE="https://introlab.github.io/rtabmap/"
+
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples ieee1394 openni2 qt5"
+IUSE="examples ieee1394 openni2 qt6"
 
 RDEPEND="
-	media-libs/opencv:=[qt5(-)?]
-	sci-libs/pcl:=[openni,vtk,qt5(-)?]
-	sci-libs/vtk:=[qt5(-)?]
-	sys-libs/zlib
-	sci-libs/octomap:=
-	dev-libs/boost:=
 	dev-cpp/yaml-cpp:=
+	dev-libs/boost:=
+	media-libs/opencv:=[qt6(-)?]
+	sci-libs/octomap:=
+	sci-libs/pcl:=[openni,vtk,qt6(-)?]
+	sci-libs/vtk:=[qt6(-)?]
+	sys-libs/zlib
 	ieee1394? ( media-libs/libdc1394:2= )
 	openni2? ( dev-libs/OpenNI2 )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
+	qt6? (
+		dev-qt/qtbase:6[gui,widgets]
+		dev-qt/qtsvg:6
 	)
 "
 DEPEND="${RDEPEND}"
@@ -49,10 +42,11 @@ BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local mycmakeargs=(
-		"-DWITH_QT=$(usex qt5 ON OFF)"
-		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
-		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
+		-DRTABMAP_QT_VERSION=6
+		-DWITH_QT=$(usex qt6)
+		-DWITH_DC1394=$(usex ieee1394)
+		-DWITH_OPENNI2=$(usex openni2)
+		-DBUILD_EXAMPLES=$(usex examples)
 	)
 	cmake_src_configure
 }

diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild
index 88c172c29ffb..89d5ba388dbb 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-9999.ebuild
@@ -3,45 +3,38 @@
 
 EAPI=8
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
-fi
-
-inherit ${SCM} cmake multilib
-
 VER_SUFFIX=noetic
+inherit cmake
 
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
 else
-	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/introlab/rtabmap/archive/refs/tags/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P}-${VER_SUFFIX}"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
-HOMEPAGE="http://introlab.github.io/rtabmap/"
+HOMEPAGE="https://introlab.github.io/rtabmap/"
+
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples ieee1394 openni2 qt5"
+IUSE="examples ieee1394 openni2 qt6"
 
 RDEPEND="
-	media-libs/opencv:=[qt5(-)?]
-	sci-libs/pcl:=[openni,vtk,qt5(-)?]
-	sci-libs/vtk:=[qt5(-)?]
-	sys-libs/zlib
-	sci-libs/octomap:=
-	dev-libs/boost:=
 	dev-cpp/yaml-cpp:=
+	dev-libs/boost:=
+	media-libs/opencv:=[qt6(-)?]
+	sci-libs/octomap:=
+	sci-libs/pcl:=[openni,vtk,qt6(-)?]
+	sci-libs/vtk:=[qt6(-)?]
+	sys-libs/zlib
 	ieee1394? ( media-libs/libdc1394:2= )
 	openni2? ( dev-libs/OpenNI2 )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
+	qt6? (
+		dev-qt/qtbase:6[gui,widgets]
+		dev-qt/qtsvg:6
 	)
 "
 DEPEND="${RDEPEND}"
@@ -49,10 +42,11 @@ BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local mycmakeargs=(
-		"-DWITH_QT=$(usex qt5 ON OFF)"
-		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
-		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
+		-DRTABMAP_QT_VERSION=6
+		-DWITH_QT=$(usex qt6)
+		-DWITH_DC1394=$(usex ieee1394)
+		-DWITH_OPENNI2=$(usex openni2)
+		-DBUILD_EXAMPLES=$(usex examples)
 	)
 	cmake_src_configure
 }

next             reply	other threads:[~2024-11-25 15:32 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-25 15:32 Andreas Sturmlechner [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-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
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:53c3575548c dfblob:f91eb8881fa dfblob:88c172c29ff
dfblob:89d5ba388db dfblob:88c172c29ff dfblob:89d5ba388db )
 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=1732548442.7d53f76de77ac8c0f716f2451bcca62010c0151f.asturm@gentoo \
    --to=asturm@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