gentoo auto-resync : 05:01:2024 - 14:04:25

3 files changed, 135 insertions, 3 deletions

diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 6a020768d0c1..59e59184a9c8 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -3,7 +3,9 @@ AUX pcl-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.pat
 AUX pcl-1.13.1-boost-1.84.patch 343 BLAKE2B 622c98f281b3de4a6fc76fca6809250c72e4e789dae600cd8071dd9255dd5ee8a0d8ffe3e86347bf20283c770d22c56b8119db159eb1455c3bc45bcc16721f2b SHA512 aa64c258ad7a988fc8275be028b9932cf5f4d05eef7bdb70b59bfba3a0abf5110b8ffcf39f390af9f42734e3d0422b2484f3e9b6c76526fc95ec0e691747286f
 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
 EBUILD pcl-1.12.1-r2.ebuild 2595 BLAKE2B db156d1c94086de35cdf4932a82d18c4e59ea7733d1410d75030e4eb644f00ea5fb9463029b7735910cb8faae813c30e5f97eb9626a498b892787405385bc1fd SHA512 b17cae37d9f77bbdcad5ac5a8e3bde7e7da118bfaa5732df3a4076c009fd24d81c85700a24b709d0b933cfc5ef53ec0945d20b5661156315a6fa7312579bab71
 EBUILD pcl-1.13.1.ebuild 2669 BLAKE2B fb965504526c80d7c253566e2f9bcded9cebf2f5b266221f1f24b25fa12c6450b4fb47fe89b3cfd37d4536f1ca9fb0c996e4272d387d68e0c84b4c6238ebc72c SHA512 66b6476db30aa0627d99324cc414e46402899a988996ef7c25d9981cf9212de1d14f5b525131628c5d4027eb00cc14ee0707cac546a52b0bbf565a1f5a4353b3
-EBUILD pcl-9999.ebuild 2532 BLAKE2B 5cdee61a105fd2725ee3bf5697d392e5414de5d834217761142d6638656793a0fbaefdb2c9bce4b708f52ebd5a5558fa52472548ab30cc80007fd91c5b41c494 SHA512 d86a0bb35a43e15dbdf516104c9e54e019a4739fdb03896faf10c729296520a44183882be28736f26ce5fc1e7f86036736b7323b444bdec93cb1059f22666e81
+EBUILD pcl-1.14.0.ebuild 2783 BLAKE2B 99e77bc0f5ad0579c3d8246d33a462c2d6e7cee437ef2ca4a6f8e9f2f5e690adc385a4ac7d90a1c325a5836e0a34f11eec36e60fa81558ca97757056cd580ffe SHA512 387902dc80d8961efc1e10a6f77ee13b4236cea85777a6e2f86b634b50f64e9e7c0f9cb4e6ec2fe3d3b79a55951d8a3bffc5c97445014557d88f980d6f355cd3
+EBUILD pcl-9999.ebuild 2783 BLAKE2B 99e77bc0f5ad0579c3d8246d33a462c2d6e7cee437ef2ca4a6f8e9f2f5e690adc385a4ac7d90a1c325a5836e0a34f11eec36e60fa81558ca97757056cd580ffe SHA512 387902dc80d8961efc1e10a6f77ee13b4236cea85777a6e2f86b634b50f64e9e7c0f9cb4e6ec2fe3d3b79a55951d8a3bffc5c97445014557d88f980d6f355cd3
 MISC metadata.xml 1069 BLAKE2B efb4dd7a8d1d65a7922da25e9f31e327b35cf88924be9dbc12ec2adc2e2d57017714ab931611d17b575daaa831934d9b90493be307ed668e24b7831bf4bd0106 SHA512 ac01ef352a9d6d66a02981585e8a19b01574a254639067520ab7422d89e5f095f84f7fc91a3e4f5b6dcb154ca0e487604aa1461bae6fa02a2037d7ca2668de3f
diff --git a/sci-libs/pcl/pcl-1.14.0.ebuild b/sci-libs/pcl/pcl-1.14.0.ebuild
new file mode 100644
index 000000000000..6247e7718047
--- /dev/null
+++ b/sci-libs/pcl/pcl-1.14.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake cuda
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+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 qt6 usb vtk cpu_flags_x86_sse test tutorials"
+# tests need the gtest sources to be available at build time
+RESTRICT="test"
+
+RDEPEND="
+	>=sci-libs/flann-1.7.1
+	dev-libs/boost:=
+	dev-cpp/eigen:3
+	opengl? ( virtual/opengl media-libs/freeglut )
+	openni? ( dev-libs/OpenNI )
+	openni2? ( dev-libs/OpenNI2 )
+	pcap? ( net-libs/libpcap )
+	png? ( media-libs/libpng:0= )
+	qhull? ( media-libs/qhull:= )
+	qt5? (
+		dev-qt/qtgui:5
+		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] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
+"
+DEPEND="${RDEPEND}
+	!!dev-cpp/metslib
+"
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		virtual/latex-base
+	)
+	tutorials? (
+		dev-python/sphinx
+		dev-python/sphinx-rtd-theme
+		dev-python/sphinxcontrib-doxylink
+	)
+	virtual/pkgconfig"
+
+REQUIRED_USE="
+	openni? ( usb )
+	openni2? ( usb )
+	tutorials? ( doc )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.1-allow-configuration-of-install-dirs.patch
+	"${FILESDIR}"/${PN}-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch
+)
+
+src_prepare() {
+	if use cuda; then
+		cuda_src_prepare
+		cuda_add_sandbox -w
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DDOC_INSTALL_DIR=share/doc/${PF}"
+		"-DLIB_INSTALL_DIR=$(get_libdir)"
+		"-DPCLCONFIG_INSTALL_DIR=share/cmake/${PN}-$(ver_cut 1-2)"
+		"-DWITH_CUDA=$(usex cuda TRUE FALSE)"
+		"-DWITH_LIBUSB=$(usex usb TRUE FALSE)"
+		"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
+		"-DWITH_PNG=$(usex png TRUE FALSE)"
+		"-DWITH_QHULL=$(usex qhull TRUE FALSE)"
+		"-DWITH_VTK=$(usex vtk TRUE FALSE)"
+		"-DWITH_PCAP=$(usex pcap TRUE FALSE)"
+		"-DWITH_OPENNI=$(usex openni TRUE FALSE)"
+		"-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)"
+		"-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
+		"-DWITH_DOCS=$(usex doc TRUE FALSE)"
+		"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
+		"-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
 }