gentoo auto-resync : 04:01:2024 - 14:00:20

4 files changed, 127 insertions, 13 deletions

diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index ff96fe58f214..6a020768d0c1 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,6 +1,9 @@
 AUX pcl-1.12.1-allow-configuration-of-install-dirs.patch 1188 BLAKE2B 5ffc3c22c10df8a14270ce1e6a3b0c2db0ed3c5e9154bfed366b87faf8a13546fbf78a88f0d52c4ca09e345ba9add384dad86a08963e0b496a2944293f38516b SHA512 ab4cb57d5d1e494501412d5fcd662f8d75f74a7cf768e948abc1270d11b7ec2bc90901630fa7ac6e96237507c9bfa4214594fc76c58f505bcf2f40e4e37487a8
 AUX pcl-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch 832 BLAKE2B e7095163cba68ee7487251506e19434050c4c7d4bb5feb6d0946356a607dad5555c7327dc1ba68761086b3708ad653256337a110983d9d656fa863dbf9a75896 SHA512 5581df74c9f6f0bd9613b7f158d0d799a4fdea512101001aafdf8eaa91c31e4570f4ce04f1b828730c9fa8082d00000e78055da87427301f04807c1087f1b8b2
+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
 EBUILD pcl-1.12.1-r2.ebuild 2595 BLAKE2B db156d1c94086de35cdf4932a82d18c4e59ea7733d1410d75030e4eb644f00ea5fb9463029b7735910cb8faae813c30e5f97eb9626a498b892787405385bc1fd SHA512 b17cae37d9f77bbdcad5ac5a8e3bde7e7da118bfaa5732df3a4076c009fd24d81c85700a24b709d0b933cfc5ef53ec0945d20b5661156315a6fa7312579bab71
-EBUILD pcl-9999.ebuild 2596 BLAKE2B c9485345ed1a7d7ea377caf3e81e3f5ebbf10bfb0dc04a2d7e968da3c369cfae42c189238678ebe0e113c8071e2c98a7525ba84499c071056898dfba6c9d2bd3 SHA512 2cec871b728a708dfa504459238837a6bca30f1817c59e886e17798f4b555627681504f6c9a5a622a48801e087bae06016c5d1e9fd9e19a4748f7a5eb7c83b63
+EBUILD pcl-1.13.1.ebuild 2669 BLAKE2B fb965504526c80d7c253566e2f9bcded9cebf2f5b266221f1f24b25fa12c6450b4fb47fe89b3cfd37d4536f1ca9fb0c996e4272d387d68e0c84b4c6238ebc72c SHA512 66b6476db30aa0627d99324cc414e46402899a988996ef7c25d9981cf9212de1d14f5b525131628c5d4027eb00cc14ee0707cac546a52b0bbf565a1f5a4353b3
+EBUILD pcl-9999.ebuild 2532 BLAKE2B 5cdee61a105fd2725ee3bf5697d392e5414de5d834217761142d6638656793a0fbaefdb2c9bce4b708f52ebd5a5558fa52472548ab30cc80007fd91c5b41c494 SHA512 d86a0bb35a43e15dbdf516104c9e54e019a4739fdb03896faf10c729296520a44183882be28736f26ce5fc1e7f86036736b7323b444bdec93cb1059f22666e81
 MISC metadata.xml 1069 BLAKE2B efb4dd7a8d1d65a7922da25e9f31e327b35cf88924be9dbc12ec2adc2e2d57017714ab931611d17b575daaa831934d9b90493be307ed668e24b7831bf4bd0106 SHA512 ac01ef352a9d6d66a02981585e8a19b01574a254639067520ab7422d89e5f095f84f7fc91a3e4f5b6dcb154ca0e487604aa1461bae6fa02a2037d7ca2668de3f
diff --git a/sci-libs/pcl/files/pcl-1.13.1-boost-1.84.patch b/sci-libs/pcl/files/pcl-1.13.1-boost-1.84.patch
new file mode 100644
index 000000000000..ee9904b78eb9
--- /dev/null
+++ b/sci-libs/pcl/files/pcl-1.13.1-boost-1.84.patch
@@ -0,0 +1,12 @@
+diff --git a/io/src/ply/ply_parser.cpp b/io/src/ply/ply_parser.cpp
+index 335c0fb1808..7e79d2d6162 100644
+--- a/io/src/ply/ply_parser.cpp
++++ b/io/src/ply/ply_parser.cpp
+@@ -40,6 +40,7 @@
+ 
+ #include <pcl/io/ply/ply_parser.h>
+ 
++#include <algorithm> // for find_if
+ #include <fstream> // for ifstream
+ #include <sstream> // for istringstream
+ 
diff --git a/sci-libs/pcl/pcl-1.13.1.ebuild b/sci-libs/pcl/pcl-1.13.1.ebuild
new file mode 100644
index 000000000000..6e465addd769
--- /dev/null
+++ b/sci-libs/pcl/pcl-1.13.1.ebuild
@@ -0,0 +1,104 @@
+# 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 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
+	)
+	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
+	# https://github.com/PointCloudLibrary/pcl/commit/c750d074cdc5fbb5382ff302ba9afe43ce51a101
+	"${FILESDIR}"/${PN}-1.13.1-boost-1.84.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_QT=$(usex qt5 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"
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index cc8d925c4502..9de81c659155 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -1,18 +1,13 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
-fi
+inherit cmake cuda
 
-inherit ${SCM} cmake cuda
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
+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"
@@ -22,7 +17,7 @@ fi
 HOMEPAGE="https://pointclouds.org/"
 DESCRIPTION="2D/3D image and point cloud processing"
 LICENSE="BSD"
-SLOT="0/1.12"
+SLOT="0/$(ver_cut 1-2)"
 IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
 # tests need the gtest sources to be available at build time
 RESTRICT="test"