[gnuradio] New version
Jaroslav Škarvada
jskarvad at fedoraproject.org
Fri Mar 6 14:48:11 UTC 2015
commit 025abfab47a67fdfc490b84e5948f1887709bbe1
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Fri Mar 6 15:48:09 2015 +0100
New version
Resolves: rhbz#1193588
- De-fuzzified size_t patch
...5-size_t.patch => gnuradio-3.7.6.1-size_t.patch | 116 +++++++++++++--------
gnuradio.spec | 11 +-
sources | 2 +-
3 files changed, 84 insertions(+), 45 deletions(-)
---
diff --git a/gnuradio-3.7.5-size_t.patch b/gnuradio-3.7.6.1-size_t.patch
similarity index 77%
rename from gnuradio-3.7.5-size_t.patch
rename to gnuradio-3.7.6.1-size_t.patch
index f55d4a4..77c07c6 100644
--- a/gnuradio-3.7.5-size_t.patch
+++ b/gnuradio-3.7.6.1-size_t.patch
@@ -1,5 +1,7 @@
---- a/cmake/Modules/GrSwig.cmake
-+++ a/cmake/Modules/GrSwig.cmake
+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})
@@ -19,8 +21,10 @@
#do swig doc generation if specified
if(GR_SWIG_DOC_FILE)
set(GR_SWIG_DOCS_SOURCE_DEPS ${GR_SWIG_SOURCE_DEPS})
---- a/docs/doxygen/other/thread_affinity.dox
-+++ a/docs/doxygen/other/thread_affinity.dox
+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:
@@ -39,9 +43,11 @@
- gr::hier_block2::unset_processor_affinity()
- gr::hier_block2::processor_affinity()
---- a/gnuradio-runtime/include/gnuradio/basic_block.h
-+++ a/gnuradio-runtime/include/gnuradio/basic_block.h
-@@ -375,13 +375,13 @@ namespace gr {
+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);
}
@@ -57,9 +63,11 @@
{ throw std::runtime_error("processor_affinity not overloaded in child class."); }
};
---- a/gnuradio-runtime/include/gnuradio/block.h
-+++ a/gnuradio-runtime/include/gnuradio/block.h
-@@ -532,9 +532,9 @@ namespace gr {
+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.
*
@@ -71,7 +79,7 @@
/*!
* \brief Remove processor affinity to a specific core.
-@@ -544,7 +544,7 @@ namespace gr {
+@@ -550,7 +550,7 @@ namespace gr {
/*!
* \brief Get the current processor affinity.
*/
@@ -80,7 +88,7 @@
/*!
* \brief Get the current thread priority in use
-@@ -589,7 +589,7 @@ namespace gr {
+@@ -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
@@ -89,8 +97,10 @@
int d_priority; // thread priority level
bool d_pc_rpc_set;
bool d_update_rate; // should sched update rel rate?
---- a/gnuradio-runtime/include/gnuradio/block_detail.h
-+++ a/gnuradio-runtime/include/gnuradio/block_detail.h
+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.
@@ -104,8 +114,10 @@
/*!
* \brief Unset core affinity.
---- a/gnuradio-runtime/include/gnuradio/hier_block2.h
-+++ a/gnuradio-runtime/include/gnuradio/hier_block2.h
+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.
@@ -124,8 +136,10 @@
};
/*!
---- a/gnuradio-runtime/include/gnuradio/thread/thread.h
-+++ a/gnuradio-runtime/include/gnuradio/thread/thread.h
+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).
@@ -153,8 +167,10 @@
/*! \brief Convineince function to bind the a thread to a single core.
---- a/gnuradio-runtime/lib/block.cc
-+++ a/gnuradio-runtime/lib/block.cc
+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 {
}
@@ -164,9 +180,11 @@
{
d_affinity = mask;
if(d_detail) {
---- a/gnuradio-runtime/lib/block_detail.cc
-+++ a/gnuradio-runtime/lib/block_detail.cc
-@@ -220,7 +220,7 @@ namespace gr {
+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
@@ -175,8 +193,10 @@
{
if(threaded) {
try {
---- a/gnuradio-runtime/lib/hier_block2.cc
-+++ a/gnuradio-runtime/lib/hier_block2.cc
+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 {
}
@@ -195,8 +215,10 @@
hier_block2::processor_affinity()
{
return d_detail->processor_affinity();
---- a/gnuradio-runtime/lib/hier_block2_detail.cc
-+++ a/gnuradio-runtime/lib/hier_block2_detail.cc
+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 {
}
@@ -215,8 +237,10 @@
hier_block2_detail::processor_affinity()
{
basic_block_vector_t tmp = d_fg->calc_used_blocks();
---- a/gnuradio-runtime/lib/hier_block2_detail.h
-+++ a/gnuradio-runtime/lib/hier_block2_detail.h
+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;
@@ -229,8 +253,10 @@
private:
// Private implementation data
---- a/gnuradio-runtime/lib/thread/thread.cc
-+++ a/gnuradio-runtime/lib/thread/thread.cc
+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 {
}
@@ -344,10 +370,12 @@
CPU_ZERO(&set);
for(itr = _mask.begin(); itr != _mask.end(); itr++)
---- a/gnuradio-runtime/swig/block.i
-+++ a/gnuradio-runtime/swig/block.i
-@@ -98,9 +98,9 @@ class gr::block : public gr::basic_block
- float pc_work_time_total();
+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<int> &mask);
@@ -358,8 +386,10 @@
// Methods to manage thread priority
int active_thread_priority();
---- a/gnuradio-runtime/swig/gr_types.i
-+++ a/gnuradio-runtime/swig/gr_types.i
+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<float> > >;
%template(gr_vector_vector_complexd) std::vector< std::vector< std::complex<double> > >;
@@ -376,8 +406,10 @@
-#endif
-
#endif /* SWIG_GR_TYPES_I */
---- a/gnuradio-runtime/swig/hier_block2.i
-+++ a/gnuradio-runtime/swig/hier_block2.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);
@@ -390,8 +422,10 @@
gr::hier_block2_sptr to_hier_block2(); // Needed for Python type coercion
};
---- a/gr-blocks/lib/qa_gr_top_block.cc
-+++ a/gr-blocks/lib/qa_gr_top_block.cc
+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)));
diff --git a/gnuradio.spec b/gnuradio.spec
index 463b38d..5b879d5 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -27,8 +27,8 @@
#%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
Name: gnuradio
-Version: 3.7.5.1
-Release: 5%{?dist}
+Version: 3.7.6.1
+Release: 1%{?dist}
Summary: Software defined radio framework
Group: Applications/Engineering
@@ -69,7 +69,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.5-size_t.patch
+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
@@ -201,6 +201,11 @@ rm -rf %{buildroot}
%{_datadir}/gnuradio/examples
%changelog
+* Thu Feb 19 2015 Jaroslav Škarvada <jskarvad at redhat.com> - 3.7.6.1-1
+- New version
+ Resolves: rhbz#1193588
+- De-fuzzified size_t patch
+
* Wed Feb 04 2015 Petr Machata <pmachata at redhat.com> - 3.7.5.1-5
- Bump for rebuild.
diff --git a/sources b/sources
index 09ff652..31fd8c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bfd2116b344a949aacc3d7e2eff07642 gnuradio-3.7.5.1.tar.gz
+7872eaa48e466c31732addd32c19ba22 gnuradio-3.7.6.1.tar.gz
More information about the scm-commits
mailing list