CVS commit: pkgsrc/graphics/pcl

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/pcl
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Thu, 30 Jan 2025 22:07:41 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 30 22:07:41 UTC 2025

Modified Files:
        pkgsrc/graphics/pcl: distinfo
        pkgsrc/graphics/pcl/patches:
            patch-visualization_src_pcl__visualizer.cpp
Added Files:
        pkgsrc/graphics/pcl/patches: patch-apps_src_openni__mobile__server.cpp
            patch-apps_src_openni__octree__compression.cpp
            patch-apps_src_openni__organized__compression.cpp
            patch-io_include_pcl_io_hdl__grabber.h
            patch-io_include_pcl_io_robot__eye__grabber.h
            patch-io_include_pcl_io_tim__grabber.h
            patch-io_src_hdl__grabber.cpp patch-io_src_robot__eye__grabber.cpp
            patch-io_src_tim__grabber.cpp patch-io_src_vlp__grabber.cpp

Log Message:
pcl: fix build with boost 1.87 using upstream patches


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/pcl/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/pcl/patches/patch-apps_src_openni__mobile__server.cpp \
    pkgsrc/graphics/pcl/patches/patch-apps_src_openni__organized__compression.cpp \
    pkgsrc/graphics/pcl/patches/patch-io_include_pcl_io_hdl__grabber.h \
    pkgsrc/graphics/pcl/patches/patch-io_include_pcl_io_robot__eye__grabber.h \
    pkgsrc/graphics/pcl/patches/patch-io_include_pcl_io_tim__grabber.h \
    pkgsrc/graphics/pcl/patches/patch-io_src_hdl__grabber.cpp \
    pkgsrc/graphics/pcl/patches/patch-io_src_robot__eye__grabber.cpp \
    pkgsrc/graphics/pcl/patches/patch-io_src_tim__grabber.cpp \
    pkgsrc/graphics/pcl/patches/patch-io_src_vlp__grabber.cpp
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/graphics/pcl/patches/patch-apps_src_openni__octree__compression.cpp
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/graphics/pcl/patches/patch-visualization_src_pcl__visualizer.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/pcl/distinfo
diff -u pkgsrc/graphics/pcl/distinfo:1.7 pkgsrc/graphics/pcl/distinfo:1.8
--- pkgsrc/graphics/pcl/distinfo:1.7    Sat Oct 26 00:06:49 2024
+++ pkgsrc/graphics/pcl/distinfo        Thu Jan 30 22:07:41 2025
@@ -1,7 +1,17 @@
-$NetBSD: distinfo,v 1.7 2024/10/26 00:06:49 gdt Exp $
+$NetBSD: distinfo,v 1.8 2025/01/30 22:07:41 wiz Exp $
 
 BLAKE2s (pcl-1.14.1.tar.gz) = 2041205bbfd63f4f5211a6332c6dd0a3d0ba90974a51b67e19e614936f0a7b20
 SHA512 (pcl-1.14.1.tar.gz) = 8e2d2839fe73a955d49b9a72861de2becf2da9a0dc906bd10ab8a3518e270a2f1900d801922d02871d704f2ed380273d35c2d0e04d8da7e24a21eb351c43c00b
 Size (pcl-1.14.1.tar.gz) = 68672885 bytes
+SHA1 (patch-apps_src_openni__mobile__server.cpp) = 8b3ec8361224a3a906b78da5fa4d412c1b6bac18
+SHA1 (patch-apps_src_openni__octree__compression.cpp) = a2e5596c17d8d093d637e2c571110cacc4276dbf
+SHA1 (patch-apps_src_openni__organized__compression.cpp) = 03a9bd658abca5a8bdd81eec514d137ee154c740
 SHA1 (patch-cmake_pcl__targets.cmake) = 8f3e85b48edabc6573d8741bbb330fbc531d9b3f
