diff options
24 files changed, 373 insertions, 3 deletions
diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo index 835bab02fc1..fbb45825a4b 100644 --- a/ham/gnuradio-core/distinfo +++ b/ham/gnuradio-core/distinfo @@ -1,16 +1,38 @@ -$NetBSD: distinfo,v 1.34 2020/04/17 13:33:44 joerg Exp $ +$NetBSD: distinfo,v 1.35 2020/05/09 15:17:51 joerg Exp $ SHA1 (gnuradio-3.7.13.5.tar.gz) = c81a9cb1ec5e9455d885c804ba8fb656c4573b53 RMD160 (gnuradio-3.7.13.5.tar.gz) = 87786c5f333069c15316c6a45dbce11f329ddac6 SHA512 (gnuradio-3.7.13.5.tar.gz) = 35fad30ccbc8a82e03d44815bb958dc3718089bce628795ded53f554dff68a4acb1a0f1110b97446f5dc0182c0313855c0f1624b5e9caea26ae6189be81453bf Size (gnuradio-3.7.13.5.tar.gz) = 4548612 bytes SHA1 (patch-cmake_Modules_FindSphinx.cmake) = 1e42ad000962f4766810fbd322c80dad1f0b1c3c +SHA1 (patch-gnuradio-runtime_lib_block.cc) = a08a3f69ade0a935d88140e386e6f623c0edb1c6 SHA1 (patch-gnuradio-runtime_lib_pmt_pmt__serialize.cc) = be8d6704aadc62f6a9c1e85c68443a94e81ea882 SHA1 (patch-gnuradio_runtime_include_gnuradio_high__res__timer__h) = 59ad8192e7ac76b2ce35cda68c378bc2abad20a5 SHA1 (patch-gnuradio_runtime_lib_thread_thread_cc) = 7e8aa146447fc7ffd006ffd540764ae4b15da2a5 +SHA1 (patch-gr-analog_lib_sig__source__X__impl.cc.t) = 103bd0b61f18e3d86d7a01189f611a9d0e3124c0 SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 42e0b52d6baba936c03e2414e83a96a19c5331e7 SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = d61dcd31058c04a6050479a6e8c321ca15420d49 -SHA1 (patch-gr-blocks_lib_socket__pdu__impl.cc) = 96a0f5c17fdea993531846ef011767c999d17d36 +SHA1 (patch-gr-blocks_lib_copy__impl.cc) = 86f6ea02c12788ba42a477500c8dcdb03f44ee6b +SHA1 (patch-gr-blocks_lib_message__debug__impl.cc) = 1f44d4dc99a46b97617e911747f5820095049d31 +SHA1 (patch-gr-blocks_lib_message__strobe__impl.cc) = 67115a9fa7f1b134384eca9cd9af4a40a6aba1f4 +SHA1 (patch-gr-blocks_lib_message__strobe__random__impl.cc) = 7512b5ca9a4ab55acb77a95b35943f070f19344e +SHA1 (patch-gr-blocks_lib_multiply__matrix__cc__impl.cc) = 96ba01c18ed47bd97cc90e6f2642ae950a9c32d4 +SHA1 (patch-gr-blocks_lib_multiply__matrix__ff__impl.cc) = 4ca3df47fce12d426efa4edfa59143bff911a1f0 +SHA1 (patch-gr-blocks_lib_mute__XX__impl.cc.t) = e2d511fd6f729f0d2947306f752cdca0e7b1c0d4 +SHA1 (patch-gr-blocks_lib_nop__impl.cc) = c388f57385a31a4c5d87923797241a9c6388303c +SHA1 (patch-gr-blocks_lib_pdu__filter__impl.cc) = 7e7ff5033120a043871cb38bdc481dd60118b9e7 +SHA1 (patch-gr-blocks_lib_pdu__remove__impl.cc) = bbf83d6097cf0a6cfb257664a7b8925c20323d34 +SHA1 (patch-gr-blocks_lib_pdu__set__impl.cc) = 9d83b3fdb39bc76bb7b9ae64d7ffa8151e8b443b +SHA1 (patch-gr-blocks_lib_random__pdu__impl.cc) = 818035e99e9607d5b429e3453a8d5e76d12fad5b +SHA1 (patch-gr-blocks_lib_repeat__impl.cc) = 7971eeb9904090d69659d6dfb9423f0673043e82 +SHA1 (patch-gr-blocks_lib_socket__pdu__impl.cc) = 41a365478936aa66bf1a31ab36f7ced81520f0de +SHA1 (patch-gr-blocks_lib_tagged__stream__multiply__length__impl.cc) = a3d2ee3887ede46142e3604c7bb4b1a77856b3af SHA1 (patch-gr-blocks_lib_tcp__connection.cc) = ef932b7a4d87d7fd2ed6dcff5ab2d75b25095acc SHA1 (patch-gr-blocks_lib_tcp__connection.h) = ef6e19424a07f4cf16dbac834bdb48f3f639ebf5 +SHA1 (patch-gr-blocks_lib_tuntap__pdu__impl.cc) = d01da5adf8a3fb888553de502657e25f730f373d +SHA1 (patch-gr-blocks_lib_wavfile.cc) = f4348c02e450671d64f4cbd5920609e3b637e981 +SHA1 (patch-gr-digital_lib_chunks__to__symbols__XX__impl.cc.t) = 39d8e2a07d98bf10d21e75976281bb0a966ff775 +SHA1 (patch-gr-filter_lib_fractional__resampler__cc__impl.cc) = 22fb471e1bb0ff46f07d824b27b113ad40ba963d +SHA1 (patch-gr-filter_lib_fractional__resampler__ff__impl.cc) = d8eac11e6788b405678cb86adf9224af6af568bf +SHA1 (patch-gr-filter_lib_freq__xlating__fir__filter__XXX__impl.cc.t) = c5bbbb471a476fdb676cbfb01efa082054d9a718 SHA1 (patch-volk_lib_qa__utils.cc) = 2bf322c4cf75183baeb589df2e3deccfffad0391 diff --git a/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_block.cc b/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_block.cc new file mode 100644 index 00000000000..7444c9d0cf4 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_block.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gnuradio-runtime_lib_block.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gnuradio-runtime/lib/block.cc.orig 2020-05-08 23:51:09.426889790 +0000 ++++ gnuradio-runtime/lib/block.cc +@@ -60,7 +60,7 @@ namespace gr { + { + global_block_registry.register_primitive(alias(), this); + message_port_register_in(d_system_port); +- set_msg_handler(d_system_port, boost::bind(&block::system_handler, this, _1)); ++ set_msg_handler(d_system_port, boost::bind(&block::system_handler, this, boost::placeholders::_1)); + + configure_default_loggers(d_logger, d_debug_logger, symbol_name()); + } diff --git a/ham/gnuradio-core/patches/patch-gr-analog_lib_sig__source__X__impl.cc.t b/ham/gnuradio-core/patches/patch-gr-analog_lib_sig__source__X__impl.cc.t new file mode 100644 index 00000000000..f271bf65dab --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-analog_lib_sig__source__X__impl.cc.t @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-analog_lib_sig__source__X__impl.cc.t,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-analog/lib/sig_source_X_impl.cc.t.orig 2020-05-09 00:48:44.893191233 +0000 ++++ gr-analog/lib/sig_source_X_impl.cc.t +@@ -55,7 +55,7 @@ namespace gr { + set_frequency(frequency); + + message_port_register_in(pmt::mp("freq")); +- set_msg_handler(pmt::mp("freq"), boost::bind(&@IMPL_NAME@::set_frequency_msg, this, _1)); ++ set_msg_handler(pmt::mp("freq"), boost::bind(&@IMPL_NAME@::set_frequency_msg, this, boost::placeholders::_1)); + } + + @IMPL_NAME@::~@IMPL_NAME@() diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_copy__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_copy__impl.cc new file mode 100644 index 00000000000..016a3653fd3 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_copy__impl.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-blocks_lib_copy__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/copy_impl.cc.orig 2020-05-09 00:11:28.288489868 +0000 ++++ gr-blocks/lib/copy_impl.cc +@@ -47,7 +47,7 @@ namespace gr { + { + message_port_register_in(pmt::mp("en")); + set_msg_handler(pmt::mp("en"), +- boost::bind(©_impl::handle_enable, this, _1)); ++ boost::bind(©_impl::handle_enable, this, boost::placeholders::_1)); + } + + copy_impl::~copy_impl() diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__debug__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__debug__impl.cc new file mode 100644 index 00000000000..e0fd0ee3fb7 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__debug__impl.cc @@ -0,0 +1,21 @@ +$NetBSD: patch-gr-blocks_lib_message__debug__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/message_debug_impl.cc.orig 2020-05-09 00:13:10.692843843 +0000 ++++ gr-blocks/lib/message_debug_impl.cc +@@ -102,13 +102,13 @@ namespace gr { + io_signature::make(0, 0, 0)) + { + message_port_register_in(pmt::mp("print")); +- set_msg_handler(pmt::mp("print"), boost::bind(&message_debug_impl::print, this, _1)); ++ set_msg_handler(pmt::mp("print"), boost::bind(&message_debug_impl::print, this, boost::placeholders::_1)); + + message_port_register_in(pmt::mp("store")); +- set_msg_handler(pmt::mp("store"), boost::bind(&message_debug_impl::store, this, _1)); ++ set_msg_handler(pmt::mp("store"), boost::bind(&message_debug_impl::store, this, boost::placeholders::_1)); + + message_port_register_in(pmt::mp("print_pdu")); +- set_msg_handler(pmt::mp("print_pdu"), boost::bind(&message_debug_impl::print_pdu, this, _1)); ++ set_msg_handler(pmt::mp("print_pdu"), boost::bind(&message_debug_impl::print_pdu, this, boost::placeholders::_1)); + } + + message_debug_impl::~message_debug_impl() diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__impl.cc new file mode 100644 index 00000000000..9fca1097c64 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__impl.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-blocks_lib_message__strobe__impl.cc,v 1.3 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/message_strobe_impl.cc.orig 2020-05-09 00:13:08.349836282 +0000 ++++ gr-blocks/lib/message_strobe_impl.cc +@@ -58,7 +58,7 @@ namespace gr { + + message_port_register_in(pmt::mp("set_msg")); + set_msg_handler(pmt::mp("set_msg"), +- boost::bind(&message_strobe_impl::set_msg, this, _1)); ++ boost::bind(&message_strobe_impl::set_msg, this, boost::placeholders::_1)); + } + + message_strobe_impl::~message_strobe_impl() diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__random__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__random__impl.cc new file mode 100644 index 00000000000..02f7212c10c --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__random__impl.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-blocks_lib_message__strobe__random__impl.cc,v 1.3 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/message_strobe_random_impl.cc.orig 2020-05-09 00:14:08.662748468 +0000 ++++ gr-blocks/lib/message_strobe_random_impl.cc +@@ -68,7 +68,7 @@ namespace gr { + + message_port_register_in(pmt::mp("set_msg")); + set_msg_handler(pmt::mp("set_msg"), +- boost::bind(&message_strobe_random_impl::set_msg, this, _1)); ++ boost::bind(&message_strobe_random_impl::set_msg, this, boost::placeholders::_1)); + } + + float message_strobe_random_impl::next_delay(){ diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_multiply__matrix__cc__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_multiply__matrix__cc__impl.cc new file mode 100644 index 00000000000..7caf88b5598 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_multiply__matrix__cc__impl.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-blocks_lib_multiply__matrix__cc__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/multiply_matrix_cc_impl.cc.orig 2020-05-09 00:14:15.273419586 +0000 ++++ gr-blocks/lib/multiply_matrix_cc_impl.cc +@@ -57,7 +57,7 @@ namespace gr { + message_port_register_in(port_name); + set_msg_handler( + port_name, +- boost::bind(&multiply_matrix_cc_impl::msg_handler_A, this, _1) ++ boost::bind(&multiply_matrix_cc_impl::msg_handler_A, this, boost::placeholders::_1) + ); + } + diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_multiply__matrix__ff__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_multiply__matrix__ff__impl.cc new file mode 100644 index 00000000000..f94a60e4160 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_multiply__matrix__ff__impl.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-blocks_lib_multiply__matrix__ff__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/multiply_matrix_ff_impl.cc.orig 2020-05-09 00:14:17.402598574 +0000 ++++ gr-blocks/lib/multiply_matrix_ff_impl.cc +@@ -57,7 +57,7 @@ namespace gr { + message_port_register_in(port_name); + set_msg_handler( + port_name, +- boost::bind(&multiply_matrix_ff_impl::msg_handler_A, this, _1) ++ boost::bind(&multiply_matrix_ff_impl::msg_handler_A, this, boost::placeholders::_1) + ); + } + diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_mute__XX__impl.cc.t b/ham/gnuradio-core/patches/patch-gr-blocks_lib_mute__XX__impl.cc.t new file mode 100644 index 00000000000..935b483d47d --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_mute__XX__impl.cc.t @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-blocks_lib_mute__XX__impl.cc.t,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/mute_XX_impl.cc.t.orig 2020-05-09 00:48:46.934718299 +0000 ++++ gr-blocks/lib/mute_XX_impl.cc.t +@@ -48,7 +48,7 @@ namespace gr { + { + message_port_register_in(pmt::intern("set_mute")); + set_msg_handler(pmt::intern("set_mute"), +- boost::bind(&@NAME_IMPL@::set_mute_pmt, this, _1)); ++ boost::bind(&@NAME_IMPL@::set_mute_pmt, this, boost::placeholders::_1)); + } + + @NAME_IMPL@::~@NAME_IMPL@() diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_nop__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_nop__impl.cc new file mode 100644 index 00000000000..b4393198731 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_nop__impl.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-blocks_lib_nop__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/nop_impl.cc.orig 2020-05-09 00:14:19.564916271 +0000 ++++ gr-blocks/lib/nop_impl.cc +@@ -46,7 +46,7 @@ namespace gr { + { + // Arrange to have count_received_msgs called when messages are received. + message_port_register_in(pmt::mp("port")); +- set_msg_handler(pmt::mp("port"), boost::bind(&nop_impl::count_received_msgs, this, _1)); ++ set_msg_handler(pmt::mp("port"), boost::bind(&nop_impl::count_received_msgs, this, boost::placeholders::_1)); + } + + nop_impl::~nop_impl() diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__filter__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__filter__impl.cc new file mode 100644 index 00000000000..03c4373cdd3 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__filter__impl.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-blocks_lib_pdu__filter__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/pdu_filter_impl.cc.orig 2020-05-09 00:14:21.693971011 +0000 ++++ gr-blocks/lib/pdu_filter_impl.cc +@@ -45,7 +45,7 @@ namespace gr { + { + message_port_register_out(pdu::pdu_port_id()); + message_port_register_in(pdu::pdu_port_id()); +- set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_filter_impl::handle_msg, this, _1)); ++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_filter_impl::handle_msg, this, boost::placeholders::_1)); + } + + void diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__remove__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__remove__impl.cc new file mode 100644 index 00000000000..914245e0ce2 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__remove__impl.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-blocks_lib_pdu__remove__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/pdu_remove_impl.cc.orig 2020-05-09 00:14:25.622411218 +0000 ++++ gr-blocks/lib/pdu_remove_impl.cc +@@ -45,7 +45,7 @@ namespace gr { + { + message_port_register_out(pdu::pdu_port_id()); + message_port_register_in(pdu::pdu_port_id()); +- set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_remove_impl::handle_msg, this, _1)); ++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_remove_impl::handle_msg, this, boost::placeholders::_1)); + } + + void diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__set__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__set__impl.cc new file mode 100644 index 00000000000..2f84e546749 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_pdu__set__impl.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-blocks_lib_pdu__set__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/pdu_set_impl.cc.orig 2020-05-09 00:14:27.639478192 +0000 ++++ gr-blocks/lib/pdu_set_impl.cc +@@ -45,7 +45,7 @@ namespace gr { + { + message_port_register_out(pdu::pdu_port_id()); + message_port_register_in(pdu::pdu_port_id()); +- set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_set_impl::handle_msg, this, _1)); ++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_set_impl::handle_msg, this, boost::placeholders::_1)); + } + + void diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_random__pdu__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_random__pdu__impl.cc new file mode 100644 index 00000000000..a5d965172f3 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_random__pdu__impl.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-blocks_lib_random__pdu__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/random_pdu_impl.cc.orig 2020-05-09 00:14:29.761401160 +0000 ++++ gr-blocks/lib/random_pdu_impl.cc +@@ -50,7 +50,7 @@ namespace gr { + { + message_port_register_out(pdu::pdu_port_id()); + message_port_register_in(pmt::mp("generate")); +- set_msg_handler(pmt::mp("generate"), boost::bind(&random_pdu_impl::generate_pdu, this, _1)); ++ set_msg_handler(pmt::mp("generate"), boost::bind(&random_pdu_impl::generate_pdu, this, boost::placeholders::_1)); + if(length_modulo < 1) + throw std::runtime_error("length_module must be >= 1"); + if(max_items < length_modulo) diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_repeat__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_repeat__impl.cc new file mode 100644 index 00000000000..ada1da64190 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_repeat__impl.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-blocks_lib_repeat__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/repeat_impl.cc.orig 2020-05-09 00:14:31.767691624 +0000 ++++ gr-blocks/lib/repeat_impl.cc +@@ -45,7 +45,7 @@ namespace gr { + { + message_port_register_in(pmt::mp("interpolation")); + set_msg_handler(pmt::mp("interpolation"), +- boost::bind(&repeat_impl::msg_set_interpolation, this, _1)); ++ boost::bind(&repeat_impl::msg_set_interpolation, this, boost::placeholders::_1)); + } + + void diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc index b350ef4a3e0..8a5fbe8ba64 100644 --- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc @@ -1,9 +1,45 @@ -$NetBSD: patch-gr-blocks_lib_socket__pdu__impl.cc,v 1.1 2019/07/08 17:50:55 ryoon Exp $ +$NetBSD: patch-gr-blocks_lib_socket__pdu__impl.cc,v 1.2 2020/05/09 15:17:51 joerg Exp $ * Fix build with boost-1.70.0 --- gr-blocks/lib/socket_pdu_impl.cc.orig 2019-04-20 09:58:09.000000000 +0000 +++ gr-blocks/lib/socket_pdu_impl.cc +@@ -86,7 +86,7 @@ namespace gr { + + start_tcp_accept(); + +- set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::tcp_server_send, this, _1)); ++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::tcp_server_send, this, boost::placeholders::_1)); + } + else if (type =="TCP_CLIENT") { + boost::system::error_code error = boost::asio::error::host_not_found; +@@ -96,7 +96,7 @@ namespace gr { + throw boost::system::system_error(error); + d_tcp_socket->set_option(boost::asio::ip::tcp::no_delay(d_tcp_no_delay)); + +- set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::tcp_client_send, this, _1)); ++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::tcp_client_send, this, boost::placeholders::_1)); + + d_tcp_socket->async_read_some(boost::asio::buffer(d_rxbuf), + boost::bind(&socket_pdu_impl::handle_tcp_read, this, +@@ -110,7 +110,7 @@ namespace gr { + boost::asio::placeholders::error, + boost::asio::placeholders::bytes_transferred)); + +- set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::udp_send, this, _1)); ++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::udp_send, this, boost::placeholders::_1)); + } + else if (type =="UDP_CLIENT") { + d_udp_socket.reset(new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint)); +@@ -119,7 +119,7 @@ namespace gr { + boost::asio::placeholders::error, + boost::asio::placeholders::bytes_transferred)); + +- set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::udp_send, this, _1)); ++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&socket_pdu_impl::udp_send, this, boost::placeholders::_1)); + } + else + throw std::runtime_error("gr::blocks:socket_pdu: unknown socket type"); @@ -165,7 +165,7 @@ namespace gr { void socket_pdu_impl::start_tcp_accept() diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_tagged__stream__multiply__length__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_tagged__stream__multiply__length__impl.cc new file mode 100644 index 00000000000..1669a7ed517 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_tagged__stream__multiply__length__impl.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-blocks_lib_tagged__stream__multiply__length__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/tagged_stream_multiply_length_impl.cc.orig 2020-05-09 00:14:36.233242762 +0000 ++++ gr-blocks/lib/tagged_stream_multiply_length_impl.cc +@@ -48,7 +48,7 @@ namespace gr { + set_relative_rate(1); + message_port_register_in(pmt::intern("set_scalar")); + set_msg_handler(pmt::intern("set_scalar"), +- boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, this, _1)); ++ boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, this, boost::placeholders::_1)); + } + + tagged_stream_multiply_length_impl::~tagged_stream_multiply_length_impl() diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_tuntap__pdu__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_tuntap__pdu__impl.cc new file mode 100644 index 00000000000..34bf7bf3cee --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_tuntap__pdu__impl.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-blocks_lib_tuntap__pdu__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/tuntap_pdu_impl.cc.orig 2020-05-09 00:14:38.266368341 +0000 ++++ gr-blocks/lib/tuntap_pdu_impl.cc +@@ -97,7 +97,7 @@ namespace gr { + + // set up input message port + message_port_register_in(pdu::pdu_port_id()); +- set_msg_handler(pdu::pdu_port_id(), boost::bind(&tuntap_pdu_impl::send, this, _1)); ++ set_msg_handler(pdu::pdu_port_id(), boost::bind(&tuntap_pdu_impl::send, this, boost::placeholders::_1)); + } + + int diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_wavfile.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_wavfile.cc new file mode 100644 index 00000000000..9c54f824c16 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_wavfile.cc @@ -0,0 +1,31 @@ +$NetBSD: patch-gr-blocks_lib_wavfile.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-blocks/lib/wavfile.cc.orig 2020-05-09 00:06:11.248216593 +0000 ++++ gr-blocks/lib/wavfile.cc +@@ -27,7 +27,7 @@ + #include <gnuradio/blocks/wavfile.h> + #include <cstring> + #include <stdint.h> +-#include <boost/detail/endian.hpp> //BOOST_BIG_ENDIAN ++#include <boost/predef/other/endian.h> + + namespace gr { + namespace blocks { +@@ -35,7 +35,7 @@ namespace gr { + + // Basically, this is the opposite of htonx() and ntohx() + // Define host to/from worknet (little endian) short and long +-#ifdef BOOST_BIG_ENDIAN ++#if BOOST_ENDIAN_BIG_BYTE + + static inline uint16_t __gri_wav_bs16(uint16_t x) + { +@@ -52,7 +52,7 @@ namespace gr { + #define htows(x) __gri_wav_bs16(x) + #define wtohs(x) __gri_wav_bs16(x) + +-#else ++#elif BOOST_ENDIAN_LITTLE_BYTE + + #define htowl(x) uint32_t(x) + #define wtohl(x) uint32_t(x) diff --git a/ham/gnuradio-core/patches/patch-gr-digital_lib_chunks__to__symbols__XX__impl.cc.t b/ham/gnuradio-core/patches/patch-gr-digital_lib_chunks__to__symbols__XX__impl.cc.t new file mode 100644 index 00000000000..fe1cc89fab5 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-digital_lib_chunks__to__symbols__XX__impl.cc.t @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-digital_lib_chunks__to__symbols__XX__impl.cc.t,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-digital/lib/chunks_to_symbols_XX_impl.cc.t.orig 2020-05-09 00:48:48.819019376 +0000 ++++ gr-digital/lib/chunks_to_symbols_XX_impl.cc.t +@@ -52,7 +52,7 @@ namespace gr { + set_msg_handler( + pmt::mp("set_symbol_table"), + boost::bind(&@IMPL_NAME@::handle_set_symbol_table, +- this, _1)); ++ this, boost::placeholders::_1)); + } + + @IMPL_NAME@::~@IMPL_NAME@() diff --git a/ham/gnuradio-core/patches/patch-gr-filter_lib_fractional__resampler__cc__impl.cc b/ham/gnuradio-core/patches/patch-gr-filter_lib_fractional__resampler__cc__impl.cc new file mode 100644 index 00000000000..5f1be9fbb10 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-filter_lib_fractional__resampler__cc__impl.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-filter_lib_fractional__resampler__cc__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-filter/lib/fractional_resampler_cc_impl.cc.orig 2020-05-09 00:31:08.332613492 +0000 ++++ gr-filter/lib/fractional_resampler_cc_impl.cc +@@ -54,7 +54,7 @@ namespace gr { + set_relative_rate(1.0 / resamp_ratio); + message_port_register_in(pmt::intern("msg_in")); + set_msg_handler(pmt::intern("msg_in"), boost::bind( +- &fractional_resampler_cc_impl::handle_msg, this, _1)); ++ &fractional_resampler_cc_impl::handle_msg, this, boost::placeholders::_1)); + } + + fractional_resampler_cc_impl::~fractional_resampler_cc_impl() diff --git a/ham/gnuradio-core/patches/patch-gr-filter_lib_fractional__resampler__ff__impl.cc b/ham/gnuradio-core/patches/patch-gr-filter_lib_fractional__resampler__ff__impl.cc new file mode 100644 index 00000000000..ef77cc6da31 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-filter_lib_fractional__resampler__ff__impl.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-filter_lib_fractional__resampler__ff__impl.cc,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-filter/lib/fractional_resampler_ff_impl.cc.orig 2020-05-09 00:31:06.387390287 +0000 ++++ gr-filter/lib/fractional_resampler_ff_impl.cc +@@ -55,7 +55,7 @@ namespace gr { + + message_port_register_in(pmt::intern("msg_in")); + set_msg_handler(pmt::intern("msg_in"), boost::bind( +- &fractional_resampler_ff_impl::handle_msg, this, _1)); ++ &fractional_resampler_ff_impl::handle_msg, this, boost::placeholders::_1)); + } + + fractional_resampler_ff_impl::~fractional_resampler_ff_impl() diff --git a/ham/gnuradio-core/patches/patch-gr-filter_lib_freq__xlating__fir__filter__XXX__impl.cc.t b/ham/gnuradio-core/patches/patch-gr-filter_lib_freq__xlating__fir__filter__XXX__impl.cc.t new file mode 100644 index 00000000000..ce8d5d9707a --- /dev/null +++ b/ham/gnuradio-core/patches/patch-gr-filter_lib_freq__xlating__fir__filter__XXX__impl.cc.t @@ -0,0 +1,13 @@ +$NetBSD: patch-gr-filter_lib_freq__xlating__fir__filter__XXX__impl.cc.t,v 1.1 2020/05/09 15:17:51 joerg Exp $ + +--- gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t.orig 2020-05-09 00:48:50.738435461 +0000 ++++ gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t +@@ -69,7 +69,7 @@ namespace gr { + message_port_register_in(pmt::mp("freq")); + set_msg_handler(pmt::mp("freq"), + boost::bind(&@IMPL_NAME@::handle_set_center_freq, +- this, _1)); ++ this, boost::placeholders::_1)); + } + + @IMPL_NAME@::~@IMPL_NAME@() |