commit: 9fa202e51778ae156570f9b9191eca455b1f8067 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Thu Jan 4 10:36:01 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Thu Jan 4 10:43:13 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa202e5
sci-libs/pcl: add 1.13.1, EAPI bump, boost compat fix Co-authored-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Closes: https://bugs.gentoo.org/921289 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> sci-libs/pcl/Manifest | 1 + sci-libs/pcl/files/pcl-1.13.1-boost-1.84.patch | 12 ++++++++++++ sci-libs/pcl/{pcl-9999.ebuild => pcl-1.13.1.ebuild} | 21 +++++++++------------ sci-libs/pcl/pcl-9999.ebuild | 19 +++++++------------ 4 files changed, 29 insertions(+), 24 deletions(-) diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest index 0799e6bc9bbc..9996d4fb3683 100644 --- a/sci-libs/pcl/Manifest +++ b/sci-libs/pcl/Manifest @@ -1 +1,2 @@ DIST pcl-1.12.1.tar.gz 68565637 BLAKE2B e93ecc9e562ba0ab6d91fbc9d890accacafe4558ddcf4950ed46d7f11bcc2b74111ea249ac2a300c2411f553f4d267467dbe77af54d8eb9538ce27e98f19a913 SHA512 5cef7699ad69df67129520b50405d62b6a1c37da791b472c112e4e0b9f24b4a37303344c774ec121370495492eee1e61c8565dee58aabec090795585365afc1b +DIST pcl-1.13.1.tar.gz 68647700 BLAKE2B e14e4d971a8c52b375887421eced62fd443b11c48146216e4e6898a53f775656c80520514956c51a0853a14c2788a7f19d87d44580569156d39c41a95285f03d SHA512 f6860b2103cb033839d044c3fed1fc3e8a989cd4f9776ae9d20e7d381b05eff8efde33dd06316ce419b44d877877ed21735d80b09d1daf64b0f94cdd302374fb 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-9999.ebuild b/sci-libs/pcl/pcl-1.13.1.ebuild similarity index 89% copy from sci-libs/pcl/pcl-9999.ebuild copy to sci-libs/pcl/pcl-1.13.1.ebuild index cc8d925c4502..6e465addd769 100644 --- a/sci-libs/pcl/pcl-9999.ebuild +++ b/sci-libs/pcl/pcl-1.13.1.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" @@ -71,6 +66,8 @@ REQUIRED_USE=" 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() { 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"
