commit: 13d23e48d9e56378bea335b20bb881316763951c
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 10:15:46 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 10:23:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13d23e48
sci-libs/pcl: add 1.14.0, add USE=qt6
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/pcl/Manifest | 1 +
sci-libs/pcl/{pcl-9999.ebuild => pcl-1.14.0.ebuild} | 18 ++++++++++++++++--
sci-libs/pcl/pcl-9999.ebuild | 18 ++++++++++++++++--
3 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 9996d4fb3683..521a0897efe1 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,2 +1,3 @@
DIST pcl-1.12.1.tar.gz 68565637 BLAKE2B
e93ecc9e562ba0ab6d91fbc9d890accacafe4558ddcf4950ed46d7f11bcc2b74111ea249ac2a300c2411f553f4d267467dbe77af54d8eb9538ce27e98f19a913
SHA512
5cef7699ad69df67129520b50405d62b6a1c37da791b472c112e4e0b9f24b4a37303344c774ec121370495492eee1e61c8565dee58aabec090795585365afc1b
DIST pcl-1.13.1.tar.gz 68647700 BLAKE2B
e14e4d971a8c52b375887421eced62fd443b11c48146216e4e6898a53f775656c80520514956c51a0853a14c2788a7f19d87d44580569156d39c41a95285f03d
SHA512
f6860b2103cb033839d044c3fed1fc3e8a989cd4f9776ae9d20e7d381b05eff8efde33dd06316ce419b44d877877ed21735d80b09d1daf64b0f94cdd302374fb
+DIST pcl-1.14.0.tar.gz 68662907 BLAKE2B
5e797666b2a6cd5b828b399592daaa78c3bcbc0968c1ec5dafe441717bb4067de4604cdab11d3317370c7f69a1b29db0cca6348e91697d16846ae44c1952ce3e
SHA512
0ea388d5f4ccdc1e5fcace6a1e1b90843be1a4ed2e1d37cc3c80d8abc0e868324d8f9da80513f1cb3f16738e00586f29cac151ce0d501645514f280aee8b1d7f
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-1.14.0.ebuild
similarity index 86%
copy from sci-libs/pcl/pcl-9999.ebuild
copy to sci-libs/pcl/pcl-1.14.0.ebuild
index 9de81c659155..6247e7718047 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-1.14.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://pointclouds.org/";
DESCRIPTION="2D/3D image and point cloud processing"
LICENSE="BSD"
SLOT="0/$(ver_cut 1-2)"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk
cpu_flags_x86_sse test tutorials"
+IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 qt6 usb vtk
cpu_flags_x86_sse test tutorials"
# tests need the gtest sources to be available at build time
RESTRICT="test"
@@ -37,6 +37,13 @@ RDEPEND="
dev-qt/qtcore:5
dev-qt/qtconcurrent:5
dev-qt/qtopengl:5
+ vtk? ( sci-libs/vtk[qt5] )
+ )
+ qt6? (
+ !qt5? (
+ dev-qt/qtbase:6[concurrent,gui,opengl]
+ vtk? ( sci-libs/vtk[-qt5,qt6] )
+ )
)
usb? ( virtual/libusb:1 )
vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] )
@@ -87,7 +94,6 @@ src_configure() {
"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
"-DWITH_PNG=$(usex png TRUE FALSE)"
"-DWITH_QHULL=$(usex qhull TRUE FALSE)"
- "-DWITH_QT=$(usex qt5 TRUE FALSE)"
"-DWITH_VTK=$(usex vtk TRUE FALSE)"
"-DWITH_PCAP=$(usex pcap TRUE FALSE)"
"-DWITH_OPENNI=$(usex openni TRUE FALSE)"
@@ -98,5 +104,13 @@ src_configure() {
"-DBUILD_global_tests=FALSE"
)
+ if use qt5; then
+ mycmakeargs+=( "-DWITH_QT=QT5" )
+ elif use qt6; then
+ mycmakeargs+=( "-DWITH_QT=QT6" )
+ else
+ mycmakeargs+=( "-DWITH_QT=NO" )
+ fi
+
cmake_src_configure
}
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index 9de81c659155..6247e7718047 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://pointclouds.org/";
DESCRIPTION="2D/3D image and point cloud processing"
LICENSE="BSD"
SLOT="0/$(ver_cut 1-2)"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk
cpu_flags_x86_sse test tutorials"
+IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 qt6 usb vtk
cpu_flags_x86_sse test tutorials"
# tests need the gtest sources to be available at build time
RESTRICT="test"
@@ -37,6 +37,13 @@ RDEPEND="
dev-qt/qtcore:5
dev-qt/qtconcurrent:5
dev-qt/qtopengl:5
+ vtk? ( sci-libs/vtk[qt5] )
+ )
+ qt6? (
+ !qt5? (
+ dev-qt/qtbase:6[concurrent,gui,opengl]
+ vtk? ( sci-libs/vtk[-qt5,qt6] )
+ )
)
usb? ( virtual/libusb:1 )
vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] )
@@ -87,7 +94,6 @@ src_configure() {
"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
"-DWITH_PNG=$(usex png TRUE FALSE)"
"-DWITH_QHULL=$(usex qhull TRUE FALSE)"
- "-DWITH_QT=$(usex qt5 TRUE FALSE)"
"-DWITH_VTK=$(usex vtk TRUE FALSE)"
"-DWITH_PCAP=$(usex pcap TRUE FALSE)"
"-DWITH_OPENNI=$(usex openni TRUE FALSE)"
@@ -98,5 +104,13 @@ src_configure() {
"-DBUILD_global_tests=FALSE"
)
+ if use qt5; then
+ mycmakeargs+=( "-DWITH_QT=QT5" )
+ elif use qt6; then
+ mycmakeargs+=( "-DWITH_QT=QT6" )
+ else
+ mycmakeargs+=( "-DWITH_QT=NO" )
+ fi
+
cmake_src_configure
}