-SHA1 (patch-visualization_src_pcl__visualizer.cpp) = 00a54a61f3ef7344de185b23603b02dbae5d395a
+SHA1 (patch-io_include_pcl_io_hdl__grabber.h) = 7a2fe4b65e12709b3c67d2188e661f65edfa4d1f
+SHA1 (patch-io_include_pcl_io_robot__eye__grabber.h) = dd81cd932e636caff3f91ba905e728b3244e3bcc
+SHA1 (patch-io_include_pcl_io_tim__grabber.h) = ed4f73a86c23eeba4b44b3c948d280f593c6b29a
+SHA1 (patch-io_src_hdl__grabber.cpp) = bae5050da0c86e2d039e2622e2d987a5d5243cc7
+SHA1 (patch-io_src_robot__eye__grabber.cpp) = 3f579a71e725516d68b4656be727abda7541eefd
+SHA1 (patch-io_src_tim__grabber.cpp) = fc1fccd50d29a96d4b0788098f5a9b7eb7633178
+SHA1 (patch-io_src_vlp__grabber.cpp) = 42edc3c5da713438491338e3539088fb9cdf241e
+SHA1 (patch-visualization_src_pcl__visualizer.cpp) = 7ed098e91f8cc74df7c9ad94d2ff612a65682c33

Index: pkgsrc/graphics/pcl/patches/patch-visualization_src_pcl__visualizer.cpp
diff -u pkgsrc/graphics/pcl/patches/patch-visualization_src_pcl__visualizer.cpp:1.3 pkgsrc/graphics/pcl/patches/patch-visualization_src_pcl__visualizer.cpp:1.4
--- pkgsrc/graphics/pcl/patches/patch-visualization_src_pcl__visualizer.cpp:1.3 Sat Oct 26 00:06:50 2024
+++ pkgsrc/graphics/pcl/patches/patch-visualization_src_pcl__visualizer.cpp     Thu Jan 30 22:07:41 2025
@@ -1,5 +1,6 @@
-$NetBSD: patch-visualization_src_pcl__visualizer.cpp,v 1.3 2024/10/26 00:06:50 gdt Exp $
+$NetBSD: patch-visualization_src_pcl__visualizer.cpp,v 1.4 2025/01/30 22:07:41 wiz Exp $
 
+build of 1.14.1 fails with boost 1.86.0 #6157
 https://github.com/PointCloudLibrary/pcl/issues/6157
 
 --- visualization/src/pcl_visualizer.cpp.orig  2024-10-25 23:54:29.888728521 +0000

Added files:

