* [gentoo-commits] repo/gentoo:master commit in: sci-libs/pcl/files/, sci-libs/pcl/
@ 2021-11-04 20:34 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-11-04 20:34 UTC (permalink / raw
To: gentoo-commits
commit: 28078997c912c4034ebc66afa7bccd81812ac2b3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 4 20:33:38 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 4 20:34:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28078997
sci-libs/pcl: fix build with newer VTK
Closes: https://bugs.gentoo.org/810853
See: https://github.com/PointCloudLibrary/pcl/pull/5012
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch | 26 +++++++++++++++++++++++
sci-libs/pcl/pcl-1.12.0.ebuild | 4 ++++
2 files changed, 30 insertions(+)
diff --git a/sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch b/sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch
new file mode 100644
index 00000000000..40821674779
--- /dev/null
+++ b/sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch
@@ -0,0 +1,26 @@
+https://github.com/PointCloudLibrary/pcl/pull/5012
+https://bugs.gentoo.org/810853
+
+From: Maarten de Vries <maarten@de-vri.es>
+Date: Wed, 3 Nov 2021 21:40:19 +0100
+Subject: [PATCH] Limit VTK_LIBRARIES to wanted components for VTK 9.0.
+
+--- a/cmake/pcl_find_vtk.cmake
++++ b/cmake/pcl_find_vtk.cmake
+@@ -119,6 +119,15 @@ else()
+ unset(HAVE_QVTK)
+ endif()
+
++# Overwrite VTK_LIBRARIES with only the set we actually want for VTK >= 9.0.
++# Otherwise, it will contain ALL available components.
++if(NOT (VTK_VERSION VERSION_LESS 9.0))
++ set(VTK_LIBRARIES)
++ foreach(vtkComponent ${PCL_VTK_COMPONENTS})
++ list(APPEND VTK_LIBRARIES VTK::${vtkComponent})
++ endforeach()
++endif()
++
+ if(PCL_SHARED_LIBS OR (NOT (PCL_SHARED_LIBS) AND NOT (VTK_BUILD_SHARED_LIBS)))
+ if(VTK_VERSION VERSION_LESS 9.0)
+ if(VTK_USE_FILE)
+
diff --git a/sci-libs/pcl/pcl-1.12.0.ebuild b/sci-libs/pcl/pcl-1.12.0.ebuild
index 1ab0b8e362f..e3cd374256f 100644
--- a/sci-libs/pcl/pcl-1.12.0.ebuild
+++ b/sci-libs/pcl/pcl-1.12.0.ebuild
@@ -61,6 +61,10 @@ REQUIRED_USE="
tutorials? ( doc )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.12.0-cmake-targets.patch
+)
+
src_configure() {
local mycmakeargs=(
"-DLIB_INSTALL_DIR=$(get_libdir)"
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/pcl/files/, sci-libs/pcl/
@ 2023-03-03 20:29 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2023-03-03 20:29 UTC (permalink / raw
To: gentoo-commits
commit: 5b8392590babd084c1ad3bab35dddb3d9f87758e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 3 19:26:15 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 3 20:29:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b839259
sci-libs/pcl: drop 1.12.0, 1.12.1
Closes: https://bugs.gentoo.org/892395
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/pcl/Manifest | 1 -
sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch | 26 -------
sci-libs/pcl/pcl-1.12.0.ebuild | 87 -----------------------
sci-libs/pcl/pcl-1.12.1.ebuild | 83 ---------------------
4 files changed, 197 deletions(-)
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 903fc851c93b..0799e6bc9bbc 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,2 +1 @@
-DIST pcl-1.12.0.tar.gz 68547886 BLAKE2B 1734af6fb44587cf52bf37802494fcdd7b3623f8fad6ca83ce40803912a48dc76a58263ba454678d18bc7ce46486c3053a5eed32947864db6653fd7381fada42 SHA512 ce0544fdd82bcc415f81a9c74d58e5f6da2d0e0aaa54238a2601eca90386774155f1e032e6fb55a9edbf467ffa5ebf2ad695ec652ab437b323b8c6241f81193f
DIST pcl-1.12.1.tar.gz 68565637 BLAKE2B e93ecc9e562ba0ab6d91fbc9d890accacafe4558ddcf4950ed46d7f11bcc2b74111ea249ac2a300c2411f553f4d267467dbe77af54d8eb9538ce27e98f19a913 SHA512 5cef7699ad69df67129520b50405d62b6a1c37da791b472c112e4e0b9f24b4a37303344c774ec121370495492eee1e61c8565dee58aabec090795585365afc1b
diff --git a/sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch b/sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch
deleted file mode 100644
index 408216747792..000000000000
--- a/sci-libs/pcl/files/pcl-1.12.0-cmake-targets.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/PointCloudLibrary/pcl/pull/5012
-https://bugs.gentoo.org/810853
-
-From: Maarten de Vries <maarten@de-vri.es>
-Date: Wed, 3 Nov 2021 21:40:19 +0100
-Subject: [PATCH] Limit VTK_LIBRARIES to wanted components for VTK 9.0.
-
---- a/cmake/pcl_find_vtk.cmake
-+++ b/cmake/pcl_find_vtk.cmake
-@@ -119,6 +119,15 @@ else()
- unset(HAVE_QVTK)
- endif()
-
-+# Overwrite VTK_LIBRARIES with only the set we actually want for VTK >= 9.0.
-+# Otherwise, it will contain ALL available components.
-+if(NOT (VTK_VERSION VERSION_LESS 9.0))
-+ set(VTK_LIBRARIES)
-+ foreach(vtkComponent ${PCL_VTK_COMPONENTS})
-+ list(APPEND VTK_LIBRARIES VTK::${vtkComponent})
-+ endforeach()
-+endif()
-+
- if(PCL_SHARED_LIBS OR (NOT (PCL_SHARED_LIBS) AND NOT (VTK_BUILD_SHARED_LIBS)))
- if(VTK_VERSION VERSION_LESS 9.0)
- if(VTK_USE_FILE)
-
diff --git a/sci-libs/pcl/pcl-1.12.0.ebuild b/sci-libs/pcl/pcl-1.12.0.ebuild
deleted file mode 100644
index 5733df559779..000000000000
--- a/sci-libs/pcl/pcl-1.12.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
-fi
-
-inherit ${SCM} cmake multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-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/1.12"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
-RESTRICT="!test? ( 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] )
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-"
-DEPEND="${RDEPEND}
- !!dev-cpp/metslib
- test? ( >=dev-cpp/gtest-1.6.0 )
-"
-BDEPEND="
- doc? ( app-doc/doxygen )
- tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink )
- virtual/pkgconfig"
-
-REQUIRED_USE="
- openni? ( usb )
- openni2? ( usb )
- tutorials? ( doc )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.12.0-cmake-targets.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- "-DLIB_INSTALL_DIR=$(get_libdir)"
- "-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_TESTS=$(usex test TRUE FALSE)"
- )
- cmake_src_configure
-}
diff --git a/sci-libs/pcl/pcl-1.12.1.ebuild b/sci-libs/pcl/pcl-1.12.1.ebuild
deleted file mode 100644
index a8ef973a1640..000000000000
--- a/sci-libs/pcl/pcl-1.12.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
-fi
-
-inherit ${SCM} cmake multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-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/1.12"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
-RESTRICT="!test? ( 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] )
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-"
-DEPEND="${RDEPEND}
- !!dev-cpp/metslib
- test? ( >=dev-cpp/gtest-1.6.0 )
-"
-BDEPEND="
- doc? ( app-doc/doxygen )
- tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink )
- virtual/pkgconfig"
-
-REQUIRED_USE="
- openni? ( usb )
- openni2? ( usb )
- tutorials? ( doc )
-"
-
-src_configure() {
- local mycmakeargs=(
- "-DLIB_INSTALL_DIR=$(get_libdir)"
- "-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_TESTS=$(usex test TRUE FALSE)"
- )
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/pcl/files/, sci-libs/pcl/
@ 2024-08-25 15:41 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-08-25 15:41 UTC (permalink / raw
To: gentoo-commits
commit: e993387056ee71a1f3017b0116b293874d7ca09c
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Aug 23 18:35:56 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 15:40:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9933870
sci-libs/pcl: Fix compilation on GCC 15
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/pcl/files/pcl-1.14.1-gcc15.patch | 62 +++++++++++++++++++++++++++++++
sci-libs/pcl/pcl-1.14.1.ebuild | 1 +
sci-libs/pcl/pcl-9999.ebuild | 1 +
3 files changed, 64 insertions(+)
diff --git a/sci-libs/pcl/files/pcl-1.14.1-gcc15.patch b/sci-libs/pcl/files/pcl-1.14.1-gcc15.patch
new file mode 100644
index 000000000000..41001211bad1
--- /dev/null
+++ b/sci-libs/pcl/files/pcl-1.14.1-gcc15.patch
@@ -0,0 +1,62 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Thu, 22 Aug 2024 16:44:39 +0200
+Subject: [PATCH] fix gcc 15
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+--- a/registration/include/pcl/registration/correspondence_rejection_features.h
++++ b/registration/include/pcl/registration/correspondence_rejection_features.h
+@@ -203,6 +203,11 @@ protected:
+ /** \brief Empty destructor */
+ ~FeatureContainer() override = default;
+
++ inline std::string getClassName()
++ {
++ return "FeatureContainer<FeatureT>";
++ }
++
+ inline void
+ setSourceFeature(const FeatureCloudConstPtr& source_features)
+ {
+--- a/surface/include/pcl/surface/3rdparty/poisson4/octree_poisson.h
++++ b/surface/include/pcl/surface/3rdparty/poisson4/octree_poisson.h
+@@ -94,6 +94,9 @@ namespace pcl
+ short d , off[DIMENSION];
+ NodeData nodeData;
+
++ Point3D<Real> center;
++ int offset[3];
++
+ OctNode(void);
+ ~OctNode(void);
+ int initChildren(void);
+--- a/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.h
++++ b/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.h
+@@ -56,6 +56,8 @@ namespace pcl
+ bool _contiguous;
+ int _maxEntriesPerRow;
+ static int UseAlloc;
++ std::size_t m_M;
++ std::size_t m_N;
+ public:
+ static Allocator<MatrixEntry<T> > internalAllocator;
+ static int UseAllocator(void);
+--- a/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp
++++ b/surface/include/pcl/surface/3rdparty/poisson4/sparse_matrix.hpp
+@@ -235,7 +235,7 @@ namespace pcl
+ void SparseMatrix<T>::SetIdentity()
+ {
+ SetZero();
+- for(int ij=0; ij < Min( this->Rows(), this->Columns() ); ij++)
++ for(int ij=0; ij < std::min( this->rows, this->_maxEntriesPerRow ); ij++)
+ (*this)(ij,ij) = T(1);
+ }
+
+@@ -388,7 +388,7 @@ namespace pcl
+ T alpha,beta,rDotR;
+ int i;
+
+- solution.Resize(M.Columns());
++ solution.Resize(M._maxEntriesPerRow);
+ solution.SetZero();
+
+ d=r=bb;
diff --git a/sci-libs/pcl/pcl-1.14.1.ebuild b/sci-libs/pcl/pcl-1.14.1.ebuild
index 46645bec9842..a9c716c2e295 100644
--- a/sci-libs/pcl/pcl-1.14.1.ebuild
+++ b/sci-libs/pcl/pcl-1.14.1.ebuild
@@ -73,6 +73,7 @@ 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
+ "${FILESDIR}/${PN}-1.14.1-gcc15.patch"
)
src_prepare() {
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index 46645bec9842..a9c716c2e295 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -73,6 +73,7 @@ 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
+ "${FILESDIR}/${PN}-1.14.1-gcc15.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-08-25 15:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-04 20:34 [gentoo-commits] repo/gentoo:master commit in: sci-libs/pcl/files/, sci-libs/pcl/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-03-03 20:29 Andreas Sturmlechner
2024-08-25 15:41 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox