diff --git a/gnuradio-3.7.10-size_t.patch b/gnuradio-3.7.10-size_t.patch new file mode 100644 index 0000000..48f2bde --- /dev/null +++ b/gnuradio-3.7.10-size_t.patch @@ -0,0 +1,394 @@ +diff --git a/docs/doxygen/other/thread_affinity.dox b/docs/doxygen/other/thread_affinity.dox +index edac813..03d2129 100644 +--- a/docs/doxygen/other/thread_affinity.dox ++++ b/docs/doxygen/other/thread_affinity.dox +@@ -50,7 +50,7 @@ Each block has two new data members: + A block can set and unset its affinity at any time using the + following member functions: + +-- gr::block::set_processor_affinity(const std::vector &mask) ++- gr::block::set_processor_affinity(const std::vector &mask) + - gr::block::unset_processor_affinity() + + Where \p mask is a vector of core numbers to set the thread's affinity +@@ -76,7 +76,7 @@ to that affinity setting. + The gr::hier_block2 class supports the same API interface to the block + thread affinity: + +-- gr::hier_block2::set_processor_affinity(const std::vector &mask) ++- gr::hier_block2::set_processor_affinity(const std::vector &mask) + - gr::hier_block2::unset_processor_affinity() + - gr::hier_block2::processor_affinity() + +diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h +index 25d9fb5..2a43a8a 100644 +--- a/gnuradio-runtime/include/gnuradio/basic_block.h ++++ b/gnuradio-runtime/include/gnuradio/basic_block.h +@@ -376,13 +376,13 @@ namespace gr { + d_msg_handlers[which_port] = msg_handler_t(msg_handler); + } + +- virtual void set_processor_affinity(const std::vector &mask) ++ virtual void set_processor_affinity(const std::vector &mask) + { throw std::runtime_error("set_processor_affinity not overloaded in child class."); } + + virtual void unset_processor_affinity() + { throw std::runtime_error("unset_processor_affinity not overloaded in child class."); } + +- virtual std::vector processor_affinity() ++ virtual std::vector processor_affinity() + { throw std::runtime_error("processor_affinity not overloaded in child class."); } + }; + +diff --git a/gnuradio-runtime/include/gnuradio/block.h b/gnuradio-runtime/include/gnuradio/block.h +index 3e85f22..d37f68d 100644 +--- a/gnuradio-runtime/include/gnuradio/block.h ++++ b/gnuradio-runtime/include/gnuradio/block.h +@@ -595,9 +595,9 @@ namespace gr { + /*! + * \brief Set the thread's affinity to processor core \p n. + * +- * \param mask a vector of ints of the core numbers available to this block. ++ * \param mask a vector of std::size_t of the core numbers available to this block. + */ +- void set_processor_affinity(const std::vector &mask); ++ void set_processor_affinity(const std::vector &mask); + + /*! + * \brief Remove processor affinity to a specific core. +@@ -607,7 +607,7 @@ namespace gr { + /*! + * \brief Get the current processor affinity. + */ +- std::vector processor_affinity() { return d_affinity; } ++ std::vector processor_affinity() { return d_affinity; } + + /*! + * \brief Get the current thread priority in use +@@ -652,7 +652,7 @@ namespace gr { + int d_max_noutput_items; // value of max_noutput_items for this block + int d_min_noutput_items; + tag_propagation_policy_t d_tag_propagation_policy; // policy for moving tags downstream +- std::vector d_affinity; // thread affinity proc. mask ++ std::vector d_affinity; // thread affinity proc. mask + int d_priority; // thread priority level + bool d_pc_rpc_set; + bool d_update_rate; // should sched update rel rate? +diff --git a/gnuradio-runtime/include/gnuradio/block_detail.h b/gnuradio-runtime/include/gnuradio/block_detail.h +index 8a9f4ab..a0a8f83 100644 +--- a/gnuradio-runtime/include/gnuradio/block_detail.h ++++ b/gnuradio-runtime/include/gnuradio/block_detail.h +@@ -181,10 +181,10 @@ namespace gr { + * \brief Set core affinity of block to the cores in the vector + * mask. + * +- * \param mask a vector of ints of the core numbers available to ++ * \param mask a vector of std::size_t of the core numbers available to + * this block. + */ +- void set_processor_affinity(const std::vector &mask); ++ void set_processor_affinity(const std::vector &mask); + + /*! + * \brief Unset core affinity. +diff --git a/gnuradio-runtime/include/gnuradio/hier_block2.h b/gnuradio-runtime/include/gnuradio/hier_block2.h +index 08a5389..d4f9696 100644 +--- a/gnuradio-runtime/include/gnuradio/hier_block2.h ++++ b/gnuradio-runtime/include/gnuradio/hier_block2.h +@@ -248,7 +248,7 @@ namespace gr { + * + * \param mask a vector of ints of the core numbers available to this block. + */ +- void set_processor_affinity(const std::vector &mask); ++ void set_processor_affinity(const std::vector &mask); + + /*! + * \brief Remove processor affinity for all blocks in hier_block2. +@@ -264,7 +264,7 @@ namespace gr { + * interface. If any block has been individually set, then this + * call could be misleading. + */ +- std::vector processor_affinity(); ++ std::vector processor_affinity(); + + /*! + * \brief Get if all block min buffers should be set. +diff --git a/gnuradio-runtime/include/gnuradio/thread/thread.h b/gnuradio-runtime/include/gnuradio/thread/thread.h +index a58d172..6c6c1bf 100644 +--- a/gnuradio-runtime/include/gnuradio/thread/thread.h ++++ b/gnuradio-runtime/include/gnuradio/thread/thread.h +@@ -77,7 +77,7 @@ namespace gr { + * do support in this way since 10.5 is not what we want or can + * use in this fashion). + */ +- GR_RUNTIME_API void thread_bind_to_processor(const std::vector &mask); ++ GR_RUNTIME_API void thread_bind_to_processor(const std::vector &mask); + + /*! \brief Convineince function to bind the current thread to a single core. + * +@@ -89,7 +89,7 @@ namespace gr { + * do support in this way since 10.5 is not what we want or can + * use in this fashion). + */ +- GR_RUNTIME_API void thread_bind_to_processor(int n); ++ GR_RUNTIME_API void thread_bind_to_processor(std::size_t n); + + /*! \brief Bind a thread to a set of cores. + * +@@ -104,7 +104,7 @@ namespace gr { + * use in this fashion). + */ + GR_RUNTIME_API void thread_bind_to_processor(gr_thread_t thread, +- const std::vector &mask); ++ const std::vector &mask); + + + /*! \brief Convineince function to bind the a thread to a single core. +diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc +index 2bae8ea..9641022 100644 +--- a/gnuradio-runtime/lib/block.cc ++++ b/gnuradio-runtime/lib/block.cc +@@ -325,7 +325,7 @@ namespace gr { + } + + void +- block::set_processor_affinity(const std::vector &mask) ++ block::set_processor_affinity(const std::vector &mask) + { + d_affinity = mask; + if(d_detail) { +diff --git a/gnuradio-runtime/lib/block_detail.cc b/gnuradio-runtime/lib/block_detail.cc +index 9e2e29f..cc47b52 100644 +--- a/gnuradio-runtime/lib/block_detail.cc ++++ b/gnuradio-runtime/lib/block_detail.cc +@@ -251,7 +251,7 @@ namespace gr { + } + + void +- block_detail::set_processor_affinity(const std::vector &mask) ++ block_detail::set_processor_affinity(const std::vector &mask) + { + if(threaded) { + try { +diff --git a/gnuradio-runtime/lib/hier_block2.cc b/gnuradio-runtime/lib/hier_block2.cc +index 597ae03..031ec30 100644 +--- a/gnuradio-runtime/lib/hier_block2.cc ++++ b/gnuradio-runtime/lib/hier_block2.cc +@@ -161,7 +161,7 @@ namespace gr { + } + + void +- hier_block2::set_processor_affinity(const std::vector &mask) ++ hier_block2::set_processor_affinity(const std::vector &mask) + { + d_detail->set_processor_affinity(mask); + } +@@ -172,7 +172,7 @@ namespace gr { + d_detail->unset_processor_affinity(); + } + +- std::vector ++ std::vector + hier_block2::processor_affinity() + { + return d_detail->processor_affinity(); +diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc +index 0d0ddf5..175e787 100644 +--- a/gnuradio-runtime/lib/hier_block2_detail.cc ++++ b/gnuradio-runtime/lib/hier_block2_detail.cc +@@ -932,7 +932,7 @@ namespace gr { + } + + void +- hier_block2_detail::set_processor_affinity(const std::vector &mask) ++ hier_block2_detail::set_processor_affinity(const std::vector &mask) + { + basic_block_vector_t tmp = d_fg->calc_used_blocks(); + for(basic_block_viter_t p = tmp.begin(); p != tmp.end(); p++) { +@@ -949,7 +949,7 @@ namespace gr { + } + } + +- std::vector ++ std::vector + hier_block2_detail::processor_affinity() + { + basic_block_vector_t tmp = d_fg->calc_used_blocks(); +diff --git a/gnuradio-runtime/lib/hier_block2_detail.h b/gnuradio-runtime/lib/hier_block2_detail.h +index a5584fe..0cdb149 100644 +--- a/gnuradio-runtime/lib/hier_block2_detail.h ++++ b/gnuradio-runtime/lib/hier_block2_detail.h +@@ -54,9 +54,9 @@ namespace gr { + void unlock(); + void flatten_aux(flat_flowgraph_sptr sfg) const; + +- void set_processor_affinity(const std::vector &mask); ++ void set_processor_affinity(const std::vector &mask); + void unset_processor_affinity(); +- std::vector processor_affinity(); ++ std::vector processor_affinity(); + + // Track output buffer min/max settings + std::vector d_max_output_buffer; +diff --git a/gnuradio-runtime/lib/thread/thread.cc b/gnuradio-runtime/lib/thread/thread.cc +index f2606c7..563715a 100644 +--- a/gnuradio-runtime/lib/thread/thread.cc ++++ b/gnuradio-runtime/lib/thread/thread.cc +@@ -40,33 +40,33 @@ namespace gr { + } + + void +- thread_bind_to_processor(int n) ++ thread_bind_to_processor(std::size_t n) + { +- std::vector mask(1, n); ++ std::vector mask(1, n); + thread_bind_to_processor(get_current_thread_id(), mask); + } + + void +- thread_bind_to_processor(const std::vector &mask) ++ thread_bind_to_processor(const std::vector &mask) + { + thread_bind_to_processor(get_current_thread_id(), mask); + } + + void +- thread_bind_to_processor(gr_thread_t thread, int n) ++ thread_bind_to_processor(gr_thread_t thread, std::size_t n) + { +- std::vector mask(1, n); ++ std::vector mask(1, n); + thread_bind_to_processor(thread, mask); + } + + void +- thread_bind_to_processor(gr_thread_t thread, const std::vector &mask) ++ thread_bind_to_processor(gr_thread_t thread, const std::vector &mask) + { + //DWORD_PTR mask = (1 << n); + DWORD_PTR dword_mask = 0; + +- std::vector _mask = mask; +- std::vector::iterator itr; ++ std::vector _mask = mask; ++ std::vector::iterator itr; + for(itr = _mask.begin(); itr != _mask.end(); itr++) + dword_mask |= (1 << (*itr)); + +@@ -179,25 +179,25 @@ namespace gr { + } + + void +- thread_bind_to_processor(int n) ++ thread_bind_to_processor(std::size_t n) + { + // Not implemented on OSX + } + + void +- thread_bind_to_processor(gr_thread_t thread, int n) ++ thread_bind_to_processor(gr_thread_t thread, std::size_t n) + { + // Not implemented on OSX + } + + void +- thread_bind_to_processor(const std::vector &mask) ++ thread_bind_to_processor(const std::vector &mask) + { + // Not implemented on OSX + } + + void +- thread_bind_to_processor(gr_thread_t thread, const std::vector &mask) ++ thread_bind_to_processor(gr_thread_t thread, const std::vector &mask) + { + // Not implemented on OSX + } +@@ -262,32 +262,32 @@ namespace gr { + } + + void +- thread_bind_to_processor(int n) ++ thread_bind_to_processor(std::size_t n) + { +- std::vector mask(1, n); ++ std::vector mask(1, n); + thread_bind_to_processor(get_current_thread_id(), mask); + } + + void +- thread_bind_to_processor(const std::vector &mask) ++ thread_bind_to_processor(const std::vector &mask) + { + thread_bind_to_processor(get_current_thread_id(), mask); + } + + void +- thread_bind_to_processor(gr_thread_t thread, int n) ++ thread_bind_to_processor(gr_thread_t thread, std::size_t n) + { +- std::vector mask(1, n); ++ std::vector mask(1, n); + thread_bind_to_processor(thread, mask); + } + + void +- thread_bind_to_processor(gr_thread_t thread, const std::vector &mask) ++ thread_bind_to_processor(gr_thread_t thread, const std::vector &mask) + { + cpu_set_t set; + size_t len = sizeof(cpu_set_t); +- std::vector _mask = mask; +- std::vector::iterator itr; ++ std::vector _mask = mask; ++ std::vector::iterator itr; + + CPU_ZERO(&set); + for(itr = _mask.begin(); itr != _mask.end(); itr++) +diff --git a/gnuradio-runtime/swig/block.i b/gnuradio-runtime/swig/block.i +index 945cea7..7d2b29e 100644 +--- a/gnuradio-runtime/swig/block.i ++++ b/gnuradio-runtime/swig/block.i +@@ -99,9 +99,9 @@ class gr::block : public gr::basic_block + float pc_throughput_avg(); + + // Methods to manage processor affinity. +- void set_processor_affinity(const std::vector &mask); ++ void set_processor_affinity(const std::vector &mask); + void unset_processor_affinity(); +- std::vector processor_affinity(); ++ std::vector processor_affinity(); + + // Methods to manage thread priority + int active_thread_priority(); +diff --git a/gnuradio-runtime/swig/hier_block2.i b/gnuradio-runtime/swig/hier_block2.i +index 12190d0..de79e3f 100644 +--- a/gnuradio-runtime/swig/hier_block2.i ++++ b/gnuradio-runtime/swig/hier_block2.i +@@ -87,9 +87,9 @@ namespace gr { + void message_port_register_hier_in(pmt::pmt_t port_id); + void message_port_register_hier_out(pmt::pmt_t port_id); + +- void set_processor_affinity(const std::vector &mask); ++ void set_processor_affinity(const std::vector &mask); + void unset_processor_affinity(); +- std::vector processor_affinity(); ++ std::vector processor_affinity(); + + // Methods to manage block's min/max buffer sizes. + size_t max_output_buffer(int i); +diff --git a/gr-blocks/lib/qa_gr_top_block.cc b/gr-blocks/lib/qa_gr_top_block.cc +index 39709d2..8792637 100644 +--- a/gr-blocks/lib/qa_gr_top_block.cc ++++ b/gr-blocks/lib/qa_gr_top_block.cc +@@ -278,7 +278,7 @@ void qa_top_block::t11_set_block_affinity() + gr::block_sptr src (gr::blocks::null_source::make(sizeof(float))); + gr::block_sptr snk (gr::blocks::null_sink::make(sizeof(float))); + +- std::vector set(1, 0), ret; ++ std::vector set(1, 0), ret; + src->set_processor_affinity(set); + + tb->connect(src, 0, snk, 0); diff --git a/gnuradio-3.7.9.1-size_t.patch b/gnuradio-3.7.9.1-size_t.patch deleted file mode 100644 index 4817dc7..0000000 --- a/gnuradio-3.7.9.1-size_t.patch +++ /dev/null @@ -1,394 +0,0 @@ -diff --git a/docs/doxygen/other/thread_affinity.dox b/docs/doxygen/other/thread_affinity.dox -index edac813..03d2129 100644 ---- a/docs/doxygen/other/thread_affinity.dox -+++ b/docs/doxygen/other/thread_affinity.dox -@@ -50,7 +50,7 @@ Each block has two new data members: - A block can set and unset its affinity at any time using the - following member functions: - --- gr::block::set_processor_affinity(const std::vector &mask) -+- gr::block::set_processor_affinity(const std::vector &mask) - - gr::block::unset_processor_affinity() - - Where \p mask is a vector of core numbers to set the thread's affinity -@@ -76,7 +76,7 @@ to that affinity setting. - The gr::hier_block2 class supports the same API interface to the block - thread affinity: - --- gr::hier_block2::set_processor_affinity(const std::vector &mask) -+- gr::hier_block2::set_processor_affinity(const std::vector &mask) - - gr::hier_block2::unset_processor_affinity() - - gr::hier_block2::processor_affinity() - -diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h -index 25d9fb5..2a43a8a 100644 ---- a/gnuradio-runtime/include/gnuradio/basic_block.h -+++ b/gnuradio-runtime/include/gnuradio/basic_block.h -@@ -376,13 +376,13 @@ namespace gr { - d_msg_handlers[which_port] = msg_handler_t(msg_handler); - } - -- virtual void set_processor_affinity(const std::vector &mask) -+ virtual void set_processor_affinity(const std::vector &mask) - { throw std::runtime_error("set_processor_affinity not overloaded in child class."); } - - virtual void unset_processor_affinity() - { throw std::runtime_error("unset_processor_affinity not overloaded in child class."); } - -- virtual std::vector processor_affinity() -+ virtual std::vector processor_affinity() - { throw std::runtime_error("processor_affinity not overloaded in child class."); } - }; - -diff --git a/gnuradio-runtime/include/gnuradio/block.h b/gnuradio-runtime/include/gnuradio/block.h -index c6185d9..8480ec7 100644 ---- a/gnuradio-runtime/include/gnuradio/block.h -+++ b/gnuradio-runtime/include/gnuradio/block.h -@@ -593,9 +593,9 @@ namespace gr { - /*! - * \brief Set the thread's affinity to processor core \p n. - * -- * \param mask a vector of ints of the core numbers available to this block. -+ * \param mask a vector of std::size_t of the core numbers available to this block. - */ -- void set_processor_affinity(const std::vector &mask); -+ void set_processor_affinity(const std::vector &mask); - - /*! - * \brief Remove processor affinity to a specific core. -@@ -605,7 +605,7 @@ namespace gr { - /*! - * \brief Get the current processor affinity. - */ -- std::vector processor_affinity() { return d_affinity; } -+ std::vector processor_affinity() { return d_affinity; } - - /*! - * \brief Get the current thread priority in use -@@ -650,7 +650,7 @@ namespace gr { - int d_max_noutput_items; // value of max_noutput_items for this block - int d_min_noutput_items; - tag_propagation_policy_t d_tag_propagation_policy; // policy for moving tags downstream -- std::vector d_affinity; // thread affinity proc. mask -+ std::vector d_affinity; // thread affinity proc. mask - int d_priority; // thread priority level - bool d_pc_rpc_set; - bool d_update_rate; // should sched update rel rate? -diff --git a/gnuradio-runtime/include/gnuradio/block_detail.h b/gnuradio-runtime/include/gnuradio/block_detail.h -index 916c0a4..1d52824 100644 ---- a/gnuradio-runtime/include/gnuradio/block_detail.h -+++ b/gnuradio-runtime/include/gnuradio/block_detail.h -@@ -174,10 +174,10 @@ namespace gr { - * \brief Set core affinity of block to the cores in the vector - * mask. - * -- * \param mask a vector of ints of the core numbers available to -+ * \param mask a vector of std::size_t of the core numbers available to - * this block. - */ -- void set_processor_affinity(const std::vector &mask); -+ void set_processor_affinity(const std::vector &mask); - - /*! - * \brief Unset core affinity. -diff --git a/gnuradio-runtime/include/gnuradio/hier_block2.h b/gnuradio-runtime/include/gnuradio/hier_block2.h -index 08a5389..d4f9696 100644 ---- a/gnuradio-runtime/include/gnuradio/hier_block2.h -+++ b/gnuradio-runtime/include/gnuradio/hier_block2.h -@@ -248,7 +248,7 @@ namespace gr { - * - * \param mask a vector of ints of the core numbers available to this block. - */ -- void set_processor_affinity(const std::vector &mask); -+ void set_processor_affinity(const std::vector &mask); - - /*! - * \brief Remove processor affinity for all blocks in hier_block2. -@@ -264,7 +264,7 @@ namespace gr { - * interface. If any block has been individually set, then this - * call could be misleading. - */ -- std::vector processor_affinity(); -+ std::vector processor_affinity(); - - /*! - * \brief Get if all block min buffers should be set. -diff --git a/gnuradio-runtime/include/gnuradio/thread/thread.h b/gnuradio-runtime/include/gnuradio/thread/thread.h -index a58d172..6c6c1bf 100644 ---- a/gnuradio-runtime/include/gnuradio/thread/thread.h -+++ b/gnuradio-runtime/include/gnuradio/thread/thread.h -@@ -77,7 +77,7 @@ namespace gr { - * do support in this way since 10.5 is not what we want or can - * use in this fashion). - */ -- GR_RUNTIME_API void thread_bind_to_processor(const std::vector &mask); -+ GR_RUNTIME_API void thread_bind_to_processor(const std::vector &mask); - - /*! \brief Convineince function to bind the current thread to a single core. - * -@@ -89,7 +89,7 @@ namespace gr { - * do support in this way since 10.5 is not what we want or can - * use in this fashion). - */ -- GR_RUNTIME_API void thread_bind_to_processor(int n); -+ GR_RUNTIME_API void thread_bind_to_processor(std::size_t n); - - /*! \brief Bind a thread to a set of cores. - * -@@ -104,7 +104,7 @@ namespace gr { - * use in this fashion). - */ - GR_RUNTIME_API void thread_bind_to_processor(gr_thread_t thread, -- const std::vector &mask); -+ const std::vector &mask); - - - /*! \brief Convineince function to bind the a thread to a single core. -diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc -index 2bae8ea..9641022 100644 ---- a/gnuradio-runtime/lib/block.cc -+++ b/gnuradio-runtime/lib/block.cc -@@ -325,7 +325,7 @@ namespace gr { - } - - void -- block::set_processor_affinity(const std::vector &mask) -+ block::set_processor_affinity(const std::vector &mask) - { - d_affinity = mask; - if(d_detail) { -diff --git a/gnuradio-runtime/lib/block_detail.cc b/gnuradio-runtime/lib/block_detail.cc -index 9463e8d..96b54d0 100644 ---- a/gnuradio-runtime/lib/block_detail.cc -+++ b/gnuradio-runtime/lib/block_detail.cc -@@ -223,7 +223,7 @@ namespace gr { - } - - void -- block_detail::set_processor_affinity(const std::vector &mask) -+ block_detail::set_processor_affinity(const std::vector &mask) - { - if(threaded) { - try { -diff --git a/gnuradio-runtime/lib/hier_block2.cc b/gnuradio-runtime/lib/hier_block2.cc -index 597ae03..031ec30 100644 ---- a/gnuradio-runtime/lib/hier_block2.cc -+++ b/gnuradio-runtime/lib/hier_block2.cc -@@ -161,7 +161,7 @@ namespace gr { - } - - void -- hier_block2::set_processor_affinity(const std::vector &mask) -+ hier_block2::set_processor_affinity(const std::vector &mask) - { - d_detail->set_processor_affinity(mask); - } -@@ -172,7 +172,7 @@ namespace gr { - d_detail->unset_processor_affinity(); - } - -- std::vector -+ std::vector - hier_block2::processor_affinity() - { - return d_detail->processor_affinity(); -diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc -index 0d0ddf5..175e787 100644 ---- a/gnuradio-runtime/lib/hier_block2_detail.cc -+++ b/gnuradio-runtime/lib/hier_block2_detail.cc -@@ -932,7 +932,7 @@ namespace gr { - } - - void -- hier_block2_detail::set_processor_affinity(const std::vector &mask) -+ hier_block2_detail::set_processor_affinity(const std::vector &mask) - { - basic_block_vector_t tmp = d_fg->calc_used_blocks(); - for(basic_block_viter_t p = tmp.begin(); p != tmp.end(); p++) { -@@ -949,7 +949,7 @@ namespace gr { - } - } - -- std::vector -+ std::vector - hier_block2_detail::processor_affinity() - { - basic_block_vector_t tmp = d_fg->calc_used_blocks(); -diff --git a/gnuradio-runtime/lib/hier_block2_detail.h b/gnuradio-runtime/lib/hier_block2_detail.h -index a5584fe..0cdb149 100644 ---- a/gnuradio-runtime/lib/hier_block2_detail.h -+++ b/gnuradio-runtime/lib/hier_block2_detail.h -@@ -54,9 +54,9 @@ namespace gr { - void unlock(); - void flatten_aux(flat_flowgraph_sptr sfg) const; - -- void set_processor_affinity(const std::vector &mask); -+ void set_processor_affinity(const std::vector &mask); - void unset_processor_affinity(); -- std::vector processor_affinity(); -+ std::vector processor_affinity(); - - // Track output buffer min/max settings - std::vector d_max_output_buffer; -diff --git a/gnuradio-runtime/lib/thread/thread.cc b/gnuradio-runtime/lib/thread/thread.cc -index 483dfed..e05a8ba 100644 ---- a/gnuradio-runtime/lib/thread/thread.cc -+++ b/gnuradio-runtime/lib/thread/thread.cc -@@ -40,33 +40,33 @@ namespace gr { - } - - void -- thread_bind_to_processor(int n) -+ thread_bind_to_processor(std::size_t n) - { -- std::vector mask(1, n); -+ std::vector mask(1, n); - thread_bind_to_processor(get_current_thread_id(), mask); - } - - void -- thread_bind_to_processor(const std::vector &mask) -+ thread_bind_to_processor(const std::vector &mask) - { - thread_bind_to_processor(get_current_thread_id(), mask); - } - - void -- thread_bind_to_processor(gr_thread_t thread, int n) -+ thread_bind_to_processor(gr_thread_t thread, std::size_t n) - { -- std::vector mask(1, n); -+ std::vector mask(1, n); - thread_bind_to_processor(thread, mask); - } - - void -- thread_bind_to_processor(gr_thread_t thread, const std::vector &mask) -+ thread_bind_to_processor(gr_thread_t thread, const std::vector &mask) - { - //DWORD_PTR mask = (1 << n); - DWORD_PTR dword_mask = 0; - -- std::vector _mask = mask; -- std::vector::iterator itr; -+ std::vector _mask = mask; -+ std::vector::iterator itr; - for(itr = _mask.begin(); itr != _mask.end(); itr++) - dword_mask |= (1 << (*itr)); - -@@ -171,25 +171,25 @@ namespace gr { - } - - void -- thread_bind_to_processor(int n) -+ thread_bind_to_processor(std::size_t n) - { - // Not implemented on OSX - } - - void -- thread_bind_to_processor(gr_thread_t thread, int n) -+ thread_bind_to_processor(gr_thread_t thread, std::size_t n) - { - // Not implemented on OSX - } - - void -- thread_bind_to_processor(const std::vector &mask) -+ thread_bind_to_processor(const std::vector &mask) - { - // Not implemented on OSX - } - - void -- thread_bind_to_processor(gr_thread_t thread, const std::vector &mask) -+ thread_bind_to_processor(gr_thread_t thread, const std::vector &mask) - { - // Not implemented on OSX - } -@@ -254,32 +254,32 @@ namespace gr { - } - - void -- thread_bind_to_processor(int n) -+ thread_bind_to_processor(std::size_t n) - { -- std::vector mask(1, n); -+ std::vector mask(1, n); - thread_bind_to_processor(get_current_thread_id(), mask); - } - - void -- thread_bind_to_processor(const std::vector &mask) -+ thread_bind_to_processor(const std::vector &mask) - { - thread_bind_to_processor(get_current_thread_id(), mask); - } - - void -- thread_bind_to_processor(gr_thread_t thread, int n) -+ thread_bind_to_processor(gr_thread_t thread, std::size_t n) - { -- std::vector mask(1, n); -+ std::vector mask(1, n); - thread_bind_to_processor(thread, mask); - } - - void -- thread_bind_to_processor(gr_thread_t thread, const std::vector &mask) -+ thread_bind_to_processor(gr_thread_t thread, const std::vector &mask) - { - cpu_set_t set; - size_t len = sizeof(cpu_set_t); -- std::vector _mask = mask; -- std::vector::iterator itr; -+ std::vector _mask = mask; -+ std::vector::iterator itr; - - CPU_ZERO(&set); - for(itr = _mask.begin(); itr != _mask.end(); itr++) -diff --git a/gnuradio-runtime/swig/block.i b/gnuradio-runtime/swig/block.i -index 945cea7..7d2b29e 100644 ---- a/gnuradio-runtime/swig/block.i -+++ b/gnuradio-runtime/swig/block.i -@@ -99,9 +99,9 @@ class gr::block : public gr::basic_block - float pc_throughput_avg(); - - // Methods to manage processor affinity. -- void set_processor_affinity(const std::vector &mask); -+ void set_processor_affinity(const std::vector &mask); - void unset_processor_affinity(); -- std::vector processor_affinity(); -+ std::vector processor_affinity(); - - // Methods to manage thread priority - int active_thread_priority(); -diff --git a/gnuradio-runtime/swig/hier_block2.i b/gnuradio-runtime/swig/hier_block2.i -index 12190d0..de79e3f 100644 ---- a/gnuradio-runtime/swig/hier_block2.i -+++ b/gnuradio-runtime/swig/hier_block2.i -@@ -87,9 +87,9 @@ namespace gr { - void message_port_register_hier_in(pmt::pmt_t port_id); - void message_port_register_hier_out(pmt::pmt_t port_id); - -- void set_processor_affinity(const std::vector &mask); -+ void set_processor_affinity(const std::vector &mask); - void unset_processor_affinity(); -- std::vector processor_affinity(); -+ std::vector processor_affinity(); - - // Methods to manage block's min/max buffer sizes. - size_t max_output_buffer(int i); -diff --git a/gr-blocks/lib/qa_gr_top_block.cc b/gr-blocks/lib/qa_gr_top_block.cc -index 39709d2..8792637 100644 ---- a/gr-blocks/lib/qa_gr_top_block.cc -+++ b/gr-blocks/lib/qa_gr_top_block.cc -@@ -278,7 +278,7 @@ void qa_top_block::t11_set_block_affinity() - gr::block_sptr src (gr::blocks::null_source::make(sizeof(float))); - gr::block_sptr snk (gr::blocks::null_sink::make(sizeof(float))); - -- std::vector set(1, 0), ret; -+ std::vector set(1, 0), ret; - src->set_processor_affinity(set); - - tb->connect(src, 0, snk, 0); diff --git a/gnuradio-3.7.9.1-stdc11-fix.patch b/gnuradio-3.7.9.1-stdc11-fix.patch deleted file mode 100644 index 34be130..0000000 --- a/gnuradio-3.7.9.1-stdc11-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/gr-fec/include/gnuradio/fec/polar_decoder_common.h b/gr-fec/include/gnuradio/fec/polar_decoder_common.h -index b0ecb85..d738ae4 100644 ---- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h -+++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h -@@ -64,7 +64,11 @@ namespace gr { - bool set_frame_size(unsigned int frame_size){return false;}; - - private: -+#ifdef BOOST_NO_CXX11_CONSTEXPR - static const float D_LLR_FACTOR = -2.19722458f; -+#else -+ static constexpr float D_LLR_FACTOR = -2.19722458f; -+#endif - unsigned int d_frozen_bit_counter; - - protected: diff --git a/gnuradio-cmake35.patch b/gnuradio-cmake35.patch deleted file mode 100644 index 878da6f..0000000 --- a/gnuradio-cmake35.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff -up gnuradio-3.7.9.1/volk/apps/CMakeLists.txt.cmake35 gnuradio-3.7.9.1/volk/apps/CMakeLists.txt ---- gnuradio-3.7.9.1/volk/apps/CMakeLists.txt.cmake35 2016-02-07 10:09:12.000000000 -0700 -+++ gnuradio-3.7.9.1/volk/apps/CMakeLists.txt 2016-02-23 20:47:31.513538541 -0700 -@@ -19,23 +19,23 @@ - # Setup profiler - ######################################################################## - if(MSVC) -- include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc) -+ include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc) - endif(MSVC) - - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} -- ${CMAKE_SOURCE_DIR}/include -- ${CMAKE_BINARY_DIR}/include -- ${CMAKE_SOURCE_DIR}/lib -- ${CMAKE_BINARY_DIR}/lib -+ ${PROJECT_SOURCE_DIR}/include -+ ${PROJECT_BINARY_DIR}/include -+ ${PROJECT_SOURCE_DIR}/lib -+ ${PROJECT_BINARY_DIR}/lib - ${Boost_INCLUDE_DIRS} - ) - - # MAKE volk_profile - add_executable(volk_profile - ${CMAKE_CURRENT_SOURCE_DIR}/volk_profile.cc -- ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc -+ ${PROJECT_SOURCE_DIR}/lib/qa_utils.cc - ) - - -diff -up gnuradio-3.7.9.1/volk/CMakeLists.txt.cmake35 gnuradio-3.7.9.1/volk/CMakeLists.txt -diff -up gnuradio-3.7.9.1/volk/lib/CMakeLists.txt.cmake35 gnuradio-3.7.9.1/volk/lib/CMakeLists.txt ---- gnuradio-3.7.9.1/volk/lib/CMakeLists.txt.cmake35 2016-02-07 10:09:12.000000000 -0700 -+++ gnuradio-3.7.9.1/volk/lib/CMakeLists.txt 2016-02-23 20:47:31.516538564 -0700 -@@ -90,7 +90,7 @@ endif() - ######################################################################## - execute_process( - COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py -+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py - --mode "arch_flags" --compiler "${COMPILER_NAME}" - OUTPUT_VARIABLE arch_flag_lines OUTPUT_STRIP_TRAILING_WHITESPACE - ) -@@ -278,7 +278,7 @@ message(STATUS "Available architectures: - ######################################################################## - execute_process( - COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py -+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py - --mode "machines" --archs "${available_archs}" - OUTPUT_VARIABLE available_machines OUTPUT_STRIP_TRAILING_WHITESPACE - ) -@@ -310,9 +310,9 @@ message(STATUS "Available machines: ${av - ######################################################################## - - #dependencies are all python, xml, and header implementation files --file(GLOB xml_files ${CMAKE_SOURCE_DIR}/gen/*.xml) --file(GLOB py_files ${CMAKE_SOURCE_DIR}/gen/*.py) --file(GLOB h_files ${CMAKE_SOURCE_DIR}/kernels/volk/*.h) -+file(GLOB xml_files ${PROJECT_SOURCE_DIR}/gen/*.xml) -+file(GLOB py_files ${PROJECT_SOURCE_DIR}/gen/*.py) -+file(GLOB h_files ${PROJECT_SOURCE_DIR}/kernels/volk/*.h) - - macro(gen_template tmpl output) - list(APPEND volk_gen_sources ${output}) -@@ -320,21 +320,21 @@ macro(gen_template tmpl output) - OUTPUT ${output} - DEPENDS ${xml_files} ${py_files} ${h_files} ${tmpl} - COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -- ${CMAKE_SOURCE_DIR}/gen/volk_tmpl_utils.py -+ ${PROJECT_SOURCE_DIR}/gen/volk_tmpl_utils.py - --input ${tmpl} --output ${output} ${ARGN} - ) - endmacro(gen_template) - --make_directory(${CMAKE_BINARY_DIR}/include/volk) -+make_directory(${PROJECT_BINARY_DIR}/include/volk) - --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk.h) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk.c) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_typedefs.h) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk_cpu.c) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.h ${CMAKE_BINARY_DIR}/lib/volk_machines.h) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk_machines.c) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk.h) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk.c) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_typedefs.h) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_cpu.h) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk_cpu.c) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_config_fixed.h) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.h ${PROJECT_BINARY_DIR}/lib/volk_machines.h) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk_machines.c) - - set(BASE_CFLAGS NONE) - string(TOUPPER ${CMAKE_BUILD_TYPE} CBTU) -@@ -362,12 +362,12 @@ set(COMPILER_INFO "${CMAKE_C_COMPILER}:: - foreach(machine_name ${available_machines}) - #generate machine source - set(machine_source ${CMAKE_CURRENT_BINARY_DIR}/volk_machine_${machine_name}.c) -- gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name}) -+ gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name}) - - #determine machine flags - execute_process( - COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py -+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py - --mode "machine_flags" --machine "${machine_name}" --compiler "${COMPILER_NAME}" - OUTPUT_VARIABLE ${machine_name}_flags OUTPUT_STRIP_TRAILING_WHITESPACE - ) -@@ -393,9 +393,9 @@ string(REPLACE "\n" " \\n" COMPILER_INFO - # Set local include directories first - ######################################################################## - include_directories( -- ${CMAKE_BINARY_DIR}/include -- ${CMAKE_SOURCE_DIR}/include -- ${CMAKE_SOURCE_DIR}/kernels -+ ${PROJECT_BINARY_DIR}/include -+ ${PROJECT_SOURCE_DIR}/include -+ ${PROJECT_SOURCE_DIR}/kernels - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ) -@@ -420,8 +420,8 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8 - # setup architecture specific assembler flags - set(ARCH_ASM_FLAGS "-mfpu=neon -g") - # then add the files -- include_directories(${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon) -- file(GLOB asm_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon/*.s) -+ include_directories(${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon) -+ file(GLOB asm_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon/*.s) - foreach(asm_file ${asm_files}) - list(APPEND volk_sources ${asm_file}) - message(STATUS "Adding source file: ${asm_file}") -@@ -453,7 +453,7 @@ if(ORC_FOUND) - list(APPEND volk_libraries ${ORC_LIBRARIES}) - - #setup orc functions -- file(GLOB orc_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/orc/*.orc) -+ file(GLOB orc_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/orc/*.orc) - foreach(orc_file ${orc_files}) - - #extract the name for the generated c source from the orc file -@@ -511,7 +511,7 @@ PROPERTIES COMPILE_DEFINITIONS "${machin - - if(MSVC) - #add compatibility includes for stdint types -- include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc) -+ include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc) - add_definitions(-DHAVE_CONFIG_H) - #compile the sources as C++ due to the lack of complex.h under MSVC - set_source_files_properties(${volk_sources} PROPERTIES LANGUAGE CXX) -diff -up gnuradio-3.7.9.1/volk/python/volk_modtool/CMakeLists.txt.cmake35 gnuradio-3.7.9.1/volk/python/volk_modtool/CMakeLists.txt diff --git a/gnuradio.spec b/gnuradio.spec index 765a303..01028f3 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,8 +19,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.7.9.1 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.7.10 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -59,12 +59,7 @@ Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 # rhbz#1143914, patch approved by upstream to be used as distro specific # patch, upstream report: http://gnuradio.org/redmine/issues/728 -Patch0: gnuradio-3.7.9.1-size_t.patch -# upstream report: http://gnuradio.org/redmine/issues/902 -Patch1: gnuradio-3.7.9.1-stdc11-fix.patch -# Fix build with cmake 3.5 -# https://bugzilla.redhat.com/show_bug.cgi?id=1311358 -Patch2: gnuradio-cmake35.patch +Patch0: gnuradio-3.7.10-size_t.patch %description GNU Radio is a collection of software that when combined with minimal @@ -103,8 +98,6 @@ GNU Radio examples %prep %setup -q -n %{name}-%{version}%{?alphatag} %patch0 -p1 -b .size_t -%patch1 -p1 -b .stdc11-fix -%patch2 -p1 -b .cmake35 # Use cmake's FindGSL.cmake instead rm cmake/Modules/FindGSL.cmake @@ -218,6 +211,12 @@ fi %{_datadir}/gnuradio/examples %changelog +* Mon Jul 4 2016 Jaroslav Škarvada - 3.7.10-1 +- New version + Resolves: rhbz#1352483 +- Dropped stdc11-fix and cmake35 patches (both upstreamed) +- Defuzzified size_t patch + * Tue May 10 2016 Jaroslav Škarvada - 3.7.9.1-4 - Rebuilt for new uhd diff --git a/sources b/sources index f4dbeb3..6c98dea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -653155499bcefb1478b1963f11841434 gnuradio-3.7.9.1.tar.gz +fc40fadcc3c9ac339c9618c6dc8c303b gnuradio-3.7.10.tar.gz