Index: pkgsrc/graphics/pcl/patches/patch-apps_src_openni__mobile__server.cpp
diff -u /dev/null pkgsrc/graphics/pcl/patches/patch-apps_src_openni__mobile__server.cpp:1.1
--- /dev/null   Thu Jan 30 22:07:41 2025
+++ pkgsrc/graphics/pcl/patches/patch-apps_src_openni__mobile__server.cpp       Thu Jan 30 22:07:41 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-apps_src_openni__mobile__server.cpp,v 1.1 2025/01/30 22:07:41 wiz Exp $
+
+Prepare for Boost 1.87
+https://github.com/PointCloudLibrary/pcl/commit/6f64495840c4e5674d542ccf20df96ed12665687
+
+--- apps/src/openni_mobile_server.cpp.orig     2024-05-03 12:14:21.000000000 +0000
++++ apps/src/openni_mobile_server.cpp
+@@ -157,7 +157,7 @@ public:
+ 
+     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);
Index: pkgsrc/graphics/pcl/patches/patch-apps_src_openni__organized__compression.cpp
diff -u /dev/null pkgsrc/graphics/pcl/patches/patch-apps_src_openni__organized__compression.cpp:1.1
--- /dev/null   Thu Jan 30 22:07:41 2025
+++ pkgsrc/graphics/pcl/patches/patch-apps_src_openni__organized__compression.cpp       Thu Jan 30 22:07:41 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-apps_src_openni__organized__compression.cpp,v 1.1 2025/01/30 22:07:41 wiz Exp $
+
+Prepare for Boost 1.87
+https://github.com/PointCloudLibrary/pcl/commit/6f64495840c4e5674d542ccf20df96ed12665687
+
+--- apps/src/openni_organized_compression.cpp.orig     2024-05-03 12:14:21.000000000 +0000
++++ 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;
+ 
Index: pkgsrc/graphics/pcl/patches/patch-io_include_pcl_io_hdl__grabber.h
diff -u /dev/null pkgsrc/graphics/pcl/patches/patch-io_include_pcl_io_hdl__grabber.h:1.1
--- /dev/null   Thu Jan 30 22:07:41 2025
+++ pkgsrc/graphics/pcl/patches/patch-io_include_pcl_io_hdl__grabber.h  Thu Jan 30 22:07:41 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-io_include_pcl_io_hdl__grabber.h,v 1.1 2025/01/30 22:07:41 wiz Exp $
+
+Prepare for Boost 1.87
+https://github.com/PointCloudLibrary/pcl/commit/6f64495840c4e5674d542ccf20df96ed12665687
+
+--- io/include/pcl/io/hdl_grabber.h.orig       2024-05-03 12:14:21.000000000 +0000
++++ 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_;
Index: pkgsrc/graphics/pcl/patches/patch-io_include_pcl_io_robot__eye__grabber.h
diff -u /dev/null pkgsrc/graphics/pcl/patches/patch-io_include_pcl_io_robot__eye__grabber.h:1.1
--- /dev/null   Thu Jan 30 22:07:41 2025
+++ pkgsrc/graphics/pcl/patches/patch-io_include_pcl_io_robot__eye__grabber.h   Thu Jan 30 22:07:41 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-io_include_pcl_io_robot__eye__grabber.h,v 1.1 2025/01/30 22:07:41 wiz Exp $
+
+Prepare for Boost 1.87
+https://github.com/PointCloudLibrary/pcl/commit/6f64495840c4e5674d542ccf20df96ed12665687
+
+--- io/include/pcl/io/robot_eye_grabber.h.orig 2024-05-03 12:14:21.000000000 +0000
++++ 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_;
Index: pkgsrc/graphics/pcl/patches/patch-io_include_pcl_io_tim__grabber.h
diff -u /dev/null pkgsrc/graphics/pcl/patches/patch-io_include_pcl_io_tim__grabber.h:1.1
--- /dev/null   Thu Jan 30 22:07:41 2025
+++ pkgsrc/graphics/pcl/patches/patch-io_include_pcl_io_tim__grabber.h  Thu Jan 30 22:07:41 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-io_include_pcl_io_tim__grabber.h,v 1.1 2025/01/30 22:07:41 wiz Exp $
+
+Prepare for Boost 1.87
+https://github.com/PointCloudLibrary/pcl/commit/6f64495840c4e5674d542ccf20df96ed12665687
+
+--- io/include/pcl/io/tim_grabber.h.orig       2024-05-03 12:14:21.000000000 +0000
++++ io/include/pcl/io/tim_grabber.h
+@@ -128,7 +128,7 @@ class PCL_EXPORTS TimGrabber : public Gr
+     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;
Index: pkgsrc/graphics/pcl/patches/patch-io_src_hdl__grabber.cpp
diff -u /dev/null pkgsrc/graphics/pcl/patches/patch-io_src_hdl__grabber.cpp:1.1
--- /dev/null   Thu Jan 30 22:07:41 2025
+++ pkgsrc/graphics/pcl/patches/patch-io_src_hdl__grabber.cpp   Thu Jan 30 22:07:41 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-io_src_hdl__grabber.cpp,v 1.1 2025/01/30 22:07:41 wiz Exp $
+
+Prepare for Boost 1.87
+https://github.com/PointCloudLibrary/pcl/commit/6f64495840c4e5674d542ccf20df96ed12665687
+
+--- io/src/hdl_grabber.cpp.orig        2024-05-03 12:14:21.000000000 +0000
++++ 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"));
+ }
+ 
+ /////////////////////////////////////////////////////////////////////////////
Index: pkgsrc/graphics/pcl/patches/patch-io_src_robot__eye__grabber.cpp
diff -u /dev/null pkgsrc/graphics/pcl/patches/patch-io_src_robot__eye__grabber.cpp:1.1
--- /dev/null   Thu Jan 30 22:07:41 2025
+++ pkgsrc/graphics/pcl/patches/patch-io_src_robot__eye__grabber.cpp    Thu Jan 30 22:07:41 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-io_src_robot__eye__grabber.cpp,v 1.1 2025/01/30 22:07:41 wiz Exp $
+
+Prepare for Boost 1.87
+https://github.com/PointCloudLibrary/pcl/commit/6f64495840c4e5674d542ccf20df96ed12665687
+
+--- io/src/robot_eye_grabber.cpp.orig  2024-05-03 12:14:21.000000000 +0000
++++ io/src/robot_eye_grabber.cpp
+@@ -269,7 +269,7 @@ void
+ pcl::RobotEyeGrabber::socketThreadLoop ()
+ {
+   asyncSocketReceive();
+-  io_service_.reset();
++  io_service_.restart();
+   io_service_.run();
+ }
+ 
Index: pkgsrc/graphics/pcl/patches/patch-io_src_tim__grabber.cpp
diff -u /dev/null pkgsrc/graphics/pcl/patches/patch-io_src_tim__grabber.cpp:1.1
--- /dev/null   Thu Jan 30 22:07:41 2025
+++ pkgsrc/graphics/pcl/patches/patch-io_src_tim__grabber.cpp   Thu Jan 30 22:07:41 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-io_src_tim__grabber.cpp,v 1.1 2025/01/30 22:07:41 wiz Exp $
+
+Prepare for Boost 1.87
+https://github.com/PointCloudLibrary/pcl/commit/6f64495840c4e5674d542ccf20df96ed12665687
+
+--- io/src/tim_grabber.cpp.orig        2024-05-03 12:14:21.000000000 +0000
++++ 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)
+   {
Index: pkgsrc/graphics/pcl/patches/patch-io_src_vlp__grabber.cpp
diff -u /dev/null pkgsrc/graphics/pcl/patches/patch-io_src_vlp__grabber.cpp:1.1
--- /dev/null   Thu Jan 30 22:07:41 2025
+++ pkgsrc/graphics/pcl/patches/patch-io_src_vlp__grabber.cpp   Thu Jan 30 22:07:41 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-io_src_vlp__grabber.cpp,v 1.1 2025/01/30 22:07:41 wiz Exp $
+
+Prepare for Boost 1.87
+https://github.com/PointCloudLibrary/pcl/commit/6f64495840c4e5674d542ccf20df96ed12665687
+
+--- io/src/vlp_grabber.cpp.orig        2024-05-03 12:14:21.000000000 +0000
++++ 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"));
+ }
+ 
+ /////////////////////////////////////////////////////////////////////////////

