From: Rafael Sadowski Subject: UPDATE: gnuradio-3.10.12.0 To: The OpenBSD ports mailing-list Date: Tue, 26 May 2026 16:09:49 +0200 Simple update gnuradio-3.10.12.0. Tested on amd64. OK? Cheers Rafael diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index 1fd6dbda8ba..d816491a692 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -1,9 +1,8 @@ COMMENT = signal-processing toolkit for SDR (software-defined radio) -GH_TAGNAME = v3.10.11.0 +GH_TAGNAME = v3.10.12.0 GH_ACCOUNT = gnuradio GH_PROJECT = gnuradio -REVISION = 4 SHARED_LIBS += gnuradio-analog 1.0 # 3.7 SHARED_LIBS += gnuradio-audio 1.0 # 3.7 @@ -106,12 +105,10 @@ CONFIGURE_ARGS =-DENABLE_DOXYGEN=OFF \ -DGR_PREFSDIR="${PREFIX}/share/examples/gnuradio/conf.d" \ -DSYSCONFDIR="${SYSCONFDIR}" -CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib -liconv" +MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib -liconv MAKE_ENV = VERBOSE=1 -CFLAGS = -Wno-implicit-const-int-float-conversion - post-install: mv ${PREFIX}/share/gnuradio/examples/* ${PREFIX}/share/examples/gnuradio rmdir ${PREFIX}/share/gnuradio/examples diff --git a/comms/gnuradio/distinfo b/comms/gnuradio/distinfo index 0ad20bcdea8..84b7470a332 100644 --- a/comms/gnuradio/distinfo +++ b/comms/gnuradio/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnuradio-3.10.11.0.tar.gz) = nKZY5sSvnP4UR3B1ezSrDt0j9tz6psXEanVGIz5ezSk= -SIZE (gnuradio-3.10.11.0.tar.gz) = 4659646 +SHA256 (gnuradio-3.10.12.0.tar.gz) = /nitn3TI6/k9XIrW+iwTI2rzMPPGcUnZGgZHs9xvOVg= +SIZE (gnuradio-3.10.12.0.tar.gz) = 4978802 diff --git a/comms/gnuradio/patches/patch-gnuradio-runtime_lib_thread_thread_cc b/comms/gnuradio/patches/patch-gnuradio-runtime_lib_thread_thread_cc deleted file mode 100644 index 6ec0828bf61..00000000000 --- a/comms/gnuradio/patches/patch-gnuradio-runtime_lib_thread_thread_cc +++ /dev/null @@ -1,29 +0,0 @@ -https://github.com/gnuradio/gnuradio/pull/7553 - -Index: gnuradio-runtime/lib/thread/thread.cc ---- gnuradio-runtime/lib/thread/thread.cc.orig -+++ gnuradio-runtime/lib/thread/thread.cc -@@ -135,8 +135,12 @@ void set_thread_name(gr_thread_t thread, std::string n - - #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || \ - defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \ -- defined(__NetBSD__) -+ defined(__NetBSD__) || defined(__OpenBSD__) - -+#include -+#ifdef __OpenBSD__ -+#include -+#endif - namespace gr { - namespace thread { - -@@ -199,6 +203,9 @@ int set_thread_priority(gr_thread_t thread, int priori - void set_thread_name(gr_thread_t thread, std::string name) - { - // Not implemented on OSX -+#ifdef __OpenBSD__ -+ pthread_set_name_np(thread, name.c_str()); -+#endif - } - - } /* namespace thread */ diff --git a/comms/gnuradio/patches/patch-gr-network_lib_socket_pdu_impl_cc b/comms/gnuradio/patches/patch-gr-network_lib_socket_pdu_impl_cc deleted file mode 100644 index 59b27e961a0..00000000000 --- a/comms/gnuradio/patches/patch-gr-network_lib_socket_pdu_impl_cc +++ /dev/null @@ -1,47 +0,0 @@ -https://github.com/gnuradio/gnuradio/pull/7554/commits/b30b5feb130a1997c53bce61a85885858d4c9a0d - -Index: gr-network/lib/socket_pdu_impl.cc ---- gr-network/lib/socket_pdu_impl.cc.orig -+++ 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/comms/gnuradio/patches/patch-gr-network_lib_tcp_sink_impl_cc b/comms/gnuradio/patches/patch-gr-network_lib_tcp_sink_impl_cc deleted file mode 100644 index 4e394b85c34..00000000000 --- a/comms/gnuradio/patches/patch-gr-network_lib_tcp_sink_impl_cc +++ /dev/null @@ -1,36 +0,0 @@ -https://github.com/gnuradio/gnuradio/pull/7554/commits/b30b5feb130a1997c53bce61a85885858d4c9a0d - -Index: gr-network/lib/tcp_sink_impl.cc ---- gr-network/lib/tcp_sink_impl.cc.orig -+++ gr-network/lib/tcp_sink_impl.cc -@@ -63,11 +63,9 @@ 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(d_host, s_port, asio::ip::tcp::resolver::passive).cbegin()); - -- d_endpoint = *resolver.resolve(query, err); -- - if (err) { - throw std::runtime_error( - std::string("[TCP Sink] Unable to resolve host/IP: ") + err.message()); -@@ -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/comms/gnuradio/patches/patch-gr-network_lib_udp_sink_impl_cc b/comms/gnuradio/patches/patch-gr-network_lib_udp_sink_impl_cc deleted file mode 100644 index 51d6d9ead57..00000000000 --- a/comms/gnuradio/patches/patch-gr-network_lib_udp_sink_impl_cc +++ /dev/null @@ -1,28 +0,0 @@ -https://github.com/gnuradio/gnuradio/pull/7554/commits/b30b5feb130a1997c53bce61a85885858d4c9a0d - -Index: gr-network/lib/udp_sink_impl.cc ---- gr-network/lib/udp_sink_impl.cc.orig -+++ 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/comms/gnuradio/patches/patch-gr-network_lib_udp_source_impl_cc b/comms/gnuradio/patches/patch-gr-network_lib_udp_source_impl_cc deleted file mode 100644 index dc94c177903..00000000000 --- a/comms/gnuradio/patches/patch-gr-network_lib_udp_source_impl_cc +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/gnuradio/gnuradio/pull/7554/commits/b30b5feb130a1997c53bce61a85885858d4c9a0d - -Index: gr-network/lib/udp_source_impl.cc ---- gr-network/lib/udp_source_impl.cc.orig -+++ 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(d_read_buffer.data()); -+ const char* read_data = static_cast(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/comms/gnuradio/pkg/PLIST b/comms/gnuradio/pkg/PLIST index 0f61cdc8321..0ca6985c050 100644 --- a/comms/gnuradio/pkg/PLIST +++ b/comms/gnuradio/pkg/PLIST @@ -631,7 +631,6 @@ include/gnuradio/trellis/pccc_decoder_blk.h include/gnuradio/trellis/pccc_decoder_combined_blk.h include/gnuradio/trellis/pccc_encoder.h include/gnuradio/trellis/permutation.h -include/gnuradio/trellis/quicksort_index.h include/gnuradio/trellis/sccc_decoder_blk.h include/gnuradio/trellis/sccc_decoder_combined_blk.h include/gnuradio/trellis/sccc_encoder.h @@ -641,6 +640,7 @@ include/gnuradio/trellis/siso_type.h include/gnuradio/trellis/viterbi.h include/gnuradio/trellis/viterbi_combined.h include/gnuradio/types.h +include/gnuradio/version.h include/gnuradio/video_sdl/ include/gnuradio/video_sdl/api.h include/gnuradio/video_sdl/sink_s.h @@ -1171,6 +1171,7 @@ lib/python${MODPY_VERSION}/site-packages/gnuradio/modtool/cli/add.py lib/python${MODPY_VERSION}/site-packages/gnuradio/modtool/cli/base.py lib/python${MODPY_VERSION}/site-packages/gnuradio/modtool/cli/bind.py lib/python${MODPY_VERSION}/site-packages/gnuradio/modtool/cli/disable.py +lib/python${MODPY_VERSION}/site-packages/gnuradio/modtool/cli/help.py lib/python${MODPY_VERSION}/site-packages/gnuradio/modtool/cli/info.py lib/python${MODPY_VERSION}/site-packages/gnuradio/modtool/cli/makeyaml.py lib/python${MODPY_VERSION}/site-packages/gnuradio/modtool/cli/newmod.py @@ -1281,6 +1282,7 @@ lib/python${MODPY_VERSION}/site-packages/pmt/pmt_to_python.py @man man/man1/uhd_siggen.1 @man man/man1/uhd_siggen_gui.1 share/applications/gnuradio-grc.desktop +share/bash-completion/completions/gr_modtool share/doc/gnuradio/ share/doc/gnuradio/CHANGELOG.md share/doc/gnuradio/CONTRIBUTING.md @@ -2305,6 +2307,9 @@ share/icons/hicolor/64x64/apps/gnuradio-grc.png share/metainfo/ share/metainfo/org.gnuradio.grc.metainfo.xml share/mime/packages/gnuradio-grc.xml +share/zsh/ +share/zsh/site-functions/ +share/zsh/site-functions/_gr_modtool @tag update-mime-database @tag gtk-update-icon-cache %D/share/icons/hicolor @tag update-desktop-database