public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-libs/rtabmap: rtabmap-0.9.0.ebuild ChangeLog rtabmap-9999.ebuild
@ 2015-05-18  7:53 Alexis Ballier (aballier)
  0 siblings, 0 replies; only message in thread
From: Alexis Ballier (aballier) @ 2015-05-18  7:53 UTC (permalink / raw
  To: gentoo-commits

aballier    15/05/18 07:53:59

  Modified:             ChangeLog rtabmap-9999.ebuild
  Added:                rtabmap-0.9.0.ebuild
  Log:
  version bump
  
  Signed-off-by: Alexis Ballier <aballier@gentoo.org>
  (Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.5                  sci-libs/rtabmap/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/rtabmap/ChangeLog?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/rtabmap/ChangeLog?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/rtabmap/ChangeLog?r1=1.4&r2=1.5

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/rtabmap/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog	16 Feb 2015 08:12:17 -0000	1.4
+++ ChangeLog	18 May 2015 07:53:59 -0000	1.5
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/rtabmap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/rtabmap/ChangeLog,v 1.4 2015/02/16 08:12:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/rtabmap/ChangeLog,v 1.5 2015/05/18 07:53:59 aballier Exp $
+
+*rtabmap-0.9.0 (18 May 2015)
+
+  18 May 2015; Alexis Ballier <aballier@gentoo.org> +rtabmap-0.9.0.ebuild,
+  rtabmap-9999.ebuild:
+  version bump
 
 *rtabmap-0.8.3 (16 Feb 2015)
 



1.3                  sci-libs/rtabmap/rtabmap-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/rtabmap/rtabmap-9999.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/rtabmap/rtabmap-9999.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/rtabmap/rtabmap-9999.ebuild?r1=1.2&r2=1.3

Index: rtabmap-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/rtabmap/rtabmap-9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rtabmap-9999.ebuild	12 Jan 2015 09:41:18 -0000	1.2
+++ rtabmap-9999.ebuild	18 May 2015 07:53:59 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/rtabmap/rtabmap-9999.ebuild,v 1.2 2015/01/12 09:41:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/rtabmap/rtabmap-9999.ebuild,v 1.3 2015/05/18 07:53:59 aballier Exp $
 
 EAPI=5
 
@@ -24,25 +24,37 @@
 HOMEPAGE="http://introlab.github.io/rtabmap/"
 LICENSE="BSD"
 SLOT="0"
-IUSE="qt4 openni2"
+IUSE="ieee1394 openni2 qt4 qt5"
 
 RDEPEND="
 	media-libs/opencv:=
 	sci-libs/pcl[openni]
 	sci-libs/vtk
 	sys-libs/zlib
+	ieee1394? ( media-libs/libdc1394 )
 	openni2? ( dev-libs/OpenNI2 )
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-		dev-qt/qtcore:4
+	!qt5? (
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtsvg:4
+			dev-qt/qtcore:4
+		)
+	)
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
 	)
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
-	use openni2 || sed -e 's/OpenNI2)/DiSaBlEd)/' -i CMakeLists.txt || die
-	use qt4     || sed -e 's/Qt4/DiSaBlEd/' -i CMakeLists.txt || die
+	local mycmakeargs=()
+	use ieee1394 || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_DC1394=TRUE" )
+	use openni2  || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_OpenNI2=TRUE" )
+	use qt4      || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=TRUE" )
+	use qt5      && mycmakeargs+=( "-DRTABMAP_QT_VERSION=5" )
 	cmake-utils_src_configure
 }



1.1                  sci-libs/rtabmap/rtabmap-0.9.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/rtabmap/rtabmap-0.9.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/rtabmap/rtabmap-0.9.0.ebuild?rev=1.1&content-type=text/plain

Index: rtabmap-0.9.0.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/rtabmap/rtabmap-0.9.0.ebuild,v 1.1 2015/05/18 07:53:59 aballier Exp $

EAPI=5

SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
	SCM="git-r3"
	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
fi

inherit ${SCM} cmake-utils multilib

if [ "${PV#9999}" != "${PV}" ] ; then
	KEYWORDS=""
	SRC_URI=""
else
	KEYWORDS="~amd64"
	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
fi

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"

RDEPEND="
	media-libs/opencv:=
	sci-libs/pcl[openni]
	sci-libs/vtk
	sys-libs/zlib
	ieee1394? ( media-libs/libdc1394 )
	openni2? ( dev-libs/OpenNI2 )
	!qt5? (
		qt4? (
			dev-qt/qtgui:4
			dev-qt/qtsvg:4
			dev-qt/qtcore:4
		)
	)
	qt5? (
		dev-qt/qtwidgets:5
		dev-qt/qtcore:5
		dev-qt/qtgui:5
		dev-qt/qtsvg:5
	)
"
DEPEND="${RDEPEND}
	virtual/pkgconfig"

src_configure() {
	local mycmakeargs=()
	use ieee1394 || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_DC1394=TRUE" )
	use openni2  || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_OpenNI2=TRUE" )
	use qt4      || mycmakeargs+=( "-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=TRUE" )
	use qt5      && mycmakeargs+=( "-DRTABMAP_QT_VERSION=5" )
	cmake-utils_src_configure
}





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-05-18  7:54 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-18  7:53 [gentoo-commits] gentoo-x86 commit in sci-libs/rtabmap: rtabmap-0.9.0.ebuild ChangeLog rtabmap-9999.ebuild Alexis Ballier (aballier)

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