summaryrefslogtreecommitdiff
path: root/sci-libs/pcl
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/pcl')
-rw-r--r--sci-libs/pcl/Manifest5
-rw-r--r--sci-libs/pcl/files/pcl-1.14.1-boost-1.87.patch171
-rw-r--r--sci-libs/pcl/files/pcl-1.14.1-boost.patch6
-rw-r--r--sci-libs/pcl/pcl-1.14.1-r2.ebuild (renamed from sci-libs/pcl/pcl-1.14.1-r1.ebuild)3
4 files changed, 176 insertions, 9 deletions
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index ee32bae51ae1..800340fc92f7 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,9 +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-boost.patch 1155 BLAKE2B 09f41979ef2878bd062e14fc38e9525cea090729e9d49b3a55d95bfc375c42cee9b9d0af1578407d9bc467babcb11b15f4c600fe2b8e34e30e12fb50c83ab577 SHA512 88431830523552c45625b1931138e79b75eebe4be0432b263519fde24518942a92ef595b77e73fea393db6da8bfaba286f07644e3894fb8eb66ebaa8babe9588
+AUX pcl-1.14.1-boost-1.87.patch 6820 BLAKE2B d8c911a00016f6132d4281dd0748177cba1d313ed8b274e0473b79cda22d4aa9d8051374f8437e6fa2caaaadd9021200877dc3316f7795cf69d5f6053c88ff3d SHA512 aa7016b62c61799f88933dcc854b9b16d16678c64ab4b1d48861e2b0e7d64bbe012f199d83de5f8590519d4f28047f54f3f02a792a7fc743998489ab563463f9
+AUX pcl-1.14.1-boost.patch 925 BLAKE2B 99c340c9187432093b32e3f667e791e41ca298ba21224a87ec1b8b5d8fc942f63ba90830e28a98007929096c16bb28002a94b9d16c61ab91f85e26115e8c2276 SHA512 856b0d31a7ffc60e408fefd68bce9a1820e11ad3df3b3f4cfcc9aca60303c10ba604b84f1932838bf03d1812eb47ebeedbe32a1fbdbdda2572dc4b98337116fd
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.1.tar.gz 68672885 BLAKE2B 207389d844ac2793f6f321504c05282ace2d8e51aaf0277c13fb11f5be22ac93f7e044f34fc2259aca7d7e34ae3b9b00287ee9df0d15f851f1f4b4bd651578c7 SHA512 8e2d2839fe73a955d49b9a72861de2becf2da9a0dc906bd10ab8a3518e270a2f1900d801922d02871d704f2ed380273d35c2d0e04d8da7e24a21eb351c43c00b
-EBUILD pcl-1.14.1-r1.ebuild 2764 BLAKE2B a9ef3a6e6df3b972772695dbc3af27c9e097cca8de84c948402ed4f358b516a2926d7de66ba4272baf3ad31f3f72f3c8665c185370c2d2e82eedaa06a0607b6f SHA512 79bfe1955093bf2015281fd67311f16182712ce84353f56be74493f9795e51556f8ed2852836659710edd76b7fde48ac7a84c295bbc9d75bae6d5ac4e968198c
+EBUILD pcl-1.14.1-r2.ebuild 2809 BLAKE2B 865c6b66403df872dfc7718e1439e3acc07c18b27a0f3badfc03628dd9653501b8b32db915eeaf06a598afae90a1bedcb580af229fceeda30cf9c8be3d427743 SHA512 ddd6b5485e84af55022df42c6f367fc29d24e7d8626004ceacf8b86e8036221874f53ac434b1c56c8cfca67ebf31e430f77edf6d2d61f384422eb53a595ad663
EBUILD pcl-9999.ebuild 2725 BLAKE2B 732a41647159d2615892ca9956f1bacdee47e005eb562018ad3071ae9ebf367b0da1ee401c6a9ce2a38a0d7403f3b8b73ab2ae29f490c386599559b9be5c8db9 SHA512 cf7fa80d405bd1594c5071b828e14ba7c3c6d940fe66dc91221e49abccd9c1903b6fe2cfe16ae485af1dac0e13c1217bc52ddf3724f1fdf68156e17c64a2a5e4
MISC metadata.xml 1069 BLAKE2B efb4dd7a8d1d65a7922da25e9f31e327b35cf88924be9dbc12ec2adc2e2d57017714ab931611d17b575daaa831934d9b90493be307ed668e24b7831bf4bd0106 SHA512 ac01ef352a9d6d66a02981585e8a19b01574a254639067520ab7422d89e5f095f84f7fc91a3e4f5b6dcb154ca0e487604aa1461bae6fa02a2037d7ca2668de3f
diff --git a/sci-libs/pcl/files/pcl-1.14.1-boost-1.87.patch b/sci-libs/pcl/files/pcl-1.14.1-boost-1.87.patch
new file mode 100644
index 000000000000..f2b1f248fcbf
--- /dev/null
+++ b/sci-libs/pcl/files/pcl-1.14.1-boost-1.87.patch
@@ -0,0 +1,171 @@
+From 6f64495840c4e5674d542ccf20df96ed12665687 Mon Sep 17 00:00:00 2001
+From: Markus Vieth <mvieth@techfak.uni-bielefeld.de>
+Date: Tue, 5 Nov 2024 20:07:13 +0100
+Subject: [PATCH 1/2] Prepare for Boost 1.87 Some stuff from Boost's asio
+ library has been removed after Boost 1.86. The documentation says that it has
+ been deprecated, but no compiler warnings are shown. This page explains what
+ is considered "old" and what should be used instead:
+ https://www.boost.org/doc/libs/1_86_0/doc/html/boost_asio/net_ts.html -
+ io_service was simply an alias (typedef) for io_context - make_address
+ replaces from_string - resolver.resolve and connect work a bit different now,
+ see also
+ https://www.boost.org/doc/libs/1_86_0/doc/html/boost_asio/tutorial/tutdaytime1/src.html
+
+--- a/apps/src/openni_mobile_server.cpp
++++ b/apps/src/openni_mobile_server.cpp
+@@ -157,7 +157,7 @@ class PCLMobileServer {
+
+ viewer_.showCloud(getLatestPointCloud());
+
+- boost::asio::io_service io_service;
++ boost::asio::io_context io_service;
+ tcp::endpoint endpoint(tcp::v4(), static_cast<unsigned short>(port_));
+ tcp::acceptor acceptor(io_service, endpoint);
+ tcp::socket socket(io_service);
+--- a/apps/src/openni_octree_compression.cpp
++++ b/apps/src/openni_octree_compression.cpp
+@@ -415,7 +415,7 @@ main(int argc, char** argv)
+ if (bEnDecode) {
+ // ENCODING
+ try {
+- boost::asio::io_service io_service;
++ boost::asio::io_context io_service;
+ tcp::endpoint endpoint(tcp::v4(), 6666);
+ tcp::acceptor acceptor(io_service, endpoint);
+
+@@ -423,7 +423,7 @@ main(int argc, char** argv)
+
+ std::cout << "Waiting for connection.." << std::endl;
+
+- acceptor.accept(*socketStream.rdbuf());
++ acceptor.accept(socketStream.rdbuf()->socket());
+
+ std::cout << "Connected!" << std::endl;
+
+--- a/apps/src/openni_organized_compression.cpp
++++ b/apps/src/openni_organized_compression.cpp
+@@ -438,7 +438,7 @@ main(int argc, char** argv)
+ if (bEnDecode) {
+ // ENCODING
+ try {
+- boost::asio::io_service io_service;
++ boost::asio::io_context io_service;
+ tcp::endpoint endpoint(tcp::v4(), 6666);
+ tcp::acceptor acceptor(io_service, endpoint);
+
+@@ -446,7 +446,7 @@ main(int argc, char** argv)
+
+ std::cout << "Waiting for connection.." << std::endl;
+
+- acceptor.accept(*socketStream.rdbuf());
++ acceptor.accept(socketStream.rdbuf()->socket());
+
+ std::cout << "Connected!" << std::endl;
+
+--- a/io/include/pcl/io/hdl_grabber.h
++++ b/io/include/pcl/io/hdl_grabber.h
+@@ -274,7 +274,7 @@ namespace pcl
+ boost::asio::ip::udp::endpoint udp_listener_endpoint_;
+ boost::asio::ip::address source_address_filter_;
+ std::uint16_t source_port_filter_;
+- boost::asio::io_service hdl_read_socket_service_;
++ boost::asio::io_context hdl_read_socket_service_;
+ boost::asio::ip::udp::socket *hdl_read_socket_;
+ std::string pcap_file_name_;
+ std::thread *queue_consumer_thread_;
+--- a/io/include/pcl/io/robot_eye_grabber.h
++++ b/io/include/pcl/io/robot_eye_grabber.h
+@@ -131,7 +131,7 @@ namespace pcl
+
+ boost::asio::ip::address sensor_address_;
+ boost::asio::ip::udp::endpoint sender_endpoint_;
+- boost::asio::io_service io_service_;
++ boost::asio::io_context io_service_;
+ std::shared_ptr<boost::asio::ip::udp::socket> socket_;
+ std::shared_ptr<std::thread> socket_thread_;
+ std::shared_ptr<std::thread> consumer_thread_;
+--- a/io/include/pcl/io/tim_grabber.h
++++ b/io/include/pcl/io/tim_grabber.h
+@@ -128,7 +128,7 @@ class PCL_EXPORTS TimGrabber : public Grabber
+ std::vector<float> distances_;
+
+ boost::asio::ip::tcp::endpoint tcp_endpoint_;
+- boost::asio::io_service tim_io_service_;
++ boost::asio::io_context tim_io_service_;
+ boost::asio::ip::tcp::socket tim_socket_;
+ //// wait time for receiving data (on the order of milliseconds)
+ unsigned int wait_time_milliseconds_ = 0;
+--- a/io/src/hdl_grabber.cpp
++++ b/io/src/hdl_grabber.cpp
+@@ -287,7 +287,7 @@ pcl::HDLGrabber::loadHDL32Corrections ()
+ boost::asio::ip::address
+ pcl::HDLGrabber::getDefaultNetworkAddress ()
+ {
+- return (boost::asio::ip::address::from_string ("192.168.3.255"));
++ return (boost::asio::ip::make_address ("192.168.3.255"));
+ }
+
+ /////////////////////////////////////////////////////////////////////////////
+--- a/io/src/robot_eye_grabber.cpp
++++ b/io/src/robot_eye_grabber.cpp
+@@ -269,7 +269,7 @@ void
+ pcl::RobotEyeGrabber::socketThreadLoop ()
+ {
+ asyncSocketReceive();
+- io_service_.reset();
++ io_service_.restart();
+ io_service_.run();
+ }
+
+--- a/io/src/tim_grabber.cpp
++++ b/io/src/tim_grabber.cpp
+@@ -184,8 +184,8 @@ pcl::TimGrabber::start ()
+
+ try {
+ boost::asio::ip::tcp::resolver resolver (tim_io_service_);
+- tcp_endpoint_ = *resolver.resolve (tcp_endpoint_);
+- tim_socket_.connect (tcp_endpoint_);
++ boost::asio::ip::tcp::resolver::results_type endpoints = resolver.resolve (tcp_endpoint_);
++ boost::asio::connect(tim_socket_, endpoints);
+ }
+ catch (std::exception& e)
+ {
+--- a/io/src/vlp_grabber.cpp
++++ b/io/src/vlp_grabber.cpp
+@@ -92,7 +92,7 @@ pcl::VLPGrabber::loadVLP16Corrections ()
+ boost::asio::ip::address
+ pcl::VLPGrabber::getDefaultNetworkAddress ()
+ {
+- return (boost::asio::ip::address::from_string ("255.255.255.255"));
++ return (boost::asio::ip::make_address ("255.255.255.255"));
+ }
+
+ /////////////////////////////////////////////////////////////////////////////
+
+From 25be27e20a017f0ea0a0884b9fe31a50b5cbb82d Mon Sep 17 00:00:00 2001
+From: Markus Vieth <mvieth@techfak.uni-bielefeld.de>
+Date: Thu, 7 Nov 2024 20:43:15 +0100
+Subject: [PATCH 2/2] =?UTF-8?q?Silence=20ABI=20warnings=20with=20GCC=2014?=
+ =?UTF-8?q?=20With=20the=20previous=20flag,=20GCC=2014=20displays=20many?=
+ =?UTF-8?q?=20warnings=20like=20"warning:=20the=20mangled=20name=20of=20..?=
+ =?UTF-8?q?.=20changed=20between=20=E2=80=98-fabi-version=3D17=E2=80=99=20?=
+ =?UTF-8?q?and=20=E2=80=98-fabi-version=3D19=E2=80=99=20[-Wabi]"=20I=20thi?=
+ =?UTF-8?q?nk=20these=20warnings=20are=20not=20useful=20for=20us.=20Since?=
+ =?UTF-8?q?=20PCL=201.15.0=20will=20not=20be=20ABI-compatible=20to=20PCL?=
+ =?UTF-8?q?=201.14.1=20anyway,=20these=20name=20changes=20do=20not=20matte?=
+ =?UTF-8?q?r=20AFAIK.?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,7 +117,7 @@ endif()
+ if(CMAKE_COMPILER_IS_GNUCXX)
+ if("${CMAKE_CXX_FLAGS}" STREQUAL "${CMAKE_CXX_FLAGS_DEFAULT}")
+ if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7)
+- string(APPEND CMAKE_CXX_FLAGS " -Wabi=11")
++ string(APPEND CMAKE_CXX_FLAGS " -Wabi=18")
+ else()
+ string(APPEND CMAKE_CXX_FLAGS " -Wabi")
+ endif()
diff --git a/sci-libs/pcl/files/pcl-1.14.1-boost.patch b/sci-libs/pcl/files/pcl-1.14.1-boost.patch
index 8f99023f741a..0c56c3b18b9a 100644
--- a/sci-libs/pcl/files/pcl-1.14.1-boost.patch
+++ b/sci-libs/pcl/files/pcl-1.14.1-boost.patch
@@ -6,12 +6,6 @@ Subject: [PATCH] Fix boost hash data type (#6053)
* Fix boost hash data type
* Change file name generation.
----
- visualization/src/pcl_visualizer.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/visualization/src/pcl_visualizer.cpp b/visualization/src/pcl_visualizer.cpp
-index 5f073646ac1..bc9b959c246 100644
--- a/visualization/src/pcl_visualizer.cpp
+++ b/visualization/src/pcl_visualizer.cpp
@@ -4591,10 +4591,12 @@ pcl::visualization::PCLVisualizer::getUniqueCameraFile (int argc, char **argv)
diff --git a/sci-libs/pcl/pcl-1.14.1-r1.ebuild b/sci-libs/pcl/pcl-1.14.1-r2.ebuild
index 42b8092fcda8..217d87752bc7 100644
--- a/sci-libs/pcl/pcl-1.14.1-r1.ebuild
+++ b/sci-libs/pcl/pcl-1.14.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -72,6 +72,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.14.1-gcc15.patch
"${FILESDIR}"/${PN}-1.14.1-tests.patch
"${FILESDIR}"/${PN}-1.14.1-boost.patch
+ "${FILESDIR}"/${PN}-1.14.1-boost-1.87.patch
)
src_prepare() {
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-12 22:11:22 +0000