pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/ham
Module Name: pkgsrc
Committed By: wiz
Date: Sat Feb 8 13:35:41 UTC 2025
Modified Files:
pkgsrc/ham/gnuradio-core: distinfo
pkgsrc/ham/gnuradio-network: Makefile
Added Files:
pkgsrc/ham/gnuradio-core/patches:
patch-gr-network_lib_socket__pdu__impl.cc
patch-gr-network_lib_tcp__sink__impl.cc
patch-gr-network_lib_udp__sink__impl.cc
patch-gr-network_lib_udp__source__impl.cc
Log Message:
gnuradio-network: fix build with boost 1.87
using upstream patch
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/ham/gnuradio-core/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_socket__pdu__impl.cc \
pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_tcp__sink__impl.cc \
pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_udp__sink__impl.cc \
pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_udp__source__impl.cc
cvs rdiff -u -r1.50 -r1.51 pkgsrc/ham/gnuradio-network/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/ham/gnuradio-core/distinfo
diff -u pkgsrc/ham/gnuradio-core/distinfo:1.59 pkgsrc/ham/gnuradio-core/distinfo:1.60
--- pkgsrc/ham/gnuradio-core/distinfo:1.59 Sun Aug 18 11:50:39 2024
+++ pkgsrc/ham/gnuradio-core/distinfo Sat Feb 8 13:35:40 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.59 2024/08/18 11:50:39 tnn Exp $
+$NetBSD: distinfo,v 1.60 2025/02/08 13:35:40 wiz Exp $
BLAKE2s (gnuradio-3.10.9.2.tar.gz) = 1ff9c9ee91f1feddc1c76fed6fa644c7b687e6e5a2ac97f86c69e0c28d76178d
SHA512 (gnuradio-3.10.9.2.tar.gz) = 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd
@@ -12,4 +12,8 @@ SHA1 (patch-gnuradio-runtime_lib_thread_
SHA1 (patch-gr-audio_lib_CMakeLists.txt) = d5acab47fdb007c50bb544af436102f0d38317aa
SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = cfa9b629e5cf21198cfd53cf27a908b5874866f4
SHA1 (patch-gr-blocks_lib_message__debug__impl.cc) = ae36b039e0224185fdd317390fcdfc47acb28365
+SHA1 (patch-gr-network_lib_socket__pdu__impl.cc) = 105784fc874c20daba0a1b42c29cd83496d76229
+SHA1 (patch-gr-network_lib_tcp__sink__impl.cc) = 2bd9a0920b293a244ea295d08d02a9a3ea2eabfd
+SHA1 (patch-gr-network_lib_udp__sink__impl.cc) = 2ad59e9572467944924e7e9f5f4f77d349b37c90
+SHA1 (patch-gr-network_lib_udp__source__impl.cc) = 4aea2b0a4cf3702a108fb8511b9492eb453924b1
SHA1 (patch-gr-qtgui_examples_c++_CMakeLists.txt) = 06a5885b5e661667cf4bfe936ff45723d0801c22
Index: pkgsrc/ham/gnuradio-network/Makefile
diff -u pkgsrc/ham/gnuradio-network/Makefile:1.50 pkgsrc/ham/gnuradio-network/Makefile:1.51
--- pkgsrc/ham/gnuradio-network/Makefile:1.50 Sun Dec 29 15:09:52 2024
+++ pkgsrc/ham/gnuradio-network/Makefile Sat Feb 8 13:35:40 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2024/12/29 15:09:52 adam Exp $
+# $NetBSD: Makefile,v 1.51 2025/02/08 13:35:40 wiz Exp $
PKGNAME= gnuradio-network-${VERSION}
-PKGREVISION= 12
+PKGREVISION= 13
COMMENT= Network blocks for GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
Added files:
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_socket__pdu__impl.cc
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_socket__pdu__impl.cc:1.1
--- /dev/null Sat Feb 8 13:35:41 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_socket__pdu__impl.cc Sat Feb 8 13:35:40 2025
@@ -0,0 +1,49 @@
+$NetBSD: patch-gr-network_lib_socket__pdu__impl.cc,v 1.1 2025/02/08 13:35:40 wiz Exp $
+
+Fix build with boost 1.87.
+https://github.com/gnuradio/gnuradio/pull/7554
+
+--- gr-network/lib/socket_pdu_impl.cc.orig 2024-01-17 20:36:19.000000000 +0000
++++ gr-network/lib/socket_pdu_impl.cc
+@@ -54,9 +54,12 @@ socket_pdu_impl::socket_pdu_impl(std::st
+ 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::st
+ 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") {
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_tcp__sink__impl.cc
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_tcp__sink__impl.cc:1.1
--- /dev/null Sat Feb 8 13:35:41 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_tcp__sink__impl.cc Sat Feb 8 13:35:40 2025
@@ -0,0 +1,37 @@
+$NetBSD: patch-gr-network_lib_tcp__sink__impl.cc,v 1.1 2025/02/08 13:35:40 wiz Exp $
+
+Fix build with boost 1.87.
+https://github.com/gnuradio/gnuradio/pull/7554
+
+--- gr-network/lib/tcp_sink_impl.cc.orig 2024-01-17 20:36:19.000000000 +0000
++++ 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
+ 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) {
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_udp__sink__impl.cc
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_udp__sink__impl.cc:1.1
--- /dev/null Sat Feb 8 13:35:41 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_udp__sink__impl.cc Sat Feb 8 13:35:40 2025
@@ -0,0 +1,30 @@
+$NetBSD: patch-gr-network_lib_udp__sink__impl.cc,v 1.1 2025/02/08 13:35:40 wiz Exp $
+
+Fix build with boost 1.87.
+https://github.com/gnuradio/gnuradio/pull/7554
+
+--- gr-network/lib/udp_sink_impl.cc.orig 2024-01-17 20:36:19.000000000 +0000
++++ 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();
+ }
+
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_udp__source__impl.cc
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_udp__source__impl.cc:1.1
--- /dev/null Sat Feb 8 13:35:41 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_udp__source__impl.cc Sat Feb 8 13:35:40 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-gr-network_lib_udp__source__impl.cc,v 1.1 2025/02/08 13:35:40 wiz Exp $
+
+Fix build with boost 1.87.
+https://github.com/gnuradio/gnuradio/pull/7554
+
+--- gr-network/lib/udp_source_impl.cc.orig 2024-01-17 20:36:19.000000000 +0000
++++ 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_it
+ // 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()) {
Home |
Main Index |
Thread Index |
Old Index