[packages/gnuradio] - rediff patches
baggins
baggins at pld-linux.org
Fri Mar 5 21:28:05 CET 2021
commit 59ce9828b2c3a04d0342d246623f0da0b96e0077
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Mar 5 21:27:52 2021 +0100
- rediff patches
gnuradio-boost.patch | 591 +++++++++++++++++++++++++++------------------------
link.patch | 28 +--
python-libdir.patch | 7 +-
3 files changed, 335 insertions(+), 291 deletions(-)
---
diff --git a/gnuradio-boost.patch b/gnuradio-boost.patch
index 8fa8289..2e1297b 100644
--- a/gnuradio-boost.patch
+++ b/gnuradio-boost.patch
@@ -1,6 +1,7 @@
---- gnuradio-3.8.0.0/gnuradio-runtime/lib/block.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gnuradio-runtime/lib/block.cc 2020-07-30 19:53:36.944956519 +0200
-@@ -61,7 +61,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gnuradio-runtime/lib/block.cc gnuradio-3.8.0.0/gnuradio-runtime/lib/block.cc
+--- gnuradio-3.8.0.0.org/gnuradio-runtime/lib/block.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gnuradio-runtime/lib/block.cc 2021-03-05 21:17:40.996626719 +0100
+@@ -61,7 +61,7 @@ block::block(const std::string& name,
{
global_block_registry.register_primitive(alias(), this);
message_port_register_in(d_system_port);
@@ -9,49 +10,22 @@
configure_default_loggers(d_logger, d_debug_logger, symbol_name());
}
---- gnuradio-3.8.0.0/gr-blocks/lib/mute_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-blocks/lib/mute_impl.cc 2020-07-30 20:01:57.627851457 +0200
-@@ -47,7 +47,7 @@
- {
- this->message_port_register_in(pmt::intern("set_mute"));
- this->set_msg_handler(pmt::intern("set_mute"),
-- boost::bind(&mute_impl<T>::set_mute_pmt, this, _1));
-+ boost::bind(&mute_impl<T>::set_mute_pmt, this, boost::placeholders::_1));
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-analog/lib/sig_source_impl.cc gnuradio-3.8.0.0/gr-analog/lib/sig_source_impl.cc
+--- gnuradio-3.8.0.0.org/gr-analog/lib/sig_source_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-analog/lib/sig_source_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -67,7 +67,7 @@ sig_source_impl<T>::sig_source_impl(doub
+ this->set_phase(phase);
+ this->message_port_register_in(pmt::mp("freq"));
+ this->set_msg_handler(pmt::mp("freq"),
+- boost::bind(&sig_source_impl<T>::set_frequency_msg, this, _1));
++ boost::bind(&sig_source_impl<T>::set_frequency_msg, this, boost::placeholders::_1));
}
template <class T>
---- gnuradio-3.8.0.0/gr-blocks/lib/wavfile.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-blocks/lib/wavfile.cc 2020-07-30 20:11:47.698777860 +0200
-@@ -26,7 +26,7 @@
-
- #include <gnuradio/blocks/wavfile.h>
- #include <stdint.h>
--#include <boost/detail/endian.hpp> //BOOST_BIG_ENDIAN
-+#include <boost/predef/other/endian.h>
- #include <cstring>
-
- namespace gr {
-@@ -35,7 +35,7 @@
-
- // 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) { return (x >> 8) | (x << 8); }
-
-@@ -57,7 +57,7 @@
- #define htows(x) uint16_t(x)
- #define wtohs(x) uint16_t(x)
-
--#endif // BOOST_BIG_ENDIAN
-+#endif // BOOST_ENDIAN_BIG_BYTE
-
- // WAV files are always little-endian, so we need some byte switching macros
- static inline uint32_t host_to_wav(uint32_t x) { return htowl(x); }
---- gnuradio-3.8.0.0/gr-blocks/lib/copy_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-blocks/lib/copy_impl.cc 2020-07-30 20:14:40.057820267 +0200
-@@ -44,7 +44,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-blocks/lib/copy_impl.cc gnuradio-3.8.0.0/gr-blocks/lib/copy_impl.cc
+--- gnuradio-3.8.0.0.org/gr-blocks/lib/copy_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-blocks/lib/copy_impl.cc 2021-03-05 21:17:40.996626719 +0100
+@@ -44,7 +44,7 @@ copy_impl::copy_impl(size_t itemsize)
d_enabled(true)
{
message_port_register_in(pmt::mp("en"));
@@ -60,9 +34,10 @@
}
copy_impl::~copy_impl() {}
---- gnuradio-3.8.0.0/gr-blocks/lib/message_debug_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-blocks/lib/message_debug_impl.cc 2020-07-30 20:19:32.656506428 +0200
-@@ -90,14 +90,14 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-blocks/lib/message_debug_impl.cc gnuradio-3.8.0.0/gr-blocks/lib/message_debug_impl.cc
+--- gnuradio-3.8.0.0.org/gr-blocks/lib/message_debug_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-blocks/lib/message_debug_impl.cc 2021-03-05 21:17:40.996626719 +0100
+@@ -90,14 +90,14 @@ message_debug_impl::message_debug_impl()
: block("message_debug", io_signature::make(0, 0, 0), io_signature::make(0, 0, 0))
{
message_port_register_in(pmt::mp("print"));
@@ -80,9 +55,10 @@
}
message_debug_impl::~message_debug_impl() {}
---- gnuradio-3.8.0.0/gr-blocks/lib/message_strobe_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-blocks/lib/message_strobe_impl.cc 2020-07-30 20:20:10.985184522 +0200
-@@ -54,7 +54,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-blocks/lib/message_strobe_impl.cc gnuradio-3.8.0.0/gr-blocks/lib/message_strobe_impl.cc
+--- gnuradio-3.8.0.0.org/gr-blocks/lib/message_strobe_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-blocks/lib/message_strobe_impl.cc 2021-03-05 21:17:40.996626719 +0100
+@@ -54,7 +54,7 @@ message_strobe_impl::message_strobe_impl
message_port_register_in(pmt::mp("set_msg"));
set_msg_handler(pmt::mp("set_msg"),
@@ -91,9 +67,10 @@
}
message_strobe_impl::~message_strobe_impl() {}
---- gnuradio-3.8.0.0/gr-blocks/lib/message_strobe_random_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-blocks/lib/message_strobe_random_impl.cc 2020-07-30 20:20:36.996549557 +0200
-@@ -75,7 +75,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-blocks/lib/message_strobe_random_impl.cc gnuradio-3.8.0.0/gr-blocks/lib/message_strobe_random_impl.cc
+--- gnuradio-3.8.0.0.org/gr-blocks/lib/message_strobe_random_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-blocks/lib/message_strobe_random_impl.cc 2021-03-05 21:17:40.996626719 +0100
+@@ -75,7 +75,7 @@ message_strobe_random_impl::message_stro
message_port_register_in(pmt::mp("set_msg"));
set_msg_handler(pmt::mp("set_msg"),
@@ -102,9 +79,10 @@
}
long message_strobe_random_impl::next_delay()
---- gnuradio-3.8.0.0/gr-blocks/lib/multiply_matrix_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-blocks/lib/multiply_matrix_impl.cc 2020-07-30 20:21:18.782075727 +0200
-@@ -237,7 +237,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-blocks/lib/multiply_matrix_impl.cc gnuradio-3.8.0.0/gr-blocks/lib/multiply_matrix_impl.cc
+--- gnuradio-3.8.0.0.org/gr-blocks/lib/multiply_matrix_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-blocks/lib/multiply_matrix_impl.cc 2021-03-05 21:17:40.996626719 +0100
+@@ -237,7 +237,7 @@ multiply_matrix_impl<gr_complex>::multip
message_port_register_in(port_name);
set_msg_handler(
port_name,
@@ -113,7 +91,7 @@
}
template <>
-@@ -257,7 +257,7 @@
+@@ -257,7 +257,7 @@ multiply_matrix_impl<float>::multiply_ma
pmt::pmt_t port_name = pmt::string_to_symbol("set_A");
message_port_register_in(port_name);
set_msg_handler(port_name,
@@ -122,9 +100,22 @@
}
---- gnuradio-3.8.0.0/gr-blocks/lib/pdu_filter_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-blocks/lib/pdu_filter_impl.cc 2020-07-30 20:22:34.176032280 +0200
-@@ -45,7 +45,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-blocks/lib/mute_impl.cc gnuradio-3.8.0.0/gr-blocks/lib/mute_impl.cc
+--- gnuradio-3.8.0.0.org/gr-blocks/lib/mute_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-blocks/lib/mute_impl.cc 2021-03-05 21:17:40.996626719 +0100
+@@ -47,7 +47,7 @@ mute_impl<T>::mute_impl(bool mute)
+ {
+ this->message_port_register_in(pmt::intern("set_mute"));
+ this->set_msg_handler(pmt::intern("set_mute"),
+- boost::bind(&mute_impl<T>::set_mute_pmt, this, _1));
++ boost::bind(&mute_impl<T>::set_mute_pmt, this, boost::placeholders::_1));
+ }
+
+ template <class T>
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-blocks/lib/pdu_filter_impl.cc gnuradio-3.8.0.0/gr-blocks/lib/pdu_filter_impl.cc
+--- gnuradio-3.8.0.0.org/gr-blocks/lib/pdu_filter_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-blocks/lib/pdu_filter_impl.cc 2021-03-05 21:17:40.996626719 +0100
+@@ -45,7 +45,7 @@ pdu_filter_impl::pdu_filter_impl(pmt::pm
message_port_register_out(pdu::pdu_port_id());
message_port_register_in(pdu::pdu_port_id());
set_msg_handler(pdu::pdu_port_id(),
@@ -133,20 +124,10 @@
}
void pdu_filter_impl::handle_msg(pmt::pmt_t pdu)
---- gnuradio-3.8.0.0/gr-blocks/lib/pdu_set_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-blocks/lib/pdu_set_impl.cc 2020-07-30 20:25:04.957278370 +0200
-@@ -43,7 +43,7 @@
- {
- 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 pdu_set_impl::handle_msg(pmt::pmt_t pdu)
---- gnuradio-3.8.0.0/gr-blocks/lib/pdu_remove_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-blocks/lib/pdu_remove_impl.cc 2020-07-30 20:25:43.595972568 +0200
-@@ -43,7 +43,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-blocks/lib/pdu_remove_impl.cc gnuradio-3.8.0.0/gr-blocks/lib/pdu_remove_impl.cc
+--- gnuradio-3.8.0.0.org/gr-blocks/lib/pdu_remove_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-blocks/lib/pdu_remove_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -43,7 +43,7 @@ pdu_remove_impl::pdu_remove_impl(pmt::pm
message_port_register_out(pdu::pdu_port_id());
message_port_register_in(pdu::pdu_port_id());
set_msg_handler(pdu::pdu_port_id(),
@@ -155,9 +136,22 @@
}
void pdu_remove_impl::handle_msg(pmt::pmt_t pdu)
---- gnuradio-3.8.0.0/gr-blocks/lib/random_pdu_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-blocks/lib/random_pdu_impl.cc 2020-07-30 20:54:28.889831075 +0200
-@@ -53,7 +53,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-blocks/lib/pdu_set_impl.cc gnuradio-3.8.0.0/gr-blocks/lib/pdu_set_impl.cc
+--- gnuradio-3.8.0.0.org/gr-blocks/lib/pdu_set_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-blocks/lib/pdu_set_impl.cc 2021-03-05 21:17:40.996626719 +0100
+@@ -43,7 +43,7 @@ pdu_set_impl::pdu_set_impl(pmt::pmt_t k,
+ {
+ 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 pdu_set_impl::handle_msg(pmt::pmt_t pdu)
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-blocks/lib/random_pdu_impl.cc gnuradio-3.8.0.0/gr-blocks/lib/random_pdu_impl.cc
+--- gnuradio-3.8.0.0.org/gr-blocks/lib/random_pdu_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-blocks/lib/random_pdu_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -53,7 +53,7 @@ random_pdu_impl::random_pdu_impl(int min
message_port_register_out(pdu::pdu_port_id());
message_port_register_in(pmt::mp("generate"));
set_msg_handler(pmt::mp("generate"),
@@ -166,9 +160,10 @@
if (length_modulo < 1)
throw std::runtime_error("length_module must be >= 1");
if (max_items < length_modulo)
---- gnuradio-3.8.0.0/gr-blocks/lib/repeat_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-blocks/lib/repeat_impl.cc 2020-07-30 20:57:03.084578109 +0200
-@@ -45,7 +45,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-blocks/lib/repeat_impl.cc gnuradio-3.8.0.0/gr-blocks/lib/repeat_impl.cc
+--- gnuradio-3.8.0.0.org/gr-blocks/lib/repeat_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-blocks/lib/repeat_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -45,7 +45,7 @@ repeat_impl::repeat_impl(size_t itemsize
{
message_port_register_in(pmt::mp("interpolation"));
set_msg_handler(pmt::mp("interpolation"),
@@ -177,9 +172,10 @@
}
void repeat_impl::msg_set_interpolation(pmt::pmt_t msg)
---- gnuradio-3.8.0.0/gr-blocks/lib/socket_pdu_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-blocks/lib/socket_pdu_impl.cc 2020-07-30 21:08:44.014634418 +0200
-@@ -101,7 +101,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-blocks/lib/socket_pdu_impl.cc gnuradio-3.8.0.0/gr-blocks/lib/socket_pdu_impl.cc
+--- gnuradio-3.8.0.0.org/gr-blocks/lib/socket_pdu_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-blocks/lib/socket_pdu_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -101,7 +101,7 @@ socket_pdu_impl::socket_pdu_impl(std::st
start_tcp_accept();
set_msg_handler(pdu::pdu_port_id(),
@@ -188,7 +184,7 @@
} else if (type == "TCP_CLIENT") {
boost::system::error_code error = boost::asio::error::host_not_found;
d_tcp_socket.reset(new boost::asio::ip::tcp::socket(d_io_service));
-@@ -111,7 +111,7 @@
+@@ -111,7 +111,7 @@ socket_pdu_impl::socket_pdu_impl(std::st
d_tcp_socket->set_option(boost::asio::ip::tcp::no_delay(d_tcp_no_delay));
set_msg_handler(pdu::pdu_port_id(),
@@ -197,7 +193,7 @@
d_tcp_socket->async_read_some(
boost::asio::buffer(d_rxbuf),
-@@ -131,7 +131,7 @@
+@@ -131,7 +131,7 @@ socket_pdu_impl::socket_pdu_impl(std::st
boost::asio::placeholders::bytes_transferred));
set_msg_handler(pdu::pdu_port_id(),
@@ -206,7 +202,7 @@
} else if (type == "UDP_CLIENT") {
d_udp_socket.reset(
new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint));
-@@ -144,7 +144,7 @@
+@@ -144,7 +144,7 @@ socket_pdu_impl::socket_pdu_impl(std::st
boost::asio::placeholders::bytes_transferred));
set_msg_handler(pdu::pdu_port_id(),
@@ -215,9 +211,10 @@
} else
throw std::runtime_error("gr::blocks:socket_pdu: unknown socket type");
---- gnuradio-3.8.0.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc 2020-07-30 21:10:41.004095833 +0200
-@@ -51,7 +51,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-blocks/lib/tagged_stream_multiply_length_impl.cc gnuradio-3.8.0.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc
+--- gnuradio-3.8.0.0.org/gr-blocks/lib/tagged_stream_multiply_length_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -51,7 +51,7 @@ tagged_stream_multiply_length_impl::tagg
message_port_register_in(pmt::intern("set_scalar"));
set_msg_handler(
pmt::intern("set_scalar"),
@@ -226,9 +223,10 @@
}
tagged_stream_multiply_length_impl::~tagged_stream_multiply_length_impl() {}
---- gnuradio-3.8.0.0/gr-blocks/lib/tuntap_pdu_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-blocks/lib/tuntap_pdu_impl.cc 2020-07-30 21:17:07.857693002 +0200
-@@ -96,7 +96,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-blocks/lib/tuntap_pdu_impl.cc gnuradio-3.8.0.0/gr-blocks/lib/tuntap_pdu_impl.cc
+--- gnuradio-3.8.0.0.org/gr-blocks/lib/tuntap_pdu_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-blocks/lib/tuntap_pdu_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -96,7 +96,7 @@ tuntap_pdu_impl::tuntap_pdu_impl(std::st
// set up input message port
message_port_register_in(pdu::pdu_port_id());
@@ -237,88 +235,40 @@
}
int tuntap_pdu_impl::tun_alloc(char* dev, int flags)
---- gnuradio-3.8.0.0/gr-fec/lib/async_decoder_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-fec/lib/async_decoder_impl.cc 2020-07-30 21:35:53.983351061 +0200
-@@ -65,10 +65,10 @@
- if (d_packed) {
- d_pack = new blocks::kernel::pack_k_bits(8);
- set_msg_handler(d_in_port,
-- boost::bind(&async_decoder_impl::decode_packed, this, _1));
-+ boost::bind(&async_decoder_impl::decode_packed, this, boost::placeholders::_1));
- } else {
- set_msg_handler(d_in_port,
-- boost::bind(&async_decoder_impl::decode_unpacked, this, _1));
-+ boost::bind(&async_decoder_impl::decode_unpacked, this, boost::placeholders::_1));
- }
-
- // The maximum frame size is set by the initial frame size of the decoder.
---- gnuradio-3.8.0.0/gr-fec/lib/async_encoder_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-fec/lib/async_encoder_impl.cc 2020-07-30 21:36:23.424894221 +0200
-@@ -64,7 +64,7 @@
-
- if (d_packed) {
- set_msg_handler(d_in_port,
-- boost::bind(&async_encoder_impl::encode_packed, this, _1));
-+ boost::bind(&async_encoder_impl::encode_packed, this, boost::placeholders::_1));
-
- d_unpack = new blocks::kernel::unpack_k_bits(8);
-
-@@ -74,7 +74,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-blocks/lib/wavfile.cc gnuradio-3.8.0.0/gr-blocks/lib/wavfile.cc
+--- gnuradio-3.8.0.0.org/gr-blocks/lib/wavfile.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-blocks/lib/wavfile.cc 2021-03-05 21:17:40.996626719 +0100
+@@ -26,7 +26,7 @@
- } else {
- set_msg_handler(d_in_port,
-- boost::bind(&async_encoder_impl::encode_unpacked, this, _1));
-+ boost::bind(&async_encoder_impl::encode_unpacked, this, boost::placeholders::_1));
- }
+ #include <gnuradio/blocks/wavfile.h>
+ #include <stdint.h>
+-#include <boost/detail/endian.hpp> //BOOST_BIG_ENDIAN
++#include <boost/predef/other/endian.h>
+ #include <cstring>
- if (d_packed || (strncmp(d_encoder->get_input_conversion(), "pack", 4) == 0)) {
---- gnuradio-3.8.0.0/gr-filter/lib/freq_xlating_fir_filter_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-filter/lib/freq_xlating_fir_filter_impl.cc 2020-07-30 21:45:00.281985689 +0200
-@@ -72,7 +72,7 @@
- boost::bind(
- &freq_xlating_fir_filter_impl<IN_T, OUT_T, TAP_T>::handle_set_center_freq,
- this,
-- _1));
-+ boost::placeholders::_1));
- }
+ namespace gr {
+@@ -35,7 +35,7 @@ namespace blocks {
- template <class IN_T, class OUT_T, class TAP_T>
---- gnuradio-3.8.0.0/gr-filter/lib/mmse_resampler_ff_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-filter/lib/mmse_resampler_ff_impl.cc 2020-07-30 21:46:30.340039944 +0200
-@@ -54,7 +54,7 @@
+ // 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
- message_port_register_in(pmt::intern("msg_in"));
- set_msg_handler(pmt::intern("msg_in"),
-- boost::bind(&mmse_resampler_ff_impl::handle_msg, this, _1));
-+ boost::bind(&mmse_resampler_ff_impl::handle_msg, this, boost::placeholders::_1));
- }
+ static inline uint16_t __gri_wav_bs16(uint16_t x) { return (x >> 8) | (x << 8); }
- mmse_resampler_ff_impl::~mmse_resampler_ff_impl() { delete d_resamp; }
---- gnuradio-3.8.0.0/gr-filter/lib/mmse_resampler_cc_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-filter/lib/mmse_resampler_cc_impl.cc 2020-07-30 21:54:49.519549624 +0200
-@@ -53,7 +53,7 @@
- set_inverse_relative_rate(d_mu_inc);
- message_port_register_in(pmt::intern("msg_in"));
- set_msg_handler(pmt::intern("msg_in"),
-- boost::bind(&mmse_resampler_cc_impl::handle_msg, this, _1));
-+ boost::bind(&mmse_resampler_cc_impl::handle_msg, this, boost::placeholders::_1));
- }
+@@ -57,7 +57,7 @@ static inline uint32_t __gri_wav_bs32(ui
+ #define htows(x) uint16_t(x)
+ #define wtohs(x) uint16_t(x)
- mmse_resampler_cc_impl::~mmse_resampler_cc_impl() { delete d_resamp; }
---- gnuradio-3.8.0.0/gr-analog/lib/sig_source_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-analog/lib/sig_source_impl.cc 2020-07-30 22:22:11.068971917 +0200
-@@ -67,7 +67,7 @@
- this->set_phase(phase);
- this->message_port_register_in(pmt::mp("freq"));
- this->set_msg_handler(pmt::mp("freq"),
-- boost::bind(&sig_source_impl<T>::set_frequency_msg, this, _1));
-+ boost::bind(&sig_source_impl<T>::set_frequency_msg, this, boost::placeholders::_1));
- }
+-#endif // BOOST_BIG_ENDIAN
++#endif // BOOST_ENDIAN_BIG_BYTE
- template <class T>
---- gnuradio-3.8.0.0/gr-digital/lib/chunks_to_symbols_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-digital/lib/chunks_to_symbols_impl.cc 2020-07-30 22:24:21.095788569 +0200
-@@ -54,7 +54,7 @@
+ // WAV files are always little-endian, so we need some byte switching macros
+ static inline uint32_t host_to_wav(uint32_t x) { return htowl(x); }
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-digital/lib/chunks_to_symbols_impl.cc gnuradio-3.8.0.0/gr-digital/lib/chunks_to_symbols_impl.cc
+--- gnuradio-3.8.0.0.org/gr-digital/lib/chunks_to_symbols_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-digital/lib/chunks_to_symbols_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -54,7 +54,7 @@ chunks_to_symbols_impl<IN_T, OUT_T>::chu
this->set_msg_handler(
pmt::mp("set_symbol_table"),
boost::bind(
@@ -327,9 +277,10 @@
}
template <class IN_T, class OUT_T>
---- gnuradio-3.8.0.0/gr-digital/lib/constellation_receiver_cb_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-digital/lib/constellation_receiver_cb_impl.cc 2020-07-30 22:28:04.524167819 +0200
-@@ -63,12 +63,12 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-digital/lib/constellation_receiver_cb_impl.cc gnuradio-3.8.0.0/gr-digital/lib/constellation_receiver_cb_impl.cc
+--- gnuradio-3.8.0.0.org/gr-digital/lib/constellation_receiver_cb_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-digital/lib/constellation_receiver_cb_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -63,12 +63,12 @@ constellation_receiver_cb_impl::constell
message_port_register_in(pmt::mp("set_constellation"));
set_msg_handler(
pmt::mp("set_constellation"),
@@ -344,9 +295,10 @@
}
constellation_receiver_cb_impl::~constellation_receiver_cb_impl() {}
---- gnuradio-3.8.0.0/gr-digital/lib/costas_loop_cc_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-digital/lib/costas_loop_cc_impl.cc 2020-07-30 22:30:35.412077208 +0200
-@@ -82,7 +82,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-digital/lib/costas_loop_cc_impl.cc gnuradio-3.8.0.0/gr-digital/lib/costas_loop_cc_impl.cc
+--- gnuradio-3.8.0.0.org/gr-digital/lib/costas_loop_cc_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-digital/lib/costas_loop_cc_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -82,7 +82,7 @@ costas_loop_cc_impl::costas_loop_cc_impl
message_port_register_in(pmt::mp("noise"));
set_msg_handler(pmt::mp("noise"),
@@ -355,9 +307,10 @@
}
costas_loop_cc_impl::~costas_loop_cc_impl() {}
---- gnuradio-3.8.0.0/gr-digital/lib/crc32_async_bb_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-digital/lib/crc32_async_bb_impl.cc 2020-07-31 06:23:29.025293773 +0200
-@@ -48,9 +48,9 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-digital/lib/crc32_async_bb_impl.cc gnuradio-3.8.0.0/gr-digital/lib/crc32_async_bb_impl.cc
+--- gnuradio-3.8.0.0.org/gr-digital/lib/crc32_async_bb_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-digital/lib/crc32_async_bb_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -48,9 +48,9 @@ crc32_async_bb_impl::crc32_async_bb_impl
message_port_register_out(d_out_port);
if (check)
@@ -369,9 +322,10 @@
}
crc32_async_bb_impl::~crc32_async_bb_impl() {}
---- gnuradio-3.8.0.0/gr-digital/lib/header_payload_demux_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-digital/lib/header_payload_demux_impl.cc 2020-07-31 06:40:37.305888600 +0200
-@@ -152,7 +152,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-digital/lib/header_payload_demux_impl.cc gnuradio-3.8.0.0/gr-digital/lib/header_payload_demux_impl.cc
+--- gnuradio-3.8.0.0.org/gr-digital/lib/header_payload_demux_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-digital/lib/header_payload_demux_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -152,7 +152,7 @@ header_payload_demux_impl::header_payloa
message_port_register_in(msg_port_id());
set_msg_handler(
msg_port_id(),
@@ -380,9 +334,10 @@
for (size_t i = 0; i < special_tags.size(); i++) {
d_special_tags.push_back(pmt::string_to_symbol(special_tags[i]));
d_special_tags_last_value.push_back(pmt::PMT_NIL);
---- gnuradio-3.8.0.0/gr-digital/lib/protocol_formatter_async_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-digital/lib/protocol_formatter_async_impl.cc 2020-07-31 06:58:30.315505541 +0200
-@@ -55,7 +55,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-digital/lib/protocol_formatter_async_impl.cc gnuradio-3.8.0.0/gr-digital/lib/protocol_formatter_async_impl.cc
+--- gnuradio-3.8.0.0.org/gr-digital/lib/protocol_formatter_async_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-digital/lib/protocol_formatter_async_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -55,7 +55,7 @@ protocol_formatter_async_impl::protocol_
message_port_register_out(d_pld_port);
set_msg_handler(d_in_port,
@@ -391,64 +346,107 @@
}
protocol_formatter_async_impl::~protocol_formatter_async_impl() {}
---- gnuradio-3.8.0.0/gr-qtgui/lib/time_sink_c_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-qtgui/lib/time_sink_c_impl.cc 2020-07-30 22:18:56.578775775 +0200
-@@ -79,7 +79,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-fec/lib/async_decoder_impl.cc gnuradio-3.8.0.0/gr-fec/lib/async_decoder_impl.cc
+--- gnuradio-3.8.0.0.org/gr-fec/lib/async_decoder_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-fec/lib/async_decoder_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -65,10 +65,10 @@ async_decoder_impl::async_decoder_impl(g
+ if (d_packed) {
+ d_pack = new blocks::kernel::pack_k_bits(8);
+ set_msg_handler(d_in_port,
+- boost::bind(&async_decoder_impl::decode_packed, this, _1));
++ boost::bind(&async_decoder_impl::decode_packed, this, boost::placeholders::_1));
+ } else {
+ set_msg_handler(d_in_port,
+- boost::bind(&async_decoder_impl::decode_unpacked, this, _1));
++ boost::bind(&async_decoder_impl::decode_unpacked, this, boost::placeholders::_1));
+ }
- // setup PDU handling input port
- message_port_register_in(pmt::mp("in"));
-- set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_c_impl::handle_pdus, this, _1));
-+ set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_c_impl::handle_pdus, this, boost::placeholders::_1));
+ // The maximum frame size is set by the initial frame size of the decoder.
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-fec/lib/async_encoder_impl.cc gnuradio-3.8.0.0/gr-fec/lib/async_encoder_impl.cc
+--- gnuradio-3.8.0.0.org/gr-fec/lib/async_encoder_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-fec/lib/async_encoder_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -64,7 +64,7 @@ async_encoder_impl::async_encoder_impl(g
- // +2 for the PDU message buffers
- for (unsigned int n = 0; n < d_nconnections + 2; n++) {
---- gnuradio-3.8.0.0/gr-qtgui/lib/time_sink_f_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-qtgui/lib/time_sink_f_impl.cc 2020-07-31 06:24:17.624509437 +0200
-@@ -80,7 +80,7 @@
+ if (d_packed) {
+ set_msg_handler(d_in_port,
+- boost::bind(&async_encoder_impl::encode_packed, this, _1));
++ boost::bind(&async_encoder_impl::encode_packed, this, boost::placeholders::_1));
- // setup PDU handling input port
- message_port_register_in(pmt::mp("in"));
-- set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_f_impl::handle_pdus, this, _1));
-+ set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
+ d_unpack = new blocks::kernel::unpack_k_bits(8);
- // +1 for the PDU buffer
- for (unsigned int n = 0; n < d_nconnections + 1; n++) {
---- gnuradio-3.8.0.0/gr-qtgui/lib/sink_f_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-qtgui/lib/sink_f_impl.cc 2020-07-31 06:24:57.396595458 +0200
-@@ -95,7 +95,7 @@
- // double-clicked
- message_port_register_out(d_port);
- message_port_register_in(d_port);
-- set_msg_handler(d_port, boost::bind(&sink_f_impl::handle_set_freq, this, _1));
-+ set_msg_handler(d_port, boost::bind(&sink_f_impl::handle_set_freq, this, boost::placeholders::_1));
+@@ -74,7 +74,7 @@ async_encoder_impl::async_encoder_impl(g
- d_main_gui = NULL;
+ } else {
+ set_msg_handler(d_in_port,
+- boost::bind(&async_encoder_impl::encode_unpacked, this, _1));
++ boost::bind(&async_encoder_impl::encode_unpacked, this, boost::placeholders::_1));
+ }
---- gnuradio-3.8.0.0/gr-qtgui/lib/time_raster_sink_b_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-qtgui/lib/time_raster_sink_b_impl.cc 2020-07-31 06:27:45.998772669 +0200
-@@ -84,7 +84,7 @@
- // setup PDU handling input port
- message_port_register_in(pmt::mp("in"));
- set_msg_handler(pmt::mp("in"),
-- boost::bind(&time_raster_sink_b_impl::handle_pdus, this, _1));
-+ boost::bind(&time_raster_sink_b_impl::handle_pdus, this, boost::placeholders::_1));
+ if (d_packed || (strncmp(d_encoder->get_input_conversion(), "pack", 4) == 0)) {
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-filter/lib/freq_xlating_fir_filter_impl.cc gnuradio-3.8.0.0/gr-filter/lib/freq_xlating_fir_filter_impl.cc
+--- gnuradio-3.8.0.0.org/gr-filter/lib/freq_xlating_fir_filter_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-filter/lib/freq_xlating_fir_filter_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -72,7 +72,7 @@ freq_xlating_fir_filter_impl<IN_T, OUT_T
+ boost::bind(
+ &freq_xlating_fir_filter_impl<IN_T, OUT_T, TAP_T>::handle_set_center_freq,
+ this,
+- _1));
++ boost::placeholders::_1));
+ }
- d_scale = 1.0f;
+ template <class IN_T, class OUT_T, class TAP_T>
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-filter/lib/mmse_resampler_cc_impl.cc gnuradio-3.8.0.0/gr-filter/lib/mmse_resampler_cc_impl.cc
+--- gnuradio-3.8.0.0.org/gr-filter/lib/mmse_resampler_cc_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-filter/lib/mmse_resampler_cc_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -53,7 +53,7 @@ mmse_resampler_cc_impl::mmse_resampler_c
+ set_inverse_relative_rate(d_mu_inc);
+ message_port_register_in(pmt::intern("msg_in"));
+ set_msg_handler(pmt::intern("msg_in"),
+- boost::bind(&mmse_resampler_cc_impl::handle_msg, this, _1));
++ boost::bind(&mmse_resampler_cc_impl::handle_msg, this, boost::placeholders::_1));
+ }
+
+ mmse_resampler_cc_impl::~mmse_resampler_cc_impl() { delete d_resamp; }
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-filter/lib/mmse_resampler_ff_impl.cc gnuradio-3.8.0.0/gr-filter/lib/mmse_resampler_ff_impl.cc
+--- gnuradio-3.8.0.0.org/gr-filter/lib/mmse_resampler_ff_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-filter/lib/mmse_resampler_ff_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -54,7 +54,7 @@ mmse_resampler_ff_impl::mmse_resampler_f
---- gnuradio-3.8.0.0/gr-qtgui/lib/time_raster_sink_f_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-qtgui/lib/time_raster_sink_f_impl.cc 2020-07-31 06:28:21.497301415 +0200
-@@ -84,7 +84,7 @@
+ message_port_register_in(pmt::intern("msg_in"));
+ set_msg_handler(pmt::intern("msg_in"),
+- boost::bind(&mmse_resampler_ff_impl::handle_msg, this, _1));
++ boost::bind(&mmse_resampler_ff_impl::handle_msg, this, boost::placeholders::_1));
+ }
+
+ mmse_resampler_ff_impl::~mmse_resampler_ff_impl() { delete d_resamp; }
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-qtgui/lib/const_sink_c_impl.cc gnuradio-3.8.0.0/gr-qtgui/lib/const_sink_c_impl.cc
+--- gnuradio-3.8.0.0.org/gr-qtgui/lib/const_sink_c_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-qtgui/lib/const_sink_c_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -70,7 +70,7 @@ const_sink_c_impl::const_sink_c_impl(int
// setup PDU handling input port
message_port_register_in(pmt::mp("in"));
set_msg_handler(pmt::mp("in"),
-- boost::bind(&time_raster_sink_f_impl::handle_pdus, this, _1));
-+ boost::bind(&time_raster_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
+- boost::bind(&const_sink_c_impl::handle_pdus, this, _1));
++ boost::bind(&const_sink_c_impl::handle_pdus, this, boost::placeholders::_1));
- d_icols = static_cast<int>(ceil(d_cols));
- d_tmpflt = (float*)volk_malloc(d_icols * sizeof(float), volk_get_alignment());
---- gnuradio-3.8.0.0/gr-qtgui/lib/freq_sink_c_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-qtgui/lib/freq_sink_c_impl.cc 2020-07-31 06:29:00.492680256 +0200
-@@ -81,17 +81,17 @@
+ for (int i = 0; i < d_nconnections; i++) {
+ d_residbufs_real.push_back(
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-qtgui/lib/edit_box_msg_impl.cc gnuradio-3.8.0.0/gr-qtgui/lib/edit_box_msg_impl.cc
+--- gnuradio-3.8.0.0.org/gr-qtgui/lib/edit_box_msg_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-qtgui/lib/edit_box_msg_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -158,7 +158,7 @@ edit_box_msg_impl::edit_box_msg_impl(dat
+ message_port_register_out(d_port);
+ message_port_register_in(pmt::mp("val"));
+
+- set_msg_handler(pmt::mp("val"), boost::bind(&edit_box_msg_impl::set_value, this, _1));
++ set_msg_handler(pmt::mp("val"), boost::bind(&edit_box_msg_impl::set_value, this, boost::placeholders::_1));
+ }
+
+ edit_box_msg_impl::~edit_box_msg_impl()
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-qtgui/lib/freq_sink_c_impl.cc gnuradio-3.8.0.0/gr-qtgui/lib/freq_sink_c_impl.cc
+--- gnuradio-3.8.0.0.org/gr-qtgui/lib/freq_sink_c_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-qtgui/lib/freq_sink_c_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -81,17 +81,17 @@ freq_sink_c_impl::freq_sink_c_impl(int f
// setup bw input port
message_port_register_in(d_port_bw);
@@ -469,9 +467,10 @@
d_main_gui = NULL;
---- gnuradio-3.8.0.0/gr-qtgui/lib/freq_sink_f_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-qtgui/lib/freq_sink_f_impl.cc 2020-07-31 06:29:42.008191290 +0200
-@@ -82,17 +82,17 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-qtgui/lib/freq_sink_f_impl.cc gnuradio-3.8.0.0/gr-qtgui/lib/freq_sink_f_impl.cc
+--- gnuradio-3.8.0.0.org/gr-qtgui/lib/freq_sink_f_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-qtgui/lib/freq_sink_f_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -82,17 +82,17 @@ freq_sink_f_impl::freq_sink_f_impl(int f
// setup bw input port
message_port_register_in(d_port_bw);
@@ -492,20 +491,22 @@
d_main_gui = NULL;
---- gnuradio-3.8.0.0/gr-qtgui/lib/const_sink_c_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-qtgui/lib/const_sink_c_impl.cc 2020-07-31 06:30:26.163840812 +0200
-@@ -70,7 +70,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-qtgui/lib/histogram_sink_f_impl.cc gnuradio-3.8.0.0/gr-qtgui/lib/histogram_sink_f_impl.cc
+--- gnuradio-3.8.0.0.org/gr-qtgui/lib/histogram_sink_f_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-qtgui/lib/histogram_sink_f_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -82,7 +82,7 @@ histogram_sink_f_impl::histogram_sink_f_
// setup PDU handling input port
message_port_register_in(pmt::mp("in"));
set_msg_handler(pmt::mp("in"),
-- boost::bind(&const_sink_c_impl::handle_pdus, this, _1));
-+ boost::bind(&const_sink_c_impl::handle_pdus, this, boost::placeholders::_1));
+- boost::bind(&histogram_sink_f_impl::handle_pdus, this, _1));
++ boost::bind(&histogram_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
- for (int i = 0; i < d_nconnections; i++) {
- d_residbufs_real.push_back(
---- gnuradio-3.8.0.0/gr-qtgui/lib/sink_c_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-qtgui/lib/sink_c_impl.cc 2020-07-31 06:31:05.122550637 +0200
-@@ -96,7 +96,7 @@
+ // +1 for the PDU buffer
+ for (int i = 0; i < d_nconnections + 1; i++) {
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-qtgui/lib/sink_c_impl.cc gnuradio-3.8.0.0/gr-qtgui/lib/sink_c_impl.cc
+--- gnuradio-3.8.0.0.org/gr-qtgui/lib/sink_c_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-qtgui/lib/sink_c_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -96,7 +96,7 @@ sink_c_impl::sink_c_impl(int fftsize,
// double-clicked
message_port_register_out(d_port);
message_port_register_in(d_port);
@@ -514,9 +515,70 @@
d_main_gui = NULL;
---- gnuradio-3.8.0.0/gr-qtgui/lib/waterfall_sink_c_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-qtgui/lib/waterfall_sink_c_impl.cc 2020-07-31 06:31:35.524144831 +0200
-@@ -117,19 +117,19 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-qtgui/lib/sink_f_impl.cc gnuradio-3.8.0.0/gr-qtgui/lib/sink_f_impl.cc
+--- gnuradio-3.8.0.0.org/gr-qtgui/lib/sink_f_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-qtgui/lib/sink_f_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -95,7 +95,7 @@ sink_f_impl::sink_f_impl(int fftsize,
+ // double-clicked
+ message_port_register_out(d_port);
+ message_port_register_in(d_port);
+- set_msg_handler(d_port, boost::bind(&sink_f_impl::handle_set_freq, this, _1));
++ set_msg_handler(d_port, boost::bind(&sink_f_impl::handle_set_freq, this, boost::placeholders::_1));
+
+ d_main_gui = NULL;
+
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-qtgui/lib/time_raster_sink_b_impl.cc gnuradio-3.8.0.0/gr-qtgui/lib/time_raster_sink_b_impl.cc
+--- gnuradio-3.8.0.0.org/gr-qtgui/lib/time_raster_sink_b_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-qtgui/lib/time_raster_sink_b_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -84,7 +84,7 @@ time_raster_sink_b_impl::time_raster_sin
+ // setup PDU handling input port
+ message_port_register_in(pmt::mp("in"));
+ set_msg_handler(pmt::mp("in"),
+- boost::bind(&time_raster_sink_b_impl::handle_pdus, this, _1));
++ boost::bind(&time_raster_sink_b_impl::handle_pdus, this, boost::placeholders::_1));
+
+ d_scale = 1.0f;
+
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-qtgui/lib/time_raster_sink_f_impl.cc gnuradio-3.8.0.0/gr-qtgui/lib/time_raster_sink_f_impl.cc
+--- gnuradio-3.8.0.0.org/gr-qtgui/lib/time_raster_sink_f_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-qtgui/lib/time_raster_sink_f_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -84,7 +84,7 @@ time_raster_sink_f_impl::time_raster_sin
+ // setup PDU handling input port
+ message_port_register_in(pmt::mp("in"));
+ set_msg_handler(pmt::mp("in"),
+- boost::bind(&time_raster_sink_f_impl::handle_pdus, this, _1));
++ boost::bind(&time_raster_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
+
+ d_icols = static_cast<int>(ceil(d_cols));
+ d_tmpflt = (float*)volk_malloc(d_icols * sizeof(float), volk_get_alignment());
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-qtgui/lib/time_sink_c_impl.cc gnuradio-3.8.0.0/gr-qtgui/lib/time_sink_c_impl.cc
+--- gnuradio-3.8.0.0.org/gr-qtgui/lib/time_sink_c_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-qtgui/lib/time_sink_c_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -79,7 +79,7 @@ time_sink_c_impl::time_sink_c_impl(int s
+
+ // setup PDU handling input port
+ message_port_register_in(pmt::mp("in"));
+- set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_c_impl::handle_pdus, this, _1));
++ set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_c_impl::handle_pdus, this, boost::placeholders::_1));
+
+ // +2 for the PDU message buffers
+ for (unsigned int n = 0; n < d_nconnections + 2; n++) {
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-qtgui/lib/time_sink_f_impl.cc gnuradio-3.8.0.0/gr-qtgui/lib/time_sink_f_impl.cc
+--- gnuradio-3.8.0.0.org/gr-qtgui/lib/time_sink_f_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-qtgui/lib/time_sink_f_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -80,7 +80,7 @@ time_sink_f_impl::time_sink_f_impl(int s
+
+ // setup PDU handling input port
+ message_port_register_in(pmt::mp("in"));
+- set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_f_impl::handle_pdus, this, _1));
++ set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
+
+ // +1 for the PDU buffer
+ for (unsigned int n = 0; n < d_nconnections + 1; n++) {
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-qtgui/lib/waterfall_sink_c_impl.cc gnuradio-3.8.0.0/gr-qtgui/lib/waterfall_sink_c_impl.cc
+--- gnuradio-3.8.0.0.org/gr-qtgui/lib/waterfall_sink_c_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-qtgui/lib/waterfall_sink_c_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -117,19 +117,19 @@ waterfall_sink_c_impl::waterfall_sink_c_
// setup bw input port
message_port_register_in(d_port_bw);
set_msg_handler(d_port_bw,
@@ -539,20 +601,10 @@
}
waterfall_sink_c_impl::~waterfall_sink_c_impl()
---- gnuradio-3.8.0.0/gr-qtgui/lib/histogram_sink_f_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-qtgui/lib/histogram_sink_f_impl.cc 2020-07-31 06:34:49.240969587 +0200
-@@ -82,7 +82,7 @@
- // setup PDU handling input port
- message_port_register_in(pmt::mp("in"));
- set_msg_handler(pmt::mp("in"),
-- boost::bind(&histogram_sink_f_impl::handle_pdus, this, _1));
-+ boost::bind(&histogram_sink_f_impl::handle_pdus, this, boost::placeholders::_1));
-
- // +1 for the PDU buffer
- for (int i = 0; i < d_nconnections + 1; i++) {
---- gnuradio-3.8.0.0/gr-qtgui/lib/waterfall_sink_f_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-qtgui/lib/waterfall_sink_f_impl.cc 2020-07-31 06:36:02.938167442 +0200
-@@ -116,19 +116,19 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-qtgui/lib/waterfall_sink_f_impl.cc gnuradio-3.8.0.0/gr-qtgui/lib/waterfall_sink_f_impl.cc
+--- gnuradio-3.8.0.0.org/gr-qtgui/lib/waterfall_sink_f_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-qtgui/lib/waterfall_sink_f_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -116,19 +116,19 @@ waterfall_sink_f_impl::waterfall_sink_f_
// setup bw input port
message_port_register_in(d_port_bw);
set_msg_handler(d_port_bw,
@@ -575,20 +627,10 @@
}
waterfall_sink_f_impl::~waterfall_sink_f_impl()
---- gnuradio-3.8.0.0/gr-qtgui/lib/edit_box_msg_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-qtgui/lib/edit_box_msg_impl.cc 2020-07-31 06:37:00.264506844 +0200
-@@ -158,7 +158,7 @@
- message_port_register_out(d_port);
- message_port_register_in(pmt::mp("val"));
-
-- set_msg_handler(pmt::mp("val"), boost::bind(&edit_box_msg_impl::set_value, this, _1));
-+ set_msg_handler(pmt::mp("val"), boost::bind(&edit_box_msg_impl::set_value, this, boost::placeholders::_1));
- }
-
- edit_box_msg_impl::~edit_box_msg_impl()
---- gnuradio-3.8.0.0/gr-zeromq/lib/pub_msg_sink_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-zeromq/lib/pub_msg_sink_impl.cc 2020-07-31 07:34:23.895216804 +0200
-@@ -55,7 +55,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-zeromq/lib/pub_msg_sink_impl.cc gnuradio-3.8.0.0/gr-zeromq/lib/pub_msg_sink_impl.cc
+--- gnuradio-3.8.0.0.org/gr-zeromq/lib/pub_msg_sink_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-zeromq/lib/pub_msg_sink_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -55,7 +55,7 @@ pub_msg_sink_impl::pub_msg_sink_impl(cha
d_socket->bind(address);
message_port_register_in(pmt::mp("in"));
@@ -597,9 +639,10 @@
}
pub_msg_sink_impl::~pub_msg_sink_impl()
---- gnuradio-3.8.0.0/gr-zeromq/lib/push_msg_sink_impl.cc.orig 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/gr-zeromq/lib/push_msg_sink_impl.cc 2020-07-31 07:35:24.158380374 +0200
-@@ -57,7 +57,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-zeromq/lib/push_msg_sink_impl.cc gnuradio-3.8.0.0/gr-zeromq/lib/push_msg_sink_impl.cc
+--- gnuradio-3.8.0.0.org/gr-zeromq/lib/push_msg_sink_impl.cc 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-zeromq/lib/push_msg_sink_impl.cc 2021-03-05 21:17:40.999960036 +0100
+@@ -57,7 +57,7 @@ push_msg_sink_impl::push_msg_sink_impl(c
d_socket->bind(address);
message_port_register_in(pmt::mp("in"));
diff --git a/link.patch b/link.patch
index d748423..cc0fed9 100644
--- a/link.patch
+++ b/link.patch
@@ -1,7 +1,7 @@
-diff -ur gnuradio-3.7.9.2.orig/gnuradio-runtime/lib/CMakeLists.txt gnuradio-3.7.9.2/gnuradio-runtime/lib/CMakeLists.txt
---- gnuradio-3.7.9.2.orig/gnuradio-runtime/lib/CMakeLists.txt 2015-08-28 14:47:45.000000000 +0000
-+++ gnuradio-3.7.9.2/gnuradio-runtime/lib/CMakeLists.txt 2016-05-23 05:30:48.922358208 +0000
-@@ -154,7 +154,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gnuradio-runtime/lib/CMakeLists.txt gnuradio-3.8.0.0/gnuradio-runtime/lib/CMakeLists.txt
+--- gnuradio-3.8.0.0.org/gnuradio-runtime/lib/CMakeLists.txt 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gnuradio-runtime/lib/CMakeLists.txt 2021-03-05 21:17:40.083297715 +0100
+@@ -236,7 +236,7 @@ endif(HAVE_WINDOWS_H)
#need to link with librt on ubuntu 11.10 for shm_*
if((LINUX) OR (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD"))
@@ -10,10 +10,10 @@ diff -ur gnuradio-3.7.9.2.orig/gnuradio-runtime/lib/CMakeLists.txt gnuradio-3.7.
endif()
########################################################################
-diff -ur gnuradio-3.7.9.2.orig/gr-audio/lib/CMakeLists.txt gnuradio-3.7.9.2/gr-audio/lib/CMakeLists.txt
---- gnuradio-3.7.9.2.orig/gr-audio/lib/CMakeLists.txt 2015-04-13 14:32:43.000000000 +0000
-+++ gnuradio-3.7.9.2/gr-audio/lib/CMakeLists.txt 2016-05-23 05:30:48.922358208 +0000
-@@ -96,7 +96,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/gr-audio/lib/CMakeLists.txt gnuradio-3.8.0.0/gr-audio/lib/CMakeLists.txt
+--- gnuradio-3.8.0.0.org/gr-audio/lib/CMakeLists.txt 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/gr-audio/lib/CMakeLists.txt 2021-03-05 21:17:40.083297715 +0100
+@@ -79,7 +79,7 @@ find_package(JACK)
if(JACK_FOUND)
target_compile_definitions(gnuradio-audio PRIVATE -DJACK_FOUND)
@@ -22,15 +22,15 @@ diff -ur gnuradio-3.7.9.2.orig/gr-audio/lib/CMakeLists.txt gnuradio-3.7.9.2/gr-a
target_sources(gnuradio-audio PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/jack/jack_impl.cc
${CMAKE_CURRENT_SOURCE_DIR}/jack/jack_source.cc
-diff -ur gnuradio-3.7.9.2.orig/volk/lib/CMakeLists.txt gnuradio-3.7.9.2/volk/lib/CMakeLists.txt
---- gnuradio-3.7.9.2.orig/volk/lib/CMakeLists.txt 2016-03-31 05:23:12.000000000 +0000
-+++ gnuradio-3.7.9.2/volk/lib/CMakeLists.txt 2016-05-23 05:30:48.925691583 +0000
-@@ -534,7 +534,7 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/volk/lib/CMakeLists.txt gnuradio-3.8.0.0/volk/lib/CMakeLists.txt
+--- gnuradio-3.8.0.0.org/volk/lib/CMakeLists.txt 2019-08-09 23:40:35.000000000 +0200
++++ gnuradio-3.8.0.0/volk/lib/CMakeLists.txt 2021-03-05 21:17:40.083297715 +0100
+@@ -566,7 +566,7 @@ target_include_directories(volk_obj
#Add dynamic library
add_library(volk SHARED $<TARGET_OBJECTS:volk_obj>)
-target_link_libraries(volk ${volk_libraries})
+target_link_libraries(volk ${volk_libraries} m)
target_include_directories(volk
- PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include
- PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include
+ PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+ PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
diff --git a/python-libdir.patch b/python-libdir.patch
index 2ff36eb..327543f 100644
--- a/python-libdir.patch
+++ b/python-libdir.patch
@@ -1,6 +1,7 @@
---- gnuradio-3.8.0.0/cmake/Modules/GrPython.cmake~ 2019-08-09 23:40:34.000000000 +0200
-+++ gnuradio-3.8.0.0/cmake/Modules/GrPython.cmake 2020-07-07 23:50:05.291900112 +0200
-@@ -111,8 +111,9 @@
+diff -urNp -x '*.orig' gnuradio-3.8.0.0.org/cmake/Modules/GrPython.cmake gnuradio-3.8.0.0/cmake/Modules/GrPython.cmake
+--- gnuradio-3.8.0.0.org/cmake/Modules/GrPython.cmake 2019-08-09 23:40:34.000000000 +0200
++++ gnuradio-3.8.0.0/cmake/Modules/GrPython.cmake 2021-03-05 21:17:40.526628947 +0100
+@@ -111,8 +111,9 @@ if(NOT DEFINED GR_PYTHON_DIR)
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
import os
import sys
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnuradio.git/commitdiff/59ce9828b2c3a04d0342d246623f0da0b96e0077
More information about the pld-cvs-commit
mailing list