Index: pkgsrc/graphics/pcl/patches/patch-apps_src_openni__octree__compression.cpp
diff -u /dev/null pkgsrc/graphics/pcl/patches/patch-apps_src_openni__octree__compression.cpp:1.3
--- /dev/null   Thu Jan 30 22:07:41 2025
+++ pkgsrc/graphics/pcl/patches/patch-apps_src_openni__octree__compression.cpp  Thu Jan 30 22:07:41 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-apps_src_openni__octree__compression.cpp,v 1.3 2025/01/30 22:07:41 wiz Exp $
+
+Prepare for Boost 1.87
+https://github.com/PointCloudLibrary/pcl/commit/6f64495840c4e5674d542ccf20df96ed12665687
+
+--- apps/src/openni_octree_compression.cpp.orig        2024-05-03 12:14:21.000000000 +0000
++++ 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;
+

Prev by Date: CVS commit: pkgsrc/graphics/py-OpenGL-accelerate
Next by Date: CVS commit: pkgsrc/sysutils/u-boot-jetson-nano
Previous by Thread: CVS commit: pkgsrc/graphics/py-OpenGL-accelerate
Next by Thread: CVS commit: pkgsrc/sysutils/u-boot-jetson-nano
Indexes:

Home | Main Index | Thread Index | Old Index