Compare commits
5 Commits
| Author | SHA1 | Date |
|---|---|---|
Jaroslav Škarvada
|
3060758331 | |
|
Jaroslav Škarvada
|
f71978366b | |
|
Jaroslav Škarvada
|
c0bf1b17da | |
Till Maas
|
ad7634ee66 | |
|
Jaroslav Škarvada
|
32cb901d6e |
|
|
@ -1 +1 @@
|
|||
gnuradio-*.tar.gz
|
||||
/gnuradio-3.7.11.tar.gz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake
|
||||
index 39a78c5..4f43f3c 100644
|
||||
--- a/cmake/Modules/GrBoost.cmake
|
||||
+++ b/cmake/Modules/GrBoost.cmake
|
||||
@@ -69,6 +69,7 @@ if(MSVC)
|
||||
endif(MSVC)
|
||||
|
||||
find_package(Boost "1.35" COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
|
||||
+set(Boost_LIBRARIES ${Boost_LIBRARIES} boost_atomic)
|
||||
|
||||
# This does not allow us to disable specific versions. It is used
|
||||
# internally by cmake to know the formation newer versions. As newer
|
||||
|
|
@ -0,0 +1,71 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0ac65fe..71378aa 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -62,7 +62,7 @@ ENDIF()
|
||||
# set(CMAKE_CXX_STANDARD 98)
|
||||
|
||||
IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
|
||||
+# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
|
||||
ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
|
||||
ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
|
||||
@@ -72,7 +72,7 @@ ELSE()
|
||||
ENDIF()
|
||||
|
||||
IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
|
||||
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
|
||||
+# SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
|
||||
ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
|
||||
ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
|
||||
diff --git a/gnuradio-runtime/lib/math/qa_fxpt.h b/gnuradio-runtime/lib/math/qa_fxpt.h
|
||||
index 58a6f02..6020e47 100644
|
||||
--- a/gnuradio-runtime/lib/math/qa_fxpt.h
|
||||
+++ b/gnuradio-runtime/lib/math/qa_fxpt.h
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
#include <cppunit/extensions/HelperMacros.h>
|
||||
#include <cppunit/TestCase.h>
|
||||
+#include <memory>
|
||||
|
||||
class qa_fxpt : public CppUnit::TestCase
|
||||
{
|
||||
diff --git a/gnuradio-runtime/lib/math/qa_fxpt_nco.h b/gnuradio-runtime/lib/math/qa_fxpt_nco.h
|
||||
index 1b2cdae..1755904 100644
|
||||
--- a/gnuradio-runtime/lib/math/qa_fxpt_nco.h
|
||||
+++ b/gnuradio-runtime/lib/math/qa_fxpt_nco.h
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
#include <cppunit/extensions/HelperMacros.h>
|
||||
#include <cppunit/TestCase.h>
|
||||
+#include <memory>
|
||||
|
||||
class qa_fxpt_nco : public CppUnit::TestCase
|
||||
{
|
||||
diff --git a/gnuradio-runtime/lib/math/qa_fxpt_vco.h b/gnuradio-runtime/lib/math/qa_fxpt_vco.h
|
||||
index 72693f3..76e0b6d 100644
|
||||
--- a/gnuradio-runtime/lib/math/qa_fxpt_vco.h
|
||||
+++ b/gnuradio-runtime/lib/math/qa_fxpt_vco.h
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
#include <cppunit/extensions/HelperMacros.h>
|
||||
#include <cppunit/TestCase.h>
|
||||
+#include <memory>
|
||||
|
||||
class qa_fxpt_vco : public CppUnit::TestCase
|
||||
{
|
||||
diff --git a/gr-fec/include/gnuradio/fec/polar_decoder_common.h b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
|
||||
index 13b25ea..8a3d65d 100644
|
||||
--- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h
|
||||
+++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
|
||||
@@ -68,7 +68,7 @@ namespace gr {
|
||||
bool set_frame_size(unsigned int frame_size){return false;};
|
||||
|
||||
private:
|
||||
- static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR;
|
||||
+ static const float D_LLR_FACTOR;
|
||||
unsigned int d_frozen_bit_counter;
|
||||
|
||||
protected:
|
||||
|
|
@ -1,26 +1,7 @@
|
|||
--- a/cmake/Modules/GrSwig.cmake
|
||||
+++ a/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<size_t> and vector<unsigned int> (on 32-bit machines) and
|
||||
- # vector<long unsigned int> (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})
|
||||
--- 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 +20,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 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);
|
||||
}
|
||||
|
||||
|
|
@ -57,9 +40,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 10742e0..ab93280 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.
|
||||
*
|
||||
|
|
@ -71,7 +56,7 @@
|
|||
|
||||
/*!
|
||||
* \brief Remove processor affinity to a specific core.
|
||||
@@ -544,7 +544,7 @@ namespace gr {
|
||||
@@ -607,7 +607,7 @@ namespace gr {
|
||||
/*!
|
||||
* \brief Get the current processor affinity.
|
||||
*/
|
||||
|
|
@ -80,7 +65,7 @@
|
|||
|
||||
/*!
|
||||
* \brief Get the current thread priority in use
|
||||
@@ -589,7 +589,7 @@ namespace gr {
|
||||
@@ -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
|
||||
|
|
@ -89,9 +74,11 @@
|
|||
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
|
||||
@@ -174,10 +174,10 @@ namespace gr {
|
||||
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.
|
||||
*
|
||||
|
|
@ -104,9 +91,11 @@
|
|||
|
||||
/*!
|
||||
* \brief Unset core affinity.
|
||||
--- a/gnuradio-runtime/include/gnuradio/hier_block2.h
|
||||
+++ a/gnuradio-runtime/include/gnuradio/hier_block2.h
|
||||
@@ -216,7 +216,7 @@ namespace gr {
|
||||
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.
|
||||
*/
|
||||
|
|
@ -115,17 +104,19 @@
|
|||
|
||||
/*!
|
||||
* \brief Remove processor affinity for all blocks in hier_block2.
|
||||
@@ -232,7 +232,7 @@ namespace gr {
|
||||
@@ -264,7 +264,7 @@ namespace gr {
|
||||
* interface. If any block has been individually set, then this
|
||||
* call could be misleading.
|
||||
*/
|
||||
- std::vector<int> processor_affinity();
|
||||
+ std::vector<std::size_t> processor_affinity();
|
||||
};
|
||||
|
||||
/*!
|
||||
--- a/gnuradio-runtime/include/gnuradio/thread/thread.h
|
||||
+++ a/gnuradio-runtime/include/gnuradio/thread/thread.h
|
||||
/*!
|
||||
* \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).
|
||||
|
|
@ -153,8 +144,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 2bae8ea..9641022 100644
|
||||
--- a/gnuradio-runtime/lib/block.cc
|
||||
+++ b/gnuradio-runtime/lib/block.cc
|
||||
@@ -325,7 +325,7 @@ namespace gr {
|
||||
}
|
||||
|
||||
|
|
@ -164,9 +157,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 9e2e29f..cc47b52 100644
|
||||
--- a/gnuradio-runtime/lib/block_detail.cc
|
||||
+++ b/gnuradio-runtime/lib/block_detail.cc
|
||||
@@ -251,7 +251,7 @@ namespace gr {
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -175,9 +170,11 @@
|
|||
{
|
||||
if(threaded) {
|
||||
try {
|
||||
--- a/gnuradio-runtime/lib/hier_block2.cc
|
||||
+++ a/gnuradio-runtime/lib/hier_block2.cc
|
||||
@@ -159,7 +159,7 @@ namespace gr {
|
||||
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
|
||||
|
|
@ -186,7 +183,7 @@
|
|||
{
|
||||
d_detail->set_processor_affinity(mask);
|
||||
}
|
||||
@@ -170,7 +170,7 @@ namespace gr {
|
||||
@@ -172,7 +172,7 @@ namespace gr {
|
||||
d_detail->unset_processor_affinity();
|
||||
}
|
||||
|
||||
|
|
@ -195,9 +192,11 @@
|
|||
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
|
||||
@@ -685,7 +685,7 @@ namespace gr {
|
||||
diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc
|
||||
index 49eb34a..65d23d4 100644
|
||||
--- a/gnuradio-runtime/lib/hier_block2_detail.cc
|
||||
+++ b/gnuradio-runtime/lib/hier_block2_detail.cc
|
||||
@@ -928,7 +928,7 @@ namespace gr {
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -206,7 +205,7 @@
|
|||
{
|
||||
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 {
|
||||
@@ -945,7 +945,7 @@ namespace gr {
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -215,8 +214,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 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;
|
||||
|
|
@ -226,11 +227,13 @@
|
|||
void unset_processor_affinity();
|
||||
- std::vector<int> processor_affinity();
|
||||
+ std::vector<std::size_t> processor_affinity();
|
||||
|
||||
private:
|
||||
// Private implementation data
|
||||
--- a/gnuradio-runtime/lib/thread/thread.cc
|
||||
+++ a/gnuradio-runtime/lib/thread/thread.cc
|
||||
|
||||
// Track output buffer min/max settings
|
||||
std::vector<size_t> 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 {
|
||||
}
|
||||
|
||||
|
|
@ -273,7 +276,7 @@
|
|||
for(itr = _mask.begin(); itr != _mask.end(); itr++)
|
||||
dword_mask |= (1 << (*itr));
|
||||
|
||||
@@ -171,25 +171,25 @@ namespace gr {
|
||||
@@ -179,25 +179,25 @@ namespace gr {
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -303,7 +306,7 @@
|
|||
{
|
||||
// Not implemented on OSX
|
||||
}
|
||||
@@ -254,32 +254,32 @@ namespace gr {
|
||||
@@ -262,32 +262,32 @@ namespace gr {
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -344,10 +347,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,26 +363,10 @@
|
|||
|
||||
// Methods to manage thread priority
|
||||
int active_thread_priority();
|
||||
--- a/gnuradio-runtime/swig/gr_types.i
|
||||
+++ a/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> > >;
|
||||
|
||||
-// Fix for Issue #529
|
||||
-#ifdef SIZE_T_32
|
||||
- // On 32-bit systems, whenever we see std::vector<size_t>, replace it
|
||||
- // with vector<unsigned int>
|
||||
- %apply std::vector<unsigned int> { std::vector<size_t> };
|
||||
-#else
|
||||
- // On 64-bit systems, whenever we see std::vector<size_t>, replace it
|
||||
- // with vector<long unsigned int>
|
||||
- %apply std::vector<long unsigned int> { std::vector<size_t> };
|
||||
-#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 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);
|
||||
|
|
@ -388,10 +377,12 @@
|
|||
- std::vector<int> processor_affinity();
|
||||
+ std::vector<std::size_t> processor_affinity();
|
||||
|
||||
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
|
||||
// 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)));
|
||||
248
gnuradio.spec
248
gnuradio.spec
|
|
@ -1,8 +1,11 @@
|
|||
# NEON support is by default disabled on ARMs
|
||||
# NEON support is by default enabled on aarch64 and disabled on other ARMs (it can be overridden)
|
||||
%ifarch aarch64
|
||||
%bcond_without neon
|
||||
%else
|
||||
%bcond_with neon
|
||||
%endif
|
||||
|
||||
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
||||
%{?_smp_mflags: %global my_smp_mflags %(echo "%{_smp_mflags}" | sed 's/-j[0-9]\\+/-j1/g')}
|
||||
|
||||
%ifarch %{arm}
|
||||
%if %{with neon}
|
||||
|
|
@ -14,21 +17,14 @@
|
|||
%endif
|
||||
%endif
|
||||
|
||||
# Workaround for rhbz#1128127
|
||||
%if 0%{?rhel:1}
|
||||
%ifnarch ppc64
|
||||
%global build_uhd 1
|
||||
%endif
|
||||
%else
|
||||
%global build_uhd 1
|
||||
%endif
|
||||
|
||||
# For versions not yet on ftp, pull from git
|
||||
#%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
|
||||
|
||||
#%%global alphatag rc1
|
||||
|
||||
Name: gnuradio
|
||||
Version: 3.7.5.1
|
||||
Release: 1%{?dist}
|
||||
Version: 3.7.11
|
||||
Release: 7%{?alphatag:.%{alphatag}}%{?dist}
|
||||
Summary: Software defined radio framework
|
||||
|
||||
Group: Applications/Engineering
|
||||
|
|
@ -36,8 +32,8 @@ License: GPLv3
|
|||
URL: http://www.gnuradio.org
|
||||
#Source0: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%%{version}.tar.gz
|
||||
#Source0: http://gnuradio.org/redmine/attachments/download/%%{attachment_id}/gnuradio-%%{version}.tar.gz
|
||||
#Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}%{alphatag}.tar.gz
|
||||
Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}.tar.gz
|
||||
Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}%{?alphatag}.tar.gz
|
||||
#Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}.tar.gz
|
||||
# git clone git://gnuradio.org/gnuradio
|
||||
# cd gnuradio
|
||||
# git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \
|
||||
|
|
@ -53,10 +49,9 @@ BuildRequires: portaudio-devel, libtool, gsm-devel
|
|||
# BuildRequires: comedilib-devel
|
||||
BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, python-cheetah
|
||||
BuildRequires: xdg-utils, python-lxml, pygtk2-devel, orc-devel
|
||||
BuildRequires: dos2unix, sphinx
|
||||
%if 0%{?build_uhd}
|
||||
#BuildRequires: sphinx
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: uhd-devel
|
||||
%endif
|
||||
%if ! 0%{?rhel:1}
|
||||
BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel
|
||||
%endif
|
||||
|
|
@ -69,7 +64,9 @@ 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.11-size_t.patch
|
||||
Patch1: gnuradio-3.7.11-gcc-7-compile-fix.patch
|
||||
Patch2: gnuradio-3.7.11-boost-atomic-compile-fix.patch
|
||||
|
||||
%description
|
||||
GNU Radio is a collection of software that when combined with minimal
|
||||
|
|
@ -106,16 +103,14 @@ Requires: %{name} = %{version}-%{release}
|
|||
GNU Radio examples
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -q -n %{name}-%{version}%{?alphatag}
|
||||
%patch0 -p1 -b .size_t
|
||||
%patch1 -p1 -b .gcc-7-compile-fix
|
||||
%patch2 -p1 -b .boost-atomic-compile-fix
|
||||
|
||||
#force regeneration of cached moc output files
|
||||
find . -name "*_moc.cc" -exec rm {} \;
|
||||
|
||||
# Convert CR + LF to LF in GnuradioConfig.cmake and GnuradioConfigVersion.cmake.in
|
||||
# upstream ticket 549
|
||||
dos2unix cmake/Modules/{GnuradioConfig.cmake,GnuradioConfigVersion.cmake.in}
|
||||
|
||||
%build
|
||||
mkdir build
|
||||
cd build
|
||||
|
|
@ -123,20 +118,22 @@ cd build
|
|||
-DENABLE_PYTHON=FORCE -DENABLE_DOXYGEN=FORCE \
|
||||
-DENABLE_VOLK=FORCE -DENABLE_GRUEL=FORCE \
|
||||
-DENABLE_GR_AUDIO=FORCE -DENABLE_GR_ATSC=FORCE \
|
||||
-DENABLE_GR_VOCODER=FORCE %{?build_uhd:-DENABLE_GR_UHD=FORCE} \
|
||||
-DENABLE_GR_VOCODER=FORCE -DENABLE_GR_UHD=FORCE \
|
||||
-DENABLE_GR_NOAA=FORCE -DENABLE_GR_PAGER=FORCE \
|
||||
-DENABLE_GR_TRELLIS=FORCE -DENABLE_GR_VIDEO_SDL=FORCE \
|
||||
-DENABLE_GR_WXGUI=FORCE -DENABLE_GR_UTILS=FORCE \
|
||||
-DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \
|
||||
-DENABLE_GR_FCD=FORCE \
|
||||
-DSYSCONFDIR=%{_sysconfdir} \
|
||||
-DGR_PKG_DOC_DIR=%{_docdir}/%{name} \
|
||||
%{?mfpu_neon} \
|
||||
..
|
||||
|
||||
## make with -j1 and compile without strict-aliasing
|
||||
#make %{?my_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
# make with -j2 to prevent internal compiler errors due to excessive
|
||||
# use of resources
|
||||
make -j2 CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
|
||||
make %{?_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
#make %{?_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
|
@ -144,33 +141,58 @@ pushd build
|
|||
make install DESTDIR=%{buildroot}
|
||||
popd
|
||||
|
||||
# install some more docs
|
||||
mv %{buildroot}%{_docdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name}
|
||||
install -m 644 -t %{buildroot}%{_docdir}/%{name} COPYING
|
||||
|
||||
# remove atsc example (bytecompilation problem)
|
||||
# the examples shouldn't be probably bytecompiled,
|
||||
# but selective bytecompilation would take a lot of time,
|
||||
# thus letting it as is
|
||||
rm -rf %{buildroot}%{_datadir}/%{name}/examples/atsc
|
||||
|
||||
# remove bundled cmake modules, upstream ticket 592
|
||||
pushd %{buildroot}%{_libdir}/cmake/gnuradio && rm -f `ls | sed '/^FindUHD.cmake\|^Gr.*\|^Gnuradio.*/ d'`
|
||||
popd
|
||||
# install desktop file, icons, and MIME configuration to right locations
|
||||
mkdir -p %{buildroot}%{_datadir}/applications
|
||||
desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
|
||||
%{buildroot}%{_datadir}/%{name}/grc/freedesktop/gnuradio-grc.desktop
|
||||
mkdir -p %{buildroot}%{_datadir}/mime/packages
|
||||
mv %{buildroot}%{_datadir}/%{name}/grc/freedesktop/gnuradio-grc.xml %{buildroot}%{_datadir}/mime/packages
|
||||
for x in 32 48 64 128 256
|
||||
do
|
||||
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${x}x${x}/apps
|
||||
mv %{buildroot}%{_datadir}/%{name}/grc/freedesktop/grc-icon-${x}.png %{buildroot}%{_datadir}/icons/hicolor/${x}x${x}/apps/gnuradio-grc.png
|
||||
done
|
||||
rm -f %{buildroot}%{_datadir}/%{name}/grc/freedesktop/*
|
||||
rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post -n gnuradio -p /sbin/ldconfig
|
||||
%postun -n gnuradio -p /sbin/ldconfig
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
/usr/bin/update-desktop-database &> /dev/null || :
|
||||
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
if [ $1 -eq 0 ] ; then
|
||||
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
|
||||
/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
||||
fi
|
||||
|
||||
%posttrans
|
||||
/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%license COPYING
|
||||
%{python_sitearch}/*
|
||||
%{_bindir}/*
|
||||
%{_libdir}/lib*.so.*
|
||||
%{_libexecdir}/*
|
||||
%{_datadir}/gnuradio
|
||||
%{_datadir}/applications/gnuradio-grc.desktop
|
||||
%{_datadir}/mime/packages/gnuradio-grc.xml
|
||||
%{_datadir}/icons/hicolor/*/apps/gnuradio-grc.png
|
||||
%config(noreplace) %{_sysconfdir}/gnuradio
|
||||
%exclude %{_datadir}/gnuradio/examples
|
||||
%exclude %{_docdir}/%{name}/html
|
||||
|
|
@ -178,7 +200,6 @@ rm -rf %{buildroot}
|
|||
%doc %{_docdir}/%{name}
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_includedir}/*
|
||||
%{_libdir}/lib*.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
|
|
@ -186,15 +207,160 @@ rm -rf %{buildroot}
|
|||
%{_libdir}/cmake/gnuradio
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root,-)
|
||||
%doc %{_docdir}/%{name}/html
|
||||
%doc %{_docdir}/%{name}/xml
|
||||
|
||||
%files examples
|
||||
%defattr(-,root,root,-)
|
||||
%{_datadir}/gnuradio/examples
|
||||
|
||||
%changelog
|
||||
* Wed Jul 4 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.11-7
|
||||
- Added all upstream cmake modules
|
||||
Resolves: rhbz#1597943
|
||||
|
||||
* Fri Sep 15 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.11-6
|
||||
- Rebuilt for new uhd
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.11-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Sun Jul 30 2017 Florian Weimer <fweimer@redhat.com> - 3.7.11-4
|
||||
- Rebuild with binutils fix for ppc64le (#1475636)
|
||||
|
||||
* Wed Jul 26 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.11-3
|
||||
- Rebuilt for new gsl
|
||||
|
||||
* Fri Jul 21 2017 Kalev Lember <klember@redhat.com> - 3.7.11-2
|
||||
- Rebuilt for Boost 1.64
|
||||
|
||||
* Wed May 24 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.11-1
|
||||
- New version
|
||||
|
||||
* Tue Feb 07 2017 Kalev Lember <klember@redhat.com> - 3.7.10.1-5
|
||||
- Rebuilt for Boost 1.63
|
||||
|
||||
* Tue Nov 22 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.10.1-4
|
||||
- Rebuilt for new uhd
|
||||
|
||||
* Thu Sep 22 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.10.1-3
|
||||
- Uncoditionally enabled NEON support on aarch64
|
||||
|
||||
* Fri Sep 16 2016 Peter Robinson <pbrobinson@fedoraproject.org> 3.7.10.1-2
|
||||
- NEON is compulary part of aarch64 so enable unconditionally on that arch
|
||||
|
||||
* Wed Aug 31 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.10.1-1
|
||||
- New version
|
||||
Resolves: rhbz#1370728
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.7.10-2
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
* Mon Jul 4 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 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 <jskarvad@redhat.com> - 3.7.9.1-4
|
||||
- Rebuilt for new uhd
|
||||
|
||||
* Mon Mar 7 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.9.1-3
|
||||
- Rebuilt for new gsl
|
||||
|
||||
* Tue Feb 23 2016 Orion Poplawski <orion@cora.nwra.com> - 3.7.9.1-2
|
||||
- Rebuild for gsl 2.1
|
||||
- Add patch for cmake 3.5 (bug #1311358)
|
||||
|
||||
* Wed Feb 10 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.9.1-1
|
||||
- New version
|
||||
Resolves: rhbz#1306066
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.9-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Sat Jan 16 2016 Jonathan Wakely <jwakely@redhat.com> - 3.7.9-2
|
||||
- Rebuilt for Boost 1.60
|
||||
|
||||
* Mon Jan 4 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.9-1
|
||||
- New version
|
||||
Resolves: rhbz#1294379
|
||||
|
||||
* Tue Dec 15 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.9-0.1.rc1
|
||||
- New version
|
||||
Resolves: rhbz#1291659
|
||||
- Dropped dos2unix and conversion from CR + LF to LF (not needed)
|
||||
|
||||
* Thu Nov 5 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.8.1-1
|
||||
- New version
|
||||
Resolves: rhbz#1276888
|
||||
|
||||
* Thu Oct 1 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.8-3
|
||||
- Fixed icon and desktop file locations
|
||||
Resolves: rhbz#1266700
|
||||
|
||||
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 3.7.8-2
|
||||
- Rebuilt for Boost 1.59
|
||||
|
||||
* Wed Aug 12 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.8-1
|
||||
- New version
|
||||
Resolves: rhbz#1251650
|
||||
|
||||
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.7.8-0.2.rc1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
|
||||
|
||||
* Mon Jul 27 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.8-0.1.rc1
|
||||
- New version
|
||||
Resolves: rhbz#1246803
|
||||
- Updated size_t patch
|
||||
- Dropped docdir-override (not needed)
|
||||
|
||||
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 3.7.7.1-3
|
||||
- rebuild for Boost 1.58
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.7.7.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Tue May 12 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 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)
|
||||
- Set DOCDIR to match Fedora documentation location (by docdir-override patch)
|
||||
|
||||
* Sun May 03 2015 Kalev Lember <kalevlember@gmail.com> - 3.7.6.1-4
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Thu Mar 12 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.6.1-3
|
||||
- Enabled uhd on ppc64 on RHEL-7
|
||||
- Built with -j2 to speed-up the build process a bit
|
||||
|
||||
* Wed Mar 11 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.6.1-2
|
||||
- Enabled optional building with NEON support on aarch64
|
||||
- Built with -j1 to prevent internal compiler errors due to excessive
|
||||
use of resources
|
||||
|
||||
* Thu Feb 19 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.6.1-1
|
||||
- New version
|
||||
Resolves: rhbz#1193588
|
||||
- De-fuzzified size_t patch
|
||||
|
||||
* Wed Feb 04 2015 Petr Machata <pmachata@redhat.com> - 3.7.5.1-5
|
||||
- Bump for rebuild.
|
||||
|
||||
* Thu Jan 29 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.5.1-4
|
||||
- Added fix for wxPython3 (by wxpython3-gtk3 patch). Patch
|
||||
provided by Scott Talbert
|
||||
|
||||
* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 3.7.5.1-3
|
||||
- Rebuild for boost 1.57.0
|
||||
|
||||
* Mon Jan 26 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.5.1-2
|
||||
- Workaround for volk memalign (by volk-memalign-fix patch)
|
||||
Resolves: rhbz#1185710
|
||||
- Rebuilt for current uhd
|
||||
Resolves: rhbz#1185508
|
||||
|
||||
* Tue Oct 21 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.5.1-1
|
||||
- New versio
|
||||
Resolves: rhbz#1155252
|
||||
|
|
|
|||
Loading…
Reference in New Issue