From f300354de9fe5d997850456a9e1f400193e6544f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Aug 2024 12:00:09 +0100 Subject: gentoo auto-resync : 26:08:2024 - 12:00:09 --- sci-libs/pcl/Manifest | 6 ++- sci-libs/pcl/files/pcl-1.14.1-gcc15.patch | 62 +++++++++++++++++++++++++++++++ sci-libs/pcl/files/pcl-1.14.1-tests.patch | 26 +++++++++++++ sci-libs/pcl/pcl-1.14.1.ebuild | 17 ++++++--- sci-libs/pcl/pcl-9999.ebuild | 17 ++++++--- 5 files changed, 116 insertions(+), 12 deletions(-) create mode 100644 sci-libs/pcl/files/pcl-1.14.1-gcc15.patch create mode 100644 sci-libs/pcl/files/pcl-1.14.1-tests.patch (limited to 'sci-libs/pcl') diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest index 72cdc4864286..9ee4e16f66d0 100644 --- a/sci-libs/pcl/Manifest +++ b/sci-libs/pcl/Manifest @@ -1,8 +1,10 @@ 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.14.1-gcc15.patch 2070 BLAKE2B 9baa1eda8a751c832fe875d9f941214f854bf70e0feba4f2793aadd3421898c6ce580f488f0daa35d102b63bf0aba7015d3552d0f6c97e456b4dfb9c47203433 SHA512 a15b13aee5d1e727072066c549a131e58f81bc804c2d9bc67cbec6da11a881a19a5438051f3eea4ad7c63ca7b4d92bc3105cc8ff8d58621a46f61a364077e7c3 +AUX pcl-1.14.1-tests.patch 785 BLAKE2B 3cd99c021f70dbf2239979772c642d60e1d4c0631b2c7dd7d732c0ed51ecfec2fa02e1c796115bd4242e0403524422f8a6a3fa0b1e47474d278770b5ea23a0b4 SHA512 0039aac3850b0fe29fb7ef416fc3f812462001c145406e196d60ab9ec4e4c325b3bd2e342bd423a89f9bc547c51ccd95184d8b548186b338b90f4b3262d5080c DIST pcl-1.14.0.tar.gz 68662907 BLAKE2B 5e797666b2a6cd5b828b399592daaa78c3bcbc0968c1ec5dafe441717bb4067de4604cdab11d3317370c7f69a1b29db0cca6348e91697d16846ae44c1952ce3e SHA512 0ea388d5f4ccdc1e5fcace6a1e1b90843be1a4ed2e1d37cc3c80d8abc0e868324d8f9da80513f1cb3f16738e00586f29cac151ce0d501645514f280aee8b1d7f DIST pcl-1.14.1.tar.gz 68672885 BLAKE2B 207389d844ac2793f6f321504c05282ace2d8e51aaf0277c13fb11f5be22ac93f7e044f34fc2259aca7d7e34ae3b9b00287ee9df0d15f851f1f4b4bd651578c7 SHA512 8e2d2839fe73a955d49b9a72861de2becf2da9a0dc906bd10ab8a3518e270a2f1900d801922d02871d704f2ed380273d35c2d0e04d8da7e24a21eb351c43c00b EBUILD pcl-1.14.0.ebuild 2783 BLAKE2B 9c7e1362d4078dcd6ce910751788ed3d3647a7d6aad4cb45f9fb632dbb0ce8f5d8947dd7d6890a9866c8ddb0aee9069799505a53f93d9c7bf94b52de0ed31fb4 SHA512 b6272250819871c32e703642f97e26f84c0682029b1d2406eca72e093c5eb8e6bc367a4655d81653dbd2dfefaa05eb1d86af8701ffd8ab0f26587d024ce6088c -EBUILD pcl-1.14.1.ebuild 2784 BLAKE2B ecaa84e6d330872b2e4ae3ec4a79c922e103c22d42fe3db3b9b440bdff565af23dfb622580fc9ba6f2eb9c1ecb35de4f8f578147464a19bdf101eebee9a1f41c SHA512 163a8e345185376b5475b81de481b54d791cdb3296d1c4053dfdb7c1c8056be3b1dea02d64c20c12a2e1ec4f4ebdc2f20d6ebd690e217d7af1f3563597418754 -EBUILD pcl-9999.ebuild 2784 BLAKE2B ecaa84e6d330872b2e4ae3ec4a79c922e103c22d42fe3db3b9b440bdff565af23dfb622580fc9ba6f2eb9c1ecb35de4f8f578147464a19bdf101eebee9a1f41c SHA512 163a8e345185376b5475b81de481b54d791cdb3296d1c4053dfdb7c1c8056be3b1dea02d64c20c12a2e1ec4f4ebdc2f20d6ebd690e217d7af1f3563597418754 +EBUILD pcl-1.14.1.ebuild 2909 BLAKE2B 313fb46699bb0cb81146f0ee803866770a9021269f73260844ae07ff3ae141633f3ffbd3aba47e98fb20e9439418f5ccf5970d5f9f292504287aabb070d001a9 SHA512 dbf5f62e2191207f96f6ba2a7b30230b66da39e9153a2aee76585beed93e18f295fb8fec02e4e0b295606815c7224ce98a781f6af846c5a3817ebfea8d65380f +EBUILD pcl-9999.ebuild 2909 BLAKE2B 313fb46699bb0cb81146f0ee803866770a9021269f73260844ae07ff3ae141633f3ffbd3aba47e98fb20e9439418f5ccf5970d5f9f292504287aabb070d001a9 SHA512 dbf5f62e2191207f96f6ba2a7b30230b66da39e9153a2aee76585beed93e18f295fb8fec02e4e0b295606815c7224ce98a781f6af846c5a3817ebfea8d65380f MISC metadata.xml 1069 BLAKE2B efb4dd7a8d1d65a7922da25e9f31e327b35cf88924be9dbc12ec2adc2e2d57017714ab931611d17b575daaa831934d9b90493be307ed668e24b7831bf4bd0106 SHA512 ac01ef352a9d6d66a02981585e8a19b01574a254639067520ab7422d89e5f095f84f7fc91a3e4f5b6dcb154ca0e487604aa1461bae6fa02a2037d7ca2668de3f 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 +Date: Thu, 22 Aug 2024 16:44:39 +0200 +Subject: [PATCH] fix gcc 15 + +Signed-off-by: Paul Zander +--- 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"; ++ } ++ + 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 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 > 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::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/files/pcl-1.14.1-tests.patch b/sci-libs/pcl/files/pcl-1.14.1-tests.patch new file mode 100644 index 000000000000..83919b0c0c07 --- /dev/null +++ b/sci-libs/pcl/files/pcl-1.14.1-tests.patch @@ -0,0 +1,26 @@ +From: Paul Zander +Date: Thu, 22 Aug 2024 17:40:21 +0200 +Subject: [PATCH] enable tests + +Signed-off-by: Paul Zander +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -8,11 +8,12 @@ if(NOT build) + return() + endif() + +-find_package(GTestSource REQUIRED) +-include_directories(SYSTEM ${GTEST_INCLUDE_DIRS} ${GTEST_SRC_DIR}) +- +-add_library(pcl_gtest STATIC ${GTEST_SRC_DIR}/src/gtest-all.cc) +-target_include_directories(pcl_gtest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) ++find_package(GTest REQUIRED) ++add_library(pcl_gtest INTERFACE IMPORTED) ++set_target_properties(pcl_gtest PROPERTIES ++ INTERFACE_LINK_LIBRARIES GTest::gtest ++ INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/include ++) + + enable_testing() + + diff --git a/sci-libs/pcl/pcl-1.14.1.ebuild b/sci-libs/pcl/pcl-1.14.1.ebuild index 46645bec9842..b5d59362af57 100644 --- a/sci-libs/pcl/pcl-1.14.1.ebuild +++ b/sci-libs/pcl/pcl-1.14.1.ebuild @@ -14,13 +14,12 @@ else S="${WORKDIR}/${PN}-${P}" fi -HOMEPAGE="https://pointclouds.org/" DESCRIPTION="2D/3D image and point cloud processing" +HOMEPAGE="https://pointclouds.org/" 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" +RESTRICT="!test? ( test )" RDEPEND=" >=sci-libs/flann-1.7.1 @@ -51,6 +50,7 @@ RDEPEND=" " DEPEND="${RDEPEND} !!dev-cpp/metslib + test? ( dev-cpp/gtest ) " BDEPEND=" doc? ( @@ -62,7 +62,8 @@ BDEPEND=" dev-python/sphinx-rtd-theme dev-python/sphinxcontrib-doxylink ) - virtual/pkgconfig" + virtual/pkgconfig +" REQUIRED_USE=" openni? ( usb ) @@ -73,6 +74,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 + "${FILESDIR}/${PN}-1.14.1-gcc15.patch" + "${FILESDIR}/${PN}-1.14.1-tests.patch" ) src_prepare() { @@ -101,7 +104,7 @@ src_configure() { "-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" + -DBUILD_global_tests="$(usex test)" ) if use qt5; then @@ -114,3 +117,7 @@ src_configure() { cmake_src_configure } + +src_test() { + BUILD_DIR="${BUILD_DIR}/test" cmake_src_test +} diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild index 46645bec9842..b5d59362af57 100644 --- a/sci-libs/pcl/pcl-9999.ebuild +++ b/sci-libs/pcl/pcl-9999.ebuild @@ -14,13 +14,12 @@ else S="${WORKDIR}/${PN}-${P}" fi -HOMEPAGE="https://pointclouds.org/" DESCRIPTION="2D/3D image and point cloud processing" +HOMEPAGE="https://pointclouds.org/" 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" +RESTRICT="!test? ( test )" RDEPEND=" >=sci-libs/flann-1.7.1 @@ -51,6 +50,7 @@ RDEPEND=" " DEPEND="${RDEPEND} !!dev-cpp/metslib + test? ( dev-cpp/gtest ) " BDEPEND=" doc? ( @@ -62,7 +62,8 @@ BDEPEND=" dev-python/sphinx-rtd-theme dev-python/sphinxcontrib-doxylink ) - virtual/pkgconfig" + virtual/pkgconfig +" REQUIRED_USE=" openni? ( usb ) @@ -73,6 +74,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 + "${FILESDIR}/${PN}-1.14.1-gcc15.patch" + "${FILESDIR}/${PN}-1.14.1-tests.patch" ) src_prepare() { @@ -101,7 +104,7 @@ src_configure() { "-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" + -DBUILD_global_tests="$(usex test)" ) if use qt5; then @@ -114,3 +117,7 @@ src_configure() { cmake_src_configure } + +src_test() { + BUILD_DIR="${BUILD_DIR}/test" cmake_src_test +} -- cgit v1.2.3