From d84e5c341fa959e618a05f4d4f135dec7f2f6b78 Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: May 12 2015 12:33:27 +0000 Subject: New version Resolves: rhbz#1220588 - Rebased size_t patch - Dropped volk-memalign-fix patch (not needed) - Dropped wxpython3-gtk3 patch (upstreamed) --- diff --git a/gnuradio-3.7.5-volk-memalign-fix.patch b/gnuradio-3.7.5-volk-memalign-fix.patch deleted file mode 100644 index 59c81cd..0000000 --- a/gnuradio-3.7.5-volk-memalign-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/volk/lib/volk_malloc.c b/volk/lib/volk_malloc.c -index d5e1709..4a31c5e 100644 ---- a/volk/lib/volk_malloc.c -+++ b/volk/lib/volk_malloc.c -@@ -55,7 +55,8 @@ - - // Otherwise, test if we are a POSIX or X/Open system - // This only has a restriction that alignment be a power of 2. --#if _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || HAVE_POSIX_MEMALIGN -+//#if _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || HAVE_POSIX_MEMALIGN -+#if 0 - - void *volk_malloc(size_t size, size_t alignment) - { diff --git a/gnuradio-3.7.5-wxpython3-gtk3.patch b/gnuradio-3.7.5-wxpython3-gtk3.patch deleted file mode 100644 index cca9220..0000000 --- a/gnuradio-3.7.5-wxpython3-gtk3.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cbc1d8036f973108a2f7f8cfcc0c526f2e93c29b Mon Sep 17 00:00:00 2001 -From: Scott Talbert -Date: Wed, 28 Jan 2015 23:35:41 -0500 -Subject: [PATCH] Fix gnuradio for wxPython3/GTK+3 - -MemoryDC needs to have a bitmap selected before using it ---- - gr-wxgui/python/wxgui/plotter/gltext.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gr-wxgui/python/wxgui/plotter/gltext.py b/gr-wxgui/python/wxgui/plotter/gltext.py -index 0b6e3f5..55627bc 100644 ---- a/gr-wxgui/python/wxgui/plotter/gltext.py -+++ b/gr-wxgui/python/wxgui/plotter/gltext.py -@@ -149,6 +149,10 @@ class TextElement(object): - # get a memory dc - dc = wx.MemoryDC() - -+ # Select an empty bitmap into the MemoryDC - otherwise the call to -+ # GetMultiLineTextExtent() may fail below -+ dc.SelectObject(wx.EmptyBitmap(1,1)) -+ - # set our font - dc.SetFont(self._font) - --- -2.2.2 - diff --git a/gnuradio-3.7.6.1-size_t.patch b/gnuradio-3.7.6.1-size_t.patch deleted file mode 100644 index 77c07c6..0000000 --- a/gnuradio-3.7.6.1-size_t.patch +++ /dev/null @@ -1,437 +0,0 @@ -diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake -index abf4dc4..1993ee6 100644 ---- a/cmake/Modules/GrSwig.cmake -+++ b/cmake/Modules/GrSwig.cmake -@@ -105,18 +105,6 @@ endfunction(GR_SWIG_MAKE_DOCS) - macro(GR_SWIG_MAKE name) - set(ifiles ${ARGN}) - -- # Shimming this in here to take care of a SWIG bug with handling -- # vector and vector (on 32-bit machines) and -- # vector (on 64-bit machines). Use this to test -- # the size of size_t, then set SIZE_T_32 if it's a 32-bit machine -- # or not if it's 64-bit. The logic in gr_type.i handles the rest. -- INCLUDE(CheckTypeSize) -- CHECK_TYPE_SIZE("size_t" SIZEOF_SIZE_T) -- CHECK_TYPE_SIZE("unsigned int" SIZEOF_UINT) -- if(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UINT}) -- list(APPEND GR_SWIG_FLAGS -DSIZE_T_32) -- endif(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UINT}) -- - #do swig doc generation if specified - if(GR_SWIG_DOC_FILE) - set(GR_SWIG_DOCS_SOURCE_DEPS ${GR_SWIG_SOURCE_DEPS}) -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 da07dd9..f79c471 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 4a534b7..edcff0e 100644 ---- a/gnuradio-runtime/include/gnuradio/block.h -+++ b/gnuradio-runtime/include/gnuradio/block.h -@@ -538,9 +538,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. -@@ -550,7 +550,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 -@@ -595,7 +595,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 1bf8ddd..3d243d2 100644 ---- a/gnuradio-runtime/include/gnuradio/hier_block2.h -+++ b/gnuradio-runtime/include/gnuradio/hier_block2.h -@@ -216,7 +216,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. -@@ -232,7 +232,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(); - }; - - /*! -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 9173094..b652766 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 f145b93..e4e7110 100644 ---- a/gnuradio-runtime/lib/hier_block2.cc -+++ b/gnuradio-runtime/lib/hier_block2.cc -@@ -159,7 +159,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); - } -@@ -170,7 +170,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 ad8fc87..ddf41ca 100644 ---- a/gnuradio-runtime/lib/hier_block2_detail.cc -+++ b/gnuradio-runtime/lib/hier_block2_detail.cc -@@ -685,7 +685,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++) { -@@ -702,7 +702,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 8067383..7c16b32 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(); - - private: - // Private implementation data -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/gr_types.i b/gnuradio-runtime/swig/gr_types.i -index 8ae953b..fa2c764 100644 ---- a/gnuradio-runtime/swig/gr_types.i -+++ b/gnuradio-runtime/swig/gr_types.i -@@ -80,15 +80,4 @@ namespace std { - %template(gr_vector_vector_complexf) std::vector< std::vector< std::complex > >; - %template(gr_vector_vector_complexd) std::vector< std::vector< std::complex > >; - --// Fix for Issue #529 --#ifdef SIZE_T_32 -- // On 32-bit systems, whenever we see std::vector, replace it -- // with vector -- %apply std::vector { std::vector }; --#else -- // On 64-bit systems, whenever we see std::vector, replace it -- // with vector -- %apply std::vector { std::vector }; --#endif -- - #endif /* SWIG_GR_TYPES_I */ -diff --git a/gnuradio-runtime/swig/hier_block2.i b/gnuradio-runtime/swig/hier_block2.i -index 053f247..52b2714 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(); - - gr::hier_block2_sptr to_hier_block2(); // Needed for Python type coercion - }; -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.7.1-size_t.patch b/gnuradio-3.7.7.1-size_t.patch new file mode 100644 index 0000000..fe80065 --- /dev/null +++ b/gnuradio-3.7.7.1-size_t.patch @@ -0,0 +1,437 @@ +diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake +index abf4dc4..1993ee6 100644 +--- a/cmake/Modules/GrSwig.cmake ++++ b/cmake/Modules/GrSwig.cmake +@@ -105,18 +105,6 @@ endfunction(GR_SWIG_MAKE_DOCS) + macro(GR_SWIG_MAKE name) + set(ifiles ${ARGN}) + +- # Shimming this in here to take care of a SWIG bug with handling +- # vector and vector (on 32-bit machines) and +- # vector (on 64-bit machines). Use this to test +- # the size of size_t, then set SIZE_T_32 if it's a 32-bit machine +- # or not if it's 64-bit. The logic in gr_type.i handles the rest. +- INCLUDE(CheckTypeSize) +- CHECK_TYPE_SIZE("size_t" SIZEOF_SIZE_T) +- CHECK_TYPE_SIZE("unsigned int" SIZEOF_UINT) +- if(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UINT}) +- list(APPEND GR_SWIG_FLAGS -DSIZE_T_32) +- endif(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UINT}) +- + #do swig doc generation if specified + if(GR_SWIG_DOC_FILE) + set(GR_SWIG_DOCS_SOURCE_DEPS ${GR_SWIG_SOURCE_DEPS}) +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 2ad5078..481b317 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 f26d6bb..342ad95 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 eeb5669..b83f563 100644 +--- a/gnuradio-runtime/lib/hier_block2.cc ++++ b/gnuradio-runtime/lib/hier_block2.cc +@@ -159,7 +159,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); + } +@@ -170,7 +170,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 948c05d..30a0721 100644 +--- a/gnuradio-runtime/lib/hier_block2_detail.cc ++++ b/gnuradio-runtime/lib/hier_block2_detail.cc +@@ -870,7 +870,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++) { +@@ -887,7 +887,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 8c38c37..8529085 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/gr_types.i b/gnuradio-runtime/swig/gr_types.i +index 8ae953b..fa2c764 100644 +--- a/gnuradio-runtime/swig/gr_types.i ++++ b/gnuradio-runtime/swig/gr_types.i +@@ -80,15 +80,4 @@ namespace std { + %template(gr_vector_vector_complexf) std::vector< std::vector< std::complex > >; + %template(gr_vector_vector_complexd) std::vector< std::vector< std::complex > >; + +-// Fix for Issue #529 +-#ifdef SIZE_T_32 +- // On 32-bit systems, whenever we see std::vector, replace it +- // with vector +- %apply std::vector { std::vector }; +-#else +- // On 64-bit systems, whenever we see std::vector, replace it +- // with vector +- %apply std::vector { std::vector }; +-#endif +- + #endif /* SWIG_GR_TYPES_I */ +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.spec b/gnuradio.spec index fb5342f..bbbaf10 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -17,8 +17,8 @@ #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a Name: gnuradio -Version: 3.7.6.1 -Release: 4%{?dist} +Version: 3.7.7.1 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -57,11 +57,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.6.1-size_t.patch -# rhbz#1185710, workaround from upstream -Patch1: gnuradio-3.7.5-volk-memalign-fix.patch -# wxPython3 patch provided by Scott Talbert, reported upstream -Patch2: gnuradio-3.7.5-wxpython3-gtk3.patch +Patch0: gnuradio-3.7.7.1-size_t.patch %description GNU Radio is a collection of software that when combined with minimal @@ -100,8 +96,6 @@ GNU Radio examples %prep %setup -q %patch0 -p1 -b .size_t -%patch1 -p1 -b .volk-memalign-fix -%patch2 -p1 -b .wxpython3-gtk3 #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -190,6 +184,13 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue May 12 2015 Jaroslav Škarvada - 3.7.7.1-1 +- New version + Resolves: rhbz#1220588 +- Rebased size_t patch +- Dropped volk-memalign-fix patch (not needed) +- Dropped wxpython3-gtk3 patch (upstreamed) + * Sun May 03 2015 Kalev Lember - 3.7.6.1-4 - Rebuilt for GCC 5 C++11 ABI change diff --git a/sources b/sources index 31fd8c0..54ffd93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7872eaa48e466c31732addd32c19ba22 gnuradio-3.7.6.1.tar.gz +ca8e47abcb01edc72014ccabe38123a3 gnuradio-3.7.7.1.tar.gz