gentoo auto-resync : 27:12:2024 - 06:30:34

3 files changed, 157 insertions, 1 deletions

diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 5e79d4d75f4e..42b7b7833c9e 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,7 +1,8 @@
 AUX PR7093.patch 3317 BLAKE2B d369dfa91c8de3c62d1c14be52f5ad9491bf10f8fb904295bb92497a43150bcf9d1576442f3087b439e54fb4dac572d421e3cac95d71d01604cf329284e7ff5a SHA512 01758de8ecb721fcaadd31d478551420290b5e59c9b8fa3d421d4170665915c21e50ed765a9647b81d4f6acf71099c98628b823a66897b4f5e57df3c3b2643ba
+AUX gnuradio-3.10.11.0-boost-1.87.patch 6533 BLAKE2B dea2f7d662c2c7119234f6cddd1405bd2b942257bea75110c3c2464b5f5137887fab7e2ec8cc2851770af44f2bcd44a8499ba3f6a9ad3f6dd21311ec8ccc9904 SHA512 1a7656d7310e59cd8fd8259920bbcffb443948bbe8193bddc65610b1e4418ec3ea806d0fb21b565aa9a54ec8302f9d2e408c07ba912a6fe910a4c51ab416e775
 DIST gnuradio-3.10.11.0.tar.gz 4659646 BLAKE2B 21d523030e578ac335dc1497da27a957026206b36323473d5e96d9bc3832a06765d26684c46c03017e23c0bc6302429c366befac40113f9987840d5c22f978af SHA512 faf47956924832b04c66469ba3bdf174876d25c41e0f1c1dde3755596d232e2d18f5dab7aa848463f2d23ec8bcda0283ee8ede34fd57b079fe3cdb62c6470a82
 DIST gnuradio-3.10.9.2.tar.gz 4413832 BLAKE2B 69443e9b6893c6cb9db1678c28ac0fd01fe57e81438903612f7f65908fede257dab06a98fa90da25fe8caa6befb731ba51759509ace10a5541cae3e9d055a5db SHA512 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd
-EBUILD gnuradio-3.10.11.0.ebuild 7142 BLAKE2B 7d745da9a915959565a1ba95e34d778e3b2b2b3b8d488ed953e5a2a18bcec639aef9a27783dbb501012b879b5bdd56aa0369daa35c4efb74bf482b857cf07bcb SHA512 0c952b388e2a989f1ab2e7b6be8b413807c8e881bb443070e6e7ebc345f7a0540b600a5a61f90f9400fc4a97262426e3c07a5a1a527632260fb79913c00e753a
+EBUILD gnuradio-3.10.11.0.ebuild 7203 BLAKE2B 8865037aea821433bdf7f71497007f7b9092732fba5180b85d64774ba53503833264020473b5bb3f74ea9da7e6bdaa195b21ad9e3e48b6922875f7830a6688c6 SHA512 800484b01de328e97525befb78717450982acd488bf05f0b3ee7b1d68a5f6a8133becedc0c659d7126978d97847f83ba58fe61cf74e32407888d459147b2bbfd
 EBUILD gnuradio-3.10.9.2-r6.ebuild 7121 BLAKE2B 303ced66aafc13c232128e4147f4bc91df9e37b830caf2fc8ab63346c9f41c01ed478e5bed98510047c6d2bc8d0e0325d420bfd421e881c79cf8c2c9e6415602 SHA512 1e9cfae50f140ffa41b38897a4ad96f7c128f59e37838b649dcbaac1070420b9a9c7d792e45157b1dd216dffde21c0c857248a36334a8b7de3eceab4fa07327f
 EBUILD gnuradio-9999.ebuild 7142 BLAKE2B 7d745da9a915959565a1ba95e34d778e3b2b2b3b8d488ed953e5a2a18bcec639aef9a27783dbb501012b879b5bdd56aa0369daa35c4efb74bf482b857cf07bcb SHA512 0c952b388e2a989f1ab2e7b6be8b413807c8e881bb443070e6e7ebc345f7a0540b600a5a61f90f9400fc4a97262426e3c07a5a1a527632260fb79913c00e753a
 MISC metadata.xml 1869 BLAKE2B de75463e64f4f3352d8959d795de15d9345e52f491f61fc824db738bccc4e2ae0487d988c22c17149f80cda5478a5bfbda03a6c5239970423371a2a76f374003 SHA512 69477d22de9e60b7f7420b14437265771391320d7c362d51b81fb573671568cf6b6b39ba50be1ad7c8bb07ed219998cf474e19b663f4a65b0e2cc69feef017a0
diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.11.0-boost-1.87.patch b/net-wireless/gnuradio/files/gnuradio-3.10.11.0-boost-1.87.patch
new file mode 100644
index 000000000000..3a935c47058c
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.10.11.0-boost-1.87.patch
@@ -0,0 +1,151 @@
+https://bugs.gentoo.org/946914
+https://github.com/gnuradio/gnuradio/issues/7564
+https://github.com/gnuradio/gnuradio/pull/7554
+
+From b30b5feb130a1997c53bce61a85885858d4c9a0d Mon Sep 17 00:00:00 2001
+From: Landry Breuil <landry@openbsd.org>
+Date: Wed, 27 Nov 2024 14:16:08 +0100
+Subject: [PATCH] gr-network: fix build with boost 1.87
+
+- stop using asio..query
+- replace deprecated io_context.reset() by restart()
+- drop unneeded io_context.reset() calls
+- stop using asio::buffer_cast
+
+Signed-off-by: Landry Breuil <landry@openbsd.org>
+---
+ gr-network/lib/socket_pdu_impl.cc | 25 ++++++++++++++++++-------
+ gr-network/lib/tcp_sink_impl.cc   |  9 +++------
+ gr-network/lib/udp_sink_impl.cc   |  8 +++-----
+ gr-network/lib/udp_source_impl.cc |  3 +--
+ 4 files changed, 25 insertions(+), 20 deletions(-)
+
+diff --git a/gr-network/lib/socket_pdu_impl.cc b/gr-network/lib/socket_pdu_impl.cc
+index ef2ce6b4828..7cfef6812eb 100644
+--- a/gr-network/lib/socket_pdu_impl.cc
++++ b/gr-network/lib/socket_pdu_impl.cc
+@@ -54,9 +54,12 @@ socket_pdu_impl::socket_pdu_impl(std::string type,
+         d_tcp_endpoint = asio::ip::tcp::endpoint(asio::ip::tcp::v4(), port_num);
+     } else if ((type == "TCP_SERVER") || (type == "TCP_CLIENT")) {
+         asio::ip::tcp::resolver resolver(d_io_context);
+-        asio::ip::tcp::resolver::query query(
+-            asio::ip::tcp::v4(), addr, port, asio::ip::resolver_query_base::passive);
+-        d_tcp_endpoint = *resolver.resolve(query);
++        d_tcp_endpoint = *(resolver
++                               .resolve(asio::ip::tcp::v4(),
++                                        addr,
++                                        port,
++                                        asio::ip::resolver_query_base::passive)
++                               .cbegin());
+     } else if ((type == "UDP_SERVER") &&
+                ((addr.empty()) || (addr == "0.0.0.0"))) { // Bind on all interfaces
+         int port_num = atoi(port.c_str());
+@@ -66,13 +69,21 @@ socket_pdu_impl::socket_pdu_impl(std::string type,
+         d_udp_endpoint = asio::ip::udp::endpoint(asio::ip::udp::v4(), port_num);
+     } else if ((type == "UDP_SERVER") || (type == "UDP_CLIENT")) {
+         asio::ip::udp::resolver resolver(d_io_context);
+-        asio::ip::udp::resolver::query query(
+-            asio::ip::udp::v4(), addr, port, asio::ip::resolver_query_base::passive);
+ 
+         if (type == "UDP_SERVER")
+-            d_udp_endpoint = *resolver.resolve(query);
++            d_udp_endpoint = *(resolver
++                                   .resolve(asio::ip::udp::v4(),
++                                            addr,
++                                            port,
++                                            asio::ip::resolver_query_base::passive)
++                                   .cbegin());
+         else
+-            d_udp_endpoint_other = *resolver.resolve(query);
++            d_udp_endpoint_other = *(resolver
++                                         .resolve(asio::ip::udp::v4(),
++                                                  addr,
++                                                  port,
++                                                  asio::ip::resolver_query_base::passive)
++                                         .cbegin());
+     }
+ 
+     if (type == "TCP_SERVER") {
+diff --git a/gr-network/lib/tcp_sink_impl.cc b/gr-network/lib/tcp_sink_impl.cc
+index bbbc053db20..b7120ad87e4 100644
+--- a/gr-network/lib/tcp_sink_impl.cc
++++ b/gr-network/lib/tcp_sink_impl.cc
+@@ -63,10 +63,8 @@ bool tcp_sink_impl::start()
+ 
+         std::string s_port = std::to_string(d_port);
+         asio::ip::tcp::resolver resolver(d_io_context);
+-        asio::ip::tcp::resolver::query query(
+-            d_host, s_port, asio::ip::resolver_query_base::passive);
+-
+-        d_endpoint = *resolver.resolve(query, err);
++        d_endpoint = *(
++            resolver.resolve(d_host, s_port, asio::ip::tcp::resolver::passive).cbegin());
+ 
+         if (err) {
+             throw std::runtime_error(
+@@ -159,7 +157,7 @@ void tcp_sink_impl::connect(bool initial_connection)
+             d_acceptor = new asio::ip::tcp::acceptor(
+                 d_io_context, asio::ip::tcp::endpoint(asio::ip::tcp::v4(), d_port));
+     } else {
+-        d_io_context.reset();
++        d_io_context.restart();
+     }
+ 
+     if (d_tcpsocket) {
+@@ -194,7 +192,6 @@ bool tcp_sink_impl::stop()
+         d_tcpsocket = NULL;
+     }
+ 
+-    d_io_context.reset();
+     d_io_context.stop();
+ 
+     if (d_acceptor) {
+diff --git a/gr-network/lib/udp_sink_impl.cc b/gr-network/lib/udp_sink_impl.cc
+index bbdb96f8bb5..3e2462a5e9b 100644
+--- a/gr-network/lib/udp_sink_impl.cc
++++ b/gr-network/lib/udp_sink_impl.cc
+@@ -125,11 +125,10 @@ bool udp_sink_impl::start()
+     std::string str_port = std::to_string(d_port);
+     std::string str_host = d_host.empty() ? std::string("localhost") : d_host;
+     asio::ip::udp::resolver resolver(d_io_context);
+-    asio::ip::udp::resolver::query query(
+-        str_host, str_port, asio::ip::resolver_query_base::passive);
+-
+     asio::error_code err;
+-    d_endpoint = *resolver.resolve(query, err);
++    d_endpoint =
++        *(resolver.resolve(str_host, str_port, asio::ip::tcp::resolver::passive, err)
++              .cbegin());
+ 
+     if (err) {
+         throw std::runtime_error(std::string("[UDP Sink] Unable to resolve host/IP: ") +
+@@ -177,7 +176,6 @@ bool udp_sink_impl::stop()
+         delete d_udpsocket;
+         d_udpsocket = nullptr;
+ 
+-        d_io_context.reset();
+         d_io_context.stop();
+     }
+ 
+diff --git a/gr-network/lib/udp_source_impl.cc b/gr-network/lib/udp_source_impl.cc
+index 37f38a9b72d..774f348b90c 100644
+--- a/gr-network/lib/udp_source_impl.cc
++++ b/gr-network/lib/udp_source_impl.cc
+@@ -163,7 +163,6 @@ bool udp_source_impl::stop()
+         delete d_udpsocket;
+         d_udpsocket = nullptr;
+ 
+-        d_io_context.reset();
+         d_io_context.stop();
+     }
+ 
+@@ -275,7 +274,7 @@ int udp_source_impl::work(int noutput_items,
+             // Get the data and add it to our local queue.  We have to maintain a
+             // local queue in case we read more bytes than noutput_items is asking
+             // for.  In that case we'll only return noutput_items bytes
+-            const char* read_data = asio::buffer_cast<const char*>(d_read_buffer.data());
++            const char* read_data = static_cast<const char*>(d_read_buffer.data().data());
+ 
+             // Discard bytes if the input is longer than the buffer
+             if (bytes_read > d_localqueue_writer->bufsize()) {
+
diff --git a/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild b/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild
index 27cb13c82bc0..1afef5f54a9e 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild
@@ -133,6 +133,10 @@ DEPEND="${RDEPEND}
 	zeromq? ( net-libs/cppzmq )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.10.11.0-boost-1.87.patch
+)
+
 src_prepare() {
 	xdg_environment_reset #534582