From 9a7a3c71929b90d4f129785623cdbbe72f90d26d Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sun, 23 Mar 2008 07:53:06 +0000 Subject: [PATCH 001/313] Initial import of gnuradio --- .cvsignore | 2 + gnuradio-3.1.1-gcc34.patch | 1275 ++++++++++++++++++++++++++++++++++++ gnuradio.spec | 185 ++++++ sources | 2 + 4 files changed, 1464 insertions(+) create mode 100644 gnuradio-3.1.1-gcc34.patch create mode 100644 gnuradio.spec diff --git a/.cvsignore b/.cvsignore index e69de29..6673afa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +gnuradio-3.1.1-templates.tar.gz +gnuradio-3.1.1.tar.gz diff --git a/gnuradio-3.1.1-gcc34.patch b/gnuradio-3.1.1-gcc34.patch new file mode 100644 index 0000000..ef9f597 --- /dev/null +++ b/gnuradio-3.1.1-gcc34.patch @@ -0,0 +1,1275 @@ +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc gnuradio-3.1.1/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -38,6 +38,7 @@ + #include + + #include ++#include + + gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector &taps) + { +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc gnuradio-3.1.1/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -33,6 +33,7 @@ + #include + + #include ++#include + + gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector &taps) + { +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -47,6 +47,7 @@ + #include + #include + #include ++#include + + using std::vector; + +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -47,6 +47,7 @@ + #include + #include + #include ++#include + + using std::vector; + +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + + using std::vector; + +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + using std::vector; + +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + + using std::vector; + +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + //define ALIGN_ADVANCED_IMPLEMENTATION to have an alternative implementation of the align algoritm which exactly follows the align_interval spec. + //It is more resource intensive, less tested and probably not needed +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_bin_statistics_f_sptr + gr_make_bin_statistics_f(unsigned int vlen, +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_circular_file.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_circular_file.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_circular_file.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_circular_file.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -39,6 +39,8 @@ + #include + + #include ++#include ++#include + + static const int HEADER_SIZE = 4096; + static const int HEADER_MAGIC = 0xEB021026; +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_delay.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_delay.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_delay.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_delay.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_delay_sptr + gr_make_delay (size_t itemsize, int delay) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc 2008-03-03 09:52:39.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + static const int PAD_VAL = 0xAA; + +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_fft_vcc.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_fft_vcc.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_fft_vcc.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_fft_vcc.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + gr_fft_vcc_sptr + gr_make_fft_vcc (int fft_size, bool forward,const std::vector window, bool shift) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_fft_vfc.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_fft_vfc.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + + // FIXME after this is working, change to use native real to complex fft. +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_framer_sink_1.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_framer_sink_1.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_framer_sink_1.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_framer_sink_1.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #define VERBOSE 0 + +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_head.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_head.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_head.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_head.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -25,6 +25,7 @@ + #endif + #include + #include ++#include + + gr_head::gr_head (size_t sizeof_stream_item, int nitems) + : gr_sync_block ("head", +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gri_fft.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gri_fft.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gri_fft.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gri_fft.cc 2008-03-03 09:04:49.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + static char * + wisdom_filename () +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_keep_one_in_n_sptr + gr_make_keep_one_in_n (size_t item_size, int n) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_log2_const.h gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_log2_const.h +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_log2_const.h 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_log2_const.h 2008-03-04 07:47:31.000000000 +0100 +@@ -31,16 +31,16 @@ + + template static inline int gr_log2_const() { assert(0); return 0; } + +-template<> static inline int gr_log2_const<1>() { return 0; } +-template<> static inline int gr_log2_const<2>() { return 1; } +-template<> static inline int gr_log2_const<4>() { return 2; } +-template<> static inline int gr_log2_const<8>() { return 3; } +-template<> static inline int gr_log2_const<16>() { return 4; } +-template<> static inline int gr_log2_const<32>() { return 5; } +-template<> static inline int gr_log2_const<64>() { return 6; } +-template<> static inline int gr_log2_const<128>() { return 7; } +-template<> static inline int gr_log2_const<256>() { return 8; } +-template<> static inline int gr_log2_const<512>() { return 9; } +-template<> static inline int gr_log2_const<1024>(){ return 10; } ++template<> inline int gr_log2_const<1>() { return 0; } ++template<> inline int gr_log2_const<2>() { return 1; } ++template<> inline int gr_log2_const<4>() { return 2; } ++template<> inline int gr_log2_const<8>() { return 3; } ++template<> inline int gr_log2_const<16>() { return 4; } ++template<> inline int gr_log2_const<32>() { return 5; } ++template<> inline int gr_log2_const<64>() { return 6; } ++template<> inline int gr_log2_const<128>() { return 7; } ++template<> inline int gr_log2_const<256>() { return 8; } ++template<> inline int gr_log2_const<512>() { return 9; } ++template<> inline int gr_log2_const<1024>(){ return 10; } + + #endif /* INCLUDED_GR_LOG2_CONST_H */ +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_null_source.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_null_source.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_null_source.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_null_source.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_null_source::gr_null_source (size_t sizeof_stream_item) + : gr_sync_block ("null_source", +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_packet_sink.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_packet_sink.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_packet_sink.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_packet_sink.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #define VERBOSE 0 + +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_simple_correlator.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_simple_correlator.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + + static const int THRESHOLD = 3; +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_simple_framer.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_simple_framer.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_simple_framer.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_simple_framer.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -29,6 +29,8 @@ + #include + #include + #include ++#include ++#include + + + gr_simple_framer_sptr +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_skiphead.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_skiphead.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_skiphead.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_skiphead.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -25,6 +25,7 @@ + #endif + #include + #include ++#include + + gr_skiphead::gr_skiphead (size_t itemsize, size_t nitems_to_skip) + : gr_block ("skiphead", +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_stream_mux.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_stream_mux.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_stream_mux.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_stream_mux.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + #define VERBOSE 0 + +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_streams_to_stream.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_streams_to_stream.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_streams_to_stream.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_streams_to_stream.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_streams_to_stream_sptr + gr_make_streams_to_stream (size_t item_size, size_t nstreams) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_streams_to_vector.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_streams_to_vector.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_streams_to_vector.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_streams_to_vector.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_streams_to_vector_sptr + gr_make_streams_to_vector (size_t item_size, size_t nstreams) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_stream_to_streams.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_stream_to_streams.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_stream_to_streams.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_stream_to_streams.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_stream_to_streams_sptr + gr_make_stream_to_streams (size_t item_size, size_t nstreams) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_stream_to_vector.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_stream_to_vector.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_stream_to_vector.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_stream_to_vector.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_stream_to_vector_sptr + gr_make_stream_to_vector (size_t item_size, size_t nitems_per_block) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_test.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_test.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_test.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_test.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + gr_test_sptr gr_make_test (const std::string &name, + int min_inputs, int max_inputs, unsigned int sizeof_input_item, +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_throttle.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_throttle.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_throttle.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_throttle.cc 2008-03-03 09:53:15.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #ifdef HAVE_TIME_H + #include + #endif +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_vector_to_stream.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_vector_to_stream.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_vector_to_stream.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_vector_to_stream.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_vector_to_stream_sptr + gr_make_vector_to_stream (size_t item_size, size_t nitems_per_block) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_vector_to_streams.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_vector_to_streams.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_vector_to_streams.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_vector_to_streams.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_vector_to_streams_sptr + gr_make_vector_to_streams (size_t item_size, size_t nstreams) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/malloc16.c gnuradio-3.1.1/gnuradio-core/src/lib/general/malloc16.c +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/malloc16.c 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/general/malloc16.c 2008-03-03 10:20:18.000000000 +0100 +@@ -7,6 +7,7 @@ + + #include "malloc16.h" + #include ++#include + + void *malloc16Align(int size){ + void *p; +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + gr_chunks_to_symbols_bc_sptr + gr_make_chunks_to_symbols_bc (const std::vector &symbol_table, const int D) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + gr_chunks_to_symbols_bf_sptr + gr_make_chunks_to_symbols_bf (const std::vector &symbol_table, const int D) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + gr_chunks_to_symbols_ic_sptr + gr_make_chunks_to_symbols_ic (const std::vector &symbol_table, const int D) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + gr_chunks_to_symbols_if_sptr + gr_make_chunks_to_symbols_if (const std::vector &symbol_table, const int D) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + gr_chunks_to_symbols_sc_sptr + gr_make_chunks_to_symbols_sc (const std::vector &symbol_table, const int D) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc 2008-03-03 09:52:10.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + gr_chunks_to_symbols_sf_sptr + gr_make_chunks_to_symbols_sf (const std::vector &symbol_table, const int D) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t 2008-03-03 09:52:10.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + @SPTR_NAME@ + gr_make_@BASE_NAME@ (const std::vector<@O_TYPE@> &symbol_table, const int D) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_cc.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_cc.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_cc.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_cc.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + + gr_mute_cc_sptr +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_ff.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_ff.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_ff.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_ff.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + + gr_mute_ff_sptr +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_ii.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_ii.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_ii.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_ii.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + + gr_mute_ii_sptr +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_ss.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_ss.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_ss.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_ss.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + + gr_mute_ss_sptr +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t 2008-03-03 09:23:08.000000000 +0100 +@@ -29,6 +29,7 @@ + #include <@NAME@.h> + #include + #include ++#include + + + @SPTR_NAME@ +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + gr_peak_detector_fb_sptr + gr_make_peak_detector_fb (float threshold_factor_rise, +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + gr_peak_detector_ib_sptr + gr_make_peak_detector_ib (float threshold_factor_rise, +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + gr_peak_detector_sb_sptr + gr_make_peak_detector_sb (float threshold_factor_rise, +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t 2008-03-03 09:23:08.000000000 +0100 +@@ -28,6 +28,7 @@ + + #include <@NAME@.h> + #include ++#include + + @SPTR_NAME@ + gr_make_@BASE_NAME@ (float threshold_factor_rise, +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc 2008-03-03 09:05:18.000000000 +0100 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + + gr_file_descriptor_sink::gr_file_descriptor_sink (size_t itemsize, int fd) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc 2008-03-03 09:52:11.000000000 +0100 +@@ -32,6 +32,8 @@ + #include + #include + #include ++#include ++#include + + + gr_file_descriptor_source::gr_file_descriptor_source (size_t itemsize, +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_sink_base.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_sink_base.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_sink_base.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_sink_base.cc 2008-03-03 09:05:28.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + // win32 (mingw/msvc) specific + #ifdef HAVE_IO_H +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_source.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_source.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_source.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_source.cc 2008-03-03 09:05:34.000000000 +0100 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + // win32 (mingw/msvc) specific + #ifdef HAVE_IO_H +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gri_logger.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gri_logger.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gri_logger.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gri_logger.cc 2008-03-03 09:52:11.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + + /* +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_message_sink.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_message_sink.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_message_sink.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_message_sink.cc 2008-03-03 09:52:11.000000000 +0100 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + + // public constructor that returns a shared_ptr +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_message_source.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_message_source.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_message_source.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_message_source.cc 2008-03-03 09:52:11.000000000 +0100 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + + // public constructor that returns a shared_ptr +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_udp_sink.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_udp_sink.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_udp_sink.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_udp_sink.cc 2008-03-03 09:04:49.000000000 +0100 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #define SNK_VERBOSE 0 + +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_udp_source.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_udp_source.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_udp_source.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_udp_source.cc 2008-03-03 09:52:11.000000000 +0100 +@@ -25,6 +25,8 @@ + #include + #include + #include ++#include ++#include + + #define SRC_VERBOSE 0 + +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/missing/getopt.c gnuradio-3.1.1/gnuradio-core/src/lib/missing/getopt.c +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/missing/getopt.c 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/missing/getopt.c 2008-03-03 09:52:11.000000000 +0100 +@@ -52,6 +52,7 @@ + #endif + + #include ++#include + + /* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C +@@ -179,6 +180,7 @@ + On some systems, it contains special magic macros that don't work + in GCC. */ + #include ++#include + #define my_index strchr + #define my_bcopy(src, dst, n) memcpy ((dst), (src), (n)) + #else +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/reed-solomon/decode_rs.c gnuradio-3.1.1/gnuradio-core/src/lib/reed-solomon/decode_rs.c +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/reed-solomon/decode_rs.c 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/reed-solomon/decode_rs.c 2008-03-03 10:22:34.000000000 +0100 +@@ -8,6 +8,7 @@ + #endif + + #include ++#include + + #define NULL ((void *)0) + #define min(a,b) ((a) < (b) ? (a) : (b)) +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/reed-solomon/encode_rs.c gnuradio-3.1.1/gnuradio-core/src/lib/reed-solomon/encode_rs.c +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/reed-solomon/encode_rs.c 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/reed-solomon/encode_rs.c 2008-03-03 10:22:34.000000000 +0100 +@@ -3,6 +3,7 @@ + * May be used under the terms of the GNU General Public License (GPL) + */ + #include ++#include + + #ifdef FIXED + #include "fixed.h" +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/reed-solomon/exercise.c gnuradio-3.1.1/gnuradio-core/src/lib/reed-solomon/exercise.c +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/reed-solomon/exercise.c 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/reed-solomon/exercise.c 2008-03-03 10:22:34.000000000 +0100 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #ifdef FIXED + #include "fixed.h" +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_dispatcher.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_dispatcher.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_dispatcher.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_dispatcher.cc 2008-03-03 09:05:53.000000000 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_SELECT + # ifdef HAVE_SYS_SELECT_H +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_error_handler.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_error_handler.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_error_handler.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_error_handler.cc 2008-03-03 09:06:11.000000000 +0100 +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_IO_H + #include +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + + gr_local_sighandler::gr_local_sighandler (int signum, +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_message.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_message.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_message.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_message.cc 2008-03-03 09:52:11.000000000 +0100 +@@ -25,6 +25,8 @@ + #endif + #include + #include ++#include ++#include + + static long s_ncurrently_allocated = 0; + +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_preferences.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_preferences.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_preferences.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_preferences.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + + #ifdef MKDIR_TAKES_ONE_ARG +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_realtime.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_realtime.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_realtime.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_realtime.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -30,6 +30,7 @@ + #endif + + #include ++#include + #include + #include + +@@ -61,6 +62,7 @@ + #elif defined(HAVE_PTHREAD_SETSCHEDPARAM) + + #include ++#include + + gr_rt_status_t + gr_enable_realtime_scheduling() +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc 2008-03-03 09:06:30.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + #ifdef HAVE_SIGNAL_H + #include +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc 2008-03-03 09:41:10.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + // all the factories we know about +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc 2008-03-03 09:06:40.000000000 +0100 +@@ -41,7 +41,6 @@ + #include + #include + +- + gr_vmcircbuf_mmap_tmpfile::gr_vmcircbuf_mmap_tmpfile (int size) + : gr_vmcircbuf (size) + { +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/tests/benchmark_nco.cc gnuradio-3.1.1/gnuradio-core/src/tests/benchmark_nco.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/tests/benchmark_nco.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/tests/benchmark_nco.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #define ITERATIONS 20000000 + #define BLOCK_SIZE (10 * 1000) // fits in cache +diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/tests/benchmark_vco.cc gnuradio-3.1.1/gnuradio-core/src/tests/benchmark_vco.cc +--- gnuradio-3.1.1-upstream/gnuradio-core/src/tests/benchmark_vco.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gnuradio-core/src/tests/benchmark_vco.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #define ITERATIONS 5000000 + #define BLOCK_SIZE (10 * 1000) // fits in cache +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsc_bit_timing_loop.cc gnuradio-3.1.1/gr-atsc/src/lib/atsc_bit_timing_loop.cc +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + // Input rate changed from 20MHz to 19.2 to support usrp at 3 * 6.4MHz + float input_rate = 19.2e6; +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_fs_checker_naive.cc gnuradio-3.1.1/gr-atsc/src/lib/atsci_fs_checker_naive.cc +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_fs_checker_naive.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/atsci_fs_checker_naive.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + using std::cerr; + using std::endl; +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_fs_correlator_naive.cc gnuradio-3.1.1/gr-atsc/src/lib/atsci_fs_correlator_naive.cc +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_fs_correlator_naive.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/atsci_fs_correlator_naive.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + using std::cerr; + using std::endl; +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_reed_solomon.cc gnuradio-3.1.1/gr-atsc/src/lib/atsci_reed_solomon.cc +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_reed_solomon.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/atsci_reed_solomon.cc 2008-03-03 09:55:00.000000000 +0100 +@@ -22,6 +22,8 @@ + + #include + #include ++#include ++#include + + extern "C" { + #include "rs.h" +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_sliding_correlator.h gnuradio-3.1.1/gr-atsc/src/lib/atsci_sliding_correlator.h +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_sliding_correlator.h 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/atsci_sliding_correlator.h 2008-03-04 09:13:50.000000000 +0100 +@@ -19,11 +19,12 @@ + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ ++#include ++#include ++ + #ifndef _ATSC_SLIDING_CORRELATOR_H_ + #define _ATSC_SLIDING_CORRELATOR_H_ + +-#include +- + extern const unsigned char atsc_pn511[511]; + extern const unsigned char atsc_pn63[63]; + +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_sssr.cc gnuradio-3.1.1/gr-atsc/src/lib/atsci_sssr.cc +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_sssr.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/atsci_sssr.cc 2008-03-03 09:07:49.000000000 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + /* + * ---------------------------------------------------------------- +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_trellis_encoder.cc gnuradio-3.1.1/gr-atsc/src/lib/atsci_trellis_encoder.cc +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_trellis_encoder.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/atsci_trellis_encoder.cc 2008-03-03 09:52:11.000000000 +0100 +@@ -23,6 +23,8 @@ + #include + #include + #include ++#include ++#include + + static const int DIBITS_PER_BYTE = 4; + +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_viterbi_decoder.cc gnuradio-3.1.1/gr-atsc/src/lib/atsci_viterbi_decoder.cc +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_viterbi_decoder.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/atsci_viterbi_decoder.cc 2008-03-03 09:52:11.000000000 +0100 +@@ -25,6 +25,8 @@ + #include + #include + #include "atsci_viterbi_mux.cc" ++#include ++#include + + + /* How many separate Trellis encoders / Viterbi decoders run in parallel */ +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsc_types.h gnuradio-3.1.1/gr-atsc/src/lib/atsc_types.h +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsc_types.h 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/atsc_types.h 2008-03-04 07:52:52.000000000 +0100 +@@ -24,6 +24,7 @@ + #define _ATSC_TYPES_H_ + + #include ++#include + #include + #include + +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/interleaver_fifo.h gnuradio-3.1.1/gr-atsc/src/lib/interleaver_fifo.h +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/interleaver_fifo.h 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/interleaver_fifo.h 2008-03-03 10:22:34.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + /*! + * \brief template class for interleaver fifo +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_data_interleaver.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_data_interleaver.cc +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -22,6 +22,7 @@ + + #include + #include ++#include + + + /*! +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + using std::cerr; + using std::endl; +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc 2008-03-04 15:03:37.000000000 +0100 +@@ -29,6 +29,8 @@ + #include + #include + #include ++#include ++#include + + + static const int NTRIALS = 50; +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_randomizer.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_randomizer.cc +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_randomizer.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_randomizer.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -23,6 +23,7 @@ + #include + + #include ++#include + + static unsigned int expected_initial_states[] = { + 0x018f, +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_reed_solomon.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_reed_solomon.cc +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_reed_solomon.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_reed_solomon.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + + static const int NROOTS = 20; +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_single_viterbi.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_single_viterbi.cc +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_single_viterbi.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_single_viterbi.cc 2008-03-04 12:53:35.000000000 +0100 +@@ -30,6 +30,8 @@ + #include + #include + #include ++#include ++#include + + + static const int NTRIALS = 50; +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #define NELEM(x) (sizeof (x) / sizeof (x[0])) + +diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc +--- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #define NELEM(x) (sizeof (x) / sizeof (x[0])) + +diff -Naur gnuradio-3.1.1-upstream/gr-audio-portaudio/src/audio_portaudio_sink.cc gnuradio-3.1.1/gr-audio-portaudio/src/audio_portaudio_sink.cc +--- gnuradio-3.1.1-upstream/gr-audio-portaudio/src/audio_portaudio_sink.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gr-audio-portaudio/src/audio_portaudio_sink.cc 2008-03-03 09:52:11.000000000 +0100 +@@ -33,6 +33,8 @@ + #include + #include + #include ++#include ++#include + + #define LOGGING 0 // define to 0 or 1 + +diff -Naur gnuradio-3.1.1-upstream/gr-audio-portaudio/src/audio_portaudio_source.cc gnuradio-3.1.1/gr-audio-portaudio/src/audio_portaudio_source.cc +--- gnuradio-3.1.1-upstream/gr-audio-portaudio/src/audio_portaudio_source.cc 2008-03-03 08:38:24.000000000 +0100 ++++ gnuradio-3.1.1/gr-audio-portaudio/src/audio_portaudio_source.cc 2008-03-03 09:52:11.000000000 +0100 +@@ -33,6 +33,8 @@ + #include + #include + #include ++#include ++#include + + #define LOGGING 0 // define to 0 or 1 + +diff -Naur gnuradio-3.1.1-upstream/gr-gsm-fr-vocoder/src/lib/gsm/code.c gnuradio-3.1.1/gr-gsm-fr-vocoder/src/lib/gsm/code.c +--- gnuradio-3.1.1-upstream/gr-gsm-fr-vocoder/src/lib/gsm/code.c 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-gsm-fr-vocoder/src/lib/gsm/code.c 2008-03-03 09:52:11.000000000 +0100 +@@ -19,6 +19,7 @@ + #include "private.h" + #include "gsm.h" + #include "proto.h" ++#include + + /* + * 4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER +diff -Naur gnuradio-3.1.1-upstream/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c gnuradio-3.1.1/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c +--- gnuradio-3.1.1-upstream/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c 2008-03-03 10:22:34.000000000 +0100 +@@ -30,6 +30,7 @@ + #include "gsm.h" + #include "private.h" + #include "proto.h" ++#include + + gsm gsm_create P0() + { +diff -Naur gnuradio-3.1.1-upstream/gr-trellis/src/lib/fsm.cc gnuradio-3.1.1/gr-trellis/src/lib/fsm.cc +--- gnuradio-3.1.1-upstream/gr-trellis/src/lib/fsm.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-trellis/src/lib/fsm.cc 2008-03-04 15:29:29.000000000 +0100 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include "base.h" + #include "fsm.h" + +diff -Naur gnuradio-3.1.1-upstream/gr-trellis/src/lib/fsm.h gnuradio-3.1.1/gr-trellis/src/lib/fsm.h +--- gnuradio-3.1.1-upstream/gr-trellis/src/lib/fsm.h 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-trellis/src/lib/fsm.h 2008-03-04 15:46:05.000000000 +0100 +@@ -24,6 +24,7 @@ + #define INCLUDED_TRELLIS_FSM_H + + #include ++#include + + /*! + * \brief FSM class +diff -Naur gnuradio-3.1.1-upstream/gr-trellis/src/lib/trellis_permutation.cc gnuradio-3.1.1/gr-trellis/src/lib/trellis_permutation.cc +--- gnuradio-3.1.1-upstream/gr-trellis/src/lib/trellis_permutation.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-trellis/src/lib/trellis_permutation.cc 2008-03-03 09:52:11.000000000 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + trellis_permutation_sptr + trellis_make_permutation (int K, const std::vector &TABLE, int SYMS_PER_BLOCK, size_t NBYTES_INOUT) +diff -Naur gnuradio-3.1.1-upstream/gr-video-sdl/src/video_sdl_sink_s.cc gnuradio-3.1.1/gr-video-sdl/src/video_sdl_sink_s.cc +--- gnuradio-3.1.1-upstream/gr-video-sdl/src/video_sdl_sink_s.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-video-sdl/src/video_sdl_sink_s.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + + +diff -Naur gnuradio-3.1.1-upstream/gr-video-sdl/src/video_sdl_sink_uc.cc gnuradio-3.1.1/gr-video-sdl/src/video_sdl_sink_uc.cc +--- gnuradio-3.1.1-upstream/gr-video-sdl/src/video_sdl_sink_uc.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/gr-video-sdl/src/video_sdl_sink_uc.cc 2008-03-03 09:52:11.000000000 +0100 +@@ -35,6 +35,8 @@ + #include + #include + #include ++#include ++#include + + + +diff -Naur gnuradio-3.1.1-upstream/usrp/host/apps/test_usrp_standard_rx.cc gnuradio-3.1.1/usrp/host/apps/test_usrp_standard_rx.cc +--- gnuradio-3.1.1-upstream/usrp/host/apps/test_usrp_standard_rx.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/usrp/host/apps/test_usrp_standard_rx.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include /* needed for usb functions */ + #include +diff -Naur gnuradio-3.1.1-upstream/usrp/host/apps/test_usrp_standard_tx.cc gnuradio-3.1.1/usrp/host/apps/test_usrp_standard_tx.cc +--- gnuradio-3.1.1-upstream/usrp/host/apps/test_usrp_standard_tx.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/usrp/host/apps/test_usrp_standard_tx.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include /* needed for usb functions */ + #include +diff -Naur gnuradio-3.1.1-upstream/usrp/host/apps/usrper.cc gnuradio-3.1.1/usrp/host/apps/usrper.cc +--- gnuradio-3.1.1-upstream/usrp/host/apps/usrper.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/usrp/host/apps/usrper.cc 2008-03-03 09:41:17.000000000 +0100 +@@ -30,6 +30,7 @@ + + #include "usrp_prims.h" + #include "usrp_spi_defs.h" ++#include + + char *prog_name; + +diff -Naur gnuradio-3.1.1-upstream/usrp/host/lib/legacy/fusb_linux.cc gnuradio-3.1.1/usrp/host/lib/legacy/fusb_linux.cc +--- gnuradio-3.1.1-upstream/usrp/host/lib/legacy/fusb_linux.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/usrp/host/lib/legacy/fusb_linux.cc 2008-03-04 07:53:55.000000000 +0100 +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include ++#include + + #define MINIMIZE_TX_BUFFERING 1 // must be defined to 0 or 1 + +diff -Naur gnuradio-3.1.1-upstream/usrp/host/lib/legacy/fusb_win32.cc gnuradio-3.1.1/usrp/host/lib/legacy/fusb_win32.cc +--- gnuradio-3.1.1-upstream/usrp/host/lib/legacy/fusb_win32.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/usrp/host/lib/legacy/fusb_win32.cc 2008-03-03 09:52:11.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + static const int MAX_BLOCK_SIZE = fusb_sysconfig::max_block_size(); + static const int DEFAULT_BLOCK_SIZE = MAX_BLOCK_SIZE; +diff -Naur gnuradio-3.1.1-upstream/usrp/host/lib/legacy/usrp_basic.cc gnuradio-3.1.1/usrp/host/lib/legacy/usrp_basic.cc +--- gnuradio-3.1.1-upstream/usrp/host/lib/legacy/usrp_basic.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/usrp/host/lib/legacy/usrp_basic.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + using namespace ad9862; + +diff -Naur gnuradio-3.1.1-upstream/usrp/host/lib/legacy/usrp_local_sighandler.cc gnuradio-3.1.1/usrp/host/lib/legacy/usrp_local_sighandler.cc +--- gnuradio-3.1.1-upstream/usrp/host/lib/legacy/usrp_local_sighandler.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/usrp/host/lib/legacy/usrp_local_sighandler.cc 2008-03-03 09:23:08.000000000 +0100 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + usrp_local_sighandler::usrp_local_sighandler (int signum, + void (*new_handler)(int)) +diff -Naur gnuradio-3.1.1-upstream/usrp/host/lib/legacy/usrp_prims.cc gnuradio-3.1.1/usrp/host/lib/legacy/usrp_prims.cc +--- gnuradio-3.1.1-upstream/usrp/host/lib/legacy/usrp_prims.cc 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/usrp/host/lib/legacy/usrp_prims.cc 2008-03-04 12:53:46.000000000 +0100 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + #include + #include // FIXME should check with autoconf (nanosleep) + #include +@@ -62,6 +63,7 @@ + static char *default_fpga_filename = "std_2rxhb_2tx.rbf"; + + #include "std_paths.h" ++#include + + static char * + find_file (const char *filename, int hw_rev) +diff -Naur gnuradio-3.1.1-upstream/usrp/host/misc/getopt.c gnuradio-3.1.1/usrp/host/misc/getopt.c +--- gnuradio-3.1.1-upstream/usrp/host/misc/getopt.c 2008-03-03 08:38:23.000000000 +0100 ++++ gnuradio-3.1.1/usrp/host/misc/getopt.c 2008-03-03 09:56:27.000000000 +0100 +@@ -52,6 +52,7 @@ + #endif + + #include ++#include + + /* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C diff --git a/gnuradio.spec b/gnuradio.spec new file mode 100644 index 0000000..14488e6 --- /dev/null +++ b/gnuradio.spec @@ -0,0 +1,185 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +Name: gnuradio +Version: 3.1.1 +Release: 1%{?dist} +Summary: Software defined radio framework + +Group: Applications/Engineering +License: GPLv3 +URL: http://www.gnuradio.org +Source0: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%{version}.tar.gz +# missing files from official tarball, upstream knows about this problem. +# $ svn export http://gnuradio.org/svn/gnuradio/branches/releases/3.1 gnuradio +# $ tar -cfz gnuradio-3.1.1-templates.tar gnuradio-3.1.1/gnuradio-core/src/lib/gengen/*.t +Source1: gnuradio-3.1.1-templates.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: gnuradio-3.1.1-gcc34.patch + +BuildRequires: sdcc +BuildRequires: fftw-devel +BuildRequires: cppunit-devel +BuildRequires: wxPython-devel +BuildRequires: xmlto +BuildRequires: graphviz +BuildRequires: boost-devel +BuildRequires: python-devel +BuildRequires: swig +BuildRequires: doxygen +BuildRequires: libusb-devel +BuildRequires: alsa-lib-devel +BuildRequires: SDL-devel + +%description +GNU Radio is a collection of software that when combined with minimal +hardware, allows the construction of radios where the actual waveforms +transmitted and received are defined by software. What this means is +that it turns the digital modulation schemes used in today's high +performance wireless devices into software problems. + +%package devel +Summary: GNU Radio +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} + +%description devel +GNU Radio Headers + +%package doc +Summary: GNU Radio +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} + +%description doc +GNU Radio Documentation + +%package examples +Summary: GNU Radio +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} + +%description examples +GNU Radio examples + +%package -n usrp +Summary: Universal Software Radio Peripheral +Group: Applications/Engineering +Requires: %{name} = %{version}-%{release} + +%description -n usrp +Gnu Radio Universal Software Radio Peripheral software + +%package -n usrp-devel +Summary: Universal Software Radio Peripheral +Group: Applications/Engineering +Requires: usrp = %{version}-%{release} + +%description -n usrp-devel +GNU Radio USRP headers + +%prep +%setup -q +%setup -q -b 1 +%patch0 -p1 -b .gcc43 + +%build +export PATH=%{_libexecdir}/sdcc:$PATH +%configure --enable-doxygen --enable-latex-doc --disable-gr-audio-oss +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -n gnuradio -p /sbin/ldconfig +%postun -n gnuradio -p /sbin/ldconfig + +%post -n gnuradio-devel -p /sbin/ldconfig +%postun -n gnuradio-devel -p /sbin/ldconfig + +%post -n usrp -p /sbin/ldconfig +%postun -n usrp -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{python_sitelib}/gnuradio +%{_sysconfdir}/gnuradio +%{_libdir}/libgnuradio-core.so.* +%{_libdir}/libgnuradio-core-qa.so.* +%{_libdir}/libgr_audio_alsa.so.* +%{_libdir}/libgromnithread.so.* +%config(noreplace)%{_sysconfdir}/gnuradio/conf.d/gr-audio-alsa.conf +%config(noreplace)%{_sysconfdir}/gnuradio/conf.d/gnuradio-core.conf +%config(noreplace)%{_sysconfdir}/gnuradio/conf.d/gr-wxgui.conf +%exclude %{python_sitelib}/gnuradio/*.la + +%files devel +%defattr(-,root,root,-) +%{_includedir}/gnuradio +%{_includedir}/usrp_* +%{_libdir}/libgnuradio-core.so +%{_libdir}/libgnuradio-core-qa.so +%{_libdir}/libgr_audio_alsa.so +%{_libdir}/libgromnithread.so +%{_libdir}/pkgconfig/*.pc +%exclude %{_libdir}/*.la + +%files doc +%defattr(-,root,root,-) +%doc ChangeLog README README.hacking NEWS INSTALL COPYING AUTHORS +%{_docdir}/usrp* +%{_docdir}/gnuradio* + +%files examples +%defattr(-,root,root,-) +%{_datadir}/%{name}/examples +%exclude %{_datadir}/%{name}/examples/atsc/*.pyc +%exclude %{_datadir}/%{name}/examples/atsc/*.pyo +%exclude %{_datadir}/%{name}/examples/audio/*.pyc +%exclude %{_datadir}/%{name}/examples/audio/*.pyo +%exclude %{_datadir}/%{name}/examples/digital/*.pyc +%exclude %{_datadir}/%{name}/examples/digital/*.pyo +%exclude %{_datadir}/%{name}/examples/hf_explorer/*.pyc +%exclude %{_datadir}/%{name}/examples/hf_explorer/*.pyo +%exclude %{_datadir}/%{name}/examples/hf_radio/*.pyc +%exclude %{_datadir}/%{name}/examples/hf_radio/*.pyo +%exclude %{_datadir}/%{name}/examples/multi-antenna/*.pyc +%exclude %{_datadir}/%{name}/examples/multi-antenna/*.pyo +%exclude %{_datadir}/%{name}/examples/multi_usrp/*.pyc +%exclude %{_datadir}/%{name}/examples/multi_usrp/*.pyo +%exclude %{_datadir}/%{name}/examples/network/*.pyc +%exclude %{_datadir}/%{name}/examples/network/*.pyo +%exclude %{_datadir}/%{name}/examples/trellis/*.pyc +%exclude %{_datadir}/%{name}/examples/trellis/*.pyo +%exclude %{_datadir}/%{name}/examples/trellis/fsm_files/*.pyc +%exclude %{_datadir}/%{name}/examples/trellis/fsm_files/*.pyo +%exclude %{_datadir}/%{name}/examples/usrp/*.pyc +%exclude %{_datadir}/%{name}/examples/usrp/*.pyo + +%files -n usrp +%defattr(-,root,root,-) +%{_bindir}/usrp* +%{_datadir}/usrp +%{_libdir}/libusrp.so.* +%{python_sitelib}/usrpm +%exclude %{_bindir}/*.pyc +%exclude %{_bindir}/*.pyo +%exclude %{_libdir}/*.la +%exclude %{python_sitelib}/usrpm/*.la + +%files -n usrp-devel +%defattr(-,root,root,-) +%{_libdir}/libusrp.so + +%changelog +* Wed Feb 20 2008 Marek Mahut - 3.1.1-1 +- Upstream release +- Spec file rewrite + +* Mon Mar 12 2007 Trond Danielsen - 3.0.3-1 +- Initial version. diff --git a/sources b/sources index e69de29..f095c10 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +ee06fe3d989caec3cd903ce48f4f311a gnuradio-3.1.1-templates.tar.gz +c5df6b26928ab6da678fbc6f993ce263 gnuradio-3.1.1.tar.gz From fad759981bd300fd16a6566ee8c1b5834d0ce28c Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sun, 23 Mar 2008 08:51:37 +0000 Subject: [PATCH 002/313] fixing wrong %exclude --- gnuradio.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 14488e6..fd80d04 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -156,8 +156,6 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_datadir}/%{name}/examples/network/*.pyo %exclude %{_datadir}/%{name}/examples/trellis/*.pyc %exclude %{_datadir}/%{name}/examples/trellis/*.pyo -%exclude %{_datadir}/%{name}/examples/trellis/fsm_files/*.pyc -%exclude %{_datadir}/%{name}/examples/trellis/fsm_files/*.pyo %exclude %{_datadir}/%{name}/examples/usrp/*.pyc %exclude %{_datadir}/%{name}/examples/usrp/*.pyo @@ -177,7 +175,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libusrp.so %changelog -* Wed Feb 20 2008 Marek Mahut - 3.1.1-1 +* Wed Feb 20 2008 Marek Mahut - 3.1.1-2 - Upstream release - Spec file rewrite From a6979c515decdf07fb7d7e4bed9ddd8b08f1b400 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Thu, 27 Mar 2008 16:30:37 +0000 Subject: [PATCH 003/313] fixing dependency problems, thanks to Lubomir Kundrak --- gnuradio.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index fd80d04..31ae87e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -113,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgnuradio-core-qa.so.* %{_libdir}/libgr_audio_alsa.so.* %{_libdir}/libgromnithread.so.* +%{_libdir}/libusrp.so.* %config(noreplace)%{_sysconfdir}/gnuradio/conf.d/gr-audio-alsa.conf %config(noreplace)%{_sysconfdir}/gnuradio/conf.d/gnuradio-core.conf %config(noreplace)%{_sysconfdir}/gnuradio/conf.d/gr-wxgui.conf @@ -163,7 +164,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_bindir}/usrp* %{_datadir}/usrp -%{_libdir}/libusrp.so.* %{python_sitelib}/usrpm %exclude %{_bindir}/*.pyc %exclude %{_bindir}/*.pyo @@ -175,6 +175,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libusrp.so %changelog +* Thu Mar 27 2008 Marek Mahut - 3.1.1-3 +- Moving libusrp to gnuradio package + * Wed Feb 20 2008 Marek Mahut - 3.1.1-2 - Upstream release - Spec file rewrite From e78e7564f92fe6ceab2a5ba0d67e4721d8f18c82 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Thu, 27 Mar 2008 18:20:24 +0000 Subject: [PATCH 004/313] correct way of fixing problems --- gnuradio.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 31ae87e..c592dd5 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -108,12 +108,13 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{python_sitelib}/gnuradio +%exclude %{python_sitelib}/gnuradio/_usrp1.so +%exclude %{python_sitelib}/gnuradio/usrp* %{_sysconfdir}/gnuradio %{_libdir}/libgnuradio-core.so.* %{_libdir}/libgnuradio-core-qa.so.* %{_libdir}/libgr_audio_alsa.so.* %{_libdir}/libgromnithread.so.* -%{_libdir}/libusrp.so.* %config(noreplace)%{_sysconfdir}/gnuradio/conf.d/gr-audio-alsa.conf %config(noreplace)%{_sysconfdir}/gnuradio/conf.d/gnuradio-core.conf %config(noreplace)%{_sysconfdir}/gnuradio/conf.d/gr-wxgui.conf @@ -164,7 +165,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_bindir}/usrp* %{_datadir}/usrp +%{_libdir}/libusrp.so.* %{python_sitelib}/usrpm +%{python_sitelib}/gnuradio/_usrp1.so +%{python_sitelib}/gnuradio/usrp* %exclude %{_bindir}/*.pyc %exclude %{_bindir}/*.pyo %exclude %{_libdir}/*.la @@ -175,7 +179,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libusrp.so %changelog -* Thu Mar 27 2008 Marek Mahut - 3.1.1-3 +* Thu Mar 27 2008 Marek Mahut - 3.1.1-4 - Moving libusrp to gnuradio package * Wed Feb 20 2008 Marek Mahut - 3.1.1-2 From 2b1a29242c0948956e261889fc00d65de825f30a Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sat, 12 Apr 2008 19:36:32 +0000 Subject: [PATCH 005/313] new upstream release --- .cvsignore | 3 +- gnuradio-3.1.1-gcc34.patch | 1275 ----------------------------- gnuradio-3.1.2-gcc34.patch | 1288 ++++++++++++++++++++++++++++++ gnuradio-3.1.2-libtool.bug.patch | 14 + gnuradio.spec | 32 +- sources | 3 +- 6 files changed, 1327 insertions(+), 1288 deletions(-) delete mode 100644 gnuradio-3.1.1-gcc34.patch create mode 100644 gnuradio-3.1.2-gcc34.patch create mode 100644 gnuradio-3.1.2-libtool.bug.patch diff --git a/.cvsignore b/.cvsignore index 6673afa..c173600 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -gnuradio-3.1.1-templates.tar.gz -gnuradio-3.1.1.tar.gz +gnuradio-3.1.2.tar.gz diff --git a/gnuradio-3.1.1-gcc34.patch b/gnuradio-3.1.1-gcc34.patch deleted file mode 100644 index ef9f597..0000000 --- a/gnuradio-3.1.1-gcc34.patch +++ /dev/null @@ -1,1275 +0,0 @@ -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc gnuradio-3.1.1/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -38,6 +38,7 @@ - #include - - #include -+#include - - gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector &taps) - { -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc gnuradio-3.1.1/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -33,6 +33,7 @@ - #include - - #include -+#include - - gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector &taps) - { -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - - using std::vector; - -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - - using std::vector; - -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - - using std::vector; - -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - using std::vector; - -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - - using std::vector; - -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - //define ALIGN_ADVANCED_IMPLEMENTATION to have an alternative implementation of the align algoritm which exactly follows the align_interval spec. - //It is more resource intensive, less tested and probably not needed -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_bin_statistics_f_sptr - gr_make_bin_statistics_f(unsigned int vlen, -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_circular_file.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_circular_file.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_circular_file.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_circular_file.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -39,6 +39,8 @@ - #include - - #include -+#include -+#include - - static const int HEADER_SIZE = 4096; - static const int HEADER_MAGIC = 0xEB021026; -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_delay.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_delay.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_delay.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_delay.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_delay_sptr - gr_make_delay (size_t itemsize, int delay) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc 2008-03-03 09:52:39.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - static const int PAD_VAL = 0xAA; - -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_fft_vcc.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_fft_vcc.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_fft_vcc.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_fft_vcc.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - gr_fft_vcc_sptr - gr_make_fft_vcc (int fft_size, bool forward,const std::vector window, bool shift) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_fft_vfc.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_fft_vfc.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - // FIXME after this is working, change to use native real to complex fft. -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_framer_sink_1.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_framer_sink_1.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_framer_sink_1.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_framer_sink_1.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #define VERBOSE 0 - -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_head.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_head.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_head.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_head.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -25,6 +25,7 @@ - #endif - #include - #include -+#include - - gr_head::gr_head (size_t sizeof_stream_item, int nitems) - : gr_sync_block ("head", -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gri_fft.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gri_fft.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gri_fft.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gri_fft.cc 2008-03-03 09:04:49.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - static char * - wisdom_filename () -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_keep_one_in_n_sptr - gr_make_keep_one_in_n (size_t item_size, int n) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_log2_const.h gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_log2_const.h ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_log2_const.h 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_log2_const.h 2008-03-04 07:47:31.000000000 +0100 -@@ -31,16 +31,16 @@ - - template static inline int gr_log2_const() { assert(0); return 0; } - --template<> static inline int gr_log2_const<1>() { return 0; } --template<> static inline int gr_log2_const<2>() { return 1; } --template<> static inline int gr_log2_const<4>() { return 2; } --template<> static inline int gr_log2_const<8>() { return 3; } --template<> static inline int gr_log2_const<16>() { return 4; } --template<> static inline int gr_log2_const<32>() { return 5; } --template<> static inline int gr_log2_const<64>() { return 6; } --template<> static inline int gr_log2_const<128>() { return 7; } --template<> static inline int gr_log2_const<256>() { return 8; } --template<> static inline int gr_log2_const<512>() { return 9; } --template<> static inline int gr_log2_const<1024>(){ return 10; } -+template<> inline int gr_log2_const<1>() { return 0; } -+template<> inline int gr_log2_const<2>() { return 1; } -+template<> inline int gr_log2_const<4>() { return 2; } -+template<> inline int gr_log2_const<8>() { return 3; } -+template<> inline int gr_log2_const<16>() { return 4; } -+template<> inline int gr_log2_const<32>() { return 5; } -+template<> inline int gr_log2_const<64>() { return 6; } -+template<> inline int gr_log2_const<128>() { return 7; } -+template<> inline int gr_log2_const<256>() { return 8; } -+template<> inline int gr_log2_const<512>() { return 9; } -+template<> inline int gr_log2_const<1024>(){ return 10; } - - #endif /* INCLUDED_GR_LOG2_CONST_H */ -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_null_source.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_null_source.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_null_source.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_null_source.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_null_source::gr_null_source (size_t sizeof_stream_item) - : gr_sync_block ("null_source", -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_packet_sink.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_packet_sink.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_packet_sink.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_packet_sink.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #define VERBOSE 0 - -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_simple_correlator.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_simple_correlator.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - - static const int THRESHOLD = 3; -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_simple_framer.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_simple_framer.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_simple_framer.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_simple_framer.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -29,6 +29,8 @@ - #include - #include - #include -+#include -+#include - - - gr_simple_framer_sptr -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_skiphead.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_skiphead.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_skiphead.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_skiphead.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -25,6 +25,7 @@ - #endif - #include - #include -+#include - - gr_skiphead::gr_skiphead (size_t itemsize, size_t nitems_to_skip) - : gr_block ("skiphead", -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_stream_mux.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_stream_mux.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_stream_mux.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_stream_mux.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - #define VERBOSE 0 - -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_streams_to_stream.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_streams_to_stream.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_streams_to_stream.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_streams_to_stream.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_streams_to_stream_sptr - gr_make_streams_to_stream (size_t item_size, size_t nstreams) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_streams_to_vector.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_streams_to_vector.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_streams_to_vector.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_streams_to_vector.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_streams_to_vector_sptr - gr_make_streams_to_vector (size_t item_size, size_t nstreams) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_stream_to_streams.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_stream_to_streams.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_stream_to_streams.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_stream_to_streams.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_stream_to_streams_sptr - gr_make_stream_to_streams (size_t item_size, size_t nstreams) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_stream_to_vector.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_stream_to_vector.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_stream_to_vector.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_stream_to_vector.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_stream_to_vector_sptr - gr_make_stream_to_vector (size_t item_size, size_t nitems_per_block) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_test.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_test.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_test.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_test.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - gr_test_sptr gr_make_test (const std::string &name, - int min_inputs, int max_inputs, unsigned int sizeof_input_item, -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_throttle.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_throttle.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_throttle.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_throttle.cc 2008-03-03 09:53:15.000000000 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #ifdef HAVE_TIME_H - #include - #endif -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_vector_to_stream.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_vector_to_stream.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_vector_to_stream.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_vector_to_stream.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_vector_to_stream_sptr - gr_make_vector_to_stream (size_t item_size, size_t nitems_per_block) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_vector_to_streams.cc gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_vector_to_streams.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/gr_vector_to_streams.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/gr_vector_to_streams.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_vector_to_streams_sptr - gr_make_vector_to_streams (size_t item_size, size_t nstreams) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/malloc16.c gnuradio-3.1.1/gnuradio-core/src/lib/general/malloc16.c ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/general/malloc16.c 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/general/malloc16.c 2008-03-03 10:20:18.000000000 +0100 -@@ -7,6 +7,7 @@ - - #include "malloc16.h" - #include -+#include - - void *malloc16Align(int size){ - void *p; -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - gr_chunks_to_symbols_bc_sptr - gr_make_chunks_to_symbols_bc (const std::vector &symbol_table, const int D) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - gr_chunks_to_symbols_bf_sptr - gr_make_chunks_to_symbols_bf (const std::vector &symbol_table, const int D) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - gr_chunks_to_symbols_ic_sptr - gr_make_chunks_to_symbols_ic (const std::vector &symbol_table, const int D) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - gr_chunks_to_symbols_if_sptr - gr_make_chunks_to_symbols_if (const std::vector &symbol_table, const int D) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - gr_chunks_to_symbols_sc_sptr - gr_make_chunks_to_symbols_sc (const std::vector &symbol_table, const int D) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc 2008-03-03 09:52:10.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - gr_chunks_to_symbols_sf_sptr - gr_make_chunks_to_symbols_sf (const std::vector &symbol_table, const int D) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t 2008-03-03 09:52:10.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - @SPTR_NAME@ - gr_make_@BASE_NAME@ (const std::vector<@O_TYPE@> &symbol_table, const int D) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_cc.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_cc.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_cc.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_cc.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - gr_mute_cc_sptr -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_ff.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_ff.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_ff.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_ff.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - gr_mute_ff_sptr -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_ii.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_ii.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_ii.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_ii.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - gr_mute_ii_sptr -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_ss.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_ss.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_ss.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_ss.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - gr_mute_ss_sptr -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t 2008-03-03 09:23:08.000000000 +0100 -@@ -29,6 +29,7 @@ - #include <@NAME@.h> - #include - #include -+#include - - - @SPTR_NAME@ -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -28,6 +28,7 @@ - - #include - #include -+#include - - gr_peak_detector_fb_sptr - gr_make_peak_detector_fb (float threshold_factor_rise, -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -28,6 +28,7 @@ - - #include - #include -+#include - - gr_peak_detector_ib_sptr - gr_make_peak_detector_ib (float threshold_factor_rise, -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -28,6 +28,7 @@ - - #include - #include -+#include - - gr_peak_detector_sb_sptr - gr_make_peak_detector_sb (float threshold_factor_rise, -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t 2008-03-03 09:23:08.000000000 +0100 -@@ -28,6 +28,7 @@ - - #include <@NAME@.h> - #include -+#include - - @SPTR_NAME@ - gr_make_@BASE_NAME@ (float threshold_factor_rise, -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc 2008-03-03 09:05:18.000000000 +0100 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - - gr_file_descriptor_sink::gr_file_descriptor_sink (size_t itemsize, int fd) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc 2008-03-03 09:52:11.000000000 +0100 -@@ -32,6 +32,8 @@ - #include - #include - #include -+#include -+#include - - - gr_file_descriptor_source::gr_file_descriptor_source (size_t itemsize, -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_sink_base.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_sink_base.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_sink_base.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_sink_base.cc 2008-03-03 09:05:28.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - // win32 (mingw/msvc) specific - #ifdef HAVE_IO_H -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_source.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_source.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_file_source.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_file_source.cc 2008-03-03 09:05:34.000000000 +0100 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - // win32 (mingw/msvc) specific - #ifdef HAVE_IO_H -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gri_logger.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gri_logger.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gri_logger.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gri_logger.cc 2008-03-03 09:52:11.000000000 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - /* -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_message_sink.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_message_sink.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_message_sink.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_message_sink.cc 2008-03-03 09:52:11.000000000 +0100 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - - // public constructor that returns a shared_ptr -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_message_source.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_message_source.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_message_source.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_message_source.cc 2008-03-03 09:52:11.000000000 +0100 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - - // public constructor that returns a shared_ptr -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_udp_sink.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_udp_sink.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_udp_sink.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_udp_sink.cc 2008-03-03 09:04:49.000000000 +0100 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #define SNK_VERBOSE 0 - -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_udp_source.cc gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_udp_source.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/io/gr_udp_source.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/io/gr_udp_source.cc 2008-03-03 09:52:11.000000000 +0100 -@@ -25,6 +25,8 @@ - #include - #include - #include -+#include -+#include - - #define SRC_VERBOSE 0 - -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/missing/getopt.c gnuradio-3.1.1/gnuradio-core/src/lib/missing/getopt.c ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/missing/getopt.c 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/missing/getopt.c 2008-03-03 09:52:11.000000000 +0100 -@@ -52,6 +52,7 @@ - #endif - - #include -+#include - - /* Comment out all this code if we are using the GNU C Library, and are not - actually compiling the library itself. This code is part of the GNU C -@@ -179,6 +180,7 @@ - On some systems, it contains special magic macros that don't work - in GCC. */ - #include -+#include - #define my_index strchr - #define my_bcopy(src, dst, n) memcpy ((dst), (src), (n)) - #else -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/reed-solomon/decode_rs.c gnuradio-3.1.1/gnuradio-core/src/lib/reed-solomon/decode_rs.c ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/reed-solomon/decode_rs.c 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/reed-solomon/decode_rs.c 2008-03-03 10:22:34.000000000 +0100 -@@ -8,6 +8,7 @@ - #endif - - #include -+#include - - #define NULL ((void *)0) - #define min(a,b) ((a) < (b) ? (a) : (b)) -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/reed-solomon/encode_rs.c gnuradio-3.1.1/gnuradio-core/src/lib/reed-solomon/encode_rs.c ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/reed-solomon/encode_rs.c 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/reed-solomon/encode_rs.c 2008-03-03 10:22:34.000000000 +0100 -@@ -3,6 +3,7 @@ - * May be used under the terms of the GNU General Public License (GPL) - */ - #include -+#include - - #ifdef FIXED - #include "fixed.h" -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/reed-solomon/exercise.c gnuradio-3.1.1/gnuradio-core/src/lib/reed-solomon/exercise.c ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/reed-solomon/exercise.c 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/reed-solomon/exercise.c 2008-03-03 10:22:34.000000000 +0100 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #ifdef FIXED - #include "fixed.h" -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_dispatcher.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_dispatcher.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_dispatcher.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_dispatcher.cc 2008-03-03 09:05:53.000000000 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_SELECT - # ifdef HAVE_SYS_SELECT_H -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_error_handler.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_error_handler.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_error_handler.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_error_handler.cc 2008-03-03 09:06:11.000000000 +0100 -@@ -48,6 +48,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_IO_H - #include -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - - gr_local_sighandler::gr_local_sighandler (int signum, -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_message.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_message.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_message.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_message.cc 2008-03-03 09:52:11.000000000 +0100 -@@ -25,6 +25,8 @@ - #endif - #include - #include -+#include -+#include - - static long s_ncurrently_allocated = 0; - -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_preferences.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_preferences.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_preferences.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_preferences.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - - #ifdef MKDIR_TAKES_ONE_ARG -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_realtime.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_realtime.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_realtime.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_realtime.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -30,6 +30,7 @@ - #endif - - #include -+#include - #include - #include - -@@ -61,6 +62,7 @@ - #elif defined(HAVE_PTHREAD_SETSCHEDPARAM) - - #include -+#include - - gr_rt_status_t - gr_enable_realtime_scheduling() -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc 2008-03-03 09:06:30.000000000 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - #ifdef HAVE_SIGNAL_H - #include -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc 2008-03-03 09:41:10.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - - // all the factories we know about -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc 2008-03-03 09:06:40.000000000 +0100 -@@ -41,7 +41,6 @@ - #include - #include - -- - gr_vmcircbuf_mmap_tmpfile::gr_vmcircbuf_mmap_tmpfile (int size) - : gr_vmcircbuf (size) - { -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/tests/benchmark_nco.cc gnuradio-3.1.1/gnuradio-core/src/tests/benchmark_nco.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/tests/benchmark_nco.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/tests/benchmark_nco.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #define ITERATIONS 20000000 - #define BLOCK_SIZE (10 * 1000) // fits in cache -diff -Naur gnuradio-3.1.1-upstream/gnuradio-core/src/tests/benchmark_vco.cc gnuradio-3.1.1/gnuradio-core/src/tests/benchmark_vco.cc ---- gnuradio-3.1.1-upstream/gnuradio-core/src/tests/benchmark_vco.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gnuradio-core/src/tests/benchmark_vco.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #define ITERATIONS 5000000 - #define BLOCK_SIZE (10 * 1000) // fits in cache -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsc_bit_timing_loop.cc gnuradio-3.1.1/gr-atsc/src/lib/atsc_bit_timing_loop.cc ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - // Input rate changed from 20MHz to 19.2 to support usrp at 3 * 6.4MHz - float input_rate = 19.2e6; -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_fs_checker_naive.cc gnuradio-3.1.1/gr-atsc/src/lib/atsci_fs_checker_naive.cc ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_fs_checker_naive.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/atsci_fs_checker_naive.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - using std::cerr; - using std::endl; -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_fs_correlator_naive.cc gnuradio-3.1.1/gr-atsc/src/lib/atsci_fs_correlator_naive.cc ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_fs_correlator_naive.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/atsci_fs_correlator_naive.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - using std::cerr; - using std::endl; -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_reed_solomon.cc gnuradio-3.1.1/gr-atsc/src/lib/atsci_reed_solomon.cc ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_reed_solomon.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/atsci_reed_solomon.cc 2008-03-03 09:55:00.000000000 +0100 -@@ -22,6 +22,8 @@ - - #include - #include -+#include -+#include - - extern "C" { - #include "rs.h" -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_sliding_correlator.h gnuradio-3.1.1/gr-atsc/src/lib/atsci_sliding_correlator.h ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_sliding_correlator.h 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/atsci_sliding_correlator.h 2008-03-04 09:13:50.000000000 +0100 -@@ -19,11 +19,12 @@ - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ -+#include -+#include -+ - #ifndef _ATSC_SLIDING_CORRELATOR_H_ - #define _ATSC_SLIDING_CORRELATOR_H_ - --#include -- - extern const unsigned char atsc_pn511[511]; - extern const unsigned char atsc_pn63[63]; - -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_sssr.cc gnuradio-3.1.1/gr-atsc/src/lib/atsci_sssr.cc ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_sssr.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/atsci_sssr.cc 2008-03-03 09:07:49.000000000 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - /* - * ---------------------------------------------------------------- -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_trellis_encoder.cc gnuradio-3.1.1/gr-atsc/src/lib/atsci_trellis_encoder.cc ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_trellis_encoder.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/atsci_trellis_encoder.cc 2008-03-03 09:52:11.000000000 +0100 -@@ -23,6 +23,8 @@ - #include - #include - #include -+#include -+#include - - static const int DIBITS_PER_BYTE = 4; - -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_viterbi_decoder.cc gnuradio-3.1.1/gr-atsc/src/lib/atsci_viterbi_decoder.cc ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsci_viterbi_decoder.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/atsci_viterbi_decoder.cc 2008-03-03 09:52:11.000000000 +0100 -@@ -25,6 +25,8 @@ - #include - #include - #include "atsci_viterbi_mux.cc" -+#include -+#include - - - /* How many separate Trellis encoders / Viterbi decoders run in parallel */ -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsc_types.h gnuradio-3.1.1/gr-atsc/src/lib/atsc_types.h ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/atsc_types.h 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/atsc_types.h 2008-03-04 07:52:52.000000000 +0100 -@@ -24,6 +24,7 @@ - #define _ATSC_TYPES_H_ - - #include -+#include - #include - #include - -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/interleaver_fifo.h gnuradio-3.1.1/gr-atsc/src/lib/interleaver_fifo.h ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/interleaver_fifo.h 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/interleaver_fifo.h 2008-03-03 10:22:34.000000000 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - /*! - * \brief template class for interleaver fifo -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_data_interleaver.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_data_interleaver.cc ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - - - /*! -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - using std::cerr; - using std::endl; -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc 2008-03-04 15:03:37.000000000 +0100 -@@ -29,6 +29,8 @@ - #include - #include - #include -+#include -+#include - - - static const int NTRIALS = 50; -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_randomizer.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_randomizer.cc ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_randomizer.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_randomizer.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -23,6 +23,7 @@ - #include - - #include -+#include - - static unsigned int expected_initial_states[] = { - 0x018f, -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_reed_solomon.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_reed_solomon.cc ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_reed_solomon.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_reed_solomon.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - static const int NROOTS = 20; -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_single_viterbi.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_single_viterbi.cc ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_single_viterbi.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_single_viterbi.cc 2008-03-04 12:53:35.000000000 +0100 -@@ -30,6 +30,8 @@ - #include - #include - #include -+#include -+#include - - - static const int NTRIALS = 50; -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #define NELEM(x) (sizeof (x) / sizeof (x[0])) - -diff -Naur gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc ---- gnuradio-3.1.1-upstream/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #define NELEM(x) (sizeof (x) / sizeof (x[0])) - -diff -Naur gnuradio-3.1.1-upstream/gr-audio-portaudio/src/audio_portaudio_sink.cc gnuradio-3.1.1/gr-audio-portaudio/src/audio_portaudio_sink.cc ---- gnuradio-3.1.1-upstream/gr-audio-portaudio/src/audio_portaudio_sink.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gr-audio-portaudio/src/audio_portaudio_sink.cc 2008-03-03 09:52:11.000000000 +0100 -@@ -33,6 +33,8 @@ - #include - #include - #include -+#include -+#include - - #define LOGGING 0 // define to 0 or 1 - -diff -Naur gnuradio-3.1.1-upstream/gr-audio-portaudio/src/audio_portaudio_source.cc gnuradio-3.1.1/gr-audio-portaudio/src/audio_portaudio_source.cc ---- gnuradio-3.1.1-upstream/gr-audio-portaudio/src/audio_portaudio_source.cc 2008-03-03 08:38:24.000000000 +0100 -+++ gnuradio-3.1.1/gr-audio-portaudio/src/audio_portaudio_source.cc 2008-03-03 09:52:11.000000000 +0100 -@@ -33,6 +33,8 @@ - #include - #include - #include -+#include -+#include - - #define LOGGING 0 // define to 0 or 1 - -diff -Naur gnuradio-3.1.1-upstream/gr-gsm-fr-vocoder/src/lib/gsm/code.c gnuradio-3.1.1/gr-gsm-fr-vocoder/src/lib/gsm/code.c ---- gnuradio-3.1.1-upstream/gr-gsm-fr-vocoder/src/lib/gsm/code.c 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-gsm-fr-vocoder/src/lib/gsm/code.c 2008-03-03 09:52:11.000000000 +0100 -@@ -19,6 +19,7 @@ - #include "private.h" - #include "gsm.h" - #include "proto.h" -+#include - - /* - * 4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER -diff -Naur gnuradio-3.1.1-upstream/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c gnuradio-3.1.1/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c ---- gnuradio-3.1.1-upstream/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c 2008-03-03 10:22:34.000000000 +0100 -@@ -30,6 +30,7 @@ - #include "gsm.h" - #include "private.h" - #include "proto.h" -+#include - - gsm gsm_create P0() - { -diff -Naur gnuradio-3.1.1-upstream/gr-trellis/src/lib/fsm.cc gnuradio-3.1.1/gr-trellis/src/lib/fsm.cc ---- gnuradio-3.1.1-upstream/gr-trellis/src/lib/fsm.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-trellis/src/lib/fsm.cc 2008-03-04 15:29:29.000000000 +0100 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include "base.h" - #include "fsm.h" - -diff -Naur gnuradio-3.1.1-upstream/gr-trellis/src/lib/fsm.h gnuradio-3.1.1/gr-trellis/src/lib/fsm.h ---- gnuradio-3.1.1-upstream/gr-trellis/src/lib/fsm.h 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-trellis/src/lib/fsm.h 2008-03-04 15:46:05.000000000 +0100 -@@ -24,6 +24,7 @@ - #define INCLUDED_TRELLIS_FSM_H - - #include -+#include - - /*! - * \brief FSM class -diff -Naur gnuradio-3.1.1-upstream/gr-trellis/src/lib/trellis_permutation.cc gnuradio-3.1.1/gr-trellis/src/lib/trellis_permutation.cc ---- gnuradio-3.1.1-upstream/gr-trellis/src/lib/trellis_permutation.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-trellis/src/lib/trellis_permutation.cc 2008-03-03 09:52:11.000000000 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - trellis_permutation_sptr - trellis_make_permutation (int K, const std::vector &TABLE, int SYMS_PER_BLOCK, size_t NBYTES_INOUT) -diff -Naur gnuradio-3.1.1-upstream/gr-video-sdl/src/video_sdl_sink_s.cc gnuradio-3.1.1/gr-video-sdl/src/video_sdl_sink_s.cc ---- gnuradio-3.1.1-upstream/gr-video-sdl/src/video_sdl_sink_s.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-video-sdl/src/video_sdl_sink_s.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - - -diff -Naur gnuradio-3.1.1-upstream/gr-video-sdl/src/video_sdl_sink_uc.cc gnuradio-3.1.1/gr-video-sdl/src/video_sdl_sink_uc.cc ---- gnuradio-3.1.1-upstream/gr-video-sdl/src/video_sdl_sink_uc.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/gr-video-sdl/src/video_sdl_sink_uc.cc 2008-03-03 09:52:11.000000000 +0100 -@@ -35,6 +35,8 @@ - #include - #include - #include -+#include -+#include - - - -diff -Naur gnuradio-3.1.1-upstream/usrp/host/apps/test_usrp_standard_rx.cc gnuradio-3.1.1/usrp/host/apps/test_usrp_standard_rx.cc ---- gnuradio-3.1.1-upstream/usrp/host/apps/test_usrp_standard_rx.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/usrp/host/apps/test_usrp_standard_rx.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include /* needed for usb functions */ - #include -diff -Naur gnuradio-3.1.1-upstream/usrp/host/apps/test_usrp_standard_tx.cc gnuradio-3.1.1/usrp/host/apps/test_usrp_standard_tx.cc ---- gnuradio-3.1.1-upstream/usrp/host/apps/test_usrp_standard_tx.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/usrp/host/apps/test_usrp_standard_tx.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include /* needed for usb functions */ - #include -diff -Naur gnuradio-3.1.1-upstream/usrp/host/apps/usrper.cc gnuradio-3.1.1/usrp/host/apps/usrper.cc ---- gnuradio-3.1.1-upstream/usrp/host/apps/usrper.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/usrp/host/apps/usrper.cc 2008-03-03 09:41:17.000000000 +0100 -@@ -30,6 +30,7 @@ - - #include "usrp_prims.h" - #include "usrp_spi_defs.h" -+#include - - char *prog_name; - -diff -Naur gnuradio-3.1.1-upstream/usrp/host/lib/legacy/fusb_linux.cc gnuradio-3.1.1/usrp/host/lib/legacy/fusb_linux.cc ---- gnuradio-3.1.1-upstream/usrp/host/lib/legacy/fusb_linux.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/usrp/host/lib/legacy/fusb_linux.cc 2008-03-04 07:53:55.000000000 +0100 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - - #define MINIMIZE_TX_BUFFERING 1 // must be defined to 0 or 1 - -diff -Naur gnuradio-3.1.1-upstream/usrp/host/lib/legacy/fusb_win32.cc gnuradio-3.1.1/usrp/host/lib/legacy/fusb_win32.cc ---- gnuradio-3.1.1-upstream/usrp/host/lib/legacy/fusb_win32.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/usrp/host/lib/legacy/fusb_win32.cc 2008-03-03 09:52:11.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - static const int MAX_BLOCK_SIZE = fusb_sysconfig::max_block_size(); - static const int DEFAULT_BLOCK_SIZE = MAX_BLOCK_SIZE; -diff -Naur gnuradio-3.1.1-upstream/usrp/host/lib/legacy/usrp_basic.cc gnuradio-3.1.1/usrp/host/lib/legacy/usrp_basic.cc ---- gnuradio-3.1.1-upstream/usrp/host/lib/legacy/usrp_basic.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/usrp/host/lib/legacy/usrp_basic.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - using namespace ad9862; - -diff -Naur gnuradio-3.1.1-upstream/usrp/host/lib/legacy/usrp_local_sighandler.cc gnuradio-3.1.1/usrp/host/lib/legacy/usrp_local_sighandler.cc ---- gnuradio-3.1.1-upstream/usrp/host/lib/legacy/usrp_local_sighandler.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/usrp/host/lib/legacy/usrp_local_sighandler.cc 2008-03-03 09:23:08.000000000 +0100 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - usrp_local_sighandler::usrp_local_sighandler (int signum, - void (*new_handler)(int)) -diff -Naur gnuradio-3.1.1-upstream/usrp/host/lib/legacy/usrp_prims.cc gnuradio-3.1.1/usrp/host/lib/legacy/usrp_prims.cc ---- gnuradio-3.1.1-upstream/usrp/host/lib/legacy/usrp_prims.cc 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/usrp/host/lib/legacy/usrp_prims.cc 2008-03-04 12:53:46.000000000 +0100 -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - #include - #include // FIXME should check with autoconf (nanosleep) - #include -@@ -62,6 +63,7 @@ - static char *default_fpga_filename = "std_2rxhb_2tx.rbf"; - - #include "std_paths.h" -+#include - - static char * - find_file (const char *filename, int hw_rev) -diff -Naur gnuradio-3.1.1-upstream/usrp/host/misc/getopt.c gnuradio-3.1.1/usrp/host/misc/getopt.c ---- gnuradio-3.1.1-upstream/usrp/host/misc/getopt.c 2008-03-03 08:38:23.000000000 +0100 -+++ gnuradio-3.1.1/usrp/host/misc/getopt.c 2008-03-03 09:56:27.000000000 +0100 -@@ -52,6 +52,7 @@ - #endif - - #include -+#include - - /* Comment out all this code if we are using the GNU C Library, and are not - actually compiling the library itself. This code is part of the GNU C diff --git a/gnuradio-3.1.2-gcc34.patch b/gnuradio-3.1.2-gcc34.patch new file mode 100644 index 0000000..1b9897b --- /dev/null +++ b/gnuradio-3.1.2-gcc34.patch @@ -0,0 +1,1288 @@ +Marek Mahut : Patch to fix build under gcc 3.4 + +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc gnuradio-3.1.2/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -38,6 +38,7 @@ + #include + + #include ++#include + + gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector &taps) + { +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc gnuradio-3.1.2/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -33,6 +33,7 @@ + #include + + #include ++#include + + gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector &taps) + { +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -47,6 +47,7 @@ + #include + #include + #include ++#include + + using std::vector; + +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -47,6 +47,7 @@ + #include + #include + #include ++#include + + using std::vector; + +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + + using std::vector; + +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + using std::vector; + +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + + using std::vector; + +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + //define ALIGN_ADVANCED_IMPLEMENTATION to have an alternative implementation of the align algoritm which exactly follows the align_interval spec. + //It is more resource intensive, less tested and probably not needed +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_bin_statistics_f_sptr + gr_make_bin_statistics_f(unsigned int vlen, +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_circular_file.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_circular_file.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_circular_file.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_circular_file.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -39,6 +39,8 @@ + #include + + #include ++#include ++#include + + static const int HEADER_SIZE = 4096; + static const int HEADER_MAGIC = 0xEB021026; +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_delay.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_delay.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_delay.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_delay.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_delay_sptr + gr_make_delay (size_t itemsize, int delay) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + static const int PAD_VAL = 0xAA; + +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fft_vcc.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fft_vcc.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fft_vcc.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fft_vcc.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + gr_fft_vcc_sptr + gr_make_fft_vcc (int fft_size, bool forward,const std::vector window, bool shift) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fft_vfc.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fft_vfc.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + + // FIXME after this is working, change to use native real to complex fft. +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_framer_sink_1.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_framer_sink_1.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_framer_sink_1.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_framer_sink_1.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #define VERBOSE 0 + +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_head.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_head.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_head.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_head.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -25,6 +25,7 @@ + #endif + #include + #include ++#include + + gr_head::gr_head (size_t sizeof_stream_item, int nitems) + : gr_sync_block ("head", +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gri_fft.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gri_fft.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gri_fft.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gri_fft.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + static char * + wisdom_filename () +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_keep_one_in_n_sptr + gr_make_keep_one_in_n (size_t item_size, int n) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_log2_const.h gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_log2_const.h +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_log2_const.h 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_log2_const.h 2008-04-11 19:57:23.000000000 +0200 +@@ -31,16 +31,16 @@ + + template static inline int gr_log2_const() { assert(0); return 0; } + +-template<> static inline int gr_log2_const<1>() { return 0; } +-template<> static inline int gr_log2_const<2>() { return 1; } +-template<> static inline int gr_log2_const<4>() { return 2; } +-template<> static inline int gr_log2_const<8>() { return 3; } +-template<> static inline int gr_log2_const<16>() { return 4; } +-template<> static inline int gr_log2_const<32>() { return 5; } +-template<> static inline int gr_log2_const<64>() { return 6; } +-template<> static inline int gr_log2_const<128>() { return 7; } +-template<> static inline int gr_log2_const<256>() { return 8; } +-template<> static inline int gr_log2_const<512>() { return 9; } +-template<> static inline int gr_log2_const<1024>(){ return 10; } ++template<> inline int gr_log2_const<1>() { return 0; } ++template<> inline int gr_log2_const<2>() { return 1; } ++template<> inline int gr_log2_const<4>() { return 2; } ++template<> inline int gr_log2_const<8>() { return 3; } ++template<> inline int gr_log2_const<16>() { return 4; } ++template<> inline int gr_log2_const<32>() { return 5; } ++template<> inline int gr_log2_const<64>() { return 6; } ++template<> inline int gr_log2_const<128>() { return 7; } ++template<> inline int gr_log2_const<256>() { return 8; } ++template<> inline int gr_log2_const<512>() { return 9; } ++template<> inline int gr_log2_const<1024>(){ return 10; } + + #endif /* INCLUDED_GR_LOG2_CONST_H */ +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_null_source.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_null_source.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_null_source.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_null_source.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_null_source::gr_null_source (size_t sizeof_stream_item) + : gr_sync_block ("null_source", +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_packet_sink.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_packet_sink.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_packet_sink.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_packet_sink.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #define VERBOSE 0 + +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc 2008-04-11 19:59:13.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_peak_detector2_fb_sptr + gr_make_peak_detector2_fb (float threshold_factor_rise, +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_simple_correlator.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_simple_correlator.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + + static const int THRESHOLD = 3; +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_simple_framer.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_simple_framer.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_simple_framer.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_simple_framer.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -29,6 +29,8 @@ + #include + #include + #include ++#include ++#include + + + gr_simple_framer_sptr +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_skiphead.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_skiphead.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_skiphead.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_skiphead.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -25,6 +25,7 @@ + #endif + #include + #include ++#include + + gr_skiphead::gr_skiphead (size_t itemsize, size_t nitems_to_skip) + : gr_block ("skiphead", +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_mux.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_mux.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_mux.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_mux.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + #define VERBOSE 0 + +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_streams_to_stream.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_streams_to_stream.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_streams_to_stream.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_streams_to_stream.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_streams_to_stream_sptr + gr_make_streams_to_stream (size_t item_size, size_t nstreams) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_streams_to_vector.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_streams_to_vector.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_streams_to_vector.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_streams_to_vector.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_streams_to_vector_sptr + gr_make_streams_to_vector (size_t item_size, size_t nstreams) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_to_streams.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_to_streams.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_to_streams.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_to_streams.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_stream_to_streams_sptr + gr_make_stream_to_streams (size_t item_size, size_t nstreams) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_to_vector.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_to_vector.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_to_vector.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_to_vector.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_stream_to_vector_sptr + gr_make_stream_to_vector (size_t item_size, size_t nitems_per_block) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_test.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_test.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_test.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_test.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + gr_test_sptr gr_make_test (const std::string &name, + int min_inputs, int max_inputs, unsigned int sizeof_input_item, +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_throttle.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_throttle.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_throttle.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_throttle.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #ifdef HAVE_TIME_H + #include + #endif +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_vector_to_stream.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_vector_to_stream.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_vector_to_stream.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_vector_to_stream.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_vector_to_stream_sptr + gr_make_vector_to_stream (size_t item_size, size_t nitems_per_block) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_vector_to_streams.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_vector_to_streams.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_vector_to_streams.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_vector_to_streams.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_vector_to_streams_sptr + gr_make_vector_to_streams (size_t item_size, size_t nstreams) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/malloc16.c gnuradio-3.1.2/gnuradio-core/src/lib/general/malloc16.c +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/malloc16.c 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/general/malloc16.c 2008-04-11 19:57:23.000000000 +0200 +@@ -7,6 +7,7 @@ + + #include "malloc16.h" + #include ++#include + + void *malloc16Align(int size){ + void *p; +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + gr_chunks_to_symbols_bc_sptr + gr_make_chunks_to_symbols_bc (const std::vector &symbol_table, const int D) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + gr_chunks_to_symbols_bf_sptr + gr_make_chunks_to_symbols_bf (const std::vector &symbol_table, const int D) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + gr_chunks_to_symbols_ic_sptr + gr_make_chunks_to_symbols_ic (const std::vector &symbol_table, const int D) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + gr_chunks_to_symbols_if_sptr + gr_make_chunks_to_symbols_if (const std::vector &symbol_table, const int D) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + gr_chunks_to_symbols_sc_sptr + gr_make_chunks_to_symbols_sc (const std::vector &symbol_table, const int D) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + gr_chunks_to_symbols_sf_sptr + gr_make_chunks_to_symbols_sf (const std::vector &symbol_table, const int D) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + @SPTR_NAME@ + gr_make_@BASE_NAME@ (const std::vector<@O_TYPE@> &symbol_table, const int D) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_cc.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_cc.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_cc.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_cc.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + + gr_mute_cc_sptr +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ff.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ff.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ff.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ff.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + + gr_mute_ff_sptr +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ii.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ii.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ii.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ii.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + + gr_mute_ii_sptr +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ss.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ss.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ss.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ss.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + + gr_mute_ss_sptr +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t 2008-04-11 19:57:23.000000000 +0200 +@@ -29,6 +29,7 @@ + #include <@NAME@.h> + #include + #include ++#include + + + @SPTR_NAME@ +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + gr_peak_detector_fb_sptr + gr_make_peak_detector_fb (float threshold_factor_rise, +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + gr_peak_detector_ib_sptr + gr_make_peak_detector_ib (float threshold_factor_rise, +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + gr_peak_detector_sb_sptr + gr_make_peak_detector_sb (float threshold_factor_rise, +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t 2008-04-11 19:57:23.000000000 +0200 +@@ -28,6 +28,7 @@ + + #include <@NAME@.h> + #include ++#include + + @SPTR_NAME@ + gr_make_@BASE_NAME@ (float threshold_factor_rise, +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + + gr_file_descriptor_sink::gr_file_descriptor_sink (size_t itemsize, int fd) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -32,6 +32,8 @@ + #include + #include + #include ++#include ++#include + + + gr_file_descriptor_source::gr_file_descriptor_source (size_t itemsize, +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_sink_base.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_sink_base.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_sink_base.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_sink_base.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + // win32 (mingw/msvc) specific + #ifdef HAVE_IO_H +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_source.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_source.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_source.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_source.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + // win32 (mingw/msvc) specific + #ifdef HAVE_IO_H +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gri_logger.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gri_logger.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gri_logger.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gri_logger.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + + /* +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_message_sink.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_message_sink.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_message_sink.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_message_sink.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + + // public constructor that returns a shared_ptr +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_message_source.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_message_source.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_message_source.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_message_source.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + + // public constructor that returns a shared_ptr +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_udp_sink.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_udp_sink.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_udp_sink.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_udp_sink.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -28,6 +28,7 @@ + #include + #if defined(HAVE_SOCKET) + #include ++#include + typedef void* optval_t; + #else + #define SHUT_RDWR 2 +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_udp_source.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_udp_source.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_udp_source.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_udp_source.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -27,6 +27,8 @@ + #include + #include + #include ++#include ++#include + #if defined(HAVE_SOCKET) + #include + typedef void* optval_t; +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/missing/getopt.c gnuradio-3.1.2/gnuradio-core/src/lib/missing/getopt.c +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/missing/getopt.c 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/missing/getopt.c 2008-04-11 19:57:23.000000000 +0200 +@@ -52,6 +52,7 @@ + #endif + + #include ++#include + + /* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C +@@ -179,6 +180,7 @@ + On some systems, it contains special magic macros that don't work + in GCC. */ + #include ++#include + #define my_index strchr + #define my_bcopy(src, dst, n) memcpy ((dst), (src), (n)) + #else +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/decode_rs.c gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/decode_rs.c +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/decode_rs.c 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/decode_rs.c 2008-04-11 19:57:23.000000000 +0200 +@@ -8,6 +8,7 @@ + #endif + + #include ++#include + + #define NULL ((void *)0) + #define min(a,b) ((a) < (b) ? (a) : (b)) +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/encode_rs.c gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/encode_rs.c +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/encode_rs.c 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/encode_rs.c 2008-04-11 19:57:23.000000000 +0200 +@@ -3,6 +3,7 @@ + * May be used under the terms of the GNU General Public License (GPL) + */ + #include ++#include + + #ifdef FIXED + #include "fixed.h" +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/exercise.c gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/exercise.c +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/exercise.c 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/exercise.c 2008-04-11 19:57:23.000000000 +0200 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #ifdef FIXED + #include "fixed.h" +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_dispatcher.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_dispatcher.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_dispatcher.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_dispatcher.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_SELECT + # ifdef HAVE_SYS_SELECT_H +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_error_handler.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_error_handler.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_error_handler.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_error_handler.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_IO_H + #include +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + + gr_local_sighandler::gr_local_sighandler (int signum, +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_message.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_message.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_message.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_message.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -25,6 +25,8 @@ + #endif + #include + #include ++#include ++#include + + static long s_ncurrently_allocated = 0; + +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_preferences.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_preferences.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_preferences.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_preferences.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + + #ifdef MKDIR_TAKES_ONE_ARG +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_realtime.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_realtime.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_realtime.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_realtime.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,7 @@ + #endif + + #include ++#include + #include + #include + +@@ -61,6 +62,7 @@ + #elif defined(HAVE_PTHREAD_SETSCHEDPARAM) + + #include ++#include + + gr_rt_status_t + gr_enable_realtime_scheduling() +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + #ifdef HAVE_SIGNAL_H + #include +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + // all the factories we know about +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -41,7 +41,6 @@ + #include + #include + +- + gr_vmcircbuf_mmap_tmpfile::gr_vmcircbuf_mmap_tmpfile (int size) + : gr_vmcircbuf (size) + { +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/tests/benchmark_nco.cc gnuradio-3.1.2/gnuradio-core/src/tests/benchmark_nco.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/tests/benchmark_nco.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/tests/benchmark_nco.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #define ITERATIONS 20000000 + #define BLOCK_SIZE (10 * 1000) // fits in cache +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/tests/benchmark_vco.cc gnuradio-3.1.2/gnuradio-core/src/tests/benchmark_vco.cc +--- gnuradio-3.1.2-upstream/gnuradio-core/src/tests/benchmark_vco.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/tests/benchmark_vco.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #define ITERATIONS 5000000 + #define BLOCK_SIZE (10 * 1000) // fits in cache +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsc_bit_timing_loop.cc gnuradio-3.1.2/gr-atsc/src/lib/atsc_bit_timing_loop.cc +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + // Input rate changed from 20MHz to 19.2 to support usrp at 3 * 6.4MHz + float input_rate = 19.2e6; +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_fs_checker_naive.cc gnuradio-3.1.2/gr-atsc/src/lib/atsci_fs_checker_naive.cc +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_fs_checker_naive.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_fs_checker_naive.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + using std::cerr; + using std::endl; +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_fs_correlator_naive.cc gnuradio-3.1.2/gr-atsc/src/lib/atsci_fs_correlator_naive.cc +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_fs_correlator_naive.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_fs_correlator_naive.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + using std::cerr; + using std::endl; +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_reed_solomon.cc gnuradio-3.1.2/gr-atsc/src/lib/atsci_reed_solomon.cc +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_reed_solomon.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_reed_solomon.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -22,6 +22,8 @@ + + #include + #include ++#include ++#include + + extern "C" { + #include "rs.h" +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_sliding_correlator.h gnuradio-3.1.2/gr-atsc/src/lib/atsci_sliding_correlator.h +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_sliding_correlator.h 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_sliding_correlator.h 2008-04-11 19:57:23.000000000 +0200 +@@ -19,11 +19,12 @@ + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ ++#include ++#include ++ + #ifndef _ATSC_SLIDING_CORRELATOR_H_ + #define _ATSC_SLIDING_CORRELATOR_H_ + +-#include +- + extern const unsigned char atsc_pn511[511]; + extern const unsigned char atsc_pn63[63]; + +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_sssr.cc gnuradio-3.1.2/gr-atsc/src/lib/atsci_sssr.cc +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_sssr.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_sssr.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + /* + * ---------------------------------------------------------------- +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_trellis_encoder.cc gnuradio-3.1.2/gr-atsc/src/lib/atsci_trellis_encoder.cc +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_trellis_encoder.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_trellis_encoder.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -23,6 +23,8 @@ + #include + #include + #include ++#include ++#include + + static const int DIBITS_PER_BYTE = 4; + +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_viterbi_decoder.cc gnuradio-3.1.2/gr-atsc/src/lib/atsci_viterbi_decoder.cc +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_viterbi_decoder.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_viterbi_decoder.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -25,6 +25,8 @@ + #include + #include + #include "atsci_viterbi_mux.cc" ++#include ++#include + + + /* How many separate Trellis encoders / Viterbi decoders run in parallel */ +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsc_types.h gnuradio-3.1.2/gr-atsc/src/lib/atsc_types.h +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsc_types.h 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/atsc_types.h 2008-04-11 19:57:23.000000000 +0200 +@@ -24,6 +24,7 @@ + #define _ATSC_TYPES_H_ + + #include ++#include + #include + #include + +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/interleaver_fifo.h gnuradio-3.1.2/gr-atsc/src/lib/interleaver_fifo.h +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/interleaver_fifo.h 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/interleaver_fifo.h 2008-04-11 19:57:23.000000000 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + /*! + * \brief template class for interleaver fifo +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_data_interleaver.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_data_interleaver.cc +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -22,6 +22,7 @@ + + #include + #include ++#include + + + /*! +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + using std::cerr; + using std::endl; +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -29,6 +29,8 @@ + #include + #include + #include ++#include ++#include + + + static const int NTRIALS = 50; +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_randomizer.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_randomizer.cc +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_randomizer.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_randomizer.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -23,6 +23,7 @@ + #include + + #include ++#include + + static unsigned int expected_initial_states[] = { + 0x018f, +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_reed_solomon.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_reed_solomon.cc +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_reed_solomon.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_reed_solomon.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + + static const int NROOTS = 20; +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_single_viterbi.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_single_viterbi.cc +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_single_viterbi.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_single_viterbi.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,8 @@ + #include + #include + #include ++#include ++#include + + + static const int NTRIALS = 50; +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #define NELEM(x) (sizeof (x) / sizeof (x[0])) + +diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc +--- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #define NELEM(x) (sizeof (x) / sizeof (x[0])) + +diff -Naur gnuradio-3.1.2-upstream/gr-audio-portaudio/src/audio_portaudio_sink.cc gnuradio-3.1.2/gr-audio-portaudio/src/audio_portaudio_sink.cc +--- gnuradio-3.1.2-upstream/gr-audio-portaudio/src/audio_portaudio_sink.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gr-audio-portaudio/src/audio_portaudio_sink.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -33,6 +33,8 @@ + #include + #include + #include ++#include ++#include + + #define LOGGING 0 // define to 0 or 1 + +diff -Naur gnuradio-3.1.2-upstream/gr-audio-portaudio/src/audio_portaudio_source.cc gnuradio-3.1.2/gr-audio-portaudio/src/audio_portaudio_source.cc +--- gnuradio-3.1.2-upstream/gr-audio-portaudio/src/audio_portaudio_source.cc 2008-04-11 19:56:47.000000000 +0200 ++++ gnuradio-3.1.2/gr-audio-portaudio/src/audio_portaudio_source.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -33,6 +33,8 @@ + #include + #include + #include ++#include ++#include + + #define LOGGING 0 // define to 0 or 1 + +diff -Naur gnuradio-3.1.2-upstream/gr-gsm-fr-vocoder/src/lib/gsm/code.c gnuradio-3.1.2/gr-gsm-fr-vocoder/src/lib/gsm/code.c +--- gnuradio-3.1.2-upstream/gr-gsm-fr-vocoder/src/lib/gsm/code.c 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-gsm-fr-vocoder/src/lib/gsm/code.c 2008-04-11 19:57:23.000000000 +0200 +@@ -19,6 +19,7 @@ + #include "private.h" + #include "gsm.h" + #include "proto.h" ++#include + + /* + * 4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER +diff -Naur gnuradio-3.1.2-upstream/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c gnuradio-3.1.2/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c +--- gnuradio-3.1.2-upstream/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,7 @@ + #include "gsm.h" + #include "private.h" + #include "proto.h" ++#include + + gsm gsm_create P0() + { +diff -Naur gnuradio-3.1.2-upstream/gr-trellis/src/lib/fsm.cc gnuradio-3.1.2/gr-trellis/src/lib/fsm.cc +--- gnuradio-3.1.2-upstream/gr-trellis/src/lib/fsm.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-trellis/src/lib/fsm.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include "base.h" + #include "fsm.h" + +diff -Naur gnuradio-3.1.2-upstream/gr-trellis/src/lib/fsm.h gnuradio-3.1.2/gr-trellis/src/lib/fsm.h +--- gnuradio-3.1.2-upstream/gr-trellis/src/lib/fsm.h 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-trellis/src/lib/fsm.h 2008-04-11 19:57:23.000000000 +0200 +@@ -24,6 +24,7 @@ + #define INCLUDED_TRELLIS_FSM_H + + #include ++#include + + /*! + * \brief FSM class +diff -Naur gnuradio-3.1.2-upstream/gr-trellis/src/lib/trellis_permutation.cc gnuradio-3.1.2/gr-trellis/src/lib/trellis_permutation.cc +--- gnuradio-3.1.2-upstream/gr-trellis/src/lib/trellis_permutation.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-trellis/src/lib/trellis_permutation.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + trellis_permutation_sptr + trellis_make_permutation (int K, const std::vector &TABLE, int SYMS_PER_BLOCK, size_t NBYTES_INOUT) +diff -Naur gnuradio-3.1.2-upstream/gr-video-sdl/src/video_sdl_sink_s.cc gnuradio-3.1.2/gr-video-sdl/src/video_sdl_sink_s.cc +--- gnuradio-3.1.2-upstream/gr-video-sdl/src/video_sdl_sink_s.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-video-sdl/src/video_sdl_sink_s.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + + +diff -Naur gnuradio-3.1.2-upstream/gr-video-sdl/src/video_sdl_sink_uc.cc gnuradio-3.1.2/gr-video-sdl/src/video_sdl_sink_uc.cc +--- gnuradio-3.1.2-upstream/gr-video-sdl/src/video_sdl_sink_uc.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/gr-video-sdl/src/video_sdl_sink_uc.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -35,6 +35,8 @@ + #include + #include + #include ++#include ++#include + + + +diff -Naur gnuradio-3.1.2-upstream/usrp/host/apps/test_usrp_standard_rx.cc gnuradio-3.1.2/usrp/host/apps/test_usrp_standard_rx.cc +--- gnuradio-3.1.2-upstream/usrp/host/apps/test_usrp_standard_rx.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/usrp/host/apps/test_usrp_standard_rx.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include /* needed for usb functions */ + #include +diff -Naur gnuradio-3.1.2-upstream/usrp/host/apps/test_usrp_standard_tx.cc gnuradio-3.1.2/usrp/host/apps/test_usrp_standard_tx.cc +--- gnuradio-3.1.2-upstream/usrp/host/apps/test_usrp_standard_tx.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/usrp/host/apps/test_usrp_standard_tx.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include /* needed for usb functions */ + #include +diff -Naur gnuradio-3.1.2-upstream/usrp/host/apps/usrper.cc gnuradio-3.1.2/usrp/host/apps/usrper.cc +--- gnuradio-3.1.2-upstream/usrp/host/apps/usrper.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/usrp/host/apps/usrper.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -30,6 +30,7 @@ + + #include "usrp_prims.h" + #include "usrp_spi_defs.h" ++#include + + char *prog_name; + +diff -Naur gnuradio-3.1.2-upstream/usrp/host/lib/legacy/fusb_linux.cc gnuradio-3.1.2/usrp/host/lib/legacy/fusb_linux.cc +--- gnuradio-3.1.2-upstream/usrp/host/lib/legacy/fusb_linux.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/usrp/host/lib/legacy/fusb_linux.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include ++#include + + #define MINIMIZE_TX_BUFFERING 1 // must be defined to 0 or 1 + +diff -Naur gnuradio-3.1.2-upstream/usrp/host/lib/legacy/fusb_win32.cc gnuradio-3.1.2/usrp/host/lib/legacy/fusb_win32.cc +--- gnuradio-3.1.2-upstream/usrp/host/lib/legacy/fusb_win32.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/usrp/host/lib/legacy/fusb_win32.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + static const int MAX_BLOCK_SIZE = fusb_sysconfig::max_block_size(); + static const int DEFAULT_BLOCK_SIZE = MAX_BLOCK_SIZE; +diff -Naur gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_basic.cc gnuradio-3.1.2/usrp/host/lib/legacy/usrp_basic.cc +--- gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_basic.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/usrp/host/lib/legacy/usrp_basic.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + using namespace ad9862; + +diff -Naur gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_local_sighandler.cc gnuradio-3.1.2/usrp/host/lib/legacy/usrp_local_sighandler.cc +--- gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_local_sighandler.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/usrp/host/lib/legacy/usrp_local_sighandler.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + usrp_local_sighandler::usrp_local_sighandler (int signum, + void (*new_handler)(int)) +diff -Naur gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_prims.cc gnuradio-3.1.2/usrp/host/lib/legacy/usrp_prims.cc +--- gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_prims.cc 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/usrp/host/lib/legacy/usrp_prims.cc 2008-04-11 19:57:23.000000000 +0200 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + #include + #include // FIXME should check with autoconf (nanosleep) + #include +@@ -62,6 +63,7 @@ + static char *default_fpga_filename = "std_2rxhb_2tx.rbf"; + + #include "std_paths.h" ++#include + + static char * + find_file (const char *filename, int hw_rev) +diff -Naur gnuradio-3.1.2-upstream/usrp/host/misc/getopt.c gnuradio-3.1.2/usrp/host/misc/getopt.c +--- gnuradio-3.1.2-upstream/usrp/host/misc/getopt.c 2008-04-11 19:56:46.000000000 +0200 ++++ gnuradio-3.1.2/usrp/host/misc/getopt.c 2008-04-11 19:57:23.000000000 +0200 +@@ -52,6 +52,7 @@ + #endif + + #include ++#include + + /* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C diff --git a/gnuradio-3.1.2-libtool.bug.patch b/gnuradio-3.1.2-libtool.bug.patch new file mode 100644 index 0000000..a31bd0e --- /dev/null +++ b/gnuradio-3.1.2-libtool.bug.patch @@ -0,0 +1,14 @@ +Marek Mahut : This patch fixes the build when libtool fails to detect that lib + +diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/tests/Makefile.am gnuradio-3.1.2/gnuradio-core/src/tests/Makefile.am +--- gnuradio-3.1.2-upstream/gnuradio-core/src/tests/Makefile.am 2008-04-12 14:00:36.000000000 +0200 ++++ gnuradio-3.1.2/gnuradio-core/src/tests/Makefile.am 2008-04-12 19:14:37.000000000 +0200 +@@ -50,7 +50,7 @@ + test_vmcircbuf + + +-LIBGNURADIO = $(GNURADIO_CORE_LA) ++LIBGNURADIO = $(GNURADIO_CORE_LA) $(top_builddir)/omnithread/libgromnithread.la + LIBGNURADIOQA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core-qa.la $(LIBGNURADIO) + + benchmark_dotprod_SOURCES = benchmark_dotprod.cc diff --git a/gnuradio.spec b/gnuradio.spec index c592dd5..df94d2b 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -1,20 +1,17 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: gnuradio -Version: 3.1.1 -Release: 4%{?dist} +Version: 3.1.2 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering License: GPLv3 URL: http://www.gnuradio.org Source0: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%{version}.tar.gz -# missing files from official tarball, upstream knows about this problem. -# $ svn export http://gnuradio.org/svn/gnuradio/branches/releases/3.1 gnuradio -# $ tar -cfz gnuradio-3.1.1-templates.tar gnuradio-3.1.1/gnuradio-core/src/lib/gengen/*.t -Source1: gnuradio-3.1.1-templates.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: gnuradio-3.1.1-gcc34.patch +Patch0: gnuradio-3.1.2-gcc34.patch +Patch1: gnuradio-3.1.2-libtool.bug.patch BuildRequires: sdcc BuildRequires: fftw-devel @@ -29,6 +26,14 @@ BuildRequires: doxygen BuildRequires: libusb-devel BuildRequires: alsa-lib-devel BuildRequires: SDL-devel +BuildRequires: guile-devel +BuildRequires: portaudio-devel +BuildRequires: libtool +Requires: numpy +Requires: wxPython +Requires: scipy +Requires: portaudio + %description GNU Radio is a collection of software that when combined with minimal @@ -79,12 +84,13 @@ GNU Radio USRP headers %prep %setup -q -%setup -q -b 1 %patch0 -p1 -b .gcc43 +%patch1 -p1 -b .libtool %build export PATH=%{_libexecdir}/sdcc:$PATH -%configure --enable-doxygen --enable-latex-doc --disable-gr-audio-oss +autoreconf -i +%configure --enable-doxygen --enable-latex-doc --disable-gr-audio-oss --enable-usrp --enable-gnuradio-core --enable-gnuradio-examples sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} @@ -111,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT %exclude %{python_sitelib}/gnuradio/_usrp1.so %exclude %{python_sitelib}/gnuradio/usrp* %{_sysconfdir}/gnuradio +%{_bindir}/gr_* +%exclude %{_bindir}/gr_plot*.pyc +%exclude %{_bindir}/gr_plot*.pyo %{_libdir}/libgnuradio-core.so.* %{_libdir}/libgnuradio-core-qa.so.* %{_libdir}/libgr_audio_alsa.so.* @@ -164,6 +173,7 @@ rm -rf $RPM_BUILD_ROOT %files -n usrp %defattr(-,root,root,-) %{_bindir}/usrp* +%{_bindir}/gpio* %{_datadir}/usrp %{_libdir}/libusrp.so.* %{python_sitelib}/usrpm @@ -179,6 +189,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libusrp.so %changelog +* Fri Apr 4 2008 Marek Mahut - 3.1.2-1 +- Upstream release +- Modification of gnuradio-3.1.2-gcc34.patch to the new release + * Thu Mar 27 2008 Marek Mahut - 3.1.1-4 - Moving libusrp to gnuradio package diff --git a/sources b/sources index f095c10..c45c965 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -ee06fe3d989caec3cd903ce48f4f311a gnuradio-3.1.1-templates.tar.gz -c5df6b26928ab6da678fbc6f993ce263 gnuradio-3.1.1.tar.gz +0208be69c598b37c8a0c4f59437e55d9 gnuradio-3.1.2.tar.gz From ec057133a3a32729ce96f7edac8c8b084637faab Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Tue, 10 Jun 2008 15:31:42 +0000 Subject: [PATCH 006/313] 192 * Tue Jun 10 2008 Marek Mahut - 3.1.2-2 193 - Moving usrp header files to usrp-devel (reported by Philip Balister) --- gnuradio.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index df94d2b..e8a34b3 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -132,7 +132,6 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %{_includedir}/gnuradio -%{_includedir}/usrp_* %{_libdir}/libgnuradio-core.so %{_libdir}/libgnuradio-core-qa.so %{_libdir}/libgr_audio_alsa.so @@ -187,8 +186,12 @@ rm -rf $RPM_BUILD_ROOT %files -n usrp-devel %defattr(-,root,root,-) %{_libdir}/libusrp.so +%{_includedir}/usrp_* %changelog +* Tue Jun 10 2008 Marek Mahut - 3.1.2-2 +- Moving usrp header files to usrp-devel (reported by Philip Balister) + * Fri Apr 4 2008 Marek Mahut - 3.1.2-1 - Upstream release - Modification of gnuradio-3.1.2-gcc34.patch to the new release From 5c2121fc9d37fc14ff0030575af5460ef17f7fcd Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Sat, 29 Nov 2008 16:37:09 +0000 Subject: [PATCH 007/313] Rebuild for Python 2.6 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index e8a34b3..7c0c55e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -189,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/usrp_* %changelog +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 3.1.2-3 +- Rebuild for Python 2.6 + * Tue Jun 10 2008 Marek Mahut - 3.1.2-2 - Moving usrp header files to usrp-devel (reported by Philip Balister) From 086c0524b90264dbb69e229c2f92498ac1aa1d1a Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Fri, 19 Dec 2008 23:15:36 +0000 Subject: [PATCH 008/313] > * Fri Dec 19 2008 Marek Mahut - 3.1.3-1 > - Upstream release 3.1.3 > - Comedi support > - RHBZ#473928 Unowned directories --- .cvsignore | 2 +- gnuradio-3.1.3-comedilib0.8.patch | 27 +++++++++++++++++++++++++++ gnuradio-3.1.3-libtool.bug.patch | 14 ++++++++++++++ gnuradio-3.1.3-werror.patch | 24 ++++++++++++++++++++++++ gnuradio.spec | 22 +++++++++++++++------- sources | 2 +- 6 files changed, 82 insertions(+), 9 deletions(-) create mode 100644 gnuradio-3.1.3-comedilib0.8.patch create mode 100644 gnuradio-3.1.3-libtool.bug.patch create mode 100644 gnuradio-3.1.3-werror.patch diff --git a/.cvsignore b/.cvsignore index c173600..8921e6c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnuradio-3.1.2.tar.gz +gnuradio-3.1.3.tar.gz diff --git a/gnuradio-3.1.3-comedilib0.8.patch b/gnuradio-3.1.3-comedilib0.8.patch new file mode 100644 index 0000000..2224e48 --- /dev/null +++ b/gnuradio-3.1.3-comedilib0.8.patch @@ -0,0 +1,27 @@ +Marek Mahut : Comedilib 0.8 API change + + +diff -Naur gnuradio-3.1.3/gr-comedi/src/comedi_sink_s.cc gnuradio-3.1.3-upstream/gr-comedi/src/comedi_sink_s.cc +--- gnuradio-3.1.3/gr-comedi/src/comedi_sink_s.cc 2008-12-19 21:51:25.000000000 +0100 ++++ gnuradio-3.1.3-upstream/gr-comedi/src/comedi_sink_s.cc 2008-12-19 23:08:59.000000000 +0100 +@@ -88,7 +88,7 @@ + comedi_cmd cmd; + int ret; + +- ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,(unsigned int)(1e9/sampling_freq)); ++ ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,cmd.chanlist_len,(unsigned int)(1e9/sampling_freq)); + if(ret<0) + bail ("comedi_get_cmd_generic_timed", comedi_errno()); + +diff -Naur gnuradio-3.1.3/gr-comedi/src/comedi_source_s.cc gnuradio-3.1.3-upstream/gr-comedi/src/comedi_source_s.cc +--- gnuradio-3.1.3/gr-comedi/src/comedi_source_s.cc 2008-12-19 21:51:25.000000000 +0100 ++++ gnuradio-3.1.3-upstream/gr-comedi/src/comedi_source_s.cc 2008-12-19 23:08:31.000000000 +0100 +@@ -85,7 +85,7 @@ + comedi_cmd cmd; + int ret; + +- ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,(unsigned int)(1e9/sampling_freq)); ++ ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,cmd.chanlist_len,(unsigned int)(1e9/sampling_freq)); + if(ret<0) + bail ("comedi_get_cmd_generic_timed", comedi_errno()); + diff --git a/gnuradio-3.1.3-libtool.bug.patch b/gnuradio-3.1.3-libtool.bug.patch new file mode 100644 index 0000000..625e503 --- /dev/null +++ b/gnuradio-3.1.3-libtool.bug.patch @@ -0,0 +1,14 @@ +Marek Mahut : This patch fixes the build when libtool fails to detect that lib + +diff -Naur gnuradio-3.1.3/gnuradio-core/src/tests/Makefile.am gnuradio-3.1.3-upstream/gnuradio-core/src/tests/Makefile.am +--- gnuradio-3.1.3/gnuradio-core/src/tests/Makefile.am 2008-08-01 19:12:00.000000000 +0200 ++++ gnuradio-3.1.3-upstream/gnuradio-core/src/tests/Makefile.am 2008-12-19 21:52:09.000000000 +0100 +@@ -56,7 +56,7 @@ + benchmark_dotprod + + +-LIBGNURADIO = $(GNURADIO_CORE_LA) ++LIBGNURADIO = $(GNURADIO_CORE_LA) $(top_builddir)/omnithread/libgromnithread.la + LIBGNURADIOQA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core-qa.la $(LIBGNURADIO) + + benchmark_dotprod_fff_SOURCES = benchmark_dotprod_fff.cc diff --git a/gnuradio-3.1.3-werror.patch b/gnuradio-3.1.3-werror.patch new file mode 100644 index 0000000..fa129ee --- /dev/null +++ b/gnuradio-3.1.3-werror.patch @@ -0,0 +1,24 @@ +diff -Naur gnuradio-3.1.3/gnuradio-core/src/lib/viterbi/Makefile.am gnuradio-3.1.3-upstream/gnuradio-core/src/lib/viterbi/Makefile.am +--- gnuradio-3.1.3/gnuradio-core/src/lib/viterbi/Makefile.am 2008-06-25 20:57:45.000000000 +0200 ++++ gnuradio-3.1.3-upstream/gnuradio-core/src/lib/viterbi/Makefile.am 2008-12-19 22:24:40.000000000 +0100 +@@ -17,7 +17,7 @@ + # Boston, MA 02110-1301, USA. + # + +-INCLUDES = -Wall -Werror ++INCLUDES = -Wall + LIBS = -lm + + noinst_LTLIBRARIES = libviterbi.la +diff -Naur gnuradio-3.1.3/gnuradio-core/src/lib/viterbi/Makefile.in gnuradio-3.1.3-upstream/gnuradio-core/src/lib/viterbi/Makefile.in +--- gnuradio-3.1.3/gnuradio-core/src/lib/viterbi/Makefile.in 2008-08-24 02:37:34.000000000 +0200 ++++ gnuradio-3.1.3-upstream/gnuradio-core/src/lib/viterbi/Makefile.in 2008-12-19 22:24:54.000000000 +0100 +@@ -484,7 +484,7 @@ + with_SWIGDIRPATH = @with_SWIGDIRPATH@ + with_SWIG_INCLUDES = @with_SWIG_INCLUDES@ + with_dirs = @with_dirs@ +-INCLUDES = -Wall -Werror ++INCLUDES = -Wall + noinst_LTLIBRARIES = libviterbi.la + libviterbi_la_SOURCES = \ + metrics.c \ diff --git a/gnuradio.spec b/gnuradio.spec index 7c0c55e..0a12818 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: gnuradio -Version: 3.1.2 -Release: 3%{?dist} +Version: 3.1.3 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -10,8 +10,9 @@ License: GPLv3 URL: http://www.gnuradio.org Source0: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: gnuradio-3.1.2-gcc34.patch -Patch1: gnuradio-3.1.2-libtool.bug.patch +Patch0: gnuradio-3.1.3-libtool.bug.patch +Patch1: gnuradio-3.1.3-werror.patch +Patch2: gnuradio-3.1.3-comedilib0.8.patch BuildRequires: sdcc BuildRequires: fftw-devel @@ -29,6 +30,7 @@ BuildRequires: SDL-devel BuildRequires: guile-devel BuildRequires: portaudio-devel BuildRequires: libtool +BuildRequires: comedilib-devel Requires: numpy Requires: wxPython Requires: scipy @@ -84,8 +86,9 @@ GNU Radio USRP headers %prep %setup -q -%patch0 -p1 -b .gcc43 -%patch1 -p1 -b .libtool +%patch0 -p1 -b .libtool +%patch1 -p1 -b .werror +%patch2 -p1 -b .comedilib %build export PATH=%{_libexecdir}/sdcc:$PATH @@ -147,7 +150,7 @@ rm -rf $RPM_BUILD_ROOT %files examples %defattr(-,root,root,-) -%{_datadir}/%{name}/examples +%{_datadir}/%{name} %exclude %{_datadir}/%{name}/examples/atsc/*.pyc %exclude %{_datadir}/%{name}/examples/atsc/*.pyo %exclude %{_datadir}/%{name}/examples/audio/*.pyc @@ -189,6 +192,11 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/usrp_* %changelog +* Fri Dec 19 2008 Marek Mahut - 3.1.3-1 +- Upstream release 3.1.3 +- Comedi support +- RHBZ#473928 Unowned directories + * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 3.1.2-3 - Rebuild for Python 2.6 diff --git a/sources b/sources index c45c965..174c15f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0208be69c598b37c8a0c4f59437e55d9 gnuradio-3.1.2.tar.gz +c1eb3de26b67ddc08a61a7c2fc636203 gnuradio-3.1.3.tar.gz From 65f5131157806e23ba3714b00352a0e828a2a440 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Fri, 19 Dec 2008 23:30:23 +0000 Subject: [PATCH 009/313] oh it does --- gnuradio-3.1.3-werror.patch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnuradio-3.1.3-werror.patch b/gnuradio-3.1.3-werror.patch index fa129ee..9ac6925 100644 --- a/gnuradio-3.1.3-werror.patch +++ b/gnuradio-3.1.3-werror.patch @@ -1,3 +1,5 @@ +Marek Mahut : -Werror really sucks + diff -Naur gnuradio-3.1.3/gnuradio-core/src/lib/viterbi/Makefile.am gnuradio-3.1.3-upstream/gnuradio-core/src/lib/viterbi/Makefile.am --- gnuradio-3.1.3/gnuradio-core/src/lib/viterbi/Makefile.am 2008-06-25 20:57:45.000000000 +0200 +++ gnuradio-3.1.3-upstream/gnuradio-core/src/lib/viterbi/Makefile.am 2008-12-19 22:24:40.000000000 +0100 From 23f5d087acedbfa1aa8637fc4a637742043ce47d Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sat, 20 Dec 2008 00:39:18 +0000 Subject: [PATCH 010/313] bumping revision --- gnuradio.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 0a12818..33eae20 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -192,7 +192,7 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/usrp_* %changelog -* Fri Dec 19 2008 Marek Mahut - 3.1.3-1 +* Fri Dec 19 2008 Marek Mahut - 3.1.3-2 - Upstream release 3.1.3 - Comedi support - RHBZ#473928 Unowned directories From 35bb457717f10ef4e42935d1cbbb865ef8db9428 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sat, 3 Jan 2009 14:21:48 +0000 Subject: [PATCH 011/313] adding udev support for usrp --- 10-usrp.rules | 3 +++ gnuradio.spec | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 10-usrp.rules diff --git a/10-usrp.rules b/10-usrp.rules new file mode 100644 index 0000000..554923a --- /dev/null +++ b/10-usrp.rules @@ -0,0 +1,3 @@ +# rule to grant read/write access on USRP to group named usrp. +# to use, install this file in /etc/udev/rules.d as 10-usrp.rules +ACTION=="add", BUS=="usb", SYSFS{idVendor}=="fffe", SYSFS{idProduct}=="0002", GROUP:="usrp", MODE:="0660" diff --git a/gnuradio.spec b/gnuradio.spec index 33eae20..77c7be9 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -10,10 +10,12 @@ License: GPLv3 URL: http://www.gnuradio.org Source0: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source1: 10-usrp.rules Patch0: gnuradio-3.1.3-libtool.bug.patch Patch1: gnuradio-3.1.3-werror.patch Patch2: gnuradio-3.1.3-comedilib0.8.patch +Requires(pre): shadow-utils BuildRequires: sdcc BuildRequires: fftw-devel BuildRequires: cppunit-devel @@ -101,6 +103,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +install -D -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-usrp.rules %clean rm -rf $RPM_BUILD_ROOT @@ -113,6 +116,8 @@ rm -rf $RPM_BUILD_ROOT %post -n usrp -p /sbin/ldconfig %postun -n usrp -p /sbin/ldconfig +%pre -n usrp +getent group usrp >/dev/null || groupadd -r usrp %files %defattr(-,root,root,-) @@ -181,6 +186,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/usrpm %{python_sitelib}/gnuradio/_usrp1.so %{python_sitelib}/gnuradio/usrp* +%config %{_sysconfdir}/udev/rules.d/10-usrp.rules %exclude %{_bindir}/*.pyc %exclude %{_bindir}/*.pyo %exclude %{_libdir}/*.la @@ -192,6 +198,10 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/usrp_* %changelog +* Wed Dec 31 2008 Marek Mahut - 3.1.3-3 +- Adding udev rule for USRP device +- Adding usrp system group + * Fri Dec 19 2008 Marek Mahut - 3.1.3-2 - Upstream release 3.1.3 - Comedi support From 9b97d7c177dac205eae479c8ecf21eed8a1d992a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 00:09:12 +0000 Subject: [PATCH 012/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 77c7be9..c21e5a1 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -198,6 +198,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 3.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Dec 31 2008 Marek Mahut - 3.1.3-3 - Adding udev rule for USRP device - Adding usrp system group From 0d44a94755041b5532366403d1fc78ee2dc203e9 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 5 Mar 2009 06:28:18 +0000 Subject: [PATCH 013/313] - Fix build with GCC 4.4 Not building yet, pending wxPython rebuild --- gnuradio-3.1.3-gcc44.patch | 324 +++++++++++++++++++++++++++++++++++++ gnuradio.spec | 7 +- 2 files changed, 330 insertions(+), 1 deletion(-) create mode 100644 gnuradio-3.1.3-gcc44.patch diff --git a/gnuradio-3.1.3-gcc44.patch b/gnuradio-3.1.3-gcc44.patch new file mode 100644 index 0000000..a32706a --- /dev/null +++ b/gnuradio-3.1.3-gcc44.patch @@ -0,0 +1,324 @@ +Fix build with GCC 4.4 + +Lubomir Rintel + +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2008-05-09 08:35:18.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2009-03-04 20:48:25.000000000 +0100 +@@ -39,6 +39,7 @@ + + #include + #include ++#include + + gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector &taps) + { +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2008-05-09 08:35:16.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2009-03-04 20:49:07.000000000 +0100 +@@ -34,6 +34,7 @@ + + #include + #include ++#include + + gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector &taps) + { +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2008-05-09 08:35:40.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2009-03-04 20:49:45.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + //define ALIGN_ADVANCED_IMPLEMENTATION to have an alternative implementation of the align algoritm which exactly follows the align_interval spec. + //It is more resource intensive, less tested and probably not needed +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc 2008-03-05 22:13:04.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc 2009-03-04 21:01:08.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + // Public constructor + +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc 2008-03-05 22:13:04.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc 2009-03-04 20:55:42.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + ++#include + #include + using std::cout; + using std::endl; +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc 2008-03-05 22:13:04.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc 2009-03-04 20:56:30.000000000 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + + #define VERBOSE 0 +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc 2008-03-05 22:13:04.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc 2009-03-04 20:57:47.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include + +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc 2008-06-25 20:57:48.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc 2009-03-04 21:00:57.000000000 +0100 +@@ -24,6 +24,7 @@ + + #include + #include ++#include + + gr_decode_ccsds_27_fb_sptr + gr_make_decode_ccsds_27_fb() +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dpll_bb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dpll_bb.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dpll_bb.cc 2008-03-05 22:13:04.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dpll_bb.cc 2009-03-04 20:58:56.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_dpll_bb_sptr + gr_make_dpll_bb (float period, float gain) +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_fft_vfc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_fft_vfc.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2008-05-09 08:35:29.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2009-03-04 22:35:36.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + + +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc 2008-03-05 22:13:04.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc 2009-03-04 21:00:40.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_simple_correlator.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_simple_correlator.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2008-05-09 08:35:37.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2009-03-04 21:00:35.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_stream_mux.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_stream_mux.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_stream_mux.cc 2008-05-09 08:35:36.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_stream_mux.cc 2009-03-04 21:01:02.000000000 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #define VERBOSE 0 + +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/io/gr_wavfile_sink.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/io/gr_wavfile_sink.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/io/gr_wavfile_sink.cc 2008-03-05 22:12:53.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/io/gr_wavfile_sink.cc 2009-03-04 22:41:30.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + +diff -urp gnuradio-3.1.3/gr-atsc/src/lib/atsc_bit_timing_loop.cc gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_bit_timing_loop.cc +--- gnuradio-3.1.3/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2008-05-09 08:36:02.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2009-03-04 22:41:18.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + // Input rate changed from 20MHz to 19.2 to support usrp at 3 * 6.4MHz + float input_rate = 19.2e6; +diff -urp gnuradio-3.1.3/gr-atsc/src/lib/atsc_fpll.cc gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_fpll.cc +--- gnuradio-3.1.3/gr-atsc/src/lib/atsc_fpll.cc 2008-03-05 22:13:10.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_fpll.cc 2009-03-04 21:00:28.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include "fpll_btloop_coupling.h" + + +diff -urp gnuradio-3.1.3/gr-atsc/src/lib/qa_atsci_data_interleaver.cc gnuradio-3.1.3.gcc44/gr-atsc/src/lib/qa_atsci_data_interleaver.cc +--- gnuradio-3.1.3/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2008-05-09 08:35:59.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2009-03-04 22:41:12.000000000 +0100 +@@ -23,7 +23,7 @@ + #include + #include + #include +- ++#include + + /*! + * write an easy to identify pattern into the packet +diff -urp gnuradio-3.1.3/gr-audio-alsa/src/gri_alsa.cc gnuradio-3.1.3.gcc44/gr-audio-alsa/src/gri_alsa.cc +--- gnuradio-3.1.3/gr-audio-alsa/src/gri_alsa.cc 2008-03-05 22:12:16.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-audio-alsa/src/gri_alsa.cc 2009-03-04 22:41:36.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + static snd_pcm_access_t access_types[] = { + SND_PCM_ACCESS_MMAP_INTERLEAVED, +diff -urp gnuradio-3.1.3/gr-audio-osx/src/audio_osx_sink.cc gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_sink.cc +--- gnuradio-3.1.3/gr-audio-osx/src/audio_osx_sink.cc 2008-03-05 22:12:12.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_sink.cc 2009-03-04 22:41:26.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + + #define _OSX_AU_DEBUG_ 0 +diff -urp gnuradio-3.1.3/gr-audio-osx/src/audio_osx_source.cc gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_source.cc +--- gnuradio-3.1.3/gr-audio-osx/src/audio_osx_source.cc 2008-03-05 22:12:12.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_source.cc 2009-03-04 22:41:22.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #define _OSX_AU_DEBUG_ 0 + #define _OSX_DO_LISTENERS_ 0 +diff -urp gnuradio-3.1.3/gr-audio-portaudio/src/gri_portaudio.cc gnuradio-3.1.3.gcc44/gr-audio-portaudio/src/gri_portaudio.cc +--- gnuradio-3.1.3/gr-audio-portaudio/src/gri_portaudio.cc 2008-03-05 22:12:12.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-audio-portaudio/src/gri_portaudio.cc 2009-03-04 21:01:15.000000000 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + + PaDeviceIndex +diff -urp gnuradio-3.1.3/gr-pager/src/pager_flex_sync.cc gnuradio-3.1.3.gcc44/gr-pager/src/pager_flex_sync.cc +--- gnuradio-3.1.3/gr-pager/src/pager_flex_sync.cc 2008-03-05 22:12:08.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-pager/src/pager_flex_sync.cc 2009-03-04 22:40:40.000000000 +0100 +@@ -23,6 +23,7 @@ + #include "config.h" + #endif + ++#include + #include + #include + #include +diff -urp gnuradio-3.1.3/gr-usrp/src/usrp1_sink_base.cc gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_sink_base.cc +--- gnuradio-3.1.3/gr-usrp/src/usrp1_sink_base.cc 2008-03-05 22:13:05.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_sink_base.cc 2009-03-04 22:40:50.000000000 +0100 +@@ -24,6 +24,7 @@ + #include "config.h" + #endif + ++#include + #include + #include + #include +diff -urp gnuradio-3.1.3/gr-usrp/src/usrp1_source_base.cc gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_source_base.cc +--- gnuradio-3.1.3/gr-usrp/src/usrp1_source_base.cc 2008-03-05 22:13:05.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_source_base.cc 2009-03-04 22:40:45.000000000 +0100 +@@ -24,6 +24,7 @@ + #include "config.h" + #endif + ++#include + #include + #include + #include +diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/fusb_darwin.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_darwin.cc +--- gnuradio-3.1.3/usrp/host/lib/legacy/fusb_darwin.cc 2008-03-05 22:12:38.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_darwin.cc 2009-03-04 22:41:08.000000000 +0100 +@@ -29,6 +29,7 @@ + #define _USE_OMNI_THREADS_ + #define DO_DEBUG 0 + ++#include + #include + #include "fusb.h" + #include "fusb_darwin.h" +diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/fusb_linux.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_linux.cc +--- gnuradio-3.1.3/usrp/host/lib/legacy/fusb_linux.cc 2008-05-09 08:53:09.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_linux.cc 2009-03-04 22:36:59.000000000 +0100 +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + #include + #include + +diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/fusb_win32.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_win32.cc +--- gnuradio-3.1.3/usrp/host/lib/legacy/fusb_win32.cc 2008-05-09 08:34:46.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_win32.cc 2009-03-04 22:40:59.000000000 +0100 +@@ -24,6 +24,7 @@ + #include "config.h" + #endif + ++#include + #include + #include + #include +diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/usrp_basic.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_basic.cc +--- gnuradio-3.1.3/usrp/host/lib/legacy/usrp_basic.cc 2008-05-09 08:34:47.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_basic.cc 2009-03-04 22:36:12.000000000 +0100 +@@ -31,6 +31,7 @@ + #include "fusb.h" + #include + #include ++#include + #include + #include + #include +diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/usrp_standard.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_standard.cc +--- gnuradio-3.1.3/usrp/host/lib/legacy/usrp_standard.cc 2008-08-01 21:45:09.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_standard.cc 2009-03-04 22:40:54.000000000 +0100 +@@ -22,6 +22,7 @@ + + #include + ++#include + #include "usrp_prims.h" + #include "fpga_regs_common.h" + #include "fpga_regs_standard.h" diff --git a/gnuradio.spec b/gnuradio.spec index c21e5a1..965ab7b 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.1.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -14,6 +14,7 @@ Source1: 10-usrp.rules Patch0: gnuradio-3.1.3-libtool.bug.patch Patch1: gnuradio-3.1.3-werror.patch Patch2: gnuradio-3.1.3-comedilib0.8.patch +Patch3: gnuradio-3.1.3-gcc44.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -91,6 +92,7 @@ GNU Radio USRP headers %patch0 -p1 -b .libtool %patch1 -p1 -b .werror %patch2 -p1 -b .comedilib +%patch3 -p1 -b .gcc44 %build export PATH=%{_libexecdir}/sdcc:$PATH @@ -198,6 +200,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Thu Mar 4 2009 Lubomir Rintel - 3.1.3-5 +- Fix build with GCC 4.4 + * Tue Feb 24 2009 Fedora Release Engineering - 3.1.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From e32eedb8df87e33a4ab2377edd4458e258d55faf Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 00:59:20 +0000 Subject: [PATCH 014/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 965ab7b..45ffb18 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.1.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -200,6 +200,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 3.1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Mar 4 2009 Lubomir Rintel - 3.1.3-5 - Fix build with GCC 4.4 From 5d0fa4e4f38bdce0170d239e74d7d3545aecf695 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Mon, 27 Jul 2009 13:08:50 +0000 Subject: [PATCH 015/313] Upstream release 3.2 --- .cvsignore | 2 +- gnuradio-3.1.2-gcc34.patch | 1288 ----------------- gnuradio-3.1.2-libtool.bug.patch | 14 - gnuradio-3.1.3-comedilib0.8.patch | 27 - gnuradio-3.1.3-gcc44.patch | 324 ----- gnuradio-3.1.3-werror.patch | 26 - gnuradio-3.2-gcc44.patch | 525 +++++++ ...ol.bug.patch => gnuradio-3.2-libtool.patch | 8 +- gnuradio.spec | 72 +- sources | 2 +- 10 files changed, 553 insertions(+), 1735 deletions(-) delete mode 100644 gnuradio-3.1.2-gcc34.patch delete mode 100644 gnuradio-3.1.2-libtool.bug.patch delete mode 100644 gnuradio-3.1.3-comedilib0.8.patch delete mode 100644 gnuradio-3.1.3-gcc44.patch delete mode 100644 gnuradio-3.1.3-werror.patch create mode 100644 gnuradio-3.2-gcc44.patch rename gnuradio-3.1.3-libtool.bug.patch => gnuradio-3.2-libtool.patch (54%) diff --git a/.cvsignore b/.cvsignore index 8921e6c..3b03220 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnuradio-3.1.3.tar.gz +gnuradio-3.2.tar.gz diff --git a/gnuradio-3.1.2-gcc34.patch b/gnuradio-3.1.2-gcc34.patch deleted file mode 100644 index 1b9897b..0000000 --- a/gnuradio-3.1.2-gcc34.patch +++ /dev/null @@ -1,1288 +0,0 @@ -Marek Mahut : Patch to fix build under gcc 3.4 - -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc gnuradio-3.1.2/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -38,6 +38,7 @@ - #include - - #include -+#include - - gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector &taps) - { -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc gnuradio-3.1.2/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -33,6 +33,7 @@ - #include - - #include -+#include - - gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector &taps) - { -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - - using std::vector; - -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - - using std::vector; - -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - - using std::vector; - -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_fff.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - using std::vector; - -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - - using std::vector; - -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - //define ALIGN_ADVANCED_IMPLEMENTATION to have an alternative implementation of the align algoritm which exactly follows the align_interval spec. - //It is more resource intensive, less tested and probably not needed -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_bin_statistics_f_sptr - gr_make_bin_statistics_f(unsigned int vlen, -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_circular_file.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_circular_file.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_circular_file.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_circular_file.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -39,6 +39,8 @@ - #include - - #include -+#include -+#include - - static const int HEADER_SIZE = 4096; - static const int HEADER_MAGIC = 0xEB021026; -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_delay.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_delay.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_delay.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_delay.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_delay_sptr - gr_make_delay (size_t itemsize, int delay) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - static const int PAD_VAL = 0xAA; - -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fft_vcc.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fft_vcc.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fft_vcc.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fft_vcc.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - gr_fft_vcc_sptr - gr_make_fft_vcc (int fft_size, bool forward,const std::vector window, bool shift) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fft_vfc.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fft_vfc.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - // FIXME after this is working, change to use native real to complex fft. -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_framer_sink_1.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_framer_sink_1.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_framer_sink_1.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_framer_sink_1.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #define VERBOSE 0 - -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_head.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_head.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_head.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_head.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -25,6 +25,7 @@ - #endif - #include - #include -+#include - - gr_head::gr_head (size_t sizeof_stream_item, int nitems) - : gr_sync_block ("head", -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gri_fft.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gri_fft.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gri_fft.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gri_fft.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - static char * - wisdom_filename () -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_keep_one_in_n_sptr - gr_make_keep_one_in_n (size_t item_size, int n) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_log2_const.h gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_log2_const.h ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_log2_const.h 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_log2_const.h 2008-04-11 19:57:23.000000000 +0200 -@@ -31,16 +31,16 @@ - - template static inline int gr_log2_const() { assert(0); return 0; } - --template<> static inline int gr_log2_const<1>() { return 0; } --template<> static inline int gr_log2_const<2>() { return 1; } --template<> static inline int gr_log2_const<4>() { return 2; } --template<> static inline int gr_log2_const<8>() { return 3; } --template<> static inline int gr_log2_const<16>() { return 4; } --template<> static inline int gr_log2_const<32>() { return 5; } --template<> static inline int gr_log2_const<64>() { return 6; } --template<> static inline int gr_log2_const<128>() { return 7; } --template<> static inline int gr_log2_const<256>() { return 8; } --template<> static inline int gr_log2_const<512>() { return 9; } --template<> static inline int gr_log2_const<1024>(){ return 10; } -+template<> inline int gr_log2_const<1>() { return 0; } -+template<> inline int gr_log2_const<2>() { return 1; } -+template<> inline int gr_log2_const<4>() { return 2; } -+template<> inline int gr_log2_const<8>() { return 3; } -+template<> inline int gr_log2_const<16>() { return 4; } -+template<> inline int gr_log2_const<32>() { return 5; } -+template<> inline int gr_log2_const<64>() { return 6; } -+template<> inline int gr_log2_const<128>() { return 7; } -+template<> inline int gr_log2_const<256>() { return 8; } -+template<> inline int gr_log2_const<512>() { return 9; } -+template<> inline int gr_log2_const<1024>(){ return 10; } - - #endif /* INCLUDED_GR_LOG2_CONST_H */ -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_null_source.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_null_source.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_null_source.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_null_source.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_null_source::gr_null_source (size_t sizeof_stream_item) - : gr_sync_block ("null_source", -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_packet_sink.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_packet_sink.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_packet_sink.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_packet_sink.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #define VERBOSE 0 - -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc 2008-04-11 19:59:13.000000000 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_peak_detector2_fb_sptr - gr_make_peak_detector2_fb (float threshold_factor_rise, -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_simple_correlator.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_simple_correlator.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - - static const int THRESHOLD = 3; -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_simple_framer.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_simple_framer.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_simple_framer.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_simple_framer.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -29,6 +29,8 @@ - #include - #include - #include -+#include -+#include - - - gr_simple_framer_sptr -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_skiphead.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_skiphead.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_skiphead.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_skiphead.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -25,6 +25,7 @@ - #endif - #include - #include -+#include - - gr_skiphead::gr_skiphead (size_t itemsize, size_t nitems_to_skip) - : gr_block ("skiphead", -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_mux.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_mux.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_mux.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_mux.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - #define VERBOSE 0 - -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_streams_to_stream.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_streams_to_stream.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_streams_to_stream.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_streams_to_stream.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_streams_to_stream_sptr - gr_make_streams_to_stream (size_t item_size, size_t nstreams) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_streams_to_vector.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_streams_to_vector.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_streams_to_vector.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_streams_to_vector.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_streams_to_vector_sptr - gr_make_streams_to_vector (size_t item_size, size_t nstreams) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_to_streams.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_to_streams.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_to_streams.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_to_streams.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_stream_to_streams_sptr - gr_make_stream_to_streams (size_t item_size, size_t nstreams) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_to_vector.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_to_vector.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_stream_to_vector.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_stream_to_vector.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_stream_to_vector_sptr - gr_make_stream_to_vector (size_t item_size, size_t nitems_per_block) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_test.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_test.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_test.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_test.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - gr_test_sptr gr_make_test (const std::string &name, - int min_inputs, int max_inputs, unsigned int sizeof_input_item, -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_throttle.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_throttle.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_throttle.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_throttle.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #ifdef HAVE_TIME_H - #include - #endif -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_vector_to_stream.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_vector_to_stream.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_vector_to_stream.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_vector_to_stream.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_vector_to_stream_sptr - gr_make_vector_to_stream (size_t item_size, size_t nitems_per_block) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_vector_to_streams.cc gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_vector_to_streams.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/gr_vector_to_streams.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/gr_vector_to_streams.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_vector_to_streams_sptr - gr_make_vector_to_streams (size_t item_size, size_t nstreams) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/malloc16.c gnuradio-3.1.2/gnuradio-core/src/lib/general/malloc16.c ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/general/malloc16.c 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/general/malloc16.c 2008-04-11 19:57:23.000000000 +0200 -@@ -7,6 +7,7 @@ - - #include "malloc16.h" - #include -+#include - - void *malloc16Align(int size){ - void *p; -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bc.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - gr_chunks_to_symbols_bc_sptr - gr_make_chunks_to_symbols_bc (const std::vector &symbol_table, const int D) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_bf.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - gr_chunks_to_symbols_bf_sptr - gr_make_chunks_to_symbols_bf (const std::vector &symbol_table, const int D) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_ic.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - gr_chunks_to_symbols_ic_sptr - gr_make_chunks_to_symbols_ic (const std::vector &symbol_table, const int D) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_if.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - gr_chunks_to_symbols_if_sptr - gr_make_chunks_to_symbols_if (const std::vector &symbol_table, const int D) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sc.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - gr_chunks_to_symbols_sc_sptr - gr_make_chunks_to_symbols_sc (const std::vector &symbol_table, const int D) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_sf.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - gr_chunks_to_symbols_sf_sptr - gr_make_chunks_to_symbols_sf (const std::vector &symbol_table, const int D) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_chunks_to_symbols_XX.cc.t 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - @SPTR_NAME@ - gr_make_@BASE_NAME@ (const std::vector<@O_TYPE@> &symbol_table, const int D) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_cc.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_cc.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_cc.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_cc.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - gr_mute_cc_sptr -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ff.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ff.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ff.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ff.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - gr_mute_ff_sptr -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ii.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ii.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ii.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ii.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - gr_mute_ii_sptr -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ss.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ss.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_ss.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_ss.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - gr_mute_ss_sptr -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t 2008-04-11 19:57:23.000000000 +0200 -@@ -29,6 +29,7 @@ - #include <@NAME@.h> - #include - #include -+#include - - - @SPTR_NAME@ -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_fb.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -28,6 +28,7 @@ - - #include - #include -+#include - - gr_peak_detector_fb_sptr - gr_make_peak_detector_fb (float threshold_factor_rise, -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_ib.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -28,6 +28,7 @@ - - #include - #include -+#include - - gr_peak_detector_ib_sptr - gr_make_peak_detector_ib (float threshold_factor_rise, -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_sb.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -28,6 +28,7 @@ - - #include - #include -+#include - - gr_peak_detector_sb_sptr - gr_make_peak_detector_sb (float threshold_factor_rise, -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t 2008-04-11 19:57:23.000000000 +0200 -@@ -28,6 +28,7 @@ - - #include <@NAME@.h> - #include -+#include - - @SPTR_NAME@ - gr_make_@BASE_NAME@ (float threshold_factor_rise, -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_descriptor_sink.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - - gr_file_descriptor_sink::gr_file_descriptor_sink (size_t itemsize, int fd) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_descriptor_source.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -32,6 +32,8 @@ - #include - #include - #include -+#include -+#include - - - gr_file_descriptor_source::gr_file_descriptor_source (size_t itemsize, -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_sink_base.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_sink_base.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_sink_base.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_sink_base.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - // win32 (mingw/msvc) specific - #ifdef HAVE_IO_H -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_source.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_source.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_file_source.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_file_source.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - // win32 (mingw/msvc) specific - #ifdef HAVE_IO_H -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gri_logger.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gri_logger.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gri_logger.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gri_logger.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - /* -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_message_sink.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_message_sink.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_message_sink.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_message_sink.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - - // public constructor that returns a shared_ptr -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_message_source.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_message_source.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_message_source.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_message_source.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - - // public constructor that returns a shared_ptr -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_udp_sink.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_udp_sink.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_udp_sink.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_udp_sink.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -28,6 +28,7 @@ - #include - #if defined(HAVE_SOCKET) - #include -+#include - typedef void* optval_t; - #else - #define SHUT_RDWR 2 -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_udp_source.cc gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_udp_source.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/io/gr_udp_source.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/io/gr_udp_source.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -27,6 +27,8 @@ - #include - #include - #include -+#include -+#include - #if defined(HAVE_SOCKET) - #include - typedef void* optval_t; -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/missing/getopt.c gnuradio-3.1.2/gnuradio-core/src/lib/missing/getopt.c ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/missing/getopt.c 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/missing/getopt.c 2008-04-11 19:57:23.000000000 +0200 -@@ -52,6 +52,7 @@ - #endif - - #include -+#include - - /* Comment out all this code if we are using the GNU C Library, and are not - actually compiling the library itself. This code is part of the GNU C -@@ -179,6 +180,7 @@ - On some systems, it contains special magic macros that don't work - in GCC. */ - #include -+#include - #define my_index strchr - #define my_bcopy(src, dst, n) memcpy ((dst), (src), (n)) - #else -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/decode_rs.c gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/decode_rs.c ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/decode_rs.c 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/decode_rs.c 2008-04-11 19:57:23.000000000 +0200 -@@ -8,6 +8,7 @@ - #endif - - #include -+#include - - #define NULL ((void *)0) - #define min(a,b) ((a) < (b) ? (a) : (b)) -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/encode_rs.c gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/encode_rs.c ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/encode_rs.c 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/encode_rs.c 2008-04-11 19:57:23.000000000 +0200 -@@ -3,6 +3,7 @@ - * May be used under the terms of the GNU General Public License (GPL) - */ - #include -+#include - - #ifdef FIXED - #include "fixed.h" -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/exercise.c gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/exercise.c ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/reed-solomon/exercise.c 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/reed-solomon/exercise.c 2008-04-11 19:57:23.000000000 +0200 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #ifdef FIXED - #include "fixed.h" -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_dispatcher.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_dispatcher.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_dispatcher.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_dispatcher.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_SELECT - # ifdef HAVE_SYS_SELECT_H -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_error_handler.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_error_handler.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_error_handler.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_error_handler.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -48,6 +48,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_IO_H - #include -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_local_sighandler.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - - gr_local_sighandler::gr_local_sighandler (int signum, -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_message.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_message.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_message.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_message.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -25,6 +25,8 @@ - #endif - #include - #include -+#include -+#include - - static long s_ncurrently_allocated = 0; - -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_preferences.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_preferences.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_preferences.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_preferences.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - - #ifdef MKDIR_TAKES_ONE_ARG -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_realtime.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_realtime.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_realtime.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_realtime.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,7 @@ - #endif - - #include -+#include - #include - #include - -@@ -61,6 +62,7 @@ - #elif defined(HAVE_PTHREAD_SETSCHEDPARAM) - - #include -+#include - - gr_rt_status_t - gr_enable_realtime_scheduling() -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_scheduler_thread.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - #ifdef HAVE_SIGNAL_H - #include -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - - // all the factories we know about -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/lib/runtime/gr_vmcircbuf_mmap_tmpfile.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -41,7 +41,6 @@ - #include - #include - -- - gr_vmcircbuf_mmap_tmpfile::gr_vmcircbuf_mmap_tmpfile (int size) - : gr_vmcircbuf (size) - { -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/tests/benchmark_nco.cc gnuradio-3.1.2/gnuradio-core/src/tests/benchmark_nco.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/tests/benchmark_nco.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/tests/benchmark_nco.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #define ITERATIONS 20000000 - #define BLOCK_SIZE (10 * 1000) // fits in cache -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/tests/benchmark_vco.cc gnuradio-3.1.2/gnuradio-core/src/tests/benchmark_vco.cc ---- gnuradio-3.1.2-upstream/gnuradio-core/src/tests/benchmark_vco.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/tests/benchmark_vco.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #define ITERATIONS 5000000 - #define BLOCK_SIZE (10 * 1000) // fits in cache -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsc_bit_timing_loop.cc gnuradio-3.1.2/gr-atsc/src/lib/atsc_bit_timing_loop.cc ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - // Input rate changed from 20MHz to 19.2 to support usrp at 3 * 6.4MHz - float input_rate = 19.2e6; -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_fs_checker_naive.cc gnuradio-3.1.2/gr-atsc/src/lib/atsci_fs_checker_naive.cc ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_fs_checker_naive.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_fs_checker_naive.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - using std::cerr; - using std::endl; -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_fs_correlator_naive.cc gnuradio-3.1.2/gr-atsc/src/lib/atsci_fs_correlator_naive.cc ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_fs_correlator_naive.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_fs_correlator_naive.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - using std::cerr; - using std::endl; -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_reed_solomon.cc gnuradio-3.1.2/gr-atsc/src/lib/atsci_reed_solomon.cc ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_reed_solomon.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_reed_solomon.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -22,6 +22,8 @@ - - #include - #include -+#include -+#include - - extern "C" { - #include "rs.h" -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_sliding_correlator.h gnuradio-3.1.2/gr-atsc/src/lib/atsci_sliding_correlator.h ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_sliding_correlator.h 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_sliding_correlator.h 2008-04-11 19:57:23.000000000 +0200 -@@ -19,11 +19,12 @@ - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ -+#include -+#include -+ - #ifndef _ATSC_SLIDING_CORRELATOR_H_ - #define _ATSC_SLIDING_CORRELATOR_H_ - --#include -- - extern const unsigned char atsc_pn511[511]; - extern const unsigned char atsc_pn63[63]; - -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_sssr.cc gnuradio-3.1.2/gr-atsc/src/lib/atsci_sssr.cc ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_sssr.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_sssr.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - /* - * ---------------------------------------------------------------- -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_trellis_encoder.cc gnuradio-3.1.2/gr-atsc/src/lib/atsci_trellis_encoder.cc ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_trellis_encoder.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_trellis_encoder.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -23,6 +23,8 @@ - #include - #include - #include -+#include -+#include - - static const int DIBITS_PER_BYTE = 4; - -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_viterbi_decoder.cc gnuradio-3.1.2/gr-atsc/src/lib/atsci_viterbi_decoder.cc ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsci_viterbi_decoder.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/atsci_viterbi_decoder.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -25,6 +25,8 @@ - #include - #include - #include "atsci_viterbi_mux.cc" -+#include -+#include - - - /* How many separate Trellis encoders / Viterbi decoders run in parallel */ -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsc_types.h gnuradio-3.1.2/gr-atsc/src/lib/atsc_types.h ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/atsc_types.h 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/atsc_types.h 2008-04-11 19:57:23.000000000 +0200 -@@ -24,6 +24,7 @@ - #define _ATSC_TYPES_H_ - - #include -+#include - #include - #include - -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/interleaver_fifo.h gnuradio-3.1.2/gr-atsc/src/lib/interleaver_fifo.h ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/interleaver_fifo.h 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/interleaver_fifo.h 2008-04-11 19:57:23.000000000 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - /*! - * \brief template class for interleaver fifo -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_data_interleaver.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_data_interleaver.cc ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - - - /*! -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - using std::cerr; - using std::endl; -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -29,6 +29,8 @@ - #include - #include - #include -+#include -+#include - - - static const int NTRIALS = 50; -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_randomizer.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_randomizer.cc ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_randomizer.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_randomizer.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -23,6 +23,7 @@ - #include - - #include -+#include - - static unsigned int expected_initial_states[] = { - 0x018f, -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_reed_solomon.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_reed_solomon.cc ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_reed_solomon.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_reed_solomon.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - static const int NROOTS = 20; -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_single_viterbi.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_single_viterbi.cc ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_single_viterbi.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_single_viterbi.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,8 @@ - #include - #include - #include -+#include -+#include - - - static const int NTRIALS = 50; -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #define NELEM(x) (sizeof (x) / sizeof (x[0])) - -diff -Naur gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc ---- gnuradio-3.1.2-upstream/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #define NELEM(x) (sizeof (x) / sizeof (x[0])) - -diff -Naur gnuradio-3.1.2-upstream/gr-audio-portaudio/src/audio_portaudio_sink.cc gnuradio-3.1.2/gr-audio-portaudio/src/audio_portaudio_sink.cc ---- gnuradio-3.1.2-upstream/gr-audio-portaudio/src/audio_portaudio_sink.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gr-audio-portaudio/src/audio_portaudio_sink.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -33,6 +33,8 @@ - #include - #include - #include -+#include -+#include - - #define LOGGING 0 // define to 0 or 1 - -diff -Naur gnuradio-3.1.2-upstream/gr-audio-portaudio/src/audio_portaudio_source.cc gnuradio-3.1.2/gr-audio-portaudio/src/audio_portaudio_source.cc ---- gnuradio-3.1.2-upstream/gr-audio-portaudio/src/audio_portaudio_source.cc 2008-04-11 19:56:47.000000000 +0200 -+++ gnuradio-3.1.2/gr-audio-portaudio/src/audio_portaudio_source.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -33,6 +33,8 @@ - #include - #include - #include -+#include -+#include - - #define LOGGING 0 // define to 0 or 1 - -diff -Naur gnuradio-3.1.2-upstream/gr-gsm-fr-vocoder/src/lib/gsm/code.c gnuradio-3.1.2/gr-gsm-fr-vocoder/src/lib/gsm/code.c ---- gnuradio-3.1.2-upstream/gr-gsm-fr-vocoder/src/lib/gsm/code.c 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-gsm-fr-vocoder/src/lib/gsm/code.c 2008-04-11 19:57:23.000000000 +0200 -@@ -19,6 +19,7 @@ - #include "private.h" - #include "gsm.h" - #include "proto.h" -+#include - - /* - * 4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER -diff -Naur gnuradio-3.1.2-upstream/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c gnuradio-3.1.2/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c ---- gnuradio-3.1.2-upstream/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-gsm-fr-vocoder/src/lib/gsm/gsm_create.c 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,7 @@ - #include "gsm.h" - #include "private.h" - #include "proto.h" -+#include - - gsm gsm_create P0() - { -diff -Naur gnuradio-3.1.2-upstream/gr-trellis/src/lib/fsm.cc gnuradio-3.1.2/gr-trellis/src/lib/fsm.cc ---- gnuradio-3.1.2-upstream/gr-trellis/src/lib/fsm.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-trellis/src/lib/fsm.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include "base.h" - #include "fsm.h" - -diff -Naur gnuradio-3.1.2-upstream/gr-trellis/src/lib/fsm.h gnuradio-3.1.2/gr-trellis/src/lib/fsm.h ---- gnuradio-3.1.2-upstream/gr-trellis/src/lib/fsm.h 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-trellis/src/lib/fsm.h 2008-04-11 19:57:23.000000000 +0200 -@@ -24,6 +24,7 @@ - #define INCLUDED_TRELLIS_FSM_H - - #include -+#include - - /*! - * \brief FSM class -diff -Naur gnuradio-3.1.2-upstream/gr-trellis/src/lib/trellis_permutation.cc gnuradio-3.1.2/gr-trellis/src/lib/trellis_permutation.cc ---- gnuradio-3.1.2-upstream/gr-trellis/src/lib/trellis_permutation.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-trellis/src/lib/trellis_permutation.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - trellis_permutation_sptr - trellis_make_permutation (int K, const std::vector &TABLE, int SYMS_PER_BLOCK, size_t NBYTES_INOUT) -diff -Naur gnuradio-3.1.2-upstream/gr-video-sdl/src/video_sdl_sink_s.cc gnuradio-3.1.2/gr-video-sdl/src/video_sdl_sink_s.cc ---- gnuradio-3.1.2-upstream/gr-video-sdl/src/video_sdl_sink_s.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-video-sdl/src/video_sdl_sink_s.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - - -diff -Naur gnuradio-3.1.2-upstream/gr-video-sdl/src/video_sdl_sink_uc.cc gnuradio-3.1.2/gr-video-sdl/src/video_sdl_sink_uc.cc ---- gnuradio-3.1.2-upstream/gr-video-sdl/src/video_sdl_sink_uc.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/gr-video-sdl/src/video_sdl_sink_uc.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -35,6 +35,8 @@ - #include - #include - #include -+#include -+#include - - - -diff -Naur gnuradio-3.1.2-upstream/usrp/host/apps/test_usrp_standard_rx.cc gnuradio-3.1.2/usrp/host/apps/test_usrp_standard_rx.cc ---- gnuradio-3.1.2-upstream/usrp/host/apps/test_usrp_standard_rx.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/usrp/host/apps/test_usrp_standard_rx.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include /* needed for usb functions */ - #include -diff -Naur gnuradio-3.1.2-upstream/usrp/host/apps/test_usrp_standard_tx.cc gnuradio-3.1.2/usrp/host/apps/test_usrp_standard_tx.cc ---- gnuradio-3.1.2-upstream/usrp/host/apps/test_usrp_standard_tx.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/usrp/host/apps/test_usrp_standard_tx.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include /* needed for usb functions */ - #include -diff -Naur gnuradio-3.1.2-upstream/usrp/host/apps/usrper.cc gnuradio-3.1.2/usrp/host/apps/usrper.cc ---- gnuradio-3.1.2-upstream/usrp/host/apps/usrper.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/usrp/host/apps/usrper.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -30,6 +30,7 @@ - - #include "usrp_prims.h" - #include "usrp_spi_defs.h" -+#include - - char *prog_name; - -diff -Naur gnuradio-3.1.2-upstream/usrp/host/lib/legacy/fusb_linux.cc gnuradio-3.1.2/usrp/host/lib/legacy/fusb_linux.cc ---- gnuradio-3.1.2-upstream/usrp/host/lib/legacy/fusb_linux.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/usrp/host/lib/legacy/fusb_linux.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - - #define MINIMIZE_TX_BUFFERING 1 // must be defined to 0 or 1 - -diff -Naur gnuradio-3.1.2-upstream/usrp/host/lib/legacy/fusb_win32.cc gnuradio-3.1.2/usrp/host/lib/legacy/fusb_win32.cc ---- gnuradio-3.1.2-upstream/usrp/host/lib/legacy/fusb_win32.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/usrp/host/lib/legacy/fusb_win32.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - static const int MAX_BLOCK_SIZE = fusb_sysconfig::max_block_size(); - static const int DEFAULT_BLOCK_SIZE = MAX_BLOCK_SIZE; -diff -Naur gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_basic.cc gnuradio-3.1.2/usrp/host/lib/legacy/usrp_basic.cc ---- gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_basic.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/usrp/host/lib/legacy/usrp_basic.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - using namespace ad9862; - -diff -Naur gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_local_sighandler.cc gnuradio-3.1.2/usrp/host/lib/legacy/usrp_local_sighandler.cc ---- gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_local_sighandler.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/usrp/host/lib/legacy/usrp_local_sighandler.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - usrp_local_sighandler::usrp_local_sighandler (int signum, - void (*new_handler)(int)) -diff -Naur gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_prims.cc gnuradio-3.1.2/usrp/host/lib/legacy/usrp_prims.cc ---- gnuradio-3.1.2-upstream/usrp/host/lib/legacy/usrp_prims.cc 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/usrp/host/lib/legacy/usrp_prims.cc 2008-04-11 19:57:23.000000000 +0200 -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - #include - #include // FIXME should check with autoconf (nanosleep) - #include -@@ -62,6 +63,7 @@ - static char *default_fpga_filename = "std_2rxhb_2tx.rbf"; - - #include "std_paths.h" -+#include - - static char * - find_file (const char *filename, int hw_rev) -diff -Naur gnuradio-3.1.2-upstream/usrp/host/misc/getopt.c gnuradio-3.1.2/usrp/host/misc/getopt.c ---- gnuradio-3.1.2-upstream/usrp/host/misc/getopt.c 2008-04-11 19:56:46.000000000 +0200 -+++ gnuradio-3.1.2/usrp/host/misc/getopt.c 2008-04-11 19:57:23.000000000 +0200 -@@ -52,6 +52,7 @@ - #endif - - #include -+#include - - /* Comment out all this code if we are using the GNU C Library, and are not - actually compiling the library itself. This code is part of the GNU C diff --git a/gnuradio-3.1.2-libtool.bug.patch b/gnuradio-3.1.2-libtool.bug.patch deleted file mode 100644 index a31bd0e..0000000 --- a/gnuradio-3.1.2-libtool.bug.patch +++ /dev/null @@ -1,14 +0,0 @@ -Marek Mahut : This patch fixes the build when libtool fails to detect that lib - -diff -Naur gnuradio-3.1.2-upstream/gnuradio-core/src/tests/Makefile.am gnuradio-3.1.2/gnuradio-core/src/tests/Makefile.am ---- gnuradio-3.1.2-upstream/gnuradio-core/src/tests/Makefile.am 2008-04-12 14:00:36.000000000 +0200 -+++ gnuradio-3.1.2/gnuradio-core/src/tests/Makefile.am 2008-04-12 19:14:37.000000000 +0200 -@@ -50,7 +50,7 @@ - test_vmcircbuf - - --LIBGNURADIO = $(GNURADIO_CORE_LA) -+LIBGNURADIO = $(GNURADIO_CORE_LA) $(top_builddir)/omnithread/libgromnithread.la - LIBGNURADIOQA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core-qa.la $(LIBGNURADIO) - - benchmark_dotprod_SOURCES = benchmark_dotprod.cc diff --git a/gnuradio-3.1.3-comedilib0.8.patch b/gnuradio-3.1.3-comedilib0.8.patch deleted file mode 100644 index 2224e48..0000000 --- a/gnuradio-3.1.3-comedilib0.8.patch +++ /dev/null @@ -1,27 +0,0 @@ -Marek Mahut : Comedilib 0.8 API change - - -diff -Naur gnuradio-3.1.3/gr-comedi/src/comedi_sink_s.cc gnuradio-3.1.3-upstream/gr-comedi/src/comedi_sink_s.cc ---- gnuradio-3.1.3/gr-comedi/src/comedi_sink_s.cc 2008-12-19 21:51:25.000000000 +0100 -+++ gnuradio-3.1.3-upstream/gr-comedi/src/comedi_sink_s.cc 2008-12-19 23:08:59.000000000 +0100 -@@ -88,7 +88,7 @@ - comedi_cmd cmd; - int ret; - -- ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,(unsigned int)(1e9/sampling_freq)); -+ ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,cmd.chanlist_len,(unsigned int)(1e9/sampling_freq)); - if(ret<0) - bail ("comedi_get_cmd_generic_timed", comedi_errno()); - -diff -Naur gnuradio-3.1.3/gr-comedi/src/comedi_source_s.cc gnuradio-3.1.3-upstream/gr-comedi/src/comedi_source_s.cc ---- gnuradio-3.1.3/gr-comedi/src/comedi_source_s.cc 2008-12-19 21:51:25.000000000 +0100 -+++ gnuradio-3.1.3-upstream/gr-comedi/src/comedi_source_s.cc 2008-12-19 23:08:31.000000000 +0100 -@@ -85,7 +85,7 @@ - comedi_cmd cmd; - int ret; - -- ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,(unsigned int)(1e9/sampling_freq)); -+ ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,cmd.chanlist_len,(unsigned int)(1e9/sampling_freq)); - if(ret<0) - bail ("comedi_get_cmd_generic_timed", comedi_errno()); - diff --git a/gnuradio-3.1.3-gcc44.patch b/gnuradio-3.1.3-gcc44.patch deleted file mode 100644 index a32706a..0000000 --- a/gnuradio-3.1.3-gcc44.patch +++ /dev/null @@ -1,324 +0,0 @@ -Fix build with GCC 4.4 - -Lubomir Rintel - -diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc ---- gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2008-05-09 08:35:18.000000000 +0200 -+++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2009-03-04 20:48:25.000000000 +0100 -@@ -39,6 +39,7 @@ - - #include - #include -+#include - - gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector &taps) - { -diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc ---- gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2008-05-09 08:35:16.000000000 +0200 -+++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2009-03-04 20:49:07.000000000 +0100 -@@ -34,6 +34,7 @@ - - #include - #include -+#include - - gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector &taps) - { -diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc ---- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2008-05-09 08:35:40.000000000 +0200 -+++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2009-03-04 20:49:45.000000000 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - //define ALIGN_ADVANCED_IMPLEMENTATION to have an alternative implementation of the align algoritm which exactly follows the align_interval spec. - //It is more resource intensive, less tested and probably not needed -diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc ---- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc 2008-03-05 22:13:04.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc 2009-03-04 21:01:08.000000000 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - // Public constructor - -diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc ---- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc 2008-03-05 22:13:04.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc 2009-03-04 20:55:42.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #include - -+#include - #include - using std::cout; - using std::endl; -diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc ---- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc 2008-03-05 22:13:04.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc 2009-03-04 20:56:30.000000000 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - - #define VERBOSE 0 -diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc ---- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc 2008-03-05 22:13:04.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc 2009-03-04 20:57:47.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #include - -diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc ---- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc 2008-06-25 20:57:48.000000000 +0200 -+++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc 2009-03-04 21:00:57.000000000 +0100 -@@ -24,6 +24,7 @@ - - #include - #include -+#include - - gr_decode_ccsds_27_fb_sptr - gr_make_decode_ccsds_27_fb() -diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dpll_bb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dpll_bb.cc ---- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dpll_bb.cc 2008-03-05 22:13:04.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dpll_bb.cc 2009-03-04 20:58:56.000000000 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_dpll_bb_sptr - gr_make_dpll_bb (float period, float gain) -diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_fft_vfc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_fft_vfc.cc ---- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2008-05-09 08:35:29.000000000 +0200 -+++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2009-03-04 22:35:36.000000000 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - - -diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc ---- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc 2008-03-05 22:13:04.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc 2009-03-04 21:00:40.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_simple_correlator.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_simple_correlator.cc ---- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2008-05-09 08:35:37.000000000 +0200 -+++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2009-03-04 21:00:35.000000000 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include - -diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_stream_mux.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_stream_mux.cc ---- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_stream_mux.cc 2008-05-09 08:35:36.000000000 +0200 -+++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_stream_mux.cc 2009-03-04 21:01:02.000000000 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #define VERBOSE 0 - -diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/io/gr_wavfile_sink.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/io/gr_wavfile_sink.cc ---- gnuradio-3.1.3/gnuradio-core/src/lib/io/gr_wavfile_sink.cc 2008-03-05 22:12:53.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/io/gr_wavfile_sink.cc 2009-03-04 22:41:30.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - #include - -diff -urp gnuradio-3.1.3/gr-atsc/src/lib/atsc_bit_timing_loop.cc gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_bit_timing_loop.cc ---- gnuradio-3.1.3/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2008-05-09 08:36:02.000000000 +0200 -+++ gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2009-03-04 22:41:18.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - // Input rate changed from 20MHz to 19.2 to support usrp at 3 * 6.4MHz - float input_rate = 19.2e6; -diff -urp gnuradio-3.1.3/gr-atsc/src/lib/atsc_fpll.cc gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_fpll.cc ---- gnuradio-3.1.3/gr-atsc/src/lib/atsc_fpll.cc 2008-03-05 22:13:10.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_fpll.cc 2009-03-04 21:00:28.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include "fpll_btloop_coupling.h" - - -diff -urp gnuradio-3.1.3/gr-atsc/src/lib/qa_atsci_data_interleaver.cc gnuradio-3.1.3.gcc44/gr-atsc/src/lib/qa_atsci_data_interleaver.cc ---- gnuradio-3.1.3/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2008-05-09 08:35:59.000000000 +0200 -+++ gnuradio-3.1.3.gcc44/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2009-03-04 22:41:12.000000000 +0100 -@@ -23,7 +23,7 @@ - #include - #include - #include -- -+#include - - /*! - * write an easy to identify pattern into the packet -diff -urp gnuradio-3.1.3/gr-audio-alsa/src/gri_alsa.cc gnuradio-3.1.3.gcc44/gr-audio-alsa/src/gri_alsa.cc ---- gnuradio-3.1.3/gr-audio-alsa/src/gri_alsa.cc 2008-03-05 22:12:16.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/gr-audio-alsa/src/gri_alsa.cc 2009-03-04 22:41:36.000000000 +0100 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - static snd_pcm_access_t access_types[] = { - SND_PCM_ACCESS_MMAP_INTERLEAVED, -diff -urp gnuradio-3.1.3/gr-audio-osx/src/audio_osx_sink.cc gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_sink.cc ---- gnuradio-3.1.3/gr-audio-osx/src/audio_osx_sink.cc 2008-03-05 22:12:12.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_sink.cc 2009-03-04 22:41:26.000000000 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - - #define _OSX_AU_DEBUG_ 0 -diff -urp gnuradio-3.1.3/gr-audio-osx/src/audio_osx_source.cc gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_source.cc ---- gnuradio-3.1.3/gr-audio-osx/src/audio_osx_source.cc 2008-03-05 22:12:12.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_source.cc 2009-03-04 22:41:22.000000000 +0100 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #define _OSX_AU_DEBUG_ 0 - #define _OSX_DO_LISTENERS_ 0 -diff -urp gnuradio-3.1.3/gr-audio-portaudio/src/gri_portaudio.cc gnuradio-3.1.3.gcc44/gr-audio-portaudio/src/gri_portaudio.cc ---- gnuradio-3.1.3/gr-audio-portaudio/src/gri_portaudio.cc 2008-03-05 22:12:12.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/gr-audio-portaudio/src/gri_portaudio.cc 2009-03-04 21:01:15.000000000 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - - PaDeviceIndex -diff -urp gnuradio-3.1.3/gr-pager/src/pager_flex_sync.cc gnuradio-3.1.3.gcc44/gr-pager/src/pager_flex_sync.cc ---- gnuradio-3.1.3/gr-pager/src/pager_flex_sync.cc 2008-03-05 22:12:08.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/gr-pager/src/pager_flex_sync.cc 2009-03-04 22:40:40.000000000 +0100 -@@ -23,6 +23,7 @@ - #include "config.h" - #endif - -+#include - #include - #include - #include -diff -urp gnuradio-3.1.3/gr-usrp/src/usrp1_sink_base.cc gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_sink_base.cc ---- gnuradio-3.1.3/gr-usrp/src/usrp1_sink_base.cc 2008-03-05 22:13:05.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_sink_base.cc 2009-03-04 22:40:50.000000000 +0100 -@@ -24,6 +24,7 @@ - #include "config.h" - #endif - -+#include - #include - #include - #include -diff -urp gnuradio-3.1.3/gr-usrp/src/usrp1_source_base.cc gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_source_base.cc ---- gnuradio-3.1.3/gr-usrp/src/usrp1_source_base.cc 2008-03-05 22:13:05.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_source_base.cc 2009-03-04 22:40:45.000000000 +0100 -@@ -24,6 +24,7 @@ - #include "config.h" - #endif - -+#include - #include - #include - #include -diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/fusb_darwin.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_darwin.cc ---- gnuradio-3.1.3/usrp/host/lib/legacy/fusb_darwin.cc 2008-03-05 22:12:38.000000000 +0100 -+++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_darwin.cc 2009-03-04 22:41:08.000000000 +0100 -@@ -29,6 +29,7 @@ - #define _USE_OMNI_THREADS_ - #define DO_DEBUG 0 - -+#include - #include - #include "fusb.h" - #include "fusb_darwin.h" -diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/fusb_linux.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_linux.cc ---- gnuradio-3.1.3/usrp/host/lib/legacy/fusb_linux.cc 2008-05-09 08:53:09.000000000 +0200 -+++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_linux.cc 2009-03-04 22:36:59.000000000 +0100 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - #include - #include - -diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/fusb_win32.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_win32.cc ---- gnuradio-3.1.3/usrp/host/lib/legacy/fusb_win32.cc 2008-05-09 08:34:46.000000000 +0200 -+++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_win32.cc 2009-03-04 22:40:59.000000000 +0100 -@@ -24,6 +24,7 @@ - #include "config.h" - #endif - -+#include - #include - #include - #include -diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/usrp_basic.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_basic.cc ---- gnuradio-3.1.3/usrp/host/lib/legacy/usrp_basic.cc 2008-05-09 08:34:47.000000000 +0200 -+++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_basic.cc 2009-03-04 22:36:12.000000000 +0100 -@@ -31,6 +31,7 @@ - #include "fusb.h" - #include - #include -+#include - #include - #include - #include -diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/usrp_standard.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_standard.cc ---- gnuradio-3.1.3/usrp/host/lib/legacy/usrp_standard.cc 2008-08-01 21:45:09.000000000 +0200 -+++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_standard.cc 2009-03-04 22:40:54.000000000 +0100 -@@ -22,6 +22,7 @@ - - #include - -+#include - #include "usrp_prims.h" - #include "fpga_regs_common.h" - #include "fpga_regs_standard.h" diff --git a/gnuradio-3.1.3-werror.patch b/gnuradio-3.1.3-werror.patch deleted file mode 100644 index 9ac6925..0000000 --- a/gnuradio-3.1.3-werror.patch +++ /dev/null @@ -1,26 +0,0 @@ -Marek Mahut : -Werror really sucks - -diff -Naur gnuradio-3.1.3/gnuradio-core/src/lib/viterbi/Makefile.am gnuradio-3.1.3-upstream/gnuradio-core/src/lib/viterbi/Makefile.am ---- gnuradio-3.1.3/gnuradio-core/src/lib/viterbi/Makefile.am 2008-06-25 20:57:45.000000000 +0200 -+++ gnuradio-3.1.3-upstream/gnuradio-core/src/lib/viterbi/Makefile.am 2008-12-19 22:24:40.000000000 +0100 -@@ -17,7 +17,7 @@ - # Boston, MA 02110-1301, USA. - # - --INCLUDES = -Wall -Werror -+INCLUDES = -Wall - LIBS = -lm - - noinst_LTLIBRARIES = libviterbi.la -diff -Naur gnuradio-3.1.3/gnuradio-core/src/lib/viterbi/Makefile.in gnuradio-3.1.3-upstream/gnuradio-core/src/lib/viterbi/Makefile.in ---- gnuradio-3.1.3/gnuradio-core/src/lib/viterbi/Makefile.in 2008-08-24 02:37:34.000000000 +0200 -+++ gnuradio-3.1.3-upstream/gnuradio-core/src/lib/viterbi/Makefile.in 2008-12-19 22:24:54.000000000 +0100 -@@ -484,7 +484,7 @@ - with_SWIGDIRPATH = @with_SWIGDIRPATH@ - with_SWIG_INCLUDES = @with_SWIG_INCLUDES@ - with_dirs = @with_dirs@ --INCLUDES = -Wall -Werror -+INCLUDES = -Wall - noinst_LTLIBRARIES = libviterbi.la - libviterbi_la_SOURCES = \ - metrics.c \ diff --git a/gnuradio-3.2-gcc44.patch b/gnuradio-3.2-gcc44.patch new file mode 100644 index 0000000..47b23a7 --- /dev/null +++ b/gnuradio-3.2-gcc44.patch @@ -0,0 +1,525 @@ +Marek Mahut : Patch to fix build under gcc 4.4 + +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc gnuradio-3.2/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2009-07-25 09:14:00.862437254 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2009-07-25 09:17:18.282187738 +0200 +@@ -39,6 +39,7 @@ + + #include + #include ++#include + + gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector &taps) + { +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc gnuradio-3.2/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2009-07-25 09:14:00.864437599 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2009-07-25 09:17:25.071217820 +0200 +@@ -34,6 +34,7 @@ + + #include + #include ++#include + + gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector &taps) + { +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2009-07-25 09:14:01.033433009 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2009-07-25 09:17:36.663188600 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + //define ALIGN_ADVANCED_IMPLEMENTATION to have an alternative implementation of the align algoritm which exactly follows the align_interval spec. +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc 2009-07-25 09:14:01.051436257 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc 2009-07-25 09:17:42.243478128 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + // Public constructor + +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc 2009-07-25 09:14:01.025437774 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc 2009-07-25 09:17:47.250185275 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include + using std::cout; +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc 2009-07-25 09:14:01.060434982 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc 2009-07-25 09:17:54.333184463 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #define VERBOSE 0 + +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc 2009-07-25 09:14:01.047433541 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc 2009-07-25 09:18:01.345183736 +0200 +@@ -30,7 +30,7 @@ + #include + #include + #include +- ++#include + #include + + #define M_TWOPI (2*M_PI) +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc 2009-07-25 09:14:01.076437534 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc 2009-07-25 09:18:07.285215839 +0200 +@@ -24,6 +24,7 @@ + + #include + #include ++#include + + gr_decode_ccsds_27_fb_sptr + gr_make_decode_ccsds_27_fb() +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_dpll_bb.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_dpll_bb.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_dpll_bb.cc 2009-07-25 09:14:01.055437436 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_dpll_bb.cc 2009-07-25 09:18:20.651188536 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_dpll_bb_sptr + gr_make_dpll_bb (float period, float gain) +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_fft_vfc.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_fft_vfc.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2009-07-25 09:14:01.032433570 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2009-07-25 09:18:27.588184185 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + + // FIXME after this is working, change to use native real to complex fft. +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc 2009-07-25 09:14:01.080445069 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc 2009-07-25 09:18:45.986188440 +0200 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + + #define M_TWOPI (2*M_PI) +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.cc 2009-07-25 09:14:01.067433082 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.cc 2009-07-25 09:36:03.133188443 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #define VERBOSE 0 + #define M_TWOPI (2*M_PI) +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc 2009-07-25 09:14:01.055437436 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc 2009-07-25 09:43:44.309459146 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + gr_ofdm_sampler_sptr + gr_make_ofdm_sampler (unsigned int fft_length, +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_simple_correlator.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_simple_correlator.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2009-07-25 09:14:01.078437530 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2009-07-25 09:18:50.951455747 +0200 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + + static const int THRESHOLD = 3; +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_stream_mux.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_stream_mux.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_stream_mux.cc 2009-07-25 09:14:01.083447508 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_stream_mux.cc 2009-07-25 09:18:55.617260043 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #define VERBOSE 0 + +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/io/gr_wavfile_sink.cc gnuradio-3.2/gnuradio-core/src/lib/io/gr_wavfile_sink.cc +--- gnuradio-3.2-upstream/gnuradio-core/src/lib/io/gr_wavfile_sink.cc 2009-07-25 09:14:00.995437624 +0200 ++++ gnuradio-3.2/gnuradio-core/src/lib/io/gr_wavfile_sink.cc 2009-07-25 09:19:02.378184445 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + +diff -Naur gnuradio-3.2-upstream/gr-audio-alsa/src/gri_alsa.cc gnuradio-3.2/gr-audio-alsa/src/gri_alsa.cc +--- gnuradio-3.2-upstream/gr-audio-alsa/src/gri_alsa.cc 2009-07-25 09:14:00.474445345 +0200 ++++ gnuradio-3.2/gr-audio-alsa/src/gri_alsa.cc 2009-07-25 09:19:13.904207014 +0200 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + static snd_pcm_access_t access_types[] = { + SND_PCM_ACCESS_MMAP_INTERLEAVED, +diff -Naur gnuradio-3.2-upstream/gr-audio-osx/src/audio_osx_sink.cc gnuradio-3.2/gr-audio-osx/src/audio_osx_sink.cc +--- gnuradio-3.2-upstream/gr-audio-osx/src/audio_osx_sink.cc 2009-07-25 09:14:00.341445675 +0200 ++++ gnuradio-3.2/gr-audio-osx/src/audio_osx_sink.cc 2009-07-25 09:19:21.598183148 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #define _OSX_AU_DEBUG_ 0 + +diff -Naur gnuradio-3.2-upstream/gr-audio-osx/src/audio_osx_source.cc gnuradio-3.2/gr-audio-osx/src/audio_osx_source.cc +--- gnuradio-3.2-upstream/gr-audio-osx/src/audio_osx_source.cc 2009-07-25 09:14:00.343450491 +0200 ++++ gnuradio-3.2/gr-audio-osx/src/audio_osx_source.cc 2009-07-25 09:19:27.590184106 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #define _OSX_AU_DEBUG_ 0 + #define _OSX_DO_LISTENERS_ 0 +diff -Naur gnuradio-3.2-upstream/gr-audio-portaudio/src/gri_portaudio.cc gnuradio-3.2/gr-audio-portaudio/src/gri_portaudio.cc +--- gnuradio-3.2-upstream/gr-audio-portaudio/src/gri_portaudio.cc 2009-07-25 09:14:00.477445200 +0200 ++++ gnuradio-3.2/gr-audio-portaudio/src/gri_portaudio.cc 2009-07-25 09:19:33.475184246 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + + PaDeviceIndex +diff -Naur gnuradio-3.2-upstream/gr-pager/src/pager_flex_sync.cc gnuradio-3.2/gr-pager/src/pager_flex_sync.cc +--- gnuradio-3.2-upstream/gr-pager/src/pager_flex_sync.cc 2009-07-25 09:14:01.100445030 +0200 ++++ gnuradio-3.2/gr-pager/src/pager_flex_sync.cc 2009-07-25 09:19:38.231198885 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + pager_flex_sync_sptr pager_make_flex_sync() + { +diff -Naur gnuradio-3.2-upstream/gr-qtgui/src/lib/spectrumUpdateEvents.h gnuradio-3.2/gr-qtgui/src/lib/spectrumUpdateEvents.h +--- gnuradio-3.2-upstream/gr-qtgui/src/lib/spectrumUpdateEvents.h 2009-07-25 09:14:00.716437539 +0200 ++++ gnuradio-3.2/gr-qtgui/src/lib/spectrumUpdateEvents.h 2009-07-26 11:08:31.834443932 +0200 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + class SpectrumUpdateEvent:public QEvent{ + +diff -Naur gnuradio-3.2-upstream/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h gnuradio-3.2/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h +--- gnuradio-3.2-upstream/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h 2009-07-25 09:14:00.717434185 +0200 ++++ gnuradio-3.2/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h 2009-07-26 15:39:18.539220269 +0200 +@@ -9,6 +9,8 @@ + #include + #include + ++#include ++ + class Waterfall3DColorMap:public Qwt3D::Color, public QwtLinearColorMap{ + public: + Waterfall3DColorMap(); +diff -Naur gnuradio-3.2-upstream/gr-usrp/apps/usrp_siggen.cc gnuradio-3.2/gr-usrp/apps/usrp_siggen.cc +--- gnuradio-3.2-upstream/gr-usrp/apps/usrp_siggen.cc 2009-07-25 09:14:00.503447733 +0200 ++++ gnuradio-3.2/gr-usrp/apps/usrp_siggen.cc 2009-07-25 17:21:57.442443913 +0200 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + namespace po = boost::program_options; + +diff -Naur gnuradio-3.2-upstream/gr-usrp/src/usrp_sink_base.cc gnuradio-3.2/gr-usrp/src/usrp_sink_base.cc +--- gnuradio-3.2-upstream/gr-usrp/src/usrp_sink_base.cc 2009-07-25 09:14:00.501447597 +0200 ++++ gnuradio-3.2/gr-usrp/src/usrp_sink_base.cc 2009-07-25 17:19:08.780188246 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + static const int OUTPUT_MULTIPLE_SAMPLES = 128; // DON'T CHANGE THIS VALUE! + +diff -Naur gnuradio-3.2-upstream/gr-usrp/src/usrp_source_base.cc gnuradio-3.2/gr-usrp/src/usrp_source_base.cc +--- gnuradio-3.2-upstream/gr-usrp/src/usrp_source_base.cc 2009-07-25 09:14:00.502445220 +0200 ++++ gnuradio-3.2/gr-usrp/src/usrp_source_base.cc 2009-07-25 17:19:51.214219555 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + static const int OUTPUT_MULTIPLE_BYTES = 4 * 1024; + +diff -Naur gnuradio-3.2-upstream/mblock/src/lib/mb_worker.cc gnuradio-3.2/mblock/src/lib/mb_worker.cc +--- gnuradio-3.2-upstream/mblock/src/lib/mb_worker.cc 2009-07-25 09:14:00.496445162 +0200 ++++ gnuradio-3.2/mblock/src/lib/mb_worker.cc 2009-07-25 11:17:09.894192322 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #ifdef HAVE_SCHED_H + #include + #endif +diff -Naur gnuradio-3.2-upstream/mblock/src/lib/qa_bitset.cc gnuradio-3.2/mblock/src/lib/qa_bitset.cc +--- gnuradio-3.2-upstream/mblock/src/lib/qa_bitset.cc 2009-07-25 09:14:00.494447611 +0200 ++++ gnuradio-3.2/mblock/src/lib/qa_bitset.cc 2009-07-25 11:17:15.999184361 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + +diff -Naur gnuradio-3.2-upstream/mblock/src/lib/qa_disconnect.cc gnuradio-3.2/mblock/src/lib/qa_disconnect.cc +--- gnuradio-3.2-upstream/mblock/src/lib/qa_disconnect.cc 2009-07-25 09:14:00.494447611 +0200 ++++ gnuradio-3.2/mblock/src/lib/qa_disconnect.cc 2009-07-25 13:41:30.945188181 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + static pmt_t s_in = pmt_intern("in"); + static pmt_t s_out = pmt_intern("out"); +diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/db_boards.cc gnuradio-3.2/usrp/host/lib/legacy/db_boards.cc +--- gnuradio-3.2-upstream/usrp/host/lib/legacy/db_boards.cc 2009-07-25 09:14:00.618447788 +0200 ++++ gnuradio-3.2/usrp/host/lib/legacy/db_boards.cc 2009-07-25 16:59:10.714438636 +0200 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + std::vector + instantiate_dbs(int dbid, usrp_basic_sptr usrp, int which_side) +diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/db_dbs_rx.cc gnuradio-3.2/usrp/host/lib/legacy/db_dbs_rx.cc +--- gnuradio-3.2-upstream/usrp/host/lib/legacy/db_dbs_rx.cc 2009-07-25 09:14:00.618447788 +0200 ++++ gnuradio-3.2/usrp/host/lib/legacy/db_dbs_rx.cc 2009-07-25 17:00:38.567217525 +0200 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + + /*****************************************************************************/ +diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/db_xcvr2450.cc gnuradio-3.2/usrp/host/lib/legacy/db_xcvr2450.cc +--- gnuradio-3.2-upstream/usrp/host/lib/legacy/db_xcvr2450.cc 2009-07-25 09:14:00.617445275 +0200 ++++ gnuradio-3.2/usrp/host/lib/legacy/db_xcvr2450.cc 2009-07-25 17:01:20.805468727 +0200 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + +diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/fusb_darwin.cc gnuradio-3.2/usrp/host/lib/legacy/fusb_darwin.cc +--- gnuradio-3.2-upstream/usrp/host/lib/legacy/fusb_darwin.cc 2009-07-25 09:14:00.612447799 +0200 ++++ gnuradio-3.2/usrp/host/lib/legacy/fusb_darwin.cc 2009-07-25 09:19:46.638210966 +0200 +@@ -33,6 +33,7 @@ + #include "fusb.h" + #include "fusb_darwin.h" + #include "darwin_libusb.h" ++#include + + static const int USB_TIMEOUT = 100; // in milliseconds + static const UInt8 NUM_QUEUE_ITEMS = 20; +diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/fusb_linux.cc gnuradio-3.2/usrp/host/lib/legacy/fusb_linux.cc +--- gnuradio-3.2-upstream/usrp/host/lib/legacy/fusb_linux.cc 2009-07-25 09:14:00.616447792 +0200 ++++ gnuradio-3.2/usrp/host/lib/legacy/fusb_linux.cc 2009-07-25 09:19:54.041184719 +0200 +@@ -33,10 +33,10 @@ + #include // interface to kernel portion of user mode usb driver + #include + #include +-#include + #include + #include + #include ++#include + + #define MINIMIZE_TX_BUFFERING 1 // must be defined to 0 or 1 + +diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/fusb_win32.cc gnuradio-3.2/usrp/host/lib/legacy/fusb_win32.cc +--- gnuradio-3.2-upstream/usrp/host/lib/legacy/fusb_win32.cc 2009-07-25 09:14:00.617445275 +0200 ++++ gnuradio-3.2/usrp/host/lib/legacy/fusb_win32.cc 2009-07-25 09:19:58.736184198 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + static const int MAX_BLOCK_SIZE = fusb_sysconfig::max_block_size(); + static const int DEFAULT_BLOCK_SIZE = MAX_BLOCK_SIZE; +diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/usrp_basic.cc gnuradio-3.2/usrp/host/lib/legacy/usrp_basic.cc +--- gnuradio-3.2-upstream/usrp/host/lib/legacy/usrp_basic.cc 2009-07-25 09:14:00.611447732 +0200 ++++ gnuradio-3.2/usrp/host/lib/legacy/usrp_basic.cc 2009-07-25 09:20:04.941434694 +0200 +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + using namespace ad9862; + +diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/usrp_standard.cc gnuradio-3.2/usrp/host/lib/legacy/usrp_standard.cc +--- gnuradio-3.2-upstream/usrp/host/lib/legacy/usrp_standard.cc 2009-07-25 09:14:00.619447576 +0200 ++++ gnuradio-3.2/usrp/host/lib/legacy/usrp_standard.cc 2009-07-25 09:20:09.756187465 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + + static const int OLD_CAPS_VAL = 0xaa55ff77; +diff -Naur gnuradio-3.2-upstream/usrp2/host/apps/find_usrps.cc gnuradio-3.2/usrp2/host/apps/find_usrps.cc +--- gnuradio-3.2-upstream/usrp2/host/apps/find_usrps.cc 2009-07-25 09:14:00.301437861 +0200 ++++ gnuradio-3.2/usrp2/host/apps/find_usrps.cc 2009-07-25 17:14:41.128188741 +0200 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + static void + usage(const char *progname) +diff -Naur gnuradio-3.2-upstream/usrp2/host/apps/gpio.cc gnuradio-3.2/usrp2/host/apps/gpio.cc +--- gnuradio-3.2-upstream/usrp2/host/apps/gpio.cc 2009-07-25 09:14:00.302450501 +0200 ++++ gnuradio-3.2/usrp2/host/apps/gpio.cc 2009-07-25 17:18:14.131203844 +0200 +@@ -22,6 +22,7 @@ + + #include + #include ++#include + + int + main(int argc, char **argv) +diff -Naur gnuradio-3.2-upstream/usrp2/host/apps/rx_streaming_samples.cc gnuradio-3.2/usrp2/host/apps/rx_streaming_samples.cc +--- gnuradio-3.2-upstream/usrp2/host/apps/rx_streaming_samples.cc 2009-07-25 09:14:00.302450501 +0200 ++++ gnuradio-3.2/usrp2/host/apps/rx_streaming_samples.cc 2009-07-25 17:15:30.560205148 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -Naur gnuradio-3.2-upstream/usrp2/host/apps/test_mimo_tx.cc gnuradio-3.2/usrp2/host/apps/test_mimo_tx.cc +--- gnuradio-3.2-upstream/usrp2/host/apps/test_mimo_tx.cc 2009-07-25 09:14:00.301437861 +0200 ++++ gnuradio-3.2/usrp2/host/apps/test_mimo_tx.cc 2009-07-25 17:17:26.239258963 +0200 +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + + typedef std::complex fcomplex; +diff -Naur gnuradio-3.2-upstream/usrp2/host/apps/tx_samples.cc gnuradio-3.2/usrp2/host/apps/tx_samples.cc +--- gnuradio-3.2-upstream/usrp2/host/apps/tx_samples.cc 2009-07-25 09:14:00.302450501 +0200 ++++ gnuradio-3.2/usrp2/host/apps/tx_samples.cc 2009-07-25 17:16:51.973188827 +0200 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -Naur gnuradio-3.2-upstream/usrp2/host/lib/eth_buffer.cc gnuradio-3.2/usrp2/host/lib/eth_buffer.cc +--- gnuradio-3.2-upstream/usrp2/host/lib/eth_buffer.cc 2009-07-25 09:14:00.295439060 +0200 ++++ gnuradio-3.2/usrp2/host/lib/eth_buffer.cc 2009-07-25 17:08:50.711203188 +0200 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -Naur gnuradio-3.2-upstream/usrp2/host/lib/ethernet.cc gnuradio-3.2/usrp2/host/lib/ethernet.cc +--- gnuradio-3.2-upstream/usrp2/host/lib/ethernet.cc 2009-07-25 09:14:00.296436544 +0200 ++++ gnuradio-3.2/usrp2/host/lib/ethernet.cc 2009-07-25 17:09:54.200210018 +0200 +@@ -25,6 +25,7 @@ + #include + + #include ++#include + #include + #include + //#include +diff -Naur gnuradio-3.2-upstream/usrp2/host/lib/ethernet.h gnuradio-3.2/usrp2/host/lib/ethernet.h +--- gnuradio-3.2-upstream/usrp2/host/lib/ethernet.h 2009-07-25 09:14:00.295439060 +0200 ++++ gnuradio-3.2/usrp2/host/lib/ethernet.h 2009-07-25 17:12:39.574184059 +0200 +@@ -20,6 +20,7 @@ + #define INCLUDED_USRP2_ETHERNET_H + + #include ++#include + #include + #include + +diff -Naur gnuradio-3.2-upstream/usrp2/host/lib/find.cc gnuradio-3.2/usrp2/host/lib/find.cc +--- gnuradio-3.2-upstream/usrp2/host/lib/find.cc 2009-07-25 09:14:00.299443453 +0200 ++++ gnuradio-3.2/usrp2/host/lib/find.cc 2009-07-25 17:13:19.549453343 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #define FIND_DEBUG 0 + +diff -Naur gnuradio-3.2-upstream/usrp2/host/lib/usrp2.cc gnuradio-3.2/usrp2/host/lib/usrp2.cc +--- gnuradio-3.2-upstream/usrp2/host/lib/usrp2.cc 2009-07-25 09:14:00.298438985 +0200 ++++ gnuradio-3.2/usrp2/host/lib/usrp2.cc 2009-07-25 17:13:54.453437924 +0200 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + + namespace usrp2 { diff --git a/gnuradio-3.1.3-libtool.bug.patch b/gnuradio-3.2-libtool.patch similarity index 54% rename from gnuradio-3.1.3-libtool.bug.patch rename to gnuradio-3.2-libtool.patch index 625e503..7f51205 100644 --- a/gnuradio-3.1.3-libtool.bug.patch +++ b/gnuradio-3.2-libtool.patch @@ -1,9 +1,9 @@ Marek Mahut : This patch fixes the build when libtool fails to detect that lib -diff -Naur gnuradio-3.1.3/gnuradio-core/src/tests/Makefile.am gnuradio-3.1.3-upstream/gnuradio-core/src/tests/Makefile.am ---- gnuradio-3.1.3/gnuradio-core/src/tests/Makefile.am 2008-08-01 19:12:00.000000000 +0200 -+++ gnuradio-3.1.3-upstream/gnuradio-core/src/tests/Makefile.am 2008-12-19 21:52:09.000000000 +0100 -@@ -56,7 +56,7 @@ +diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/tests/Makefile.am gnuradio-3.2/gnuradio-core/src/tests/Makefile.am +--- gnuradio-3.2-upstream/gnuradio-core/src/tests/Makefile.am 2009-07-25 09:14:01.090447704 +0200 ++++ gnuradio-3.2/gnuradio-core/src/tests/Makefile.am 2009-07-25 09:25:12.681195057 +0200 +@@ -59,7 +59,7 @@ benchmark_dotprod diff --git a/gnuradio.spec b/gnuradio.spec index 45ffb18..fd1b0c0 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: gnuradio -Version: 3.1.3 -Release: 6%{?dist} +Version: 3.2 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -11,10 +11,8 @@ URL: http://www.gnuradio.org Source0: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: 10-usrp.rules -Patch0: gnuradio-3.1.3-libtool.bug.patch -Patch1: gnuradio-3.1.3-werror.patch -Patch2: gnuradio-3.1.3-comedilib0.8.patch -Patch3: gnuradio-3.1.3-gcc44.patch +Patch0: gnuradio-3.2-libtool.patch +Patch1: gnuradio-3.2-gcc44.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -34,6 +32,12 @@ BuildRequires: guile-devel BuildRequires: portaudio-devel BuildRequires: libtool BuildRequires: comedilib-devel +BuildRequires: gsl-devel +BuildRequires: tex(latex) +BuildRequires: numpy +BuildRequires: PyQt4-devel +BuildRequires: PyQwt-devel +BuildRequires: qwtplot3d-qt4-devel Requires: numpy Requires: wxPython Requires: scipy @@ -90,9 +94,7 @@ GNU Radio USRP headers %prep %setup -q %patch0 -p1 -b .libtool -%patch1 -p1 -b .werror -%patch2 -p1 -b .comedilib -%patch3 -p1 -b .gcc44 +%patch1 -p1 -b .gcc44 %build export PATH=%{_libexecdir}/sdcc:$PATH @@ -124,28 +126,20 @@ getent group usrp >/dev/null || groupadd -r usrp %files %defattr(-,root,root,-) %{python_sitelib}/gnuradio -%exclude %{python_sitelib}/gnuradio/_usrp1.so +%exclude %{python_sitelib}/gnuradio/_usrp2.so %exclude %{python_sitelib}/gnuradio/usrp* %{_sysconfdir}/gnuradio %{_bindir}/gr_* -%exclude %{_bindir}/gr_plot*.pyc -%exclude %{_bindir}/gr_plot*.pyo -%{_libdir}/libgnuradio-core.so.* -%{_libdir}/libgnuradio-core-qa.so.* -%{_libdir}/libgr_audio_alsa.so.* -%{_libdir}/libgromnithread.so.* -%config(noreplace)%{_sysconfdir}/gnuradio/conf.d/gr-audio-alsa.conf -%config(noreplace)%{_sysconfdir}/gnuradio/conf.d/gnuradio-core.conf -%config(noreplace)%{_sysconfdir}/gnuradio/conf.d/gr-wxgui.conf +%{_bindir}/find_usrps +%{_bindir}/lsusrp +%{_libdir}/lib*.so.* +%config(noreplace)%{_sysconfdir}/gnuradio/conf.d/*.conf %exclude %{python_sitelib}/gnuradio/*.la %files devel %defattr(-,root,root,-) -%{_includedir}/gnuradio -%{_libdir}/libgnuradio-core.so -%{_libdir}/libgnuradio-core-qa.so -%{_libdir}/libgr_audio_alsa.so -%{_libdir}/libgromnithread.so +%{_includedir}/* +%{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc %exclude %{_libdir}/*.la @@ -158,26 +152,6 @@ getent group usrp >/dev/null || groupadd -r usrp %files examples %defattr(-,root,root,-) %{_datadir}/%{name} -%exclude %{_datadir}/%{name}/examples/atsc/*.pyc -%exclude %{_datadir}/%{name}/examples/atsc/*.pyo -%exclude %{_datadir}/%{name}/examples/audio/*.pyc -%exclude %{_datadir}/%{name}/examples/audio/*.pyo -%exclude %{_datadir}/%{name}/examples/digital/*.pyc -%exclude %{_datadir}/%{name}/examples/digital/*.pyo -%exclude %{_datadir}/%{name}/examples/hf_explorer/*.pyc -%exclude %{_datadir}/%{name}/examples/hf_explorer/*.pyo -%exclude %{_datadir}/%{name}/examples/hf_radio/*.pyc -%exclude %{_datadir}/%{name}/examples/hf_radio/*.pyo -%exclude %{_datadir}/%{name}/examples/multi-antenna/*.pyc -%exclude %{_datadir}/%{name}/examples/multi-antenna/*.pyo -%exclude %{_datadir}/%{name}/examples/multi_usrp/*.pyc -%exclude %{_datadir}/%{name}/examples/multi_usrp/*.pyo -%exclude %{_datadir}/%{name}/examples/network/*.pyc -%exclude %{_datadir}/%{name}/examples/network/*.pyo -%exclude %{_datadir}/%{name}/examples/trellis/*.pyc -%exclude %{_datadir}/%{name}/examples/trellis/*.pyo -%exclude %{_datadir}/%{name}/examples/usrp/*.pyc -%exclude %{_datadir}/%{name}/examples/usrp/*.pyo %files -n usrp %defattr(-,root,root,-) @@ -186,11 +160,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_datadir}/usrp %{_libdir}/libusrp.so.* %{python_sitelib}/usrpm -%{python_sitelib}/gnuradio/_usrp1.so +%{python_sitelib}/gnuradio/_usrp2.so %{python_sitelib}/gnuradio/usrp* -%config %{_sysconfdir}/udev/rules.d/10-usrp.rules -%exclude %{_bindir}/*.pyc -%exclude %{_bindir}/*.pyo +%config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp.rules %exclude %{_libdir}/*.la %exclude %{python_sitelib}/usrpm/*.la @@ -200,8 +172,8 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog -* Fri Jul 24 2009 Fedora Release Engineering - 3.1.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Sat Jul 25 2009 Marek Mahut - 3.2-1 +- Upstream release 3.2 * Thu Mar 4 2009 Lubomir Rintel - 3.1.3-5 - Fix build with GCC 4.4 diff --git a/sources b/sources index 174c15f..3710553 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c1eb3de26b67ddc08a61a7c2fc636203 gnuradio-3.1.3.tar.gz +9d91d0f8f2cb35bc86435784fa8e72d8 gnuradio-3.2.tar.gz From b75a9475809710607729b4e2b131c0e2112ca237 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Wed, 29 Jul 2009 10:10:04 +0000 Subject: [PATCH 016/313] release 3.2.2 --- .cvsignore | 2 +- gnuradio.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3b03220..874b5a9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnuradio-3.2.tar.gz +gnuradio-3.2.2.tar.gz diff --git a/gnuradio.spec b/gnuradio.spec index fd1b0c0..765ef5f 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: gnuradio -Version: 3.2 +Version: 3.2.2 Release: 1%{?dist} Summary: Software defined radio framework @@ -12,7 +12,6 @@ Source0: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: 10-usrp.rules Patch0: gnuradio-3.2-libtool.patch -Patch1: gnuradio-3.2-gcc44.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -94,7 +93,6 @@ GNU Radio USRP headers %prep %setup -q %patch0 -p1 -b .libtool -%patch1 -p1 -b .gcc44 %build export PATH=%{_libexecdir}/sdcc:$PATH @@ -172,6 +170,10 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Wed Jul 29 2009 Marek Mahut - 3.2.2-1 +- Upstream release 3.2.2 +- Dropped patch gnuradio-3.2-gcc44.patch + * Sat Jul 25 2009 Marek Mahut - 3.2-1 - Upstream release 3.2 diff --git a/sources b/sources index 3710553..7c4afa2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d91d0f8f2cb35bc86435784fa8e72d8 gnuradio-3.2.tar.gz +3fedcd64c2f51671cc1417b4c1e06834 gnuradio-3.2.2.tar.gz From 1e87a1041c0aba5054c226df8548f889eec16cb9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:19:42 +0000 Subject: [PATCH 017/313] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 937eb5d..00bc482 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: gnuradio -# $Id$ +# $Id: Makefile,v 1.1 2008/03/23 01:03:11 kevin Exp $ NAME := gnuradio SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From a6349a36c4445ca9de6b2289a6fa8cb8f385c1e4 Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Thu, 21 Jan 2010 19:52:34 +0000 Subject: [PATCH 018/313] - Rebuild for Boost soname bump --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 765ef5f..2ee43cc 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -170,6 +170,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Fri Jan 22 2010 Rahul Sundaram - 3.2.2-2 +- Rebuild for Boost soname bump + * Wed Jul 29 2009 Marek Mahut - 3.2.2-1 - Upstream release 3.2.2 - Dropped patch gnuradio-3.2-gcc44.patch From a8e380c72813be3db5d28cb783a358ea5de9bc31 Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Wed, 10 Feb 2010 19:19:28 +0000 Subject: [PATCH 019/313] Resolves: rhbz#539069 FTBFS --- gnuradio-3.2-configure.patch | 12 +++++++++ gnuradio.spec | 52 +++++++++++++++++++++++++++++------- 2 files changed, 54 insertions(+), 10 deletions(-) create mode 100644 gnuradio-3.2-configure.patch diff --git a/gnuradio-3.2-configure.patch b/gnuradio-3.2-configure.patch new file mode 100644 index 0000000..982f7de --- /dev/null +++ b/gnuradio-3.2-configure.patch @@ -0,0 +1,12 @@ +--- gnuradio-3.2.2/configure.ac 2010-01-20 09:54:08.000000000 +0000 ++++ gnuradio-3.2.2/configure.ac 2010-01-20 09:55:35.000000000 +0000 +@@ -121,7 +121,9 @@ + AC_ENABLE_SHARED dnl do build shared libraries + AC_DISABLE_STATIC dnl don't build static libraries + m4_ifdef([LT_INIT],[LT_INIT],[AC_PROG_LIBTOOL]) ++AC_LANG_PUSH([Fortran]) + GR_FORTRAN ++AC_LANG_POP([Fortran]) + + GR_NO_UNDEFINED dnl do we need the -no-undefined linker flag + GR_SCRIPTING diff --git a/gnuradio.spec b/gnuradio.spec index 2ee43cc..0eee79b 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -1,8 +1,8 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: gnuradio Version: 3.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -12,6 +12,7 @@ Source0: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: 10-usrp.rules Patch0: gnuradio-3.2-libtool.patch +Patch1: gnuradio-3.2-configure.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -93,6 +94,9 @@ GNU Radio USRP headers %prep %setup -q %patch0 -p1 -b .libtool +%patch1 -p1 -b .configure +#force regeneration of cached moc output files +find . -name "*_moc.cc" -exec rm {} \; %build export PATH=%{_libexecdir}/sdcc:$PATH @@ -100,6 +104,31 @@ autoreconf -i %configure --enable-doxygen --enable-latex-doc --disable-gr-audio-oss --enable-usrp --enable-gnuradio-core --enable-gnuradio-examples sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +mkdir -p gnuradio-core/src/lib/swig/.deps usrp/host/swig/.deps \ + gr-usrp/src/.deps gr-usrp2/src/.deps gr-audio-alsa/src/.deps \ + gr-audio-jack/src/.deps gr-audio-portaudio/src/.deps \ + gr-cvsd-vocoder/src/lib/.deps gr-gsm-fr-vocoder/src/lib/.deps \ + gr-pager/src/.deps gr-radio-astronomy/src/lib/.deps gr-trellis/src/lib/.deps \ + gr-video-sdl/src/.deps gr-qtgui/src/lib/.deps +touch gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_runtime.d \ + gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_general.d \ + gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_gengen.d \ + gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_filter.d \ + gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_io.d \ + gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_hier.d \ + usrp/host/swig/.deps/usrp_prims.d \ + gr-usrp/src/.deps/usrp_swig.d \ + gr-usrp2/src/.deps/usrp2.d \ + gr-audio-alsa/src/.deps/audio_alsa.d \ + gr-audio-jack/src/.deps/audio_jack.d \ + gr-audio-portaudio/src/.deps/audio_portaudio.d \ + gr-cvsd-vocoder/src/lib/.deps/cvsd_vocoder.d \ + gr-gsm-fr-vocoder/src/lib/.deps/gsm_full_rate.d \ + gr-pager/src/.deps/pager_swig.d \ + gr-radio-astronomy/src/lib/.deps/ra.d \ + gr-trellis/src/lib/.deps/trellis.d \ + gr-video-sdl/src/.deps/video_sdl.d \ + gr-qtgui/src/lib/.deps/qtgui.d make %{?_smp_mflags} %install @@ -123,16 +152,16 @@ getent group usrp >/dev/null || groupadd -r usrp %files %defattr(-,root,root,-) -%{python_sitelib}/gnuradio -%exclude %{python_sitelib}/gnuradio/_usrp2.so -%exclude %{python_sitelib}/gnuradio/usrp* +%{python_sitearch}/gnuradio +%exclude %{python_sitearch}/gnuradio/_usrp2.so +%exclude %{python_sitearch}/gnuradio/usrp* %{_sysconfdir}/gnuradio %{_bindir}/gr_* %{_bindir}/find_usrps %{_bindir}/lsusrp %{_libdir}/lib*.so.* %config(noreplace)%{_sysconfdir}/gnuradio/conf.d/*.conf -%exclude %{python_sitelib}/gnuradio/*.la +%exclude %{python_sitearch}/gnuradio/*.la %files devel %defattr(-,root,root,-) @@ -157,12 +186,12 @@ getent group usrp >/dev/null || groupadd -r usrp %{_bindir}/gpio* %{_datadir}/usrp %{_libdir}/libusrp.so.* -%{python_sitelib}/usrpm -%{python_sitelib}/gnuradio/_usrp2.so -%{python_sitelib}/gnuradio/usrp* +%{python_sitearch}/usrpm +%{python_sitearch}/gnuradio/_usrp2.so +%{python_sitearch}/gnuradio/usrp* %config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp.rules %exclude %{_libdir}/*.la -%exclude %{python_sitelib}/usrpm/*.la +%exclude %{python_sitearch}/usrpm/*.la %files -n usrp-devel %defattr(-,root,root,-) @@ -170,6 +199,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Tue Feb 09 2010 Caolán McNamara - 3.2.2-3 +- Resolves: rhbz#539069 FTBFS + * Fri Jan 22 2010 Rahul Sundaram - 3.2.2-2 - Rebuild for Boost soname bump From dbe4f16640bb157739b81820b3013453ff2581a2 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 21 May 2010 15:17:10 +0000 Subject: [PATCH 020/313] dont BR on comedilib-devel --- gnuradio.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 0eee79b..b18c632 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -31,7 +31,9 @@ BuildRequires: SDL-devel BuildRequires: guile-devel BuildRequires: portaudio-devel BuildRequires: libtool -BuildRequires: comedilib-devel +# Gnuradio deprecated gr-comedi +# http://gnuradio.org/redmine/issues/show/395 +# BuildRequires: comedilib-devel BuildRequires: gsl-devel BuildRequires: tex(latex) BuildRequires: numpy @@ -199,6 +201,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Fri May 21 2010 Tom "spot" Callaway - 3.2.2-4 +- don't BuildRequires: comedilib-devel, code doesn't use it + * Tue Feb 09 2010 Caolán McNamara - 3.2.2-3 - Resolves: rhbz#539069 FTBFS From c0dcc505aa520b6dc905254b2fdc9e759fffaaf0 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 22 May 2010 03:01:16 +0000 Subject: [PATCH 021/313] use PATH override during %install too --- gnuradio.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index b18c632..5604206 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -135,6 +135,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT +export PATH=%{_libexecdir}/sdcc:$PATH make install DESTDIR=$RPM_BUILD_ROOT install -D -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-usrp.rules @@ -201,6 +202,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Fri May 21 2010 Tom "spot" Callaway - 3.2.2-5 +- re-export PATH for %%install + * Fri May 21 2010 Tom "spot" Callaway - 3.2.2-4 - don't BuildRequires: comedilib-devel, code doesn't use it From 179020670cd1e2083789d00f01df8ed3a3cd126f Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 01:43:47 +0000 Subject: [PATCH 022/313] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 5604206..cea1c20 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.2.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -202,6 +202,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Wed Jul 21 2010 David Malcolm - 3.2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Fri May 21 2010 Tom "spot" Callaway - 3.2.2-5 - re-export PATH for %%install From a1adbd60af12e525bbd02587cd6501f1249896f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 16:48:19 +0000 Subject: [PATCH 023/313] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 00bc482..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: gnuradio -# $Id: Makefile,v 1.1 2008/03/23 01:03:11 kevin Exp $ -NAME := gnuradio -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 1aa7da41c381998b907ea2f650e2428fd10146dd Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sun, 1 Aug 2010 01:19:22 -0400 Subject: [PATCH 024/313] * Sun Aug 01 2010 Orcan Ogetbil - 3.2.2-7 - Fix gcc-4.5 build errors --- gnuradio-gcc45.patch | 24 ++++++++++++++++++++++++ gnuradio.spec | 8 +++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gnuradio-gcc45.patch diff --git a/gnuradio-gcc45.patch b/gnuradio-gcc45.patch new file mode 100644 index 0000000..749a820 --- /dev/null +++ b/gnuradio-gcc45.patch @@ -0,0 +1,24 @@ +diff -rupN gnuradio.old/usrp2/host/lib/usrp2.cc gnuradio/usrp2/host/lib/usrp2.cc +--- gnuradio.old/usrp2/host/lib/usrp2.cc 2010-08-01 01:01:48.000000000 -0400 ++++ gnuradio/usrp2/host/lib/usrp2.cc 2010-08-01 01:09:45.000000000 -0400 +@@ -38,9 +38,9 @@ namespace usrp2 { + struct usrp_table_entry { + // inteface + normalized mac addr ("eth0:01:23:45:67:89:ab") + std::string key; +- boost::weak_ptr value; ++ boost::weak_ptr value; + +- usrp_table_entry(const std::string &_key, boost::weak_ptr _value) ++ usrp_table_entry(const std::string &_key, boost::weak_ptr _value) + : key(_key), value(_value) {} + }; + +@@ -70,7 +70,7 @@ namespace usrp2 { + // We don't have the USRP2 we're looking for + + // create a new one and stick it in the table. +- usrp2::sptr r(new usrp2::usrp2(ifc, pr, rx_bufsize)); ++ usrp2::sptr r(new typename usrp2::usrp2(ifc, pr, rx_bufsize)); + usrp_table_entry t(key, r); + s_table.push_back(t); + diff --git a/gnuradio.spec b/gnuradio.spec index cea1c20..4683174 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.2.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: 10-usrp.rules Patch0: gnuradio-3.2-libtool.patch Patch1: gnuradio-3.2-configure.patch +Patch2: gnuradio-gcc45.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -97,6 +98,8 @@ GNU Radio USRP headers %setup -q %patch0 -p1 -b .libtool %patch1 -p1 -b .configure +%patch2 -p1 -b .gcc45 + #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -202,6 +205,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Sun Aug 01 2010 Orcan Ogetbil - 3.2.2-7 +- Fix gcc-4.5 build errors + * Wed Jul 21 2010 David Malcolm - 3.2.2-6 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From 7c454f904d95658422f1862712228a9c48946897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 7 Sep 2010 11:41:33 +0200 Subject: [PATCH 025/313] - Add sparc64 and s390x to 64-bit platforms --- gnuradio-3.2.2-64bit.patch | 30 ++++++++++++++++++++++++++++++ gnuradio.spec | 7 ++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gnuradio-3.2.2-64bit.patch diff --git a/gnuradio-3.2.2-64bit.patch b/gnuradio-3.2.2-64bit.patch new file mode 100644 index 0000000..2273518 --- /dev/null +++ b/gnuradio-3.2.2-64bit.patch @@ -0,0 +1,30 @@ +diff -up gnuradio-3.2.2/config/gr_lib64.m4.64bit gnuradio-3.2.2/config/gr_lib64.m4 +--- gnuradio-3.2.2/config/gr_lib64.m4.64bit 2010-09-07 10:50:42.000000000 +0200 ++++ gnuradio-3.2.2/config/gr_lib64.m4 2010-09-07 10:53:15.000000000 +0200 +@@ -21,14 +21,14 @@ dnl + + dnl GR_LIB64() + dnl +-dnl Checks to see if we're on a x86_64 or powerpc64 machine, and if so, determine ++dnl Checks to see if we're on a x86_64, powerpc64, sparc64 or s390x machine, and if so, determine + dnl if libdir should end in "64" or not. + dnl + dnl Sets gr_libdir_suffix to "" or "64" and calls AC_SUBST(gr_libdir_suffix) + dnl May append "64" to libdir. + dnl + dnl The current heuristic is: +-dnl if the host_cpu isn't x86_64 or powerpc64, then "" ++dnl if the host_cpu isn't x86_64 or powerpc64 or sparc64 or s390x, then "" + dnl if the host_os isn't linux, then "" + dnl if we're cross-compiling, ask the linker, by way of the selected compiler + dnl if we're x86_64 and there's a /lib64 and it's not a symlink, then "64", else "" +@@ -47,7 +47,8 @@ AC_DEFUN([GR_LIB64],[ + *) is_linux=no ;; + esac + +- if test "$is_linux" = no || test "$host_cpu" != "x86_64" && test "$host_cpu" != "powerpc64"; then ++ if test "$is_linux" = no || test "$host_cpu" != "x86_64" && test "$host_cpu" != "powerpc64" \ ++ && test "$host_cpu" != "sparc64" && test "$host_cpu" != "s390x"; then + gr_libdir_suffix="" + elif test "$cross_compiling" = yes; then + _GR_LIB64_ASK_COMPILER diff --git a/gnuradio.spec b/gnuradio.spec index 4683174..42e9126 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.2.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -14,6 +14,7 @@ Source1: 10-usrp.rules Patch0: gnuradio-3.2-libtool.patch Patch1: gnuradio-3.2-configure.patch Patch2: gnuradio-gcc45.patch +Patch3: gnuradio-3.2.2-64bit.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -99,6 +100,7 @@ GNU Radio USRP headers %patch0 -p1 -b .libtool %patch1 -p1 -b .configure %patch2 -p1 -b .gcc45 +%patch3 -p1 -b .64bit #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -205,6 +207,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Tue Sep 07 2010 Dan Horák - 3.2.2-8 +- Add sparc64 and s390x to 64-bit platforms + * Sun Aug 01 2010 Orcan Ogetbil - 3.2.2-7 - Fix gcc-4.5 build errors From 1d53d4f453f83df5b8446fef91a750687334faf7 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Mon, 7 Feb 2011 00:22:55 +0100 Subject: [PATCH 026/313] rebuild for new boost --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 42e9126..b7427b0 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.2.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -207,6 +207,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Mon Feb 07 2011 Thomas Spura - 3.2.2-9 +- rebuild for new boost + * Tue Sep 07 2010 Dan Horák - 3.2.2-8 - Add sparc64 and s390x to 64-bit platforms From 36876c5f7b04421cd6fe7ab6874c4fc2f22bf7c5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 23:18:19 -0600 Subject: [PATCH 027/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index b7427b0..8dca7a3 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.2.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -207,6 +207,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 3.2.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Feb 07 2011 Thomas Spura - 3.2.2-9 - rebuild for new boost From afce1cb05bbd5898fa7318ad63c46496c8b950bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 15 Feb 2011 10:07:32 +0100 Subject: [PATCH 028/313] - Rebuild for new boost --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 8dca7a3..fe83063 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.2.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -207,6 +207,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Tue Feb 15 2011 Jaroslav Škarvada - 3.2.2-11 +- Rebuild for new boost + * Tue Feb 08 2011 Fedora Release Engineering - 3.2.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From f5237d106e038d9ffdd9fae2619869a4b7f3b8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 17 Feb 2011 11:39:28 +0100 Subject: [PATCH 029/313] - Fix compilation with ptrdifft-std patch - Rebuild for new boost --- gnuradio-3.2.2-ptrdifft-std.patch | 13 +++++++++++++ gnuradio.spec | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 gnuradio-3.2.2-ptrdifft-std.patch diff --git a/gnuradio-3.2.2-ptrdifft-std.patch b/gnuradio-3.2.2-ptrdifft-std.patch new file mode 100644 index 0000000..dc31a5f --- /dev/null +++ b/gnuradio-3.2.2-ptrdifft-std.patch @@ -0,0 +1,13 @@ +--- gnuradio-3.3.0/usrp/host/swig/usrp_prims.i.old 2011-02-16 23:53:52.000639466 +0100 ++++ gnuradio-3.3.0/usrp/host/swig/usrp_prims.i 2011-02-16 23:53:11.017005325 +0100 +@@ -32,6 +32,10 @@ + * Linux, *BSD and Mac OS/X. http://libusb.sourceforge.net + */ + ++%{ ++typedef std::ptrdiff_t ptrdiff_t; ++%} ++ + %include // pick up string stuff + + diff --git a/gnuradio.spec b/gnuradio.spec index fe83063..de1bc8c 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -15,6 +15,7 @@ Patch0: gnuradio-3.2-libtool.patch Patch1: gnuradio-3.2-configure.patch Patch2: gnuradio-gcc45.patch Patch3: gnuradio-3.2.2-64bit.patch +Patch4: gnuradio-3.2.2-ptrdifft-std.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -101,6 +102,7 @@ GNU Radio USRP headers %patch1 -p1 -b .configure %patch2 -p1 -b .gcc45 %patch3 -p1 -b .64bit +%patch4 -p1 -b .ptrdifft-std #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -208,6 +210,7 @@ getent group usrp >/dev/null || groupadd -r usrp %changelog * Tue Feb 15 2011 Jaroslav Škarvada - 3.2.2-11 +- Fix compilation with ptrdifft-std patch - Rebuild for new boost * Tue Feb 08 2011 Fedora Release Engineering - 3.2.2-10 From 73f811ea575114cffcf8f7cb9cfd74c93ac8f8b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 15 Mar 2011 10:06:57 +0100 Subject: [PATCH 030/313] Rebuild for new boost --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index de1bc8c..779f975 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.2.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -209,6 +209,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Tue Mar 15 2011 Jaroslav Škarvada - 3.2.2-12 +- Rebuild for new boost + * Tue Feb 15 2011 Jaroslav Škarvada - 3.2.2-11 - Fix compilation with ptrdifft-std patch - Rebuild for new boost From 71dc4204e1b9d5ac10497b74e1bb8d04bc918cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 7 Apr 2011 13:20:57 +0200 Subject: [PATCH 031/313] Rebuild for new boost --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 779f975..2c888cc 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.2.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -209,6 +209,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Thu Apr 07 2011 Jaroslav Škarvada - 3.2.2-13 +- Rebuild for new boost + * Tue Mar 15 2011 Jaroslav Škarvada - 3.2.2-12 - Rebuild for new boost From dbd06bdfc8303c4b2993440f15e2af402f6651e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 28 Jun 2011 18:02:36 +0200 Subject: [PATCH 032/313] New version Updated 10-usrp.rules Resolves: rhbz#597023 Merged usrp to gnuradio, fixes some packaging bugs Resolves: rhbz#516352 Resolves: rhbz#619195 Rebuilt with included grc, obsoleted grc package Resolves: rhbz#592486 Removed unneeded patches (libtool, configure, gcc45, ptrdifft-std) Fixed compilation with sdcc3 (sdcc3 patch) Fixed detection of libusb (libusb-detect-fix patch) Compiled with -fno-strict-aliasing --- 10-usrp.rules | 2 +- gnuradio-3.2-configure.patch | 12 - gnuradio-3.2-gcc44.patch | 525 ------------------------- gnuradio-3.2-libtool.patch | 14 - gnuradio-3.2.2-ptrdifft-std.patch | 13 - gnuradio-3.4.0-libusb-detect-fix.patch | 40 ++ gnuradio-3.4.0-sdcc3.patch | 69 ++++ gnuradio-gcc45.patch | 24 -- gnuradio.spec | 164 ++++---- sources | 2 +- 10 files changed, 181 insertions(+), 684 deletions(-) delete mode 100644 gnuradio-3.2-configure.patch delete mode 100644 gnuradio-3.2-gcc44.patch delete mode 100644 gnuradio-3.2-libtool.patch delete mode 100644 gnuradio-3.2.2-ptrdifft-std.patch create mode 100644 gnuradio-3.4.0-libusb-detect-fix.patch create mode 100644 gnuradio-3.4.0-sdcc3.patch delete mode 100644 gnuradio-gcc45.patch diff --git a/10-usrp.rules b/10-usrp.rules index 554923a..996c52a 100644 --- a/10-usrp.rules +++ b/10-usrp.rules @@ -1,3 +1,3 @@ # rule to grant read/write access on USRP to group named usrp. # to use, install this file in /etc/udev/rules.d as 10-usrp.rules -ACTION=="add", BUS=="usb", SYSFS{idVendor}=="fffe", SYSFS{idProduct}=="0002", GROUP:="usrp", MODE:="0660" +ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", GROUP:="usrp", MODE:="0660" diff --git a/gnuradio-3.2-configure.patch b/gnuradio-3.2-configure.patch deleted file mode 100644 index 982f7de..0000000 --- a/gnuradio-3.2-configure.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- gnuradio-3.2.2/configure.ac 2010-01-20 09:54:08.000000000 +0000 -+++ gnuradio-3.2.2/configure.ac 2010-01-20 09:55:35.000000000 +0000 -@@ -121,7 +121,9 @@ - AC_ENABLE_SHARED dnl do build shared libraries - AC_DISABLE_STATIC dnl don't build static libraries - m4_ifdef([LT_INIT],[LT_INIT],[AC_PROG_LIBTOOL]) -+AC_LANG_PUSH([Fortran]) - GR_FORTRAN -+AC_LANG_POP([Fortran]) - - GR_NO_UNDEFINED dnl do we need the -no-undefined linker flag - GR_SCRIPTING diff --git a/gnuradio-3.2-gcc44.patch b/gnuradio-3.2-gcc44.patch deleted file mode 100644 index 47b23a7..0000000 --- a/gnuradio-3.2-gcc44.patch +++ /dev/null @@ -1,525 +0,0 @@ -Marek Mahut : Patch to fix build under gcc 4.4 - -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc gnuradio-3.2/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2009-07-25 09:14:00.862437254 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2009-07-25 09:17:18.282187738 +0200 -@@ -39,6 +39,7 @@ - - #include - #include -+#include - - gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector &taps) - { -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc gnuradio-3.2/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2009-07-25 09:14:00.864437599 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2009-07-25 09:17:25.071217820 +0200 -@@ -34,6 +34,7 @@ - - #include - #include -+#include - - gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector &taps) - { -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2009-07-25 09:14:01.033433009 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2009-07-25 09:17:36.663188600 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - - //define ALIGN_ADVANCED_IMPLEMENTATION to have an alternative implementation of the align algoritm which exactly follows the align_interval spec. -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc 2009-07-25 09:14:01.051436257 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc 2009-07-25 09:17:42.243478128 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - // Public constructor - -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc 2009-07-25 09:14:01.025437774 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc 2009-07-25 09:17:47.250185275 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #include - using std::cout; -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc 2009-07-25 09:14:01.060434982 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc 2009-07-25 09:17:54.333184463 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #define VERBOSE 0 - -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc 2009-07-25 09:14:01.047433541 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc 2009-07-25 09:18:01.345183736 +0200 -@@ -30,7 +30,7 @@ - #include - #include - #include -- -+#include - #include - - #define M_TWOPI (2*M_PI) -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc 2009-07-25 09:14:01.076437534 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc 2009-07-25 09:18:07.285215839 +0200 -@@ -24,6 +24,7 @@ - - #include - #include -+#include - - gr_decode_ccsds_27_fb_sptr - gr_make_decode_ccsds_27_fb() -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_dpll_bb.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_dpll_bb.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_dpll_bb.cc 2009-07-25 09:14:01.055437436 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_dpll_bb.cc 2009-07-25 09:18:20.651188536 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - gr_dpll_bb_sptr - gr_make_dpll_bb (float period, float gain) -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_fft_vfc.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_fft_vfc.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2009-07-25 09:14:01.032433570 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2009-07-25 09:18:27.588184185 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - - // FIXME after this is working, change to use native real to complex fft. -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc 2009-07-25 09:14:01.080445069 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc 2009-07-25 09:18:45.986188440 +0200 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - - #define M_TWOPI (2*M_PI) -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.cc 2009-07-25 09:14:01.067433082 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.cc 2009-07-25 09:36:03.133188443 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #define VERBOSE 0 - #define M_TWOPI (2*M_PI) -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc 2009-07-25 09:14:01.055437436 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_ofdm_sampler.cc 2009-07-25 09:43:44.309459146 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - gr_ofdm_sampler_sptr - gr_make_ofdm_sampler (unsigned int fft_length, -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_simple_correlator.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_simple_correlator.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2009-07-25 09:14:01.078437530 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2009-07-25 09:18:50.951455747 +0200 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - - static const int THRESHOLD = 3; -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_stream_mux.cc gnuradio-3.2/gnuradio-core/src/lib/general/gr_stream_mux.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/general/gr_stream_mux.cc 2009-07-25 09:14:01.083447508 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/general/gr_stream_mux.cc 2009-07-25 09:18:55.617260043 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #define VERBOSE 0 - -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/lib/io/gr_wavfile_sink.cc gnuradio-3.2/gnuradio-core/src/lib/io/gr_wavfile_sink.cc ---- gnuradio-3.2-upstream/gnuradio-core/src/lib/io/gr_wavfile_sink.cc 2009-07-25 09:14:00.995437624 +0200 -+++ gnuradio-3.2/gnuradio-core/src/lib/io/gr_wavfile_sink.cc 2009-07-25 09:19:02.378184445 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - #include - -diff -Naur gnuradio-3.2-upstream/gr-audio-alsa/src/gri_alsa.cc gnuradio-3.2/gr-audio-alsa/src/gri_alsa.cc ---- gnuradio-3.2-upstream/gr-audio-alsa/src/gri_alsa.cc 2009-07-25 09:14:00.474445345 +0200 -+++ gnuradio-3.2/gr-audio-alsa/src/gri_alsa.cc 2009-07-25 09:19:13.904207014 +0200 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - static snd_pcm_access_t access_types[] = { - SND_PCM_ACCESS_MMAP_INTERLEAVED, -diff -Naur gnuradio-3.2-upstream/gr-audio-osx/src/audio_osx_sink.cc gnuradio-3.2/gr-audio-osx/src/audio_osx_sink.cc ---- gnuradio-3.2-upstream/gr-audio-osx/src/audio_osx_sink.cc 2009-07-25 09:14:00.341445675 +0200 -+++ gnuradio-3.2/gr-audio-osx/src/audio_osx_sink.cc 2009-07-25 09:19:21.598183148 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #define _OSX_AU_DEBUG_ 0 - -diff -Naur gnuradio-3.2-upstream/gr-audio-osx/src/audio_osx_source.cc gnuradio-3.2/gr-audio-osx/src/audio_osx_source.cc ---- gnuradio-3.2-upstream/gr-audio-osx/src/audio_osx_source.cc 2009-07-25 09:14:00.343450491 +0200 -+++ gnuradio-3.2/gr-audio-osx/src/audio_osx_source.cc 2009-07-25 09:19:27.590184106 +0200 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #define _OSX_AU_DEBUG_ 0 - #define _OSX_DO_LISTENERS_ 0 -diff -Naur gnuradio-3.2-upstream/gr-audio-portaudio/src/gri_portaudio.cc gnuradio-3.2/gr-audio-portaudio/src/gri_portaudio.cc ---- gnuradio-3.2-upstream/gr-audio-portaudio/src/gri_portaudio.cc 2009-07-25 09:14:00.477445200 +0200 -+++ gnuradio-3.2/gr-audio-portaudio/src/gri_portaudio.cc 2009-07-25 09:19:33.475184246 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - - PaDeviceIndex -diff -Naur gnuradio-3.2-upstream/gr-pager/src/pager_flex_sync.cc gnuradio-3.2/gr-pager/src/pager_flex_sync.cc ---- gnuradio-3.2-upstream/gr-pager/src/pager_flex_sync.cc 2009-07-25 09:14:01.100445030 +0200 -+++ gnuradio-3.2/gr-pager/src/pager_flex_sync.cc 2009-07-25 09:19:38.231198885 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - pager_flex_sync_sptr pager_make_flex_sync() - { -diff -Naur gnuradio-3.2-upstream/gr-qtgui/src/lib/spectrumUpdateEvents.h gnuradio-3.2/gr-qtgui/src/lib/spectrumUpdateEvents.h ---- gnuradio-3.2-upstream/gr-qtgui/src/lib/spectrumUpdateEvents.h 2009-07-25 09:14:00.716437539 +0200 -+++ gnuradio-3.2/gr-qtgui/src/lib/spectrumUpdateEvents.h 2009-07-26 11:08:31.834443932 +0200 -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - - class SpectrumUpdateEvent:public QEvent{ - -diff -Naur gnuradio-3.2-upstream/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h gnuradio-3.2/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h ---- gnuradio-3.2-upstream/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h 2009-07-25 09:14:00.717434185 +0200 -+++ gnuradio-3.2/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h 2009-07-26 15:39:18.539220269 +0200 -@@ -9,6 +9,8 @@ - #include - #include - -+#include -+ - class Waterfall3DColorMap:public Qwt3D::Color, public QwtLinearColorMap{ - public: - Waterfall3DColorMap(); -diff -Naur gnuradio-3.2-upstream/gr-usrp/apps/usrp_siggen.cc gnuradio-3.2/gr-usrp/apps/usrp_siggen.cc ---- gnuradio-3.2-upstream/gr-usrp/apps/usrp_siggen.cc 2009-07-25 09:14:00.503447733 +0200 -+++ gnuradio-3.2/gr-usrp/apps/usrp_siggen.cc 2009-07-25 17:21:57.442443913 +0200 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - namespace po = boost::program_options; - -diff -Naur gnuradio-3.2-upstream/gr-usrp/src/usrp_sink_base.cc gnuradio-3.2/gr-usrp/src/usrp_sink_base.cc ---- gnuradio-3.2-upstream/gr-usrp/src/usrp_sink_base.cc 2009-07-25 09:14:00.501447597 +0200 -+++ gnuradio-3.2/gr-usrp/src/usrp_sink_base.cc 2009-07-25 17:19:08.780188246 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - static const int OUTPUT_MULTIPLE_SAMPLES = 128; // DON'T CHANGE THIS VALUE! - -diff -Naur gnuradio-3.2-upstream/gr-usrp/src/usrp_source_base.cc gnuradio-3.2/gr-usrp/src/usrp_source_base.cc ---- gnuradio-3.2-upstream/gr-usrp/src/usrp_source_base.cc 2009-07-25 09:14:00.502445220 +0200 -+++ gnuradio-3.2/gr-usrp/src/usrp_source_base.cc 2009-07-25 17:19:51.214219555 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - static const int OUTPUT_MULTIPLE_BYTES = 4 * 1024; - -diff -Naur gnuradio-3.2-upstream/mblock/src/lib/mb_worker.cc gnuradio-3.2/mblock/src/lib/mb_worker.cc ---- gnuradio-3.2-upstream/mblock/src/lib/mb_worker.cc 2009-07-25 09:14:00.496445162 +0200 -+++ gnuradio-3.2/mblock/src/lib/mb_worker.cc 2009-07-25 11:17:09.894192322 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #ifdef HAVE_SCHED_H - #include - #endif -diff -Naur gnuradio-3.2-upstream/mblock/src/lib/qa_bitset.cc gnuradio-3.2/mblock/src/lib/qa_bitset.cc ---- gnuradio-3.2-upstream/mblock/src/lib/qa_bitset.cc 2009-07-25 09:14:00.494447611 +0200 -+++ gnuradio-3.2/mblock/src/lib/qa_bitset.cc 2009-07-25 11:17:15.999184361 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - -diff -Naur gnuradio-3.2-upstream/mblock/src/lib/qa_disconnect.cc gnuradio-3.2/mblock/src/lib/qa_disconnect.cc ---- gnuradio-3.2-upstream/mblock/src/lib/qa_disconnect.cc 2009-07-25 09:14:00.494447611 +0200 -+++ gnuradio-3.2/mblock/src/lib/qa_disconnect.cc 2009-07-25 13:41:30.945188181 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - static pmt_t s_in = pmt_intern("in"); - static pmt_t s_out = pmt_intern("out"); -diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/db_boards.cc gnuradio-3.2/usrp/host/lib/legacy/db_boards.cc ---- gnuradio-3.2-upstream/usrp/host/lib/legacy/db_boards.cc 2009-07-25 09:14:00.618447788 +0200 -+++ gnuradio-3.2/usrp/host/lib/legacy/db_boards.cc 2009-07-25 16:59:10.714438636 +0200 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - std::vector - instantiate_dbs(int dbid, usrp_basic_sptr usrp, int which_side) -diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/db_dbs_rx.cc gnuradio-3.2/usrp/host/lib/legacy/db_dbs_rx.cc ---- gnuradio-3.2-upstream/usrp/host/lib/legacy/db_dbs_rx.cc 2009-07-25 09:14:00.618447788 +0200 -+++ gnuradio-3.2/usrp/host/lib/legacy/db_dbs_rx.cc 2009-07-25 17:00:38.567217525 +0200 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - - /*****************************************************************************/ -diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/db_xcvr2450.cc gnuradio-3.2/usrp/host/lib/legacy/db_xcvr2450.cc ---- gnuradio-3.2-upstream/usrp/host/lib/legacy/db_xcvr2450.cc 2009-07-25 09:14:00.617445275 +0200 -+++ gnuradio-3.2/usrp/host/lib/legacy/db_xcvr2450.cc 2009-07-25 17:01:20.805468727 +0200 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - -diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/fusb_darwin.cc gnuradio-3.2/usrp/host/lib/legacy/fusb_darwin.cc ---- gnuradio-3.2-upstream/usrp/host/lib/legacy/fusb_darwin.cc 2009-07-25 09:14:00.612447799 +0200 -+++ gnuradio-3.2/usrp/host/lib/legacy/fusb_darwin.cc 2009-07-25 09:19:46.638210966 +0200 -@@ -33,6 +33,7 @@ - #include "fusb.h" - #include "fusb_darwin.h" - #include "darwin_libusb.h" -+#include - - static const int USB_TIMEOUT = 100; // in milliseconds - static const UInt8 NUM_QUEUE_ITEMS = 20; -diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/fusb_linux.cc gnuradio-3.2/usrp/host/lib/legacy/fusb_linux.cc ---- gnuradio-3.2-upstream/usrp/host/lib/legacy/fusb_linux.cc 2009-07-25 09:14:00.616447792 +0200 -+++ gnuradio-3.2/usrp/host/lib/legacy/fusb_linux.cc 2009-07-25 09:19:54.041184719 +0200 -@@ -33,10 +33,10 @@ - #include // interface to kernel portion of user mode usb driver - #include - #include --#include - #include - #include - #include -+#include - - #define MINIMIZE_TX_BUFFERING 1 // must be defined to 0 or 1 - -diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/fusb_win32.cc gnuradio-3.2/usrp/host/lib/legacy/fusb_win32.cc ---- gnuradio-3.2-upstream/usrp/host/lib/legacy/fusb_win32.cc 2009-07-25 09:14:00.617445275 +0200 -+++ gnuradio-3.2/usrp/host/lib/legacy/fusb_win32.cc 2009-07-25 09:19:58.736184198 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - static const int MAX_BLOCK_SIZE = fusb_sysconfig::max_block_size(); - static const int DEFAULT_BLOCK_SIZE = MAX_BLOCK_SIZE; -diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/usrp_basic.cc gnuradio-3.2/usrp/host/lib/legacy/usrp_basic.cc ---- gnuradio-3.2-upstream/usrp/host/lib/legacy/usrp_basic.cc 2009-07-25 09:14:00.611447732 +0200 -+++ gnuradio-3.2/usrp/host/lib/legacy/usrp_basic.cc 2009-07-25 09:20:04.941434694 +0200 -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - using namespace ad9862; - -diff -Naur gnuradio-3.2-upstream/usrp/host/lib/legacy/usrp_standard.cc gnuradio-3.2/usrp/host/lib/legacy/usrp_standard.cc ---- gnuradio-3.2-upstream/usrp/host/lib/legacy/usrp_standard.cc 2009-07-25 09:14:00.619447576 +0200 -+++ gnuradio-3.2/usrp/host/lib/legacy/usrp_standard.cc 2009-07-25 09:20:09.756187465 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - - static const int OLD_CAPS_VAL = 0xaa55ff77; -diff -Naur gnuradio-3.2-upstream/usrp2/host/apps/find_usrps.cc gnuradio-3.2/usrp2/host/apps/find_usrps.cc ---- gnuradio-3.2-upstream/usrp2/host/apps/find_usrps.cc 2009-07-25 09:14:00.301437861 +0200 -+++ gnuradio-3.2/usrp2/host/apps/find_usrps.cc 2009-07-25 17:14:41.128188741 +0200 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - static void - usage(const char *progname) -diff -Naur gnuradio-3.2-upstream/usrp2/host/apps/gpio.cc gnuradio-3.2/usrp2/host/apps/gpio.cc ---- gnuradio-3.2-upstream/usrp2/host/apps/gpio.cc 2009-07-25 09:14:00.302450501 +0200 -+++ gnuradio-3.2/usrp2/host/apps/gpio.cc 2009-07-25 17:18:14.131203844 +0200 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - - int - main(int argc, char **argv) -diff -Naur gnuradio-3.2-upstream/usrp2/host/apps/rx_streaming_samples.cc gnuradio-3.2/usrp2/host/apps/rx_streaming_samples.cc ---- gnuradio-3.2-upstream/usrp2/host/apps/rx_streaming_samples.cc 2009-07-25 09:14:00.302450501 +0200 -+++ gnuradio-3.2/usrp2/host/apps/rx_streaming_samples.cc 2009-07-25 17:15:30.560205148 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -Naur gnuradio-3.2-upstream/usrp2/host/apps/test_mimo_tx.cc gnuradio-3.2/usrp2/host/apps/test_mimo_tx.cc ---- gnuradio-3.2-upstream/usrp2/host/apps/test_mimo_tx.cc 2009-07-25 09:14:00.301437861 +0200 -+++ gnuradio-3.2/usrp2/host/apps/test_mimo_tx.cc 2009-07-25 17:17:26.239258963 +0200 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - - typedef std::complex fcomplex; -diff -Naur gnuradio-3.2-upstream/usrp2/host/apps/tx_samples.cc gnuradio-3.2/usrp2/host/apps/tx_samples.cc ---- gnuradio-3.2-upstream/usrp2/host/apps/tx_samples.cc 2009-07-25 09:14:00.302450501 +0200 -+++ gnuradio-3.2/usrp2/host/apps/tx_samples.cc 2009-07-25 17:16:51.973188827 +0200 -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -Naur gnuradio-3.2-upstream/usrp2/host/lib/eth_buffer.cc gnuradio-3.2/usrp2/host/lib/eth_buffer.cc ---- gnuradio-3.2-upstream/usrp2/host/lib/eth_buffer.cc 2009-07-25 09:14:00.295439060 +0200 -+++ gnuradio-3.2/usrp2/host/lib/eth_buffer.cc 2009-07-25 17:08:50.711203188 +0200 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -Naur gnuradio-3.2-upstream/usrp2/host/lib/ethernet.cc gnuradio-3.2/usrp2/host/lib/ethernet.cc ---- gnuradio-3.2-upstream/usrp2/host/lib/ethernet.cc 2009-07-25 09:14:00.296436544 +0200 -+++ gnuradio-3.2/usrp2/host/lib/ethernet.cc 2009-07-25 17:09:54.200210018 +0200 -@@ -25,6 +25,7 @@ - #include - - #include -+#include - #include - #include - //#include -diff -Naur gnuradio-3.2-upstream/usrp2/host/lib/ethernet.h gnuradio-3.2/usrp2/host/lib/ethernet.h ---- gnuradio-3.2-upstream/usrp2/host/lib/ethernet.h 2009-07-25 09:14:00.295439060 +0200 -+++ gnuradio-3.2/usrp2/host/lib/ethernet.h 2009-07-25 17:12:39.574184059 +0200 -@@ -20,6 +20,7 @@ - #define INCLUDED_USRP2_ETHERNET_H - - #include -+#include - #include - #include - -diff -Naur gnuradio-3.2-upstream/usrp2/host/lib/find.cc gnuradio-3.2/usrp2/host/lib/find.cc ---- gnuradio-3.2-upstream/usrp2/host/lib/find.cc 2009-07-25 09:14:00.299443453 +0200 -+++ gnuradio-3.2/usrp2/host/lib/find.cc 2009-07-25 17:13:19.549453343 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #define FIND_DEBUG 0 - -diff -Naur gnuradio-3.2-upstream/usrp2/host/lib/usrp2.cc gnuradio-3.2/usrp2/host/lib/usrp2.cc ---- gnuradio-3.2-upstream/usrp2/host/lib/usrp2.cc 2009-07-25 09:14:00.298438985 +0200 -+++ gnuradio-3.2/usrp2/host/lib/usrp2.cc 2009-07-25 17:13:54.453437924 +0200 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - - namespace usrp2 { diff --git a/gnuradio-3.2-libtool.patch b/gnuradio-3.2-libtool.patch deleted file mode 100644 index 7f51205..0000000 --- a/gnuradio-3.2-libtool.patch +++ /dev/null @@ -1,14 +0,0 @@ -Marek Mahut : This patch fixes the build when libtool fails to detect that lib - -diff -Naur gnuradio-3.2-upstream/gnuradio-core/src/tests/Makefile.am gnuradio-3.2/gnuradio-core/src/tests/Makefile.am ---- gnuradio-3.2-upstream/gnuradio-core/src/tests/Makefile.am 2009-07-25 09:14:01.090447704 +0200 -+++ gnuradio-3.2/gnuradio-core/src/tests/Makefile.am 2009-07-25 09:25:12.681195057 +0200 -@@ -59,7 +59,7 @@ - benchmark_dotprod - - --LIBGNURADIO = $(GNURADIO_CORE_LA) -+LIBGNURADIO = $(GNURADIO_CORE_LA) $(top_builddir)/omnithread/libgromnithread.la - LIBGNURADIOQA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core-qa.la $(LIBGNURADIO) - - benchmark_dotprod_fff_SOURCES = benchmark_dotprod_fff.cc diff --git a/gnuradio-3.2.2-ptrdifft-std.patch b/gnuradio-3.2.2-ptrdifft-std.patch deleted file mode 100644 index dc31a5f..0000000 --- a/gnuradio-3.2.2-ptrdifft-std.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- gnuradio-3.3.0/usrp/host/swig/usrp_prims.i.old 2011-02-16 23:53:52.000639466 +0100 -+++ gnuradio-3.3.0/usrp/host/swig/usrp_prims.i 2011-02-16 23:53:11.017005325 +0100 -@@ -32,6 +32,10 @@ - * Linux, *BSD and Mac OS/X. http://libusb.sourceforge.net - */ - -+%{ -+typedef std::ptrdiff_t ptrdiff_t; -+%} -+ - %include // pick up string stuff - - diff --git a/gnuradio-3.4.0-libusb-detect-fix.patch b/gnuradio-3.4.0-libusb-detect-fix.patch new file mode 100644 index 0000000..aafc210 --- /dev/null +++ b/gnuradio-3.4.0-libusb-detect-fix.patch @@ -0,0 +1,40 @@ +diff -up gnuradio-3.4.0/config/usrp_libusb.m4.orig gnuradio-3.4.0/config/usrp_libusb.m4 +--- gnuradio-3.4.0/config/usrp_libusb.m4.orig 2011-06-12 05:54:36.000000000 +0200 ++++ gnuradio-3.4.0/config/usrp_libusb.m4 2011-06-28 11:34:32.893634688 +0200 +@@ -160,36 +160,6 @@ AC_DEFUN([USRP_LIBUSB], [ + AC_MSG_RESULT([$libusbok]) + LIBS="$save_LIBS" + AC_LANG_POP(C) +- +- if test $libusbok = yes; then +- if test ${libusb_name} != "libusb-1.0"; then +- dnl PKGCONFIG found a legacy version of libusb; make sure the +- dnl variable _usb_debug is available in the found library. +- dnl Do not test on Windows, since that symbol is not defined. +- case "$host_os" in +- cygwin* | mingw*) +- ;; +- *) +- AC_LANG_PUSH(C) +- save_CPPFLAGS="$CPPFLAGS" +- if test x$USB_INCLUDEDIR != x; then +- CPPFLAGS="$USB_INCLUDES" +- fi +- save_LIBS="$LIBS" +- LIBS="$USB_LIBS" +- AC_MSG_CHECKING([$libusb_name for symbol usb_debug in library $usb_lib_name]) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +- extern int usb_debug;]], +- [[usb_debug = 0;]])], +- [libusbok=yes],[libusbok=no]) +- AC_MSG_RESULT([$libusbok]) +- LIBS="$save_LIBS" +- CPPFLAGS="$save_CPPFLAGS" +- AC_LANG_POP(C) +- ;; +- esac +- fi +- fi + fi + fi + dnl if everything checks out OK, finish up diff --git a/gnuradio-3.4.0-sdcc3.patch b/gnuradio-3.4.0-sdcc3.patch new file mode 100644 index 0000000..7401f8c --- /dev/null +++ b/gnuradio-3.4.0-sdcc3.patch @@ -0,0 +1,69 @@ +diff -up gnuradio-3.4.0/gr-howto-write-a-block/config/usrp_sdcc.m4.orig gnuradio-3.4.0/gr-howto-write-a-block/config/usrp_sdcc.m4 +--- gnuradio-3.4.0/gr-howto-write-a-block/config/usrp_sdcc.m4.orig 2011-06-12 05:54:36.000000000 +0200 ++++ gnuradio-3.4.0/gr-howto-write-a-block/config/usrp_sdcc.m4 2011-06-27 16:17:42.001053649 +0200 +@@ -21,7 +21,7 @@ AC_DEFUN([USRP_SDCC], + [ + sdccok=yes + AC_CHECK_PROG(XCC, sdcc, sdcc -mmcs51 --no-xinit-opt,no) +- AC_CHECK_PROG(XAS, asx8051, asx8051 -plosgff,no) ++ AC_CHECK_PROG(XAS, sdas8051, sdas8051 -plosgff,no) + + if test "$XCC" = "no" -o "$XAS" = "no" ; then + AC_MSG_RESULT([USRP requires sdcc. sdcc not found. See http://sdcc.sf.net]) +diff -up gnuradio-3.4.0/config/usrp_sdcc.m4.orig gnuradio-3.4.0/config/usrp_sdcc.m4 +--- gnuradio-3.4.0/config/usrp_sdcc.m4.orig 2011-06-12 05:54:36.000000000 +0200 ++++ gnuradio-3.4.0/config/usrp_sdcc.m4 2011-06-27 16:17:42.001053649 +0200 +@@ -21,7 +21,7 @@ AC_DEFUN([USRP_SDCC], + [ + sdccok=yes + AC_CHECK_PROG(XCC, sdcc, sdcc -mmcs51 --no-xinit-opt,no) +- AC_CHECK_PROG(XAS, asx8051, asx8051 -plosgff,no) ++ AC_CHECK_PROG(XAS, sdas8051, sdas8051 -plosgff,no) + + if test "$XCC" = "no" -o "$XAS" = "no" ; then + AC_MSG_RESULT([USRP requires sdcc version 2. sdcc not found. See http://sdcc.sf.net]) +diff -up gnuradio-3.4.0/usrp/firmware/lib/delay.c.orig gnuradio-3.4.0/usrp/firmware/lib/delay.c +--- gnuradio-3.4.0/usrp/firmware/lib/delay.c.orig 2011-06-12 05:54:36.000000000 +0200 ++++ gnuradio-3.4.0/usrp/firmware/lib/delay.c 2011-06-28 09:31:11.361044713 +0200 +@@ -24,7 +24,7 @@ + * Delay approximately 1 microsecond (including overhead in udelay). + */ + static void +-udelay1 (void) _naked ++udelay1 (void) __naked + { + _asm ; lcall that got us here took 4 bus cycles + ret ; 4 bus cycles +@@ -51,7 +51,7 @@ udelay (unsigned char usecs) + * but explains the factor of 4 problem below). + */ + static void +-mdelay1 (void) _naked ++mdelay1 (void) __naked + { + _asm + mov dptr,#(-1200 & 0xffff) +diff -up gnuradio-3.4.0/usrp/firmware/src/common/fpga_load.c.orig gnuradio-3.4.0/usrp/firmware/src/common/fpga_load.c +--- gnuradio-3.4.0/usrp/firmware/src/common/fpga_load.c.orig 2011-06-12 05:54:36.000000000 +0200 ++++ gnuradio-3.4.0/usrp/firmware/src/common/fpga_load.c 2011-06-28 09:32:03.222101208 +0200 +@@ -89,7 +89,7 @@ clock_out_config_byte (unsigned char bit + #else + + static void +-clock_out_config_byte (unsigned char bits) _naked ++clock_out_config_byte (unsigned char bits) __naked + { + _asm + mov a, dpl +diff -up gnuradio-3.4.0/usrp/firmware/src/usrp2/spi.c.orig gnuradio-3.4.0/usrp/firmware/src/usrp2/spi.c +--- gnuradio-3.4.0/usrp/firmware/src/usrp2/spi.c.orig 2011-06-28 09:31:40.754340711 +0200 ++++ gnuradio-3.4.0/usrp/firmware/src/usrp2/spi.c 2011-06-28 09:31:27.800820713 +0200 +@@ -320,7 +320,7 @@ read_byte_msb (void) + } + #else + static unsigned char +-read_byte_msb (void) _naked ++read_byte_msb (void) __naked + { + _asm + clr a diff --git a/gnuradio-gcc45.patch b/gnuradio-gcc45.patch deleted file mode 100644 index 749a820..0000000 --- a/gnuradio-gcc45.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -rupN gnuradio.old/usrp2/host/lib/usrp2.cc gnuradio/usrp2/host/lib/usrp2.cc ---- gnuradio.old/usrp2/host/lib/usrp2.cc 2010-08-01 01:01:48.000000000 -0400 -+++ gnuradio/usrp2/host/lib/usrp2.cc 2010-08-01 01:09:45.000000000 -0400 -@@ -38,9 +38,9 @@ namespace usrp2 { - struct usrp_table_entry { - // inteface + normalized mac addr ("eth0:01:23:45:67:89:ab") - std::string key; -- boost::weak_ptr value; -+ boost::weak_ptr value; - -- usrp_table_entry(const std::string &_key, boost::weak_ptr _value) -+ usrp_table_entry(const std::string &_key, boost::weak_ptr _value) - : key(_key), value(_value) {} - }; - -@@ -70,7 +70,7 @@ namespace usrp2 { - // We don't have the USRP2 we're looking for - - // create a new one and stick it in the table. -- usrp2::sptr r(new usrp2::usrp2(ifc, pr, rx_bufsize)); -+ usrp2::sptr r(new typename usrp2::usrp2(ifc, pr, rx_bufsize)); - usrp_table_entry t(key, r); - s_table.push_back(t); - diff --git a/gnuradio.spec b/gnuradio.spec index 2c888cc..fe6be9c 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -1,21 +1,29 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +# 3.4.0 version is not yet on ftp, pull from git +%define git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a + Name: gnuradio -Version: 3.2.2 -Release: 13%{?dist} +Version: 3.4.0 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering License: GPLv3 URL: http://www.gnuradio.org -Source0: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%{version}.tar.gz +#Source0: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%{version}.tar.gz +# git clone git://gnuradio.org/gnuradio +# cd gnuradio +# git archive --format=tar --prefix=%{name}-%{version}/ %{git_commit} | \ +# gzip > ../%{name}-%{version}.tar.gz +Source0: gnuradio-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: 10-usrp.rules -Patch0: gnuradio-3.2-libtool.patch -Patch1: gnuradio-3.2-configure.patch -Patch2: gnuradio-gcc45.patch Patch3: gnuradio-3.2.2-64bit.patch -Patch4: gnuradio-3.2.2-ptrdifft-std.patch +# fixed compilation with sdcc3 +Patch4: gnuradio-3.4.0-sdcc3.patch +# fixed detection of libusb +Patch5: gnuradio-3.4.0-libusb-detect-fix.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -43,11 +51,19 @@ BuildRequires: numpy BuildRequires: PyQt4-devel BuildRequires: PyQwt-devel BuildRequires: qwtplot3d-qt4-devel +BuildRequires: python-cheetah +BuildRequires: xdg-utils +BuildRequires: python-lxml +BuildRequires: pygtk2-devel Requires: numpy Requires: wxPython Requires: scipy Requires: portaudio - +Requires: python-lxml +Requires: pygtk2 +Provides: usrp = %{version}-%{release} +Obsoletes: usrp < 3.3.0-1 +Obsoletes: grc < 0.80-1 %description GNU Radio is a collection of software that when combined with minimal @@ -60,6 +76,8 @@ performance wireless devices into software problems. Summary: GNU Radio Group: Applications/Engineering Requires: %{name} = %{version}-%{release} +Provides: usrp-devel = %{version}-%{release} +Obsoletes: usrp-devel < 3.3.0-1 %description devel GNU Radio Headers @@ -80,65 +98,34 @@ Requires: %{name} = %{version}-%{release} %description examples GNU Radio examples -%package -n usrp -Summary: Universal Software Radio Peripheral -Group: Applications/Engineering -Requires: %{name} = %{version}-%{release} - -%description -n usrp -Gnu Radio Universal Software Radio Peripheral software - -%package -n usrp-devel -Summary: Universal Software Radio Peripheral -Group: Applications/Engineering -Requires: usrp = %{version}-%{release} - -%description -n usrp-devel -GNU Radio USRP headers - %prep %setup -q -%patch0 -p1 -b .libtool -%patch1 -p1 -b .configure -%patch2 -p1 -b .gcc45 %patch3 -p1 -b .64bit -%patch4 -p1 -b .ptrdifft-std +%patch4 -p1 -b .sdcc3 +%patch5 -p1 -b .libusb-detect-fix #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; %build export PATH=%{_libexecdir}/sdcc:$PATH -autoreconf -i -%configure --enable-doxygen --enable-latex-doc --disable-gr-audio-oss --enable-usrp --enable-gnuradio-core --enable-gnuradio-examples -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +./bootstrap +#enabling deps tracking is workaround to build +%configure --enable-dependency-tracking --enable-python --enable-doxygen \ +--enable-dot --enable-gruel --enable-gnuradio-core \ +--enable-usrp --enable-usrp2 --enable-gr-usrp --enable-gr-usrp2 \ +--enable-gr-msdd6000 --enable-gr-audio --enable-gr-atsc \ +--enable-gr-cvsd-vocoder --enable-gr-gpio \ +--enable-gr-gsm-fr-vocoder --enable-gr-noaa --enable-gr-pager \ +--enable-gr-radar-pager --enable-gr-radar-mono --enable-gr-radio-astronomy \ +--enable-gr-trellis --enable-gr-video-sdl --enable-gr-wxgui \ +--enable-gr-sounder --enable-gr-utils --enable-gnuradio-examples \ +--enable-grc --enable-docs \ +--disable-volk +# volk disabled due to gcc-4.6 internal compiler error (#717240) + sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -mkdir -p gnuradio-core/src/lib/swig/.deps usrp/host/swig/.deps \ - gr-usrp/src/.deps gr-usrp2/src/.deps gr-audio-alsa/src/.deps \ - gr-audio-jack/src/.deps gr-audio-portaudio/src/.deps \ - gr-cvsd-vocoder/src/lib/.deps gr-gsm-fr-vocoder/src/lib/.deps \ - gr-pager/src/.deps gr-radio-astronomy/src/lib/.deps gr-trellis/src/lib/.deps \ - gr-video-sdl/src/.deps gr-qtgui/src/lib/.deps -touch gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_runtime.d \ - gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_general.d \ - gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_gengen.d \ - gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_filter.d \ - gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_io.d \ - gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_hier.d \ - usrp/host/swig/.deps/usrp_prims.d \ - gr-usrp/src/.deps/usrp_swig.d \ - gr-usrp2/src/.deps/usrp2.d \ - gr-audio-alsa/src/.deps/audio_alsa.d \ - gr-audio-jack/src/.deps/audio_jack.d \ - gr-audio-portaudio/src/.deps/audio_portaudio.d \ - gr-cvsd-vocoder/src/lib/.deps/cvsd_vocoder.d \ - gr-gsm-fr-vocoder/src/lib/.deps/gsm_full_rate.d \ - gr-pager/src/.deps/pager_swig.d \ - gr-radio-astronomy/src/lib/.deps/ra.d \ - gr-trellis/src/lib/.deps/trellis.d \ - gr-video-sdl/src/.deps/video_sdl.d \ - gr-qtgui/src/lib/.deps/qtgui.d -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %install rm -rf $RPM_BUILD_ROOT @@ -151,27 +138,22 @@ rm -rf $RPM_BUILD_ROOT %post -n gnuradio -p /sbin/ldconfig %postun -n gnuradio -p /sbin/ldconfig - -%post -n gnuradio-devel -p /sbin/ldconfig -%postun -n gnuradio-devel -p /sbin/ldconfig - -%post -n usrp -p /sbin/ldconfig -%postun -n usrp -p /sbin/ldconfig -%pre -n usrp +%pre -n gnuradio getent group usrp >/dev/null || groupadd -r usrp %files %defattr(-,root,root,-) -%{python_sitearch}/gnuradio -%exclude %{python_sitearch}/gnuradio/_usrp2.so -%exclude %{python_sitearch}/gnuradio/usrp* -%{_sysconfdir}/gnuradio -%{_bindir}/gr_* -%{_bindir}/find_usrps -%{_bindir}/lsusrp +%{python_sitearch}/* +%{_bindir}/* %{_libdir}/lib*.so.* -%config(noreplace)%{_sysconfdir}/gnuradio/conf.d/*.conf +%{_libexecdir}/* +%{_datadir}/gnuradio +%{_datadir}/usrp +%config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp.rules +%config(noreplace) %{_sysconfdir}/gnuradio/conf.d/*.conf +%exclude %{_datadir}/gnuradio/examples %exclude %{python_sitearch}/gnuradio/*.la +%doc ChangeLog README README.hacking NEWS INSTALL COPYING AUTHORS %files devel %defattr(-,root,root,-) @@ -182,33 +164,27 @@ getent group usrp >/dev/null || groupadd -r usrp %files doc %defattr(-,root,root,-) -%doc ChangeLog README README.hacking NEWS INSTALL COPYING AUTHORS -%{_docdir}/usrp* -%{_docdir}/gnuradio* +%doc %{_docdir}/* %files examples %defattr(-,root,root,-) -%{_datadir}/%{name} - -%files -n usrp -%defattr(-,root,root,-) -%{_bindir}/usrp* -%{_bindir}/gpio* -%{_datadir}/usrp -%{_libdir}/libusrp.so.* -%{python_sitearch}/usrpm -%{python_sitearch}/gnuradio/_usrp2.so -%{python_sitearch}/gnuradio/usrp* -%config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp.rules -%exclude %{_libdir}/*.la -%exclude %{python_sitearch}/usrpm/*.la - -%files -n usrp-devel -%defattr(-,root,root,-) -%{_libdir}/libusrp.so -%{_includedir}/usrp_* +%{_datadir}/gnuradio/examples %changelog +* Mon Jun 27 2011 Jaroslav Škarvada - 3.4.0-1 +- New version +- Updated 10-usrp.rules + Resolves: rhbz#597023 +- Merged usrp to gnuradio, fixes some packaging bugs + Resolves: rhbz#516352 + Resolves: rhbz#619195 +- Rebuilt with included grc, obsoleted grc package + Resolves: rhbz#592486 +- Removed unneeded patches (libtool, configure, gcc45, ptrdifft-std) +- Fixed compilation with sdcc3 (sdcc3 patch) +- Fixed detection of libusb (libusb-detect-fix patch) +- Compiled with -fno-strict-aliasing + * Thu Apr 07 2011 Jaroslav Škarvada - 3.2.2-13 - Rebuild for new boost diff --git a/sources b/sources index 7c4afa2..8d1cf5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3fedcd64c2f51671cc1417b4c1e06834 gnuradio-3.2.2.tar.gz +d48283504e0e5abd1c2e6848bc885506 gnuradio-3.4.0.tar.gz From 31a19f109ce89d09b3fcc4826da0f15828a80966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sun, 3 Jul 2011 15:26:21 +0200 Subject: [PATCH 033/313] Rebuilt with -j1, otherwise the build process may fail on machines with low RAM Define changed to global --- gnuradio.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index fe6be9c..498a5d6 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -1,11 +1,12 @@ %{!?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')} # 3.4.0 version is not yet on ftp, pull from git -%define git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a +%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a Name: gnuradio Version: 3.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -125,7 +126,9 @@ export PATH=%{_libexecdir}/sdcc:$PATH # volk disabled due to gcc-4.6 internal compiler error (#717240) sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" + +# make with -j1 and compile without strict-aliasing +make %{?my_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %install rm -rf $RPM_BUILD_ROOT @@ -171,6 +174,10 @@ getent group usrp >/dev/null || groupadd -r usrp %{_datadir}/gnuradio/examples %changelog +* Sun Jul 03 2011 Jaroslav Škarvada - 3.4.0-2 +- Rebuilt with -j1, otherwise the build process may fail on machines with low RAM +- Define changed to global + * Mon Jun 27 2011 Jaroslav Škarvada - 3.4.0-1 - New version - Updated 10-usrp.rules From 8767c493cdb4c1cd9a736489446d95d4df4b078e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 21 Jul 2011 15:36:52 +0200 Subject: [PATCH 034/313] Enabled volk Rebuilt for new boost --- gnuradio.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 498a5d6..e4d7e2f 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -6,7 +6,7 @@ Name: gnuradio Version: 3.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -113,7 +113,7 @@ export PATH=%{_libexecdir}/sdcc:$PATH ./bootstrap #enabling deps tracking is workaround to build %configure --enable-dependency-tracking --enable-python --enable-doxygen \ ---enable-dot --enable-gruel --enable-gnuradio-core \ +--enable-dot --enable-volk --enable-gruel --enable-gnuradio-core \ --enable-usrp --enable-usrp2 --enable-gr-usrp --enable-gr-usrp2 \ --enable-gr-msdd6000 --enable-gr-audio --enable-gr-atsc \ --enable-gr-cvsd-vocoder --enable-gr-gpio \ @@ -121,9 +121,7 @@ export PATH=%{_libexecdir}/sdcc:$PATH --enable-gr-radar-pager --enable-gr-radar-mono --enable-gr-radio-astronomy \ --enable-gr-trellis --enable-gr-video-sdl --enable-gr-wxgui \ --enable-gr-sounder --enable-gr-utils --enable-gnuradio-examples \ ---enable-grc --enable-docs \ ---disable-volk -# volk disabled due to gcc-4.6 internal compiler error (#717240) +--enable-grc --enable-docs sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -174,6 +172,10 @@ getent group usrp >/dev/null || groupadd -r usrp %{_datadir}/gnuradio/examples %changelog +* Thu Jul 21 2011 Jaroslav Škarvada - 3.4.0-3 +- Enabled volk +- Rebuilt for new boost + * Sun Jul 03 2011 Jaroslav Škarvada - 3.4.0-2 - Rebuilt with -j1, otherwise the build process may fail on machines with low RAM - Define changed to global From 90be5ac750425b6ef416de5403127e940777de83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 20 Oct 2011 22:06:14 +0200 Subject: [PATCH 035/313] explicitly set boost libdir to workaround build failures on non-x86 64-bit arches --- gnuradio-3.2.2-64bit.patch | 30 ------------------------------ gnuradio.spec | 10 ++++++---- 2 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 gnuradio-3.2.2-64bit.patch diff --git a/gnuradio-3.2.2-64bit.patch b/gnuradio-3.2.2-64bit.patch deleted file mode 100644 index 2273518..0000000 --- a/gnuradio-3.2.2-64bit.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up gnuradio-3.2.2/config/gr_lib64.m4.64bit gnuradio-3.2.2/config/gr_lib64.m4 ---- gnuradio-3.2.2/config/gr_lib64.m4.64bit 2010-09-07 10:50:42.000000000 +0200 -+++ gnuradio-3.2.2/config/gr_lib64.m4 2010-09-07 10:53:15.000000000 +0200 -@@ -21,14 +21,14 @@ dnl - - dnl GR_LIB64() - dnl --dnl Checks to see if we're on a x86_64 or powerpc64 machine, and if so, determine -+dnl Checks to see if we're on a x86_64, powerpc64, sparc64 or s390x machine, and if so, determine - dnl if libdir should end in "64" or not. - dnl - dnl Sets gr_libdir_suffix to "" or "64" and calls AC_SUBST(gr_libdir_suffix) - dnl May append "64" to libdir. - dnl - dnl The current heuristic is: --dnl if the host_cpu isn't x86_64 or powerpc64, then "" -+dnl if the host_cpu isn't x86_64 or powerpc64 or sparc64 or s390x, then "" - dnl if the host_os isn't linux, then "" - dnl if we're cross-compiling, ask the linker, by way of the selected compiler - dnl if we're x86_64 and there's a /lib64 and it's not a symlink, then "64", else "" -@@ -47,7 +47,8 @@ AC_DEFUN([GR_LIB64],[ - *) is_linux=no ;; - esac - -- if test "$is_linux" = no || test "$host_cpu" != "x86_64" && test "$host_cpu" != "powerpc64"; then -+ if test "$is_linux" = no || test "$host_cpu" != "x86_64" && test "$host_cpu" != "powerpc64" \ -+ && test "$host_cpu" != "sparc64" && test "$host_cpu" != "s390x"; then - gr_libdir_suffix="" - elif test "$cross_compiling" = yes; then - _GR_LIB64_ASK_COMPILER diff --git a/gnuradio.spec b/gnuradio.spec index e4d7e2f..7610ee3 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -6,7 +6,7 @@ Name: gnuradio Version: 3.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -20,7 +20,6 @@ URL: http://www.gnuradio.org Source0: gnuradio-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: 10-usrp.rules -Patch3: gnuradio-3.2.2-64bit.patch # fixed compilation with sdcc3 Patch4: gnuradio-3.4.0-sdcc3.patch # fixed detection of libusb @@ -101,7 +100,6 @@ GNU Radio examples %prep %setup -q -%patch3 -p1 -b .64bit %patch4 -p1 -b .sdcc3 %patch5 -p1 -b .libusb-detect-fix @@ -121,7 +119,8 @@ export PATH=%{_libexecdir}/sdcc:$PATH --enable-gr-radar-pager --enable-gr-radar-mono --enable-gr-radio-astronomy \ --enable-gr-trellis --enable-gr-video-sdl --enable-gr-wxgui \ --enable-gr-sounder --enable-gr-utils --enable-gnuradio-examples \ ---enable-grc --enable-docs +--enable-grc --enable-docs \ +--with-boost-libdir=%{_libdir} sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -172,6 +171,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_datadir}/gnuradio/examples %changelog +* Thu Oct 20 2011 Dan Horák - 3.4.0-4 +- explicitly set boost libdir to workaround build failures on non-x86 64-bit arches + * Thu Jul 21 2011 Jaroslav Škarvada - 3.4.0-3 - Enabled volk - Rebuilt for new boost From 0cc25c12e68ec08d2837db223ff988e74640e6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 21 Oct 2011 12:36:16 +0200 Subject: [PATCH 036/313] add missing return value in generated code add BR: orc-devel - needed for secondary arches in volk --- gnuradio-3.4.0-retval.patch | 11 +++++++++++ gnuradio.spec | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gnuradio-3.4.0-retval.patch diff --git a/gnuradio-3.4.0-retval.patch b/gnuradio-3.4.0-retval.patch new file mode 100644 index 0000000..2d76d92 --- /dev/null +++ b/gnuradio-3.4.0-retval.patch @@ -0,0 +1,11 @@ +diff -up gnuradio-3.4.0/volk/include/volk/make_mktables.py.retval gnuradio-3.4.0/volk/include/volk/make_mktables.py +--- gnuradio-3.4.0/volk/include/volk/make_mktables.py.retval 2011-10-20 22:20:13.000000000 +0200 ++++ gnuradio-3.4.0/volk/include/volk/make_mktables.py 2011-10-20 22:20:26.000000000 +0200 +@@ -21,6 +21,7 @@ def make_mktables(funclist) : + tempstring = tempstring + ' fprintf(output, "static const ' + func + '_func_table = %u;\\n", volk_rank_archs(' + func + '_arch_defs, volk_get_lvarch()));\n'; + tempstring = tempstring + ' fprintf(output, "#endif /*INCLUDED_VOLK_TABLES_H*/\\n");\n'; + tempstring = tempstring + ' fclose(output);\n' ++ tempstring = tempstring + ' return 0;\n' + tempstring = tempstring + '}\n'; + return tempstring; + diff --git a/gnuradio.spec b/gnuradio.spec index 7610ee3..9b396d3 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -6,7 +6,7 @@ Name: gnuradio Version: 3.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -24,6 +24,8 @@ Source1: 10-usrp.rules Patch4: gnuradio-3.4.0-sdcc3.patch # fixed detection of libusb Patch5: gnuradio-3.4.0-libusb-detect-fix.patch +# add missing return value in generated code +Patch6: gnuradio-3.4.0-retval.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -55,6 +57,7 @@ BuildRequires: python-cheetah BuildRequires: xdg-utils BuildRequires: python-lxml BuildRequires: pygtk2-devel +BuildRequires: orc-devel Requires: numpy Requires: wxPython Requires: scipy @@ -102,6 +105,7 @@ GNU Radio examples %setup -q %patch4 -p1 -b .sdcc3 %patch5 -p1 -b .libusb-detect-fix +%patch6 -p1 -b .retval #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -171,6 +175,10 @@ getent group usrp >/dev/null || groupadd -r usrp %{_datadir}/gnuradio/examples %changelog +* Fri Oct 21 2011 Dan Horák - 3.4.0-5 +- add missing return value in generated code +- add BR: orc-devel - needed for secondary arches in volk + * Thu Oct 20 2011 Dan Horák - 3.4.0-4 - explicitly set boost libdir to workaround build failures on non-x86 64-bit arches From bd438c36b4fa7ceaab1820166d33b11acf629004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 29 Oct 2011 00:17:50 +0200 Subject: [PATCH 037/313] New version Dropped retval patch --- .gitignore | 2 +- gnuradio-3.4.0-retval.patch | 11 ---------- ...-sdcc3.patch => gnuradio-3.4.2-sdcc3.patch | 12 ---------- gnuradio.spec | 22 +++++++++++-------- sources | 2 +- 5 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 gnuradio-3.4.0-retval.patch rename gnuradio-3.4.0-sdcc3.patch => gnuradio-3.4.2-sdcc3.patch (76%) diff --git a/.gitignore b/.gitignore index 874b5a9..5ecd989 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gnuradio-3.2.2.tar.gz +gnuradio-3.4.2.tar.gz diff --git a/gnuradio-3.4.0-retval.patch b/gnuradio-3.4.0-retval.patch deleted file mode 100644 index 2d76d92..0000000 --- a/gnuradio-3.4.0-retval.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up gnuradio-3.4.0/volk/include/volk/make_mktables.py.retval gnuradio-3.4.0/volk/include/volk/make_mktables.py ---- gnuradio-3.4.0/volk/include/volk/make_mktables.py.retval 2011-10-20 22:20:13.000000000 +0200 -+++ gnuradio-3.4.0/volk/include/volk/make_mktables.py 2011-10-20 22:20:26.000000000 +0200 -@@ -21,6 +21,7 @@ def make_mktables(funclist) : - tempstring = tempstring + ' fprintf(output, "static const ' + func + '_func_table = %u;\\n", volk_rank_archs(' + func + '_arch_defs, volk_get_lvarch()));\n'; - tempstring = tempstring + ' fprintf(output, "#endif /*INCLUDED_VOLK_TABLES_H*/\\n");\n'; - tempstring = tempstring + ' fclose(output);\n' -+ tempstring = tempstring + ' return 0;\n' - tempstring = tempstring + '}\n'; - return tempstring; - diff --git a/gnuradio-3.4.0-sdcc3.patch b/gnuradio-3.4.2-sdcc3.patch similarity index 76% rename from gnuradio-3.4.0-sdcc3.patch rename to gnuradio-3.4.2-sdcc3.patch index 7401f8c..9b5b08c 100644 --- a/gnuradio-3.4.0-sdcc3.patch +++ b/gnuradio-3.4.2-sdcc3.patch @@ -1,15 +1,3 @@ -diff -up gnuradio-3.4.0/gr-howto-write-a-block/config/usrp_sdcc.m4.orig gnuradio-3.4.0/gr-howto-write-a-block/config/usrp_sdcc.m4 ---- gnuradio-3.4.0/gr-howto-write-a-block/config/usrp_sdcc.m4.orig 2011-06-12 05:54:36.000000000 +0200 -+++ gnuradio-3.4.0/gr-howto-write-a-block/config/usrp_sdcc.m4 2011-06-27 16:17:42.001053649 +0200 -@@ -21,7 +21,7 @@ AC_DEFUN([USRP_SDCC], - [ - sdccok=yes - AC_CHECK_PROG(XCC, sdcc, sdcc -mmcs51 --no-xinit-opt,no) -- AC_CHECK_PROG(XAS, asx8051, asx8051 -plosgff,no) -+ AC_CHECK_PROG(XAS, sdas8051, sdas8051 -plosgff,no) - - if test "$XCC" = "no" -o "$XAS" = "no" ; then - AC_MSG_RESULT([USRP requires sdcc. sdcc not found. See http://sdcc.sf.net]) diff -up gnuradio-3.4.0/config/usrp_sdcc.m4.orig gnuradio-3.4.0/config/usrp_sdcc.m4 --- gnuradio-3.4.0/config/usrp_sdcc.m4.orig 2011-06-12 05:54:36.000000000 +0200 +++ gnuradio-3.4.0/config/usrp_sdcc.m4 2011-06-27 16:17:42.001053649 +0200 diff --git a/gnuradio.spec b/gnuradio.spec index 9b396d3..9496143 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -1,31 +1,32 @@ %{!?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')} -# 3.4.0 version is not yet on ftp, pull from git -%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a +# For versions not yet on ftp, pull from git +#%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a + +# For versions published as attachment (strange) +%global attachment_id 279 Name: gnuradio -Version: 3.4.0 -Release: 5%{?dist} +Version: 3.4.2 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering 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 # git clone git://gnuradio.org/gnuradio # cd gnuradio # git archive --format=tar --prefix=%{name}-%{version}/ %{git_commit} | \ # gzip > ../%{name}-%{version}.tar.gz -Source0: gnuradio-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: 10-usrp.rules # fixed compilation with sdcc3 -Patch4: gnuradio-3.4.0-sdcc3.patch +Patch4: gnuradio-3.4.2-sdcc3.patch # fixed detection of libusb Patch5: gnuradio-3.4.0-libusb-detect-fix.patch -# add missing return value in generated code -Patch6: gnuradio-3.4.0-retval.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -105,7 +106,6 @@ GNU Radio examples %setup -q %patch4 -p1 -b .sdcc3 %patch5 -p1 -b .libusb-detect-fix -%patch6 -p1 -b .retval #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -175,6 +175,10 @@ getent group usrp >/dev/null || groupadd -r usrp %{_datadir}/gnuradio/examples %changelog +* Thu Oct 27 2011 Jaroslav Škarvada - 3.4.2-1 +- New version +- Dropped retval patch + * Fri Oct 21 2011 Dan Horák - 3.4.0-5 - add missing return value in generated code - add BR: orc-devel - needed for secondary arches in volk diff --git a/sources b/sources index 8d1cf5e..c297f54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d48283504e0e5abd1c2e6848bc885506 gnuradio-3.4.0.tar.gz +bb4eafa483375e3422802bc070c20827 gnuradio-3.4.2.tar.gz From 4d79f9e4ec7ec322caad9f13266bbbc1e3f40ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sun, 20 Nov 2011 19:17:33 +0100 Subject: [PATCH 038/313] Rebuilt for new boost --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 9496143..1db083c 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -9,7 +9,7 @@ Name: gnuradio Version: 3.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -175,6 +175,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_datadir}/gnuradio/examples %changelog +* Sun Nov 20 2011 Jaroslav Škarvada - 3.4.2-2 +- Rebuilt for new boost + * Thu Oct 27 2011 Jaroslav Škarvada - 3.4.2-1 - New version - Dropped retval patch From e510c1b49c0a9ebe88d08ec8064ab6e150d7fdb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 2 Dec 2011 00:47:28 +0100 Subject: [PATCH 039/313] New pre-release version Followed upstream and dropped support for usrp, use uhd instead Dropped sdcc3 and libusb-detect-fix patches Dropped 10-usrp.rules and usrp group creation, now handled by uhd --- 10-usrp.rules | 3 -- gnuradio-3.4.0-libusb-detect-fix.patch | 40 ------------------ gnuradio-3.4.2-sdcc3.patch | 57 -------------------------- gnuradio.spec | 41 ++++++++---------- 4 files changed, 18 insertions(+), 123 deletions(-) delete mode 100644 10-usrp.rules delete mode 100644 gnuradio-3.4.0-libusb-detect-fix.patch delete mode 100644 gnuradio-3.4.2-sdcc3.patch diff --git a/10-usrp.rules b/10-usrp.rules deleted file mode 100644 index 996c52a..0000000 --- a/10-usrp.rules +++ /dev/null @@ -1,3 +0,0 @@ -# rule to grant read/write access on USRP to group named usrp. -# to use, install this file in /etc/udev/rules.d as 10-usrp.rules -ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", GROUP:="usrp", MODE:="0660" diff --git a/gnuradio-3.4.0-libusb-detect-fix.patch b/gnuradio-3.4.0-libusb-detect-fix.patch deleted file mode 100644 index aafc210..0000000 --- a/gnuradio-3.4.0-libusb-detect-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -up gnuradio-3.4.0/config/usrp_libusb.m4.orig gnuradio-3.4.0/config/usrp_libusb.m4 ---- gnuradio-3.4.0/config/usrp_libusb.m4.orig 2011-06-12 05:54:36.000000000 +0200 -+++ gnuradio-3.4.0/config/usrp_libusb.m4 2011-06-28 11:34:32.893634688 +0200 -@@ -160,36 +160,6 @@ AC_DEFUN([USRP_LIBUSB], [ - AC_MSG_RESULT([$libusbok]) - LIBS="$save_LIBS" - AC_LANG_POP(C) -- -- if test $libusbok = yes; then -- if test ${libusb_name} != "libusb-1.0"; then -- dnl PKGCONFIG found a legacy version of libusb; make sure the -- dnl variable _usb_debug is available in the found library. -- dnl Do not test on Windows, since that symbol is not defined. -- case "$host_os" in -- cygwin* | mingw*) -- ;; -- *) -- AC_LANG_PUSH(C) -- save_CPPFLAGS="$CPPFLAGS" -- if test x$USB_INCLUDEDIR != x; then -- CPPFLAGS="$USB_INCLUDES" -- fi -- save_LIBS="$LIBS" -- LIBS="$USB_LIBS" -- AC_MSG_CHECKING([$libusb_name for symbol usb_debug in library $usb_lib_name]) -- AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -- extern int usb_debug;]], -- [[usb_debug = 0;]])], -- [libusbok=yes],[libusbok=no]) -- AC_MSG_RESULT([$libusbok]) -- LIBS="$save_LIBS" -- CPPFLAGS="$save_CPPFLAGS" -- AC_LANG_POP(C) -- ;; -- esac -- fi -- fi - fi - fi - dnl if everything checks out OK, finish up diff --git a/gnuradio-3.4.2-sdcc3.patch b/gnuradio-3.4.2-sdcc3.patch deleted file mode 100644 index 9b5b08c..0000000 --- a/gnuradio-3.4.2-sdcc3.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up gnuradio-3.4.0/config/usrp_sdcc.m4.orig gnuradio-3.4.0/config/usrp_sdcc.m4 ---- gnuradio-3.4.0/config/usrp_sdcc.m4.orig 2011-06-12 05:54:36.000000000 +0200 -+++ gnuradio-3.4.0/config/usrp_sdcc.m4 2011-06-27 16:17:42.001053649 +0200 -@@ -21,7 +21,7 @@ AC_DEFUN([USRP_SDCC], - [ - sdccok=yes - AC_CHECK_PROG(XCC, sdcc, sdcc -mmcs51 --no-xinit-opt,no) -- AC_CHECK_PROG(XAS, asx8051, asx8051 -plosgff,no) -+ AC_CHECK_PROG(XAS, sdas8051, sdas8051 -plosgff,no) - - if test "$XCC" = "no" -o "$XAS" = "no" ; then - AC_MSG_RESULT([USRP requires sdcc version 2. sdcc not found. See http://sdcc.sf.net]) -diff -up gnuradio-3.4.0/usrp/firmware/lib/delay.c.orig gnuradio-3.4.0/usrp/firmware/lib/delay.c ---- gnuradio-3.4.0/usrp/firmware/lib/delay.c.orig 2011-06-12 05:54:36.000000000 +0200 -+++ gnuradio-3.4.0/usrp/firmware/lib/delay.c 2011-06-28 09:31:11.361044713 +0200 -@@ -24,7 +24,7 @@ - * Delay approximately 1 microsecond (including overhead in udelay). - */ - static void --udelay1 (void) _naked -+udelay1 (void) __naked - { - _asm ; lcall that got us here took 4 bus cycles - ret ; 4 bus cycles -@@ -51,7 +51,7 @@ udelay (unsigned char usecs) - * but explains the factor of 4 problem below). - */ - static void --mdelay1 (void) _naked -+mdelay1 (void) __naked - { - _asm - mov dptr,#(-1200 & 0xffff) -diff -up gnuradio-3.4.0/usrp/firmware/src/common/fpga_load.c.orig gnuradio-3.4.0/usrp/firmware/src/common/fpga_load.c ---- gnuradio-3.4.0/usrp/firmware/src/common/fpga_load.c.orig 2011-06-12 05:54:36.000000000 +0200 -+++ gnuradio-3.4.0/usrp/firmware/src/common/fpga_load.c 2011-06-28 09:32:03.222101208 +0200 -@@ -89,7 +89,7 @@ clock_out_config_byte (unsigned char bit - #else - - static void --clock_out_config_byte (unsigned char bits) _naked -+clock_out_config_byte (unsigned char bits) __naked - { - _asm - mov a, dpl -diff -up gnuradio-3.4.0/usrp/firmware/src/usrp2/spi.c.orig gnuradio-3.4.0/usrp/firmware/src/usrp2/spi.c ---- gnuradio-3.4.0/usrp/firmware/src/usrp2/spi.c.orig 2011-06-28 09:31:40.754340711 +0200 -+++ gnuradio-3.4.0/usrp/firmware/src/usrp2/spi.c 2011-06-28 09:31:27.800820713 +0200 -@@ -320,7 +320,7 @@ read_byte_msb (void) - } - #else - static unsigned char --read_byte_msb (void) _naked -+read_byte_msb (void) __naked - { - _asm - clr a diff --git a/gnuradio.spec b/gnuradio.spec index 9496143..a40dd11 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -5,28 +5,27 @@ #%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a # For versions published as attachment (strange) -%global attachment_id 279 +%global attachment_id 281 + +# For pre-release versions +%global prerelease rc0 Name: gnuradio -Version: 3.4.2 -Release: 1%{?dist} +Version: 3.5.0 +Release: 0.1.%{prerelease}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering 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/redmine/attachments/download/%{attachment_id}/gnuradio-%{version}.tar.gz +Source0: http://gnuradio.org/redmine/attachments/download/%{attachment_id}/gnuradio-%{version}%{prerelease}.tar.gz # git clone git://gnuradio.org/gnuradio # cd gnuradio # git archive --format=tar --prefix=%{name}-%{version}/ %{git_commit} | \ # gzip > ../%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source1: 10-usrp.rules -# fixed compilation with sdcc3 -Patch4: gnuradio-3.4.2-sdcc3.patch -# fixed detection of libusb -Patch5: gnuradio-3.4.0-libusb-detect-fix.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -59,13 +58,13 @@ BuildRequires: xdg-utils BuildRequires: python-lxml BuildRequires: pygtk2-devel BuildRequires: orc-devel +BuildRequires: uhd-devel Requires: numpy Requires: wxPython Requires: scipy Requires: portaudio Requires: python-lxml Requires: pygtk2 -Provides: usrp = %{version}-%{release} Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 @@ -80,7 +79,6 @@ performance wireless devices into software problems. Summary: GNU Radio Group: Applications/Engineering Requires: %{name} = %{version}-%{release} -Provides: usrp-devel = %{version}-%{release} Obsoletes: usrp-devel < 3.3.0-1 %description devel @@ -103,22 +101,18 @@ Requires: %{name} = %{version}-%{release} GNU Radio examples %prep -%setup -q -%patch4 -p1 -b .sdcc3 -%patch5 -p1 -b .libusb-detect-fix +%setup -q -n %{name}-%{version}%{prerelease} #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; %build -export PATH=%{_libexecdir}/sdcc:$PATH -./bootstrap +#./bootstrap #enabling deps tracking is workaround to build %configure --enable-dependency-tracking --enable-python --enable-doxygen \ --enable-dot --enable-volk --enable-gruel --enable-gnuradio-core \ ---enable-usrp --enable-usrp2 --enable-gr-usrp --enable-gr-usrp2 \ --enable-gr-msdd6000 --enable-gr-audio --enable-gr-atsc \ ---enable-gr-cvsd-vocoder --enable-gr-gpio \ +--enable-gr-cvsd-vocoder --enable-gr-gpio --enable-gr-uhd \ --enable-gr-gsm-fr-vocoder --enable-gr-noaa --enable-gr-pager \ --enable-gr-radar-pager --enable-gr-radar-mono --enable-gr-radio-astronomy \ --enable-gr-trellis --enable-gr-video-sdl --enable-gr-wxgui \ @@ -135,15 +129,12 @@ make %{?my_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$R rm -rf $RPM_BUILD_ROOT export PATH=%{_libexecdir}/sdcc:$PATH make install DESTDIR=$RPM_BUILD_ROOT -install -D -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-usrp.rules %clean rm -rf $RPM_BUILD_ROOT %post -n gnuradio -p /sbin/ldconfig %postun -n gnuradio -p /sbin/ldconfig -%pre -n gnuradio -getent group usrp >/dev/null || groupadd -r usrp %files %defattr(-,root,root,-) @@ -152,8 +143,6 @@ getent group usrp >/dev/null || groupadd -r usrp %{_libdir}/lib*.so.* %{_libexecdir}/* %{_datadir}/gnuradio -%{_datadir}/usrp -%config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp.rules %config(noreplace) %{_sysconfdir}/gnuradio/conf.d/*.conf %exclude %{_datadir}/gnuradio/examples %exclude %{python_sitearch}/gnuradio/*.la @@ -175,6 +164,12 @@ getent group usrp >/dev/null || groupadd -r usrp %{_datadir}/gnuradio/examples %changelog +* Tue Nov 01 2011 Jaroslav Škarvada - 3.5.0-0.1.rc0 +- New pre-release version +- Followed upstream and dropped support for usrp, use uhd instead +- Dropped sdcc3 and libusb-detect-fix patches +- Dropped 10-usrp.rules and usrp group creation, now handled by uhd + * Thu Oct 27 2011 Jaroslav Škarvada - 3.4.2-1 - New version - Dropped retval patch From 6ba677b53242f04e22ab68059964c15da2cb123c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 2 Dec 2011 01:04:27 +0100 Subject: [PATCH 040/313] Uploaded new sources --- .gitignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5ecd989..ab043ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gnuradio-3.4.2.tar.gz +gnuradio-3.5.0rc0.tar.gz diff --git a/sources b/sources index c297f54..4a9a6f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb4eafa483375e3422802bc070c20827 gnuradio-3.4.2.tar.gz +33c2b0300e892d39f141559003f1a819 gnuradio-3.5.0rc0.tar.gz From d3fba5ea46ffb5b01c9e0be21a4175588c54640b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sun, 4 Dec 2011 18:06:02 +0100 Subject: [PATCH 041/313] Added python-cheetah dependency Resolves: rhbz#759834 --- gnuradio.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index f7294a3..0ba2df1 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -12,7 +12,7 @@ Name: gnuradio Version: 3.5.0 -Release: 0.1.%{prerelease}%{?dist} +Release: 0.2.%{prerelease}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -65,6 +65,7 @@ Requires: scipy Requires: portaudio Requires: python-lxml Requires: pygtk2 +Requires: python-cheetah Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 @@ -164,6 +165,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gnuradio/examples %changelog +* Sun Dec 4 2011 Jaroslav Škarvada - 3.5.0-0.2.rc0 +- Added python-cheetah dependency + Resolves: rhbz#759834 + * Fri Dec 02 2011 Jaroslav Škarvada - 3.5.0-0.1.rc0 - New pre-release version - Followed upstream and dropped support for usrp, use uhd instead From 8451672690ab9060d22700c05aa38d756fb985d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 15 Dec 2011 00:33:37 +0100 Subject: [PATCH 042/313] New version Used macros instead of variables in spec Dropped sdcc hack, was needed by obsoleted libusrp --- .gitignore | 2 +- gnuradio.spec | 25 +++++++++++++------------ sources | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index ab043ef..e8ee128 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gnuradio-3.5.0rc0.tar.gz +gnuradio-*.tar.gz diff --git a/gnuradio.spec b/gnuradio.spec index 0ba2df1..2fa8eba 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -5,14 +5,11 @@ #%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a # For versions published as attachment (strange) -%global attachment_id 281 - -# For pre-release versions -%global prerelease rc0 +%global attachment_id 288 Name: gnuradio Version: 3.5.0 -Release: 0.2.%{prerelease}%{?dist} +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -20,7 +17,7 @@ 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/redmine/attachments/download/%{attachment_id}/gnuradio-%{version}%{prerelease}.tar.gz +Source0: http://gnuradio.org/redmine/attachments/download/%{attachment_id}/gnuradio-%{version}.tar.gz # git clone git://gnuradio.org/gnuradio # cd gnuradio # git archive --format=tar --prefix=%{name}-%{version}/ %{git_commit} | \ @@ -102,7 +99,7 @@ Requires: %{name} = %{version}-%{release} GNU Radio examples %prep -%setup -q -n %{name}-%{version}%{prerelease} +%setup -q #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -124,15 +121,14 @@ find . -name "*_moc.cc" -exec rm {} \; sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # make with -j1 and compile without strict-aliasing -make %{?my_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +make %{?my_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing" %install -rm -rf $RPM_BUILD_ROOT -export PATH=%{_libexecdir}/sdcc:$PATH -make install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -n gnuradio -p /sbin/ldconfig %postun -n gnuradio -p /sbin/ldconfig @@ -165,6 +161,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gnuradio/examples %changelog +* Tue Dec 13 2011 Jaroslav Škarvada - 3.5.0-1 +- New version +- Used macros instead of variables in spec +- Dropped sdcc hack, was needed by obsoleted libusrp + * Sun Dec 4 2011 Jaroslav Škarvada - 3.5.0-0.2.rc0 - Added python-cheetah dependency Resolves: rhbz#759834 diff --git a/sources b/sources index 4a9a6f9..497ffd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -33c2b0300e892d39f141559003f1a819 gnuradio-3.5.0rc0.tar.gz +a1dd4953f67807ce8d265aec85561584 gnuradio-3.5.0.tar.gz From 9d363ebd7efb28df4966aa0565ecdac57e7f3f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 21 Dec 2011 15:39:24 +0100 Subject: [PATCH 043/313] Fixed double packaging of doc Resolves: rhbz#769069 Fixed rpmlint warnings --- gnuradio.spec | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 2fa8eba..46892a7 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,26 +2,26 @@ %{?_smp_mflags: %global my_smp_mflags %(echo "%{_smp_mflags}" | sed 's/-j[0-9]\\+/-j1/g')} # For versions not yet on ftp, pull from git -#%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a +#%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a # For versions published as attachment (strange) %global attachment_id 288 Name: gnuradio Version: 3.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering 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: 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/redmine/attachments/download/%{attachment_id}/gnuradio-%{version}.tar.gz # git clone git://gnuradio.org/gnuradio # cd gnuradio -# git archive --format=tar --prefix=%{name}-%{version}/ %{git_commit} | \ -# gzip > ../%{name}-%{version}.tar.gz +# git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ +# gzip > ../%%{name}-%%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): shadow-utils @@ -62,8 +62,8 @@ Requires: scipy Requires: portaudio Requires: python-lxml Requires: pygtk2 -Requires: python-cheetah -Obsoletes: usrp < 3.3.0-1 +Requires: python-cheetah +Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 %description @@ -143,7 +143,9 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/gnuradio/conf.d/*.conf %exclude %{_datadir}/gnuradio/examples %exclude %{python_sitearch}/gnuradio/*.la -%doc ChangeLog README README.hacking NEWS INSTALL COPYING AUTHORS +%exclude %{_docdir}/%{name}-%{version}/html +%exclude %{_docdir}/%{name}-%{version}/xml +%doc ChangeLog NEWS INSTALL COPYING AUTHORS %files devel %defattr(-,root,root,-) @@ -154,13 +156,19 @@ rm -rf %{buildroot} %files doc %defattr(-,root,root,-) -%doc %{_docdir}/* +%doc %{_docdir}/%{name}-%{version}/html +%doc %{_docdir}/%{name}-%{version}/xml %files examples %defattr(-,root,root,-) %{_datadir}/gnuradio/examples %changelog +* Tue Dec 20 2011 Jaroslav Škarvada - 3.5.0-2 +- Fixed double packaging of doc + Resolves: rhbz#769069 +- Fixed rpmlint warnings + * Tue Dec 13 2011 Jaroslav Škarvada - 3.5.0-1 - New version - Used macros instead of variables in spec From e575feb802aa94869123188686b6b4c292711e5f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 22:07:09 -0600 Subject: [PATCH 044/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 46892a7..c86c2bd 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -9,7 +9,7 @@ Name: gnuradio Version: 3.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -164,6 +164,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 3.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Dec 20 2011 Jaroslav Škarvada - 3.5.0-2 - Fixed double packaging of doc Resolves: rhbz#769069 From d5397350bc8c7f3997e7c3b73b3d1c269579534c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 13 Jan 2012 15:48:26 +0100 Subject: [PATCH 045/313] New version Resolves: rhbz#781355 Fixed compilation with gcc-4.7.0 (compile-fix patch) --- gnuradio-3.5.1-compile-fix.patch | 11 +++++++++++ gnuradio.spec | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 gnuradio-3.5.1-compile-fix.patch diff --git a/gnuradio-3.5.1-compile-fix.patch b/gnuradio-3.5.1-compile-fix.patch new file mode 100644 index 0000000..ae1fa88 --- /dev/null +++ b/gnuradio-3.5.1-compile-fix.patch @@ -0,0 +1,11 @@ +diff -up gnuradio-3.5.1/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator_cc.cc.orig gnuradio-3.5.1/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator_cc.cc +--- gnuradio-3.5.1/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator_cc.cc.orig 2011-05-05 14:19:10.000000000 +0200 ++++ gnuradio-3.5.1/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator_cc.cc 2012-01-13 15:12:31.959981553 +0100 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #define NELEM(x) (sizeof (x) / sizeof (x[0])) + diff --git a/gnuradio.spec b/gnuradio.spec index c86c2bd..988e0c2 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -5,11 +5,11 @@ #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a # For versions published as attachment (strange) -%global attachment_id 288 +%global attachment_id 293 Name: gnuradio -Version: 3.5.0 -Release: 3%{?dist} +Version: 3.5.1 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -22,6 +22,9 @@ Source0: http://gnuradio.org/redmine/attachments/download/%{attachment_id}/gnura # cd gnuradio # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ # gzip > ../%%{name}-%%{version}.tar.gz + +# Fix compilation with gcc-4.7.0 +Patch0: gnuradio-3.5.1-compile-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): shadow-utils @@ -100,6 +103,7 @@ GNU Radio examples %prep %setup -q +%patch0 -p1 -b .compile-fix #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -164,6 +168,11 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Fri Jan 13 2012 Jaroslav Škarvada - 3.5.1-1 +- New version + Resolves: rhbz#781355 +- Fixed compilation with gcc-4.7.0 (compile-fix patch) + * Fri Jan 13 2012 Fedora Release Engineering - 3.5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 7e75a9f597a5e953c99d702740d1068e1c95e789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 13 Jan 2012 16:18:49 +0100 Subject: [PATCH 046/313] Uploaded sources --- gnuradio.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 988e0c2..e43e78a 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -103,7 +103,7 @@ GNU Radio examples %prep %setup -q -%patch0 -p1 -b .compile-fix +#%patch0 -p1 -b .compile-fix #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; diff --git a/sources b/sources index 497ffd0..effba73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1dd4953f67807ce8d265aec85561584 gnuradio-3.5.0.tar.gz +3c8f6a0e32e178239efa856f76aec50f gnuradio-3.5.1.tar.gz From f88f8bd6c61c3d7eab7c73cc14f8ca3663f7d034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 13 Jan 2012 16:21:13 +0100 Subject: [PATCH 047/313] Applied patch --- gnuradio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index e43e78a..988e0c2 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -103,7 +103,7 @@ GNU Radio examples %prep %setup -q -#%patch0 -p1 -b .compile-fix +%patch0 -p1 -b .compile-fix #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; From 0efdd981c0cf82b0ecf51b09b2caa5b052afd15d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 17 Jan 2012 15:13:20 +0100 Subject: [PATCH 048/313] Added explicit requires on PyQt4 Resolves: rhbz#781494 --- gnuradio.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 988e0c2..cca88be 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -9,7 +9,7 @@ Name: gnuradio Version: 3.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -66,6 +66,7 @@ Requires: portaudio Requires: python-lxml Requires: pygtk2 Requires: python-cheetah +Requires: PyQt4 Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 @@ -168,6 +169,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Jan 17 2012 Jaroslav Škarvada - 3.5.1-2 +- Added explicit requires on PyQt4 + Resolves: rhbz#781494 + * Fri Jan 13 2012 Jaroslav Škarvada - 3.5.1-1 - New version Resolves: rhbz#781355 From 2b45c15348b1fc7b3a2d6a98e32c4347dbcf62a7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 28 Feb 2012 12:32:21 -0600 Subject: [PATCH 049/313] - Rebuilt for c++ ABI breakage --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index cca88be..8528cc7 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -9,7 +9,7 @@ Name: gnuradio Version: 3.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -169,6 +169,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Feb 28 2012 Fedora Release Engineering - 3.5.1-3 +- Rebuilt for c++ ABI breakage + * Tue Jan 17 2012 Jaroslav Škarvada - 3.5.1-2 - Added explicit requires on PyQt4 Resolves: rhbz#781494 From 5deefd59245560836438aa1d967ea471c7af1676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 15 Mar 2012 19:44:32 +0100 Subject: [PATCH 050/313] New version Resolves: rhbz#802950 - Dropped compile-fix patch (upstreamed) --- gnuradio-3.5.1-compile-fix.patch | 11 ----------- gnuradio.spec | 14 ++++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 gnuradio-3.5.1-compile-fix.patch diff --git a/gnuradio-3.5.1-compile-fix.patch b/gnuradio-3.5.1-compile-fix.patch deleted file mode 100644 index ae1fa88..0000000 --- a/gnuradio-3.5.1-compile-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up gnuradio-3.5.1/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator_cc.cc.orig gnuradio-3.5.1/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator_cc.cc ---- gnuradio-3.5.1/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator_cc.cc.orig 2011-05-05 14:19:10.000000000 +0200 -+++ gnuradio-3.5.1/gnuradio-core/src/lib/filter/qa_gri_mmse_fir_interpolator_cc.cc 2012-01-13 15:12:31.959981553 +0100 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #define NELEM(x) (sizeof (x) / sizeof (x[0])) - diff --git a/gnuradio.spec b/gnuradio.spec index 8528cc7..afa5484 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -5,11 +5,11 @@ #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a # For versions published as attachment (strange) -%global attachment_id 293 +%global attachment_id 317 Name: gnuradio -Version: 3.5.1 -Release: 3%{?dist} +Version: 3.5.2 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -23,8 +23,6 @@ Source0: http://gnuradio.org/redmine/attachments/download/%{attachment_id}/gnura # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ # gzip > ../%%{name}-%%{version}.tar.gz -# Fix compilation with gcc-4.7.0 -Patch0: gnuradio-3.5.1-compile-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): shadow-utils @@ -104,7 +102,6 @@ GNU Radio examples %prep %setup -q -%patch0 -p1 -b .compile-fix #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -169,6 +166,11 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Thu Mar 15 2012 Jaroslav Škarvada - 3.5.2-1 +- New version + Resolves: rhbz#802950 +- Dropped compile-fix patch (upstreamed) + * Tue Feb 28 2012 Fedora Release Engineering - 3.5.1-3 - Rebuilt for c++ ABI breakage diff --git a/sources b/sources index effba73..dc0188a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c8f6a0e32e178239efa856f76aec50f gnuradio-3.5.1.tar.gz +e205757ce9c1c270cbb2ae8782239fae gnuradio-3.5.2.tar.gz From d0a6a63e97b8a8a40e61b37f532b89ce6ab6c2e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 16 Mar 2012 14:27:19 +0100 Subject: [PATCH 051/313] New version Resolves: rhbz#804032 --- gnuradio.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index afa5484..db71aef 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -8,7 +8,7 @@ %global attachment_id 317 Name: gnuradio -Version: 3.5.2 +Version: 3.5.2.1 Release: 1%{?dist} Summary: Software defined radio framework @@ -166,6 +166,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Fri Mar 16 2012 Jaroslav Škarvada - 3.5.2.1-1 +- New version + Resolves: rhbz#804032 + * Thu Mar 15 2012 Jaroslav Škarvada - 3.5.2-1 - New version Resolves: rhbz#802950 diff --git a/sources b/sources index dc0188a..85be235 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e205757ce9c1c270cbb2ae8782239fae gnuradio-3.5.2.tar.gz +10bdf040fe775561fed1ca4837d9a270 gnuradio-3.5.2.1.tar.gz From 09a96786e1649220e7ae346959741a1dfd87c2f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 27 Mar 2012 13:53:57 +0200 Subject: [PATCH 052/313] Rebuilt with new uhd --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index db71aef..610bac8 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -9,7 +9,7 @@ Name: gnuradio Version: 3.5.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -166,6 +166,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Mar 27 2012 Jaroslav Škarvada - 3.5.2.1-2 +- Rebuilt with new uhd + * Fri Mar 16 2012 Jaroslav Škarvada - 3.5.2.1-1 - New version Resolves: rhbz#804032 From aa72e601329ec79f3bd6bc4adbf5f3a665efc9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 10 Apr 2012 16:01:56 +0200 Subject: [PATCH 053/313] New version Resolves: rhbz#810683 --- gnuradio.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 610bac8..4cfa0ed 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -8,8 +8,8 @@ %global attachment_id 317 Name: gnuradio -Version: 3.5.2.1 -Release: 2%{?dist} +Version: 3.5.3 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -166,6 +166,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Apr 10 2012 Jaroslav Škarvada - 3.5.3-1 +- New version + Resolves: rhbz#810683 + * Tue Mar 27 2012 Jaroslav Škarvada - 3.5.2.1-2 - Rebuilt with new uhd diff --git a/sources b/sources index 85be235..61410fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10bdf040fe775561fed1ca4837d9a270 gnuradio-3.5.2.1.tar.gz +61cf928fe27c7947714a87cf4e151d33 gnuradio-3.5.3.tar.gz From c82303b59a1d8e0d5731321c5ac7cf4d6ac9e144 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 18 Apr 2012 10:00:58 +0100 Subject: [PATCH 054/313] Fix building on ARM --- gnuradio-disable-arm-opt.patch | 59 ++++++++++++++++++++++++++++++++++ gnuradio.spec | 10 ++++-- 2 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 gnuradio-disable-arm-opt.patch diff --git a/gnuradio-disable-arm-opt.patch b/gnuradio-disable-arm-opt.patch new file mode 100644 index 0000000..de1414f --- /dev/null +++ b/gnuradio-disable-arm-opt.patch @@ -0,0 +1,59 @@ +--- gnuradio-3.5.3/configure.old 2012-04-16 21:05:13.000000000 -0400 ++++ gnuradio-3.5.3/configure 2012-04-16 21:06:33.000000000 -0400 +@@ -19521,55 +19521,7 @@ + x86 | i[3-7]86) MD_CPU=x86 MD_SUBCPU=x86 ;; + x86_64) MD_CPU=x86 MD_SUBCPU=x86_64 ;; + powerpc*) MD_CPU=powerpc ;; +- arm*) +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifndef __ARM_ARCH_5__ +- #error "Not armv5" +- #endif +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- is_armv5=yes +-else +- is_armv5=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifndef __ARM_ARCH_7A__ +- #error "Not armv7-a" +- #endif +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- is_armv7_a=yes +-else +- is_armv7_a=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +- +- if test $is_armv5 = yes; then MD_CPU=armv5; +- elif test $is_armv7_a = yes; then MD_CPU=armv7_a; +- else MD_CPU=generic; fi +- ;; ++ arm*) MD_CPU=generic ;; + *) MD_CPU=generic ;; + esac + diff --git a/gnuradio.spec b/gnuradio.spec index 4cfa0ed..71c61bb 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -9,7 +9,7 @@ Name: gnuradio Version: 3.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -23,7 +23,9 @@ Source0: http://gnuradio.org/redmine/attachments/download/%{attachment_id}/gnura # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ # gzip > ../%%{name}-%%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# we actually disable ARM optimisations so it actually compiles on ARM. The compiler and the +# Fedora rpm compiler options do a much better job of sorting this out +Patch0: gnuradio-disable-arm-opt.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -102,6 +104,7 @@ GNU Radio examples %prep %setup -q +%patch0 -p1 -b .disable-arm-opts #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -166,6 +169,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Apr 18 2012 Peter Robinson - 3.5.3-2 +- Fix building on ARM + * Tue Apr 10 2012 Jaroslav Škarvada - 3.5.3-1 - New version Resolves: rhbz#810683 From e8b9d63f1f0296beef0349ba9b23cf0ecf8fe4ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 18 Apr 2012 15:23:43 +0200 Subject: [PATCH 055/313] New version Resolves: rhbz#813725 --- gnuradio.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 71c61bb..1132516 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -8,8 +8,8 @@ %global attachment_id 317 Name: gnuradio -Version: 3.5.3 -Release: 2%{?dist} +Version: 3.5.3.1 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -169,6 +169,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Apr 18 2012 Jaroslav Škarvada - 3.5.3.1-1 +- New version + Resolves: rhbz#813725 + * Wed Apr 18 2012 Peter Robinson - 3.5.3-2 - Fix building on ARM diff --git a/sources b/sources index 61410fd..cf04848 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -61cf928fe27c7947714a87cf4e151d33 gnuradio-3.5.3.tar.gz +6b7ce62b76f1e91ccc7228a72d9614f7 gnuradio-3.5.3.1.tar.gz From 257702638ed194f83f5ecb886e2023e316b0b22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 23 Apr 2012 17:29:42 +0200 Subject: [PATCH 056/313] New version Resolves: rhbz#815070 - Dropped ARM patch (not used in new buildsystem) - Fixed pygtk detection (pygtk2-no-x-detect patch) --- gnuradio-3.6.0-pygtk2-no-x-detect.patch | 21 +++++++++ gnuradio-disable-arm-opt.patch | 59 ------------------------- gnuradio.spec | 54 ++++++++++++---------- sources | 2 +- 4 files changed, 53 insertions(+), 83 deletions(-) create mode 100644 gnuradio-3.6.0-pygtk2-no-x-detect.patch delete mode 100644 gnuradio-disable-arm-opt.patch diff --git a/gnuradio-3.6.0-pygtk2-no-x-detect.patch b/gnuradio-3.6.0-pygtk2-no-x-detect.patch new file mode 100644 index 0000000..d17ba83 --- /dev/null +++ b/gnuradio-3.6.0-pygtk2-no-x-detect.patch @@ -0,0 +1,21 @@ +diff -up gnuradio-3.6.0/cmake/Modules/GrPython.cmake.orig gnuradio-3.6.0/cmake/Modules/GrPython.cmake +--- gnuradio-3.6.0/cmake/Modules/GrPython.cmake.orig 2012-04-21 21:00:33.000000000 +0200 ++++ gnuradio-3.6.0/cmake/Modules/GrPython.cmake 2012-04-23 15:13:49.227149681 +0200 +@@ -76,12 +76,11 @@ macro(GR_PYTHON_CHECK_MODULE desc mod cm + execute_process( + COMMAND ${PYTHON_EXECUTABLE} -c " + ######################################### +-try: import ${mod} +-except: +- try: ${mod} +- except: exit(-1) +-try: assert ${cmd} +-except: exit(-1) ++try: ++ import ${mod} ++ assert ${cmd} ++except ImportError, AssertionError: exit(-1) ++except: pass + #########################################" + RESULT_VARIABLE ${have} + ) diff --git a/gnuradio-disable-arm-opt.patch b/gnuradio-disable-arm-opt.patch deleted file mode 100644 index de1414f..0000000 --- a/gnuradio-disable-arm-opt.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- gnuradio-3.5.3/configure.old 2012-04-16 21:05:13.000000000 -0400 -+++ gnuradio-3.5.3/configure 2012-04-16 21:06:33.000000000 -0400 -@@ -19521,55 +19521,7 @@ - x86 | i[3-7]86) MD_CPU=x86 MD_SUBCPU=x86 ;; - x86_64) MD_CPU=x86 MD_SUBCPU=x86_64 ;; - powerpc*) MD_CPU=powerpc ;; -- arm*) -- -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#ifndef __ARM_ARCH_5__ -- #error "Not armv5" -- #endif -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- is_armv5=yes --else -- is_armv5=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#ifndef __ARM_ARCH_7A__ -- #error "Not armv7-a" -- #endif -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- is_armv7_a=yes --else -- is_armv7_a=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- -- -- if test $is_armv5 = yes; then MD_CPU=armv5; -- elif test $is_armv7_a = yes; then MD_CPU=armv7_a; -- else MD_CPU=generic; fi -- ;; -+ arm*) MD_CPU=generic ;; - *) MD_CPU=generic ;; - esac - diff --git a/gnuradio.spec b/gnuradio.spec index 1132516..9148354 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -5,10 +5,10 @@ #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a # For versions published as attachment (strange) -%global attachment_id 317 +%global attachment_id 326 Name: gnuradio -Version: 3.5.3.1 +Version: 3.6.0 Release: 1%{?dist} Summary: Software defined radio framework @@ -23,11 +23,11 @@ Source0: http://gnuradio.org/redmine/attachments/download/%{attachment_id}/gnura # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ # gzip > ../%%{name}-%%{version}.tar.gz -# we actually disable ARM optimisations so it actually compiles on ARM. The compiler and the -# Fedora rpm compiler options do a much better job of sorting this out -Patch0: gnuradio-disable-arm-opt.patch +# Fix detection of pygtk if there is no running X session, sent upstream +Patch0: gnuradio-3.6.0-pygtk2-no-x-detect.patch Requires(pre): shadow-utils +BuildRequires: cmake BuildRequires: sdcc BuildRequires: fftw-devel BuildRequires: cppunit-devel @@ -104,34 +104,38 @@ GNU Radio examples %prep %setup -q -%patch0 -p1 -b .disable-arm-opts +%patch0 -p1 -b .pygtk2-no-x-detect #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; %build -#./bootstrap -#enabling deps tracking is workaround to build -%configure --enable-dependency-tracking --enable-python --enable-doxygen \ ---enable-dot --enable-volk --enable-gruel --enable-gnuradio-core \ ---enable-gr-msdd6000 --enable-gr-audio --enable-gr-atsc \ ---enable-gr-cvsd-vocoder --enable-gr-gpio --enable-gr-uhd \ ---enable-gr-gsm-fr-vocoder --enable-gr-noaa --enable-gr-pager \ ---enable-gr-radar-pager --enable-gr-radar-mono --enable-gr-radio-astronomy \ ---enable-gr-trellis --enable-gr-video-sdl --enable-gr-wxgui \ ---enable-gr-sounder --enable-gr-utils --enable-gnuradio-examples \ ---enable-grc --enable-docs \ ---with-boost-libdir=%{_libdir} - -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +mkdir build +cd build +%cmake -DENABLE_PYTHON=FORCE -DENABLE_DOXYGEN=FORCE \ +-DENABLE_VOLK=FORCE -DENABLE_GRUEL=FORCE \ +-DENABLE_GR_CORE=FORCE \ +-DENABLE_GR_AUDIO=FORCE -DENABLE_GR_ATSC=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 \ +.. # make with -j1 and compile without strict-aliasing make %{?my_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing" %install rm -rf %{buildroot} +cd build make install DESTDIR=%{buildroot} +# fix sysconfdir location, preserve previous content +mkdir -p %{buildroot}/etc/ +cp -a %{buildroot}/usr/etc/* %{buildroot}/etc/ +rm -rf %{buildroot}/usr/etc + %clean rm -rf %{buildroot} @@ -147,17 +151,15 @@ rm -rf %{buildroot} %{_datadir}/gnuradio %config(noreplace) %{_sysconfdir}/gnuradio/conf.d/*.conf %exclude %{_datadir}/gnuradio/examples -%exclude %{python_sitearch}/gnuradio/*.la %exclude %{_docdir}/%{name}-%{version}/html %exclude %{_docdir}/%{name}-%{version}/xml -%doc ChangeLog NEWS INSTALL COPYING AUTHORS +%doc README README.hacking COPYING AUTHORS %files devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc -%exclude %{_libdir}/*.la %files doc %defattr(-,root,root,-) @@ -169,6 +171,12 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Mon Apr 23 2012 Jaroslav Škarvada - 3.6.0-1 +- New version + Resolves: rhbz#815070 +- Dropped ARM patch (not used in new buildsystem) +- Fixed pygtk detection (pygtk2-no-x-detect patch) + * Wed Apr 18 2012 Jaroslav Škarvada - 3.5.3.1-1 - New version Resolves: rhbz#813725 diff --git a/sources b/sources index cf04848..eeefcd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6b7ce62b76f1e91ccc7228a72d9614f7 gnuradio-3.5.3.1.tar.gz +82980e6924708221f4bc31446fa87f01 gnuradio-3.6.0.tar.gz From bcecd70fcfc17c90bee19829619f8c484a1db2fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 12 Jun 2012 17:21:57 +0200 Subject: [PATCH 057/313] New version Resolves: rhbz#831187 Dropped pygtk2-no-x-detect patch (upstreamed) --- gnuradio-3.6.0-pygtk2-no-x-detect.patch | 21 --------------------- gnuradio.spec | 13 +++++++------ sources | 2 +- 3 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 gnuradio-3.6.0-pygtk2-no-x-detect.patch diff --git a/gnuradio-3.6.0-pygtk2-no-x-detect.patch b/gnuradio-3.6.0-pygtk2-no-x-detect.patch deleted file mode 100644 index d17ba83..0000000 --- a/gnuradio-3.6.0-pygtk2-no-x-detect.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up gnuradio-3.6.0/cmake/Modules/GrPython.cmake.orig gnuradio-3.6.0/cmake/Modules/GrPython.cmake ---- gnuradio-3.6.0/cmake/Modules/GrPython.cmake.orig 2012-04-21 21:00:33.000000000 +0200 -+++ gnuradio-3.6.0/cmake/Modules/GrPython.cmake 2012-04-23 15:13:49.227149681 +0200 -@@ -76,12 +76,11 @@ macro(GR_PYTHON_CHECK_MODULE desc mod cm - execute_process( - COMMAND ${PYTHON_EXECUTABLE} -c " - ######################################### --try: import ${mod} --except: -- try: ${mod} -- except: exit(-1) --try: assert ${cmd} --except: exit(-1) -+try: -+ import ${mod} -+ assert ${cmd} -+except ImportError, AssertionError: exit(-1) -+except: pass - #########################################" - RESULT_VARIABLE ${have} - ) diff --git a/gnuradio.spec b/gnuradio.spec index 9148354..476ee2f 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -5,10 +5,10 @@ #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a # For versions published as attachment (strange) -%global attachment_id 326 +%global attachment_id 389 Name: gnuradio -Version: 3.6.0 +Version: 3.6.1 Release: 1%{?dist} Summary: Software defined radio framework @@ -23,9 +23,6 @@ Source0: http://gnuradio.org/redmine/attachments/download/%{attachment_id}/gnura # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ # gzip > ../%%{name}-%%{version}.tar.gz -# Fix detection of pygtk if there is no running X session, sent upstream -Patch0: gnuradio-3.6.0-pygtk2-no-x-detect.patch - Requires(pre): shadow-utils BuildRequires: cmake BuildRequires: sdcc @@ -104,7 +101,6 @@ GNU Radio examples %prep %setup -q -%patch0 -p1 -b .pygtk2-no-x-detect #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -171,6 +167,11 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Jun 12 2012 Jaroslav Škarvada - 3.6.1-1 +- New version + Resolves: rhbz#831187 + Dropped pygtk2-no-x-detect patch (upstreamed) + * Mon Apr 23 2012 Jaroslav Škarvada - 3.6.0-1 - New version Resolves: rhbz#815070 diff --git a/sources b/sources index eeefcd3..b482809 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82980e6924708221f4bc31446fa87f01 gnuradio-3.6.0.tar.gz +162bd70651b6350d09ac45ab95b29004 gnuradio-3.6.1.tar.gz From 3e4ea58f5b7e3703c31c77e2a62ec2ca7abc4cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 13 Jul 2012 17:18:22 +0200 Subject: [PATCH 058/313] Disabled NEON optimisations (neon patch, sent upstream) Resolves: rhbz#837028 - Removed sdcc build requires (not needed) --- gnuradio-3.6.1-neon.patch | 40 +++++++++++++++++++++++++++++++++++++++ gnuradio.spec | 17 +++++++++++++++-- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 gnuradio-3.6.1-neon.patch diff --git a/gnuradio-3.6.1-neon.patch b/gnuradio-3.6.1-neon.patch new file mode 100644 index 0000000..0b19277 --- /dev/null +++ b/gnuradio-3.6.1-neon.patch @@ -0,0 +1,40 @@ +diff --git a/gnuradio-core/src/lib/filter/CMakeLists.txt b/gnuradio-core/src/lib/filter/CMakeLists.txt +index facaff7..088d337 100644 +--- a/gnuradio-core/src/lib/filter/CMakeLists.txt ++++ b/gnuradio-core/src/lib/filter/CMakeLists.txt +@@ -210,6 +210,9 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") + ${CMAKE_CURRENT_SOURCE_DIR}/qa_dotprod_powerpc.cc + ) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") ++ if(have_mfpu_neon) ++ add_definitions(-DHAVE_MFPU_NEON) ++ endif() + list(APPEND gnuradio_core_sources + ${CMAKE_CURRENT_SOURCE_DIR}/sysconfig_armv7_a.cc + ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_sysconfig_armv7_a.cc +diff --git a/gnuradio-core/src/lib/filter/dotprod_ccf_armv7_a.c b/gnuradio-core/src/lib/filter/dotprod_ccf_armv7_a.c +index e7c6b26..c125b49 100644 +--- a/gnuradio-core/src/lib/filter/dotprod_ccf_armv7_a.c ++++ b/gnuradio-core/src/lib/filter/dotprod_ccf_armv7_a.c +@@ -37,7 +37,7 @@ gr_p2_round_down(size_t x, size_t pow2) + } + + +-#if 0 ++#ifndef HAVE_MFPU_NEON + + void + dotprod_ccf_armv7_a(const float *a, const float *b, float *res, size_t n) +diff --git a/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.c b/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.c +index 68c448b..23bbef0 100644 +--- a/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.c ++++ b/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.c +@@ -37,7 +37,7 @@ gr_p2_round_down(size_t x, size_t pow2) + } + + +-#if 0 ++#ifndef HAVE_MFPU_NEON + + float + dotprod_fff_armv7_a(const float *a, const float *b, size_t n) diff --git a/gnuradio.spec b/gnuradio.spec index 476ee2f..57b9005 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -1,6 +1,11 @@ %{!?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')} +# For now disable NEON on all ARMs +%ifarch %{arm} +%global disable_mfpu_neon -Dhave_mfpu_neon=0 +%endif + # For versions not yet on ftp, pull from git #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a @@ -9,7 +14,7 @@ Name: gnuradio Version: 3.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -23,9 +28,10 @@ Source0: http://gnuradio.org/redmine/attachments/download/%{attachment_id}/gnura # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ # gzip > ../%%{name}-%%{version}.tar.gz +Patch0: gnuradio-3.6.1-neon.patch + Requires(pre): shadow-utils BuildRequires: cmake -BuildRequires: sdcc BuildRequires: fftw-devel BuildRequires: cppunit-devel BuildRequires: wxPython-devel @@ -101,6 +107,7 @@ GNU Radio examples %prep %setup -q +%patch0 -p1 -b .neon #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -117,6 +124,7 @@ cd build -DENABLE_GR_TRELLIS=FORCE -DENABLE_GR_VIDEO_SDL=FORCE \ -DENABLE_GR_WXGUI=FORCE -DENABLE_GR_UTILS=FORCE \ -DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \ +%{disable_mfpu_neon} \ .. # make with -j1 and compile without strict-aliasing @@ -167,6 +175,11 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Fri Jul 13 2012 Jaroslav Škarvada - 3.6.1-2 +- Disabled NEON optimisations (neon patch, sent upstream) + Resolves: rhbz#837028 +- Removed sdcc build requires (not needed) + * Tue Jun 12 2012 Jaroslav Škarvada - 3.6.1-1 - New version Resolves: rhbz#831187 From fe1150f46f63bfb83174cfa04ba802173270edd2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 03:40:37 -0500 Subject: [PATCH 059/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 57b9005..4aba5af 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -14,7 +14,7 @@ Name: gnuradio Version: 3.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -175,6 +175,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 3.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jul 13 2012 Jaroslav Škarvada - 3.6.1-2 - Disabled NEON optimisations (neon patch, sent upstream) Resolves: rhbz#837028 From cfcd5f8ae5612350bb72c85ebeca2420490357bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 24 Jul 2012 15:41:53 +0200 Subject: [PATCH 060/313] On non ARM expand disable_mfpu_neon macro to empty string --- gnuradio.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 4aba5af..1f4afb5 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -14,7 +14,7 @@ Name: gnuradio Version: 3.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -124,7 +124,7 @@ cd build -DENABLE_GR_TRELLIS=FORCE -DENABLE_GR_VIDEO_SDL=FORCE \ -DENABLE_GR_WXGUI=FORCE -DENABLE_GR_UTILS=FORCE \ -DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \ -%{disable_mfpu_neon} \ +%{?disable_mfpu_neon} \ .. # make with -j1 and compile without strict-aliasing @@ -175,6 +175,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Jul 24 2012 Jaroslav Škarvada - 3.6.1-4 +- On non ARM expand disable_mfpu_neon macro to empty string + * Thu Jul 19 2012 Fedora Release Engineering - 3.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From c7b2b7fae3c8624a0540f26fdbdab1f297be57f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 10 Aug 2012 09:09:52 +0200 Subject: [PATCH 061/313] Rebuilt for new boost --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 1f4afb5..dd308af 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -14,7 +14,7 @@ Name: gnuradio Version: 3.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -175,6 +175,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Fri Aug 10 2012 Jaroslav Škarvada - 3.6.1-5 +- Rebuilt for new boost + * Tue Jul 24 2012 Jaroslav Škarvada - 3.6.1-4 - On non ARM expand disable_mfpu_neon macro to empty string From 92ea364a79bdfdcc47876f2ea559fb95236389a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 4 Sep 2012 14:29:29 +0200 Subject: [PATCH 062/313] Added conditional for ARM NEON build (%bcond_with neon) --- gnuradio.spec | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index dd308af..509fc65 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -1,9 +1,17 @@ +# NEON support is by default disabled on ARMs +%bcond_with neon + %{!?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')} -# For now disable NEON on all ARMs %ifarch %{arm} -%global disable_mfpu_neon -Dhave_mfpu_neon=0 +%if %{with neon} +%global my_optflags %(echo -n "%{optflags}" | sed 's/-mfpu=[^ \\t]\\+//g'; echo " -mfpu=neon") +%{expand: %global optflags %{my_optflags}} +%global mfpu_neon -Dhave_mfpu_neon=1 +%else +%global mfpu_neon -Dhave_mfpu_neon=0 +%endif %endif # For versions not yet on ftp, pull from git @@ -14,7 +22,7 @@ Name: gnuradio Version: 3.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -124,7 +132,7 @@ cd build -DENABLE_GR_TRELLIS=FORCE -DENABLE_GR_VIDEO_SDL=FORCE \ -DENABLE_GR_WXGUI=FORCE -DENABLE_GR_UTILS=FORCE \ -DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \ -%{?disable_mfpu_neon} \ +%{?mfpu_neon} \ .. # make with -j1 and compile without strict-aliasing @@ -175,6 +183,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Aug 29 2012 Jaroslav Škarvada - 3.6.1-6 +- Added conditional for ARM NEON build (%%bcond_with neon) + * Fri Aug 10 2012 Jaroslav Škarvada - 3.6.1-5 - Rebuilt for new boost From 55b41f72df5db47f9acb487db63b7d03f6f6739a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 24 Sep 2012 14:49:49 +0200 Subject: [PATCH 063/313] Fixed doc subpackage to be noarch --- gnuradio.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 509fc65..c67f85e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.6.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -101,6 +101,7 @@ GNU Radio Headers Summary: GNU Radio Group: Applications/Engineering Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description doc GNU Radio Documentation @@ -183,6 +184,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Mon Sep 24 2012 Jaroslav Škarvada - 3.6.1-7 +- Fixed doc subpackage to be noarch + * Wed Aug 29 2012 Jaroslav Škarvada - 3.6.1-6 - Added conditional for ARM NEON build (%%bcond_with neon) From c91f9e5cc18635c4c52d1bbe321ea2bf17ab58fd Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 19 Oct 2012 14:29:48 -0500 Subject: [PATCH 064/313] rebuild (qwt) --- gnuradio.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index c67f85e..7f833e0 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.6.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -63,6 +63,7 @@ BuildRequires: tex(latex) BuildRequires: numpy BuildRequires: PyQt4-devel BuildRequires: PyQwt-devel +BuildRequires: qwt-devel BuildRequires: qwtplot3d-qt4-devel BuildRequires: python-cheetah BuildRequires: xdg-utils @@ -184,6 +185,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Fri Oct 19 2012 Rex Dieter 3.6.1-8 +- rebuild (qwt) + * Mon Sep 24 2012 Jaroslav Škarvada - 3.6.1-7 - Fixed doc subpackage to be noarch From bd36678a92fb46b97733a23ec0b35d6e135753e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 25 Oct 2012 15:12:54 +0200 Subject: [PATCH 065/313] New version Resolves: rhbz#869840 - Dropped neon patch (upstreamed) --- gnuradio-3.6.1-neon.patch | 40 --------------------------------------- gnuradio.spec | 23 +++++++++------------- sources | 2 +- 3 files changed, 10 insertions(+), 55 deletions(-) delete mode 100644 gnuradio-3.6.1-neon.patch diff --git a/gnuradio-3.6.1-neon.patch b/gnuradio-3.6.1-neon.patch deleted file mode 100644 index 0b19277..0000000 --- a/gnuradio-3.6.1-neon.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/gnuradio-core/src/lib/filter/CMakeLists.txt b/gnuradio-core/src/lib/filter/CMakeLists.txt -index facaff7..088d337 100644 ---- a/gnuradio-core/src/lib/filter/CMakeLists.txt -+++ b/gnuradio-core/src/lib/filter/CMakeLists.txt -@@ -210,6 +210,9 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") - ${CMAKE_CURRENT_SOURCE_DIR}/qa_dotprod_powerpc.cc - ) - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") -+ if(have_mfpu_neon) -+ add_definitions(-DHAVE_MFPU_NEON) -+ endif() - list(APPEND gnuradio_core_sources - ${CMAKE_CURRENT_SOURCE_DIR}/sysconfig_armv7_a.cc - ${CMAKE_CURRENT_SOURCE_DIR}/gr_fir_sysconfig_armv7_a.cc -diff --git a/gnuradio-core/src/lib/filter/dotprod_ccf_armv7_a.c b/gnuradio-core/src/lib/filter/dotprod_ccf_armv7_a.c -index e7c6b26..c125b49 100644 ---- a/gnuradio-core/src/lib/filter/dotprod_ccf_armv7_a.c -+++ b/gnuradio-core/src/lib/filter/dotprod_ccf_armv7_a.c -@@ -37,7 +37,7 @@ gr_p2_round_down(size_t x, size_t pow2) - } - - --#if 0 -+#ifndef HAVE_MFPU_NEON - - void - dotprod_ccf_armv7_a(const float *a, const float *b, float *res, size_t n) -diff --git a/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.c b/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.c -index 68c448b..23bbef0 100644 ---- a/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.c -+++ b/gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.c -@@ -37,7 +37,7 @@ gr_p2_round_down(size_t x, size_t pow2) - } - - --#if 0 -+#ifndef HAVE_MFPU_NEON - - float - dotprod_fff_armv7_a(const float *a, const float *b, size_t n) diff --git a/gnuradio.spec b/gnuradio.spec index 7f833e0..37651c5 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -17,12 +17,9 @@ # For versions not yet on ftp, pull from git #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a -# For versions published as attachment (strange) -%global attachment_id 389 - Name: gnuradio -Version: 3.6.1 -Release: 8%{?dist} +Version: 3.6.2 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -30,14 +27,12 @@ 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/redmine/attachments/download/%{attachment_id}/gnuradio-%{version}.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} | \ # gzip > ../%%{name}-%%{version}.tar.gz -Patch0: gnuradio-3.6.1-neon.patch - Requires(pre): shadow-utils BuildRequires: cmake BuildRequires: fftw-devel @@ -117,7 +112,6 @@ GNU Radio examples %prep %setup -q -%patch0 -p1 -b .neon #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -134,6 +128,7 @@ cd build -DENABLE_GR_TRELLIS=FORCE -DENABLE_GR_VIDEO_SDL=FORCE \ -DENABLE_GR_WXGUI=FORCE -DENABLE_GR_UTILS=FORCE \ -DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \ +-DSYSCONFDIR=/etc \ %{?mfpu_neon} \ .. @@ -145,11 +140,6 @@ rm -rf %{buildroot} cd build make install DESTDIR=%{buildroot} -# fix sysconfdir location, preserve previous content -mkdir -p %{buildroot}/etc/ -cp -a %{buildroot}/usr/etc/* %{buildroot}/etc/ -rm -rf %{buildroot}/usr/etc - %clean rm -rf %{buildroot} @@ -185,6 +175,11 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Thu Oct 25 2012 Jaroslav Škarvada - 3.6.2-1 +- New version + Resolves: rhbz#869840 +- Dropped neon patch (upstreamed) + * Fri Oct 19 2012 Rex Dieter 3.6.1-8 - rebuild (qwt) diff --git a/sources b/sources index b482809..fed6d24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -162bd70651b6350d09ac45ab95b29004 gnuradio-3.6.1.tar.gz +beaaa4944e0e0a0fd3752f40a00b6114 gnuradio-3.6.2.tar.gz From 82aea538cfbd5069b8ab25c871f2edc9597a2c1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 31 Oct 2012 10:57:02 +0100 Subject: [PATCH 066/313] Fixed libusb requirements - Enabled gr-fcd Resolves: rhbz#871513 --- gnuradio.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 37651c5..aebfdb2 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -44,7 +44,7 @@ BuildRequires: boost-devel BuildRequires: python-devel BuildRequires: swig BuildRequires: doxygen -BuildRequires: libusb-devel +BuildRequires: libusbx-devel BuildRequires: alsa-lib-devel BuildRequires: SDL-devel BuildRequires: guile-devel @@ -121,13 +121,13 @@ mkdir build cd build %cmake -DENABLE_PYTHON=FORCE -DENABLE_DOXYGEN=FORCE \ -DENABLE_VOLK=FORCE -DENABLE_GRUEL=FORCE \ --DENABLE_GR_CORE=FORCE \ -DENABLE_GR_AUDIO=FORCE -DENABLE_GR_ATSC=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=/etc \ %{?mfpu_neon} \ .. @@ -175,6 +175,11 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Oct 30 2012 Jaroslav Škarvada - 3.6.2-2 +- Fixed libusb requirements +- Enabled gr-fcd + Resolves: rhbz#871513 + * Thu Oct 25 2012 Jaroslav Škarvada - 3.6.2-1 - New version Resolves: rhbz#869840 From 9674934b8551e644d419e931bf7655cea468a262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 31 Oct 2012 16:13:28 +0100 Subject: [PATCH 067/313] Forced gr-core build --- gnuradio.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index aebfdb2..39a86a2 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -119,7 +119,8 @@ find . -name "*_moc.cc" -exec rm {} \; %build mkdir build cd build -%cmake -DENABLE_PYTHON=FORCE -DENABLE_DOXYGEN=FORCE \ +%cmake -DENABLE_GR_CORE=FORCE \ +-DENABLE_PYTHON=FORCE -DENABLE_DOXYGEN=FORCE \ -DENABLE_VOLK=FORCE -DENABLE_GRUEL=FORCE \ -DENABLE_GR_AUDIO=FORCE -DENABLE_GR_ATSC=FORCE \ -DENABLE_GR_VOCODER=FORCE -DENABLE_GR_UHD=FORCE \ @@ -175,6 +176,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Oct 31 2012 Jaroslav Škarvada - 3.6.2-3 +- Forced gr-core build + * Tue Oct 30 2012 Jaroslav Škarvada - 3.6.2-2 - Fixed libusb requirements - Enabled gr-fcd From 1a3e1cedbdf74d6fc851ca253f7d66c31d9300a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 15 Nov 2012 12:32:34 +0100 Subject: [PATCH 068/313] Added PyQwt requirement Resolves: rhbz#876830 --- gnuradio.spec | 51 ++++++++++++++------------------------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 39a86a2..1779003 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -34,46 +34,19 @@ Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}.tar.gz # gzip > ../%%{name}-%%{version}.tar.gz Requires(pre): shadow-utils -BuildRequires: cmake -BuildRequires: fftw-devel -BuildRequires: cppunit-devel -BuildRequires: wxPython-devel -BuildRequires: xmlto -BuildRequires: graphviz -BuildRequires: boost-devel -BuildRequires: python-devel -BuildRequires: swig -BuildRequires: doxygen -BuildRequires: libusbx-devel -BuildRequires: alsa-lib-devel -BuildRequires: SDL-devel -BuildRequires: guile-devel -BuildRequires: portaudio-devel -BuildRequires: libtool +BuildRequires: cmake, fftw-devel, cppunit-devel, wxPython-devel, xmlto +BuildRequires: graphviz, boost-devel, python-devel, swig, doxygen +BuildRequires: libusbx-devel, alsa-lib-devel, SDL-devel, guile-devel +BuildRequires: portaudio-devel, libtool # Gnuradio deprecated gr-comedi # http://gnuradio.org/redmine/issues/show/395 # BuildRequires: comedilib-devel -BuildRequires: gsl-devel -BuildRequires: tex(latex) -BuildRequires: numpy -BuildRequires: PyQt4-devel -BuildRequires: PyQwt-devel -BuildRequires: qwt-devel -BuildRequires: qwtplot3d-qt4-devel -BuildRequires: python-cheetah -BuildRequires: xdg-utils -BuildRequires: python-lxml -BuildRequires: pygtk2-devel -BuildRequires: orc-devel +BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, PyQwt-devel +BuildRequires: qwt-devel, qwtplot3d-qt4-devel, python-cheetah +BuildRequires: xdg-utils, python-lxml, pygtk2-devel, orc-devel BuildRequires: uhd-devel -Requires: numpy -Requires: wxPython -Requires: scipy -Requires: portaudio -Requires: python-lxml -Requires: pygtk2 -Requires: python-cheetah -Requires: PyQt4 +Requires: numpy, wxPython, scipy, portaudio, python-lxml +Requires: pygtk2, python-cheetah, PyQt4, PyQwt Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 @@ -176,6 +149,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Thu Nov 15 2012 Jaroslav Škarvada - 3.6.2-4 +- Added PyQwt requirement + Resolves: rhbz#876830 + * Wed Oct 31 2012 Jaroslav Škarvada - 3.6.2-3 - Forced gr-core build From 5bc30681a627b6788b3af0b36c88bec3ec78268d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 4 Jan 2013 13:44:56 +0100 Subject: [PATCH 069/313] New version Resolves: rhbz#890393 - Fixed bogus date in changelog --- gnuradio.spec | 34 +++++++++++++++++++++++----------- sources | 1 + 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 1779003..f63801f 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -17,9 +17,11 @@ # For versions not yet on ftp, pull from git #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a +%global pretag rc0 + Name: gnuradio -Version: 3.6.2 -Release: 4%{?dist} +Version: 3.6.3 +Release: 0.1.%{pretag}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -27,7 +29,7 @@ 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}.tar.gz +Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}%{pretag}.tar.gz # git clone git://gnuradio.org/gnuradio # cd gnuradio # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ @@ -84,7 +86,7 @@ Requires: %{name} = %{version}-%{release} GNU Radio examples %prep -%setup -q +%setup -q -n %{name}-%{version}%{pretag} #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -111,9 +113,14 @@ make %{?my_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{opt %install rm -rf %{buildroot} -cd build +pushd build make install DESTDIR=%{buildroot} +# install some more docs +popd +mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}%{pretag} +install -m 644 -t %{buildroot}%{_docdir}/%{name}-%{version}%{pretag} COPYING AUTHORS + %clean rm -rf %{buildroot} @@ -129,9 +136,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio %config(noreplace) %{_sysconfdir}/gnuradio/conf.d/*.conf %exclude %{_datadir}/gnuradio/examples -%exclude %{_docdir}/%{name}-%{version}/html -%exclude %{_docdir}/%{name}-%{version}/xml -%doc README README.hacking COPYING AUTHORS +%exclude %{_docdir}/%{name}-%{version}%{pretag}/html +%exclude %{_docdir}/%{name}-%{version}%{pretag}/xml +%doc %{_docdir}/%{name}-%{version}%{pretag} %files devel %defattr(-,root,root,-) @@ -141,14 +148,19 @@ rm -rf %{buildroot} %files doc %defattr(-,root,root,-) -%doc %{_docdir}/%{name}-%{version}/html -%doc %{_docdir}/%{name}-%{version}/xml +%doc %{_docdir}/%{name}-%{version}%{pretag}/html +%doc %{_docdir}/%{name}-%{version}%{pretag}/xml %files examples %defattr(-,root,root,-) %{_datadir}/gnuradio/examples %changelog +* Wed Jan 2 2013 Jaroslav Škarvada - 3.6.3-0.1.rc0 +- New version + Resolves: rhbz#890393 +- Fixed bogus date in changelog + * Thu Nov 15 2012 Jaroslav Škarvada - 3.6.2-4 - Added PyQwt requirement Resolves: rhbz#876830 @@ -338,7 +350,7 @@ rm -rf %{buildroot} * Sat Jul 25 2009 Marek Mahut - 3.2-1 - Upstream release 3.2 -* Thu Mar 4 2009 Lubomir Rintel - 3.1.3-5 +* Wed Mar 4 2009 Lubomir Rintel - 3.1.3-5 - Fix build with GCC 4.4 * Tue Feb 24 2009 Fedora Release Engineering - 3.1.3-4 diff --git a/sources b/sources index fed6d24..38a5a4e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ beaaa4944e0e0a0fd3752f40a00b6114 gnuradio-3.6.2.tar.gz +0a045b5ea4adfc602d3d8f9f62173bd6 gnuradio-3.6.3rc0.tar.gz From a6db227de17338451a7a174b461bdacc0980f609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 11 Jan 2013 17:15:38 +0100 Subject: [PATCH 070/313] Fixed unowned directories Resolves: rhbz#894200 --- gnuradio.spec | 8 ++++++-- sources | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index f63801f..e28c8f4 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,7 +21,7 @@ Name: gnuradio Version: 3.6.3 -Release: 0.1.%{pretag}%{?dist} +Release: 0.2.%{pretag}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -134,7 +134,7 @@ rm -rf %{buildroot} %{_libdir}/lib*.so.* %{_libexecdir}/* %{_datadir}/gnuradio -%config(noreplace) %{_sysconfdir}/gnuradio/conf.d/*.conf +%config(noreplace) %{_sysconfdir}/gnuradio %exclude %{_datadir}/gnuradio/examples %exclude %{_docdir}/%{name}-%{version}%{pretag}/html %exclude %{_docdir}/%{name}-%{version}%{pretag}/xml @@ -156,6 +156,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Fri Jan 11 2013 Jaroslav Škarvada - 3.6.3-0.2.rc0 +- Fixed unowned directories + Resolves: rhbz#894200 + * Wed Jan 2 2013 Jaroslav Škarvada - 3.6.3-0.1.rc0 - New version Resolves: rhbz#890393 diff --git a/sources b/sources index 38a5a4e..371c8f3 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -beaaa4944e0e0a0fd3752f40a00b6114 gnuradio-3.6.2.tar.gz 0a045b5ea4adfc602d3d8f9f62173bd6 gnuradio-3.6.3rc0.tar.gz From fdff999be4556951f945108aaba53fc518602fa0 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sat, 9 Feb 2013 22:58:17 +0100 Subject: [PATCH 071/313] Rebuild for Boost-1.53.0 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index e28c8f4..de996b8 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,7 +21,7 @@ Name: gnuradio Version: 3.6.3 -Release: 0.2.%{pretag}%{?dist} +Release: 0.3.%{pretag}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -156,6 +156,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Sat Feb 09 2013 Denis Arnaud - 3.6.3-0.3.rc0 +- Rebuild for Boost-1.53.0 + * Fri Jan 11 2013 Jaroslav Škarvada - 3.6.3-0.2.rc0 - Fixed unowned directories Resolves: rhbz#894200 From 34ec61eff834bc9007b4abf4c3c0be866b5d5a5e Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sun, 10 Feb 2013 02:32:48 +0100 Subject: [PATCH 072/313] Rebuild for Boost-1.53.0 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index de996b8..c689507 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,7 +21,7 @@ Name: gnuradio Version: 3.6.3 -Release: 0.3.%{pretag}%{?dist} +Release: 0.4.%{pretag}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -156,6 +156,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Sun Feb 10 2013 Denis Arnaud - 3.6.3-0.4.rc0 +- Rebuild for Boost-1.53.0 + * Sat Feb 09 2013 Denis Arnaud - 3.6.3-0.3.rc0 - Rebuild for Boost-1.53.0 From ce200ddd2f20e1d83bdeb4e46e2e4c19fe76e07d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 28 Feb 2013 11:01:13 +0100 Subject: [PATCH 073/313] New version Resolves: rhbz#916530 --- gnuradio.spec | 28 +++++++++++++++------------- sources | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index c689507..cf7f726 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -17,11 +17,9 @@ # For versions not yet on ftp, pull from git #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a -%global pretag rc0 - Name: gnuradio -Version: 3.6.3 -Release: 0.4.%{pretag}%{?dist} +Version: 3.6.4 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -29,7 +27,7 @@ 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}%{pretag}.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} | \ @@ -86,7 +84,7 @@ Requires: %{name} = %{version}-%{release} GNU Radio examples %prep -%setup -q -n %{name}-%{version}%{pretag} +%setup -q #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -118,8 +116,8 @@ make install DESTDIR=%{buildroot} # install some more docs popd -mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}%{pretag} -install -m 644 -t %{buildroot}%{_docdir}/%{name}-%{version}%{pretag} COPYING AUTHORS +mkdir -p %{buildroot}%{_docdir}/%{name}-%{version} +install -m 644 -t %{buildroot}%{_docdir}/%{name}-%{version} COPYING AUTHORS %clean rm -rf %{buildroot} @@ -136,9 +134,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio %config(noreplace) %{_sysconfdir}/gnuradio %exclude %{_datadir}/gnuradio/examples -%exclude %{_docdir}/%{name}-%{version}%{pretag}/html -%exclude %{_docdir}/%{name}-%{version}%{pretag}/xml -%doc %{_docdir}/%{name}-%{version}%{pretag} +%exclude %{_docdir}/%{name}-%{version}/html +%exclude %{_docdir}/%{name}-%{version}/xml +%doc %{_docdir}/%{name}-%{version} %files devel %defattr(-,root,root,-) @@ -148,14 +146,18 @@ rm -rf %{buildroot} %files doc %defattr(-,root,root,-) -%doc %{_docdir}/%{name}-%{version}%{pretag}/html -%doc %{_docdir}/%{name}-%{version}%{pretag}/xml +%doc %{_docdir}/%{name}-%{version}/html +%doc %{_docdir}/%{name}-%{version}/xml %files examples %defattr(-,root,root,-) %{_datadir}/gnuradio/examples %changelog +* Thu Feb 28 2013 Jaroslav Škarvada - 3.6.4-1 +- New version + Resolves: rhbz#916530 + * Sun Feb 10 2013 Denis Arnaud - 3.6.3-0.4.rc0 - Rebuild for Boost-1.53.0 diff --git a/sources b/sources index 371c8f3..eef970d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a045b5ea4adfc602d3d8f9f62173bd6 gnuradio-3.6.3rc0.tar.gz +320a7f18593ec493e1061141f23c9a86 gnuradio-3.6.4.tar.gz From 2a996933b005224d5721fbf9e978c268a9fe7b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 20 Mar 2013 16:50:45 +0100 Subject: [PATCH 074/313] New version Resolves: rhbz#923699 --- gnuradio.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index cf7f726..26ecf8c 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -18,7 +18,7 @@ #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a Name: gnuradio -Version: 3.6.4 +Version: 3.6.4.1 Release: 1%{?dist} Summary: Software defined radio framework @@ -154,6 +154,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Mar 20 2013 Jaroslav Škarvada - 3.6.4.1-1 +- New version + Resolves: rhbz#923699 + * Thu Feb 28 2013 Jaroslav Škarvada - 3.6.4-1 - New version Resolves: rhbz#916530 diff --git a/sources b/sources index eef970d..a60b846 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -320a7f18593ec493e1061141f23c9a86 gnuradio-3.6.4.tar.gz +cad7cb89e2e0cae74b8c9ea3fb89ad07 gnuradio-3.6.4.1.tar.gz From ce3b5c34dfd717d476a201aa899f94443deff0f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 28 May 2013 15:21:13 +0200 Subject: [PATCH 075/313] New version Resolves: rhbz#967804 --- gnuradio.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 26ecf8c..f48c9b1 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -18,7 +18,7 @@ #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a Name: gnuradio -Version: 3.6.4.1 +Version: 3.6.5 Release: 1%{?dist} Summary: Software defined radio framework @@ -154,6 +154,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue May 28 2013 Jaroslav Škarvada - 3.6.5-1 +- New version + Resolves: rhbz#967804 + * Wed Mar 20 2013 Jaroslav Škarvada - 3.6.4.1-1 - New version Resolves: rhbz#923699 diff --git a/sources b/sources index a60b846..508eaf5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cad7cb89e2e0cae74b8c9ea3fb89ad07 gnuradio-3.6.4.1.tar.gz +d1bbfa4e5e244f30c9b9b47b9c3fecd8 gnuradio-3.6.5.tar.gz From 9bfefe0ad0f7ccdb4392e5a94ef5527de794cb20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 5 Jun 2013 21:03:28 +0200 Subject: [PATCH 076/313] New version Resolves: rhbz#967804 - Make cmake modules installation directory configurable (by cmake-modules-fix patch) - Tried to switch back to parallel build (hopefully the koji builder machines have now enough resources) --- gnuradio-3.6.5-cmake-modules-fix.patch | 19 ++++++++++++++++++ gnuradio.spec | 27 +++++++++++++++++++++----- 2 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 gnuradio-3.6.5-cmake-modules-fix.patch diff --git a/gnuradio-3.6.5-cmake-modules-fix.patch b/gnuradio-3.6.5-cmake-modules-fix.patch new file mode 100644 index 0000000..a050854 --- /dev/null +++ b/gnuradio-3.6.5-cmake-modules-fix.patch @@ -0,0 +1,19 @@ +diff -up gnuradio-3.6.5/CMakeLists.txt.orig gnuradio-3.6.5/CMakeLists.txt +--- gnuradio-3.6.5/CMakeLists.txt.orig 2013-05-26 19:31:51.000000000 +0200 ++++ gnuradio-3.6.5/CMakeLists.txt 2013-06-04 15:29:18.766492710 +0200 +@@ -294,9 +294,13 @@ SET(cmake_configs + ${CMAKE_BINARY_DIR}/cmake/Modules/GnuradioConfigVersion.cmake + ) + ++if(NOT CMAKE_MODULES_DIR) ++ set(CMAKE_MODULES_DIR lib/cmake/gnuradio) ++endif(NOT CMAKE_MODULES_DIR) ++ + install( +- FILES ${cmake_configs} +- DESTINATION lib/cmake/gnuradio ++ FILES ${cmake_configs} ++ DESTINATION ${CMAKE_MODULES_DIR} + COMPONENT "runtime_devel" + ) + diff --git a/gnuradio.spec b/gnuradio.spec index f48c9b1..f99368d 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -44,11 +44,14 @@ BuildRequires: portaudio-devel, libtool BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, PyQwt-devel BuildRequires: qwt-devel, qwtplot3d-qt4-devel, python-cheetah BuildRequires: xdg-utils, python-lxml, pygtk2-devel, orc-devel -BuildRequires: uhd-devel +BuildRequires: uhd-devel, dos2unix Requires: numpy, wxPython, scipy, portaudio, python-lxml Requires: pygtk2, python-cheetah, PyQt4, PyQwt Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 +# Make cmake modules installation directory configurable, +# patch sent upstream, ticket 548 +Patch0: gnuradio-3.6.5-cmake-modules-fix.patch %description GNU Radio is a collection of software that when combined with minimal @@ -86,9 +89,15 @@ GNU Radio examples %prep %setup -q +%patch0 -p1 -b .cmake-modules-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 @@ -102,12 +111,15 @@ cd build -DENABLE_GR_WXGUI=FORCE -DENABLE_GR_UTILS=FORCE \ -DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \ -DENABLE_GR_FCD=FORCE \ --DSYSCONFDIR=/etc \ +-DSYSCONFDIR=%{_sysconfdir} \ +-DCMAKE_MODULES_DIR=%{_datadir}/cmake/Modules \ %{?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 -j1 and compile without strict-aliasing +#make %{?my_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} @@ -143,6 +155,7 @@ rm -rf %{buildroot} %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc +%{_datadir}/cmake/Modules/*.cmake %files doc %defattr(-,root,root,-) @@ -154,9 +167,13 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog -* Tue May 28 2013 Jaroslav Škarvada - 3.6.5-1 +* Tue Jun 4 2013 Jaroslav Škarvada - 3.6.5-1 - New version Resolves: rhbz#967804 +- Make cmake modules installation directory configurable + (by cmake-modules-fix patch) +- Tried to switch back to parallel build (hopefully the koji builder + machines have now enough resources) * Wed Mar 20 2013 Jaroslav Škarvada - 3.6.4.1-1 - New version From e3acc9e237e641a5d36ff6cd2a9836810437821a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 12 Jun 2013 16:46:07 +0200 Subject: [PATCH 077/313] - fix build on big endian arches --- gnuradio-3.6.5-bigendian.patch | 21 +++++++++++++++++++++ gnuradio.spec | 8 +++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 gnuradio-3.6.5-bigendian.patch diff --git a/gnuradio-3.6.5-bigendian.patch b/gnuradio-3.6.5-bigendian.patch new file mode 100644 index 0000000..7f1bb15 --- /dev/null +++ b/gnuradio-3.6.5-bigendian.patch @@ -0,0 +1,21 @@ +diff -up gnuradio-3.6.5/gr-blocks/lib/wavfile.cc.bigendian gnuradio-3.6.5/gr-blocks/lib/wavfile.cc +--- gnuradio-3.6.5/gr-blocks/lib/wavfile.cc.bigendian 2013-06-12 13:41:54.000000000 +0200 ++++ gnuradio-3.6.5/gr-blocks/lib/wavfile.cc 2013-06-12 13:42:22.000000000 +0200 +@@ -38,14 +38,14 @@ namespace gr { + // Define host to/from worknet (little endian) short and long + #ifdef BOOST_BIG_ENDIAN + +- static inline uint16_t __wav_bs16(uint16_t x) ++ static inline uint16_t __gri_wav_bs16(uint16_t x) + { + return (x>>8) | (x<<8); + } + +- static inline uint32_t __wav_bs32(uint32_t x) ++ static inline uint32_t __gri_wav_bs32(uint32_t x) + { +- return (uint32_t(__wav_bs16(uint16_t(x&0xfffful)))<<16) | (__wav_bs16(uint16_t(x>>16))); ++ return (uint32_t(__gri_wav_bs16(uint16_t(x&0xfffful)))<<16) | (__gri_wav_bs16(uint16_t(x>>16))); + } + + #define htowl(x) __gri_wav_bs32(x) diff --git a/gnuradio.spec b/gnuradio.spec index f99368d..138c21e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.6.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -52,6 +52,8 @@ Obsoletes: grc < 0.80-1 # Make cmake modules installation directory configurable, # patch sent upstream, ticket 548 Patch0: gnuradio-3.6.5-cmake-modules-fix.patch +# big endian fix +Patch1: gnuradio-3.6.5-bigendian.patch %description GNU Radio is a collection of software that when combined with minimal @@ -90,6 +92,7 @@ GNU Radio examples %setup -q %patch0 -p1 -b .cmake-modules-fix +%patch1 -p1 -b .bigendian #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -167,6 +170,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Jun 12 2013 Dan Horák - 3.6.5-2 +- fix build on big endian arches + * Tue Jun 4 2013 Jaroslav Škarvada - 3.6.5-1 - New version Resolves: rhbz#967804 From 93fb13052f5b13ce339f153149c87fc36f0227bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 25 Jun 2013 11:14:12 +0200 Subject: [PATCH 078/313] New version Resolves: rhbz#976982 - Defuzzified cmake-modules-fix patch --- ... gnuradio-3.7.0rc0-cmake-modules-fix.patch | 9 +++--- gnuradio.spec | 31 ++++++++++++++----- sources | 2 +- 3 files changed, 30 insertions(+), 12 deletions(-) rename gnuradio-3.6.5-cmake-modules-fix.patch => gnuradio-3.7.0rc0-cmake-modules-fix.patch (57%) diff --git a/gnuradio-3.6.5-cmake-modules-fix.patch b/gnuradio-3.7.0rc0-cmake-modules-fix.patch similarity index 57% rename from gnuradio-3.6.5-cmake-modules-fix.patch rename to gnuradio-3.7.0rc0-cmake-modules-fix.patch index a050854..d4009f3 100644 --- a/gnuradio-3.6.5-cmake-modules-fix.patch +++ b/gnuradio-3.7.0rc0-cmake-modules-fix.patch @@ -1,7 +1,8 @@ -diff -up gnuradio-3.6.5/CMakeLists.txt.orig gnuradio-3.6.5/CMakeLists.txt ---- gnuradio-3.6.5/CMakeLists.txt.orig 2013-05-26 19:31:51.000000000 +0200 -+++ gnuradio-3.6.5/CMakeLists.txt 2013-06-04 15:29:18.766492710 +0200 -@@ -294,9 +294,13 @@ SET(cmake_configs +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 161017b..5862273 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -311,9 +311,13 @@ SET(cmake_configs ${CMAKE_BINARY_DIR}/cmake/Modules/GnuradioConfigVersion.cmake ) diff --git a/gnuradio.spec b/gnuradio.spec index 138c21e..87efd67 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -14,12 +14,14 @@ %endif %endif +%global alphatag rc0 + # For versions not yet on ftp, pull from git #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a Name: gnuradio -Version: 3.6.5 -Release: 2%{?dist} +Version: 3.7.0 +Release: 0.1.%{alphatag}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -27,7 +29,7 @@ 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}.tar.gz +Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}%{alphatag}.tar.gz # git clone git://gnuradio.org/gnuradio # cd gnuradio # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ @@ -51,9 +53,11 @@ Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 # Make cmake modules installation directory configurable, # patch sent upstream, ticket 548 -Patch0: gnuradio-3.6.5-cmake-modules-fix.patch +Patch0: gnuradio-3.7.0rc0-cmake-modules-fix.patch # big endian fix Patch1: gnuradio-3.6.5-bigendian.patch +# patch sent upstream +Patch2: gnuradio-3.7.0rc0-build-fix.patch %description GNU Radio is a collection of software that when combined with minimal @@ -89,10 +93,11 @@ Requires: %{name} = %{version}-%{release} GNU Radio examples %prep -%setup -q +%setup -q -n %{name}-%{version}%{alphatag} %patch0 -p1 -b .cmake-modules-fix %patch1 -p1 -b .bigendian +%patch2 -p1 -b .build-fix #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -128,12 +133,18 @@ make %{?_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optfl rm -rf %{buildroot} pushd build make install DESTDIR=%{buildroot} +popd # install some more docs -popd -mkdir -p %{buildroot}%{_docdir}/%{name}-%{version} +mv %{buildroot}%{_docdir}/%{name}-%{version}%{alphatag} %{buildroot}%{_docdir}/%{name}-%{version} install -m 644 -t %{buildroot}%{_docdir}/%{name}-%{version} COPYING AUTHORS +# 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 + %clean rm -rf %{buildroot} @@ -158,6 +169,7 @@ rm -rf %{buildroot} %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc +%{_libdir}/cmake/volk/*.cmake %{_datadir}/cmake/Modules/*.cmake %files doc @@ -170,6 +182,11 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Mon Jun 24 2013 Jaroslav Škarvada - 3.7.0-0.1.rc0 +- New version + Resolves: rhbz#976982 +- Defuzzified cmake-modules-fix patch + * Wed Jun 12 2013 Dan Horák - 3.6.5-2 - fix build on big endian arches diff --git a/sources b/sources index 508eaf5..3d49614 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1bbfa4e5e244f30c9b9b47b9c3fecd8 gnuradio-3.6.5.tar.gz +0b53c4794d24a816c8a12122fe4eaf7e gnuradio-3.7.0rc0.tar.gz From 11c4b46361a0f9983f36a2bbb0062b2cadd5d36c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 25 Jun 2013 11:14:30 +0200 Subject: [PATCH 079/313] New version Resolves: rhbz#976982 - Defuzzified cmake-modules-fix patch --- gnuradio-3.7.0rc0-build-fix.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 gnuradio-3.7.0rc0-build-fix.patch diff --git a/gnuradio-3.7.0rc0-build-fix.patch b/gnuradio-3.7.0rc0-build-fix.patch new file mode 100644 index 0000000..a2a3f3b --- /dev/null +++ b/gnuradio-3.7.0rc0-build-fix.patch @@ -0,0 +1,11 @@ +diff -up gnuradio-3.7.0rc0/gr-channels/lib/flat_fader_impl.h.orig3 gnuradio-3.7.0rc0/gr-channels/lib/flat_fader_impl.h +--- gnuradio-3.7.0rc0/gr-channels/lib/flat_fader_impl.h.orig3 2013-06-24 21:55:16.076417510 +0200 ++++ gnuradio-3.7.0rc0/gr-channels/lib/flat_fader_impl.h 2013-06-24 21:55:31.534171476 +0200 +@@ -25,6 +25,7 @@ + + #include + #include ++#include + + #include + #include From 0218ccc9543d86e076c064eafe536d3de01af38d Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Sun, 28 Jul 2013 20:24:09 +0200 Subject: [PATCH 080/313] Rebuild for boost 1.54.0 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 87efd67..99da982 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,7 +21,7 @@ Name: gnuradio Version: 3.7.0 -Release: 0.1.%{alphatag}%{?dist} +Release: 0.2.%{alphatag}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -182,6 +182,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Sun Jul 28 2013 Petr Machata - 3.7.0-0.2.rc0 +- Rebuild for boost 1.54.0 + * Mon Jun 24 2013 Jaroslav Škarvada - 3.7.0-0.1.rc0 - New version Resolves: rhbz#976982 From c74830a5d213b6fb63267a93f1e41e0e28e524f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 29 Jul 2013 17:02:11 +0200 Subject: [PATCH 081/313] Symlinked FindGnuradio.cmake --- gnuradio.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 99da982..7367f39 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,7 +21,7 @@ Name: gnuradio Version: 3.7.0 -Release: 0.2.%{alphatag}%{?dist} +Release: 0.3.%{alphatag}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -135,6 +135,11 @@ pushd build make install DESTDIR=%{buildroot} popd +# Symlink FindGnuradio.cmake +pushd %{buildroot}%{_datadir}/cmake/Modules +ln -s GnuradioConfig.cmake FindGnuradio.cmake +popd + # install some more docs mv %{buildroot}%{_docdir}/%{name}-%{version}%{alphatag} %{buildroot}%{_docdir}/%{name}-%{version} install -m 644 -t %{buildroot}%{_docdir}/%{name}-%{version} COPYING AUTHORS @@ -182,6 +187,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Mon Jul 29 2013 Jaroslav Škarvada - 3.7.0-0.3.rc0 +- Symlinked FindGnuradio.cmake + * Sun Jul 28 2013 Petr Machata - 3.7.0-0.2.rc0 - Rebuild for boost 1.54.0 From d075e927fc1415cab3956cfd876e8e51f755c9d9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 30 Jul 2013 20:29:20 -0500 Subject: [PATCH 082/313] rebuild against 1.54.0 again --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 7367f39..488c459 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,7 +21,7 @@ Name: gnuradio Version: 3.7.0 -Release: 0.3.%{alphatag}%{?dist} +Release: 0.4.%{alphatag}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -187,6 +187,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Jul 30 2013 Dennis Gilmore - 3.7.0-0.4.rc0 +- rebuild against 1.54.0 again + * Mon Jul 29 2013 Jaroslav Škarvada - 3.7.0-0.3.rc0 - Symlinked FindGnuradio.cmake From 5e99c3235b28e86ada20698086cd320de486240f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 6 Aug 2013 16:01:50 +0200 Subject: [PATCH 083/313] Used unversioned doc directory Resolves: rhbz#993794 --- gnuradio.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 488c459..ab33ba6 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,7 +21,7 @@ Name: gnuradio Version: 3.7.0 -Release: 0.4.%{alphatag}%{?dist} +Release: 0.5.%{alphatag}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -141,8 +141,8 @@ ln -s GnuradioConfig.cmake FindGnuradio.cmake popd # install some more docs -mv %{buildroot}%{_docdir}/%{name}-%{version}%{alphatag} %{buildroot}%{_docdir}/%{name}-%{version} -install -m 644 -t %{buildroot}%{_docdir}/%{name}-%{version} COPYING AUTHORS +mv %{buildroot}%{_docdir}/%{name}-%{version}%{alphatag} %{buildroot}%{_docdir}/%{name} +install -m 644 -t %{buildroot}%{_docdir}/%{name} COPYING AUTHORS # remove atsc example (bytecompilation problem) # the examples shouldn't be probably bytecompiled, @@ -165,9 +165,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio %config(noreplace) %{_sysconfdir}/gnuradio %exclude %{_datadir}/gnuradio/examples -%exclude %{_docdir}/%{name}-%{version}/html -%exclude %{_docdir}/%{name}-%{version}/xml -%doc %{_docdir}/%{name}-%{version} +%exclude %{_docdir}/%{name}/html +%exclude %{_docdir}/%{name}/xml +%doc %{_docdir}/%{name} %files devel %defattr(-,root,root,-) @@ -179,14 +179,18 @@ rm -rf %{buildroot} %files doc %defattr(-,root,root,-) -%doc %{_docdir}/%{name}-%{version}/html -%doc %{_docdir}/%{name}-%{version}/xml +%doc %{_docdir}/%{name}/html +%doc %{_docdir}/%{name}/xml %files examples %defattr(-,root,root,-) %{_datadir}/gnuradio/examples %changelog +* Tue Aug 6 2013 Jaroslav Škarvada - 3.7.0-0.5.rc0 +- Used unversioned doc directory + Resolves: rhbz#993794 + * Tue Jul 30 2013 Dennis Gilmore - 3.7.0-0.4.rc0 - rebuild against 1.54.0 again From 51685e0b44d0c3e19cd986379c591c5d7ade6699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 2 Sep 2013 10:47:36 +0200 Subject: [PATCH 084/313] New version Resolves: rhbz#1003319 - Dropped cmake-modules-fix, bigendian, build-fix patches (upstreamed) - Fixed uhd_fft error handling Resolves: rhbz#1003075 --- gnuradio-3.6.5-bigendian.patch | 21 --------------- gnuradio-3.7.0rc0-build-fix.patch | 11 -------- gnuradio-3.7.0rc0-cmake-modules-fix.patch | 20 -------------- gnuradio.spec | 33 +++++++++++------------ sources | 2 +- 5 files changed, 17 insertions(+), 70 deletions(-) delete mode 100644 gnuradio-3.6.5-bigendian.patch delete mode 100644 gnuradio-3.7.0rc0-build-fix.patch delete mode 100644 gnuradio-3.7.0rc0-cmake-modules-fix.patch diff --git a/gnuradio-3.6.5-bigendian.patch b/gnuradio-3.6.5-bigendian.patch deleted file mode 100644 index 7f1bb15..0000000 --- a/gnuradio-3.6.5-bigendian.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up gnuradio-3.6.5/gr-blocks/lib/wavfile.cc.bigendian gnuradio-3.6.5/gr-blocks/lib/wavfile.cc ---- gnuradio-3.6.5/gr-blocks/lib/wavfile.cc.bigendian 2013-06-12 13:41:54.000000000 +0200 -+++ gnuradio-3.6.5/gr-blocks/lib/wavfile.cc 2013-06-12 13:42:22.000000000 +0200 -@@ -38,14 +38,14 @@ namespace gr { - // Define host to/from worknet (little endian) short and long - #ifdef BOOST_BIG_ENDIAN - -- static inline uint16_t __wav_bs16(uint16_t x) -+ static inline uint16_t __gri_wav_bs16(uint16_t x) - { - return (x>>8) | (x<<8); - } - -- static inline uint32_t __wav_bs32(uint32_t x) -+ static inline uint32_t __gri_wav_bs32(uint32_t x) - { -- return (uint32_t(__wav_bs16(uint16_t(x&0xfffful)))<<16) | (__wav_bs16(uint16_t(x>>16))); -+ return (uint32_t(__gri_wav_bs16(uint16_t(x&0xfffful)))<<16) | (__gri_wav_bs16(uint16_t(x>>16))); - } - - #define htowl(x) __gri_wav_bs32(x) diff --git a/gnuradio-3.7.0rc0-build-fix.patch b/gnuradio-3.7.0rc0-build-fix.patch deleted file mode 100644 index a2a3f3b..0000000 --- a/gnuradio-3.7.0rc0-build-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up gnuradio-3.7.0rc0/gr-channels/lib/flat_fader_impl.h.orig3 gnuradio-3.7.0rc0/gr-channels/lib/flat_fader_impl.h ---- gnuradio-3.7.0rc0/gr-channels/lib/flat_fader_impl.h.orig3 2013-06-24 21:55:16.076417510 +0200 -+++ gnuradio-3.7.0rc0/gr-channels/lib/flat_fader_impl.h 2013-06-24 21:55:31.534171476 +0200 -@@ -25,6 +25,7 @@ - - #include - #include -+#include - - #include - #include diff --git a/gnuradio-3.7.0rc0-cmake-modules-fix.patch b/gnuradio-3.7.0rc0-cmake-modules-fix.patch deleted file mode 100644 index d4009f3..0000000 --- a/gnuradio-3.7.0rc0-cmake-modules-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 161017b..5862273 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -311,9 +311,13 @@ SET(cmake_configs - ${CMAKE_BINARY_DIR}/cmake/Modules/GnuradioConfigVersion.cmake - ) - -+if(NOT CMAKE_MODULES_DIR) -+ set(CMAKE_MODULES_DIR lib/cmake/gnuradio) -+endif(NOT CMAKE_MODULES_DIR) -+ - install( -- FILES ${cmake_configs} -- DESTINATION lib/cmake/gnuradio -+ FILES ${cmake_configs} -+ DESTINATION ${CMAKE_MODULES_DIR} - COMPONENT "runtime_devel" - ) - diff --git a/gnuradio.spec b/gnuradio.spec index ab33ba6..6c75bba 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -14,14 +14,12 @@ %endif %endif -%global alphatag rc0 - # For versions not yet on ftp, pull from git #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a Name: gnuradio -Version: 3.7.0 -Release: 0.5.%{alphatag}%{?dist} +Version: 3.7.1 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -29,7 +27,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}%{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} | \ @@ -51,13 +50,8 @@ Requires: numpy, wxPython, scipy, portaudio, python-lxml Requires: pygtk2, python-cheetah, PyQt4, PyQwt Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 -# Make cmake modules installation directory configurable, -# patch sent upstream, ticket 548 -Patch0: gnuradio-3.7.0rc0-cmake-modules-fix.patch -# big endian fix -Patch1: gnuradio-3.6.5-bigendian.patch -# patch sent upstream -Patch2: gnuradio-3.7.0rc0-build-fix.patch +# Fix uhd_fft error handling, sent upstream, ticket 590 +Patch0: gnuradio-3.6.5-uhd-fft-err.patch %description GNU Radio is a collection of software that when combined with minimal @@ -93,11 +87,9 @@ Requires: %{name} = %{version}-%{release} GNU Radio examples %prep -%setup -q -n %{name}-%{version}%{alphatag} +%setup -q -%patch0 -p1 -b .cmake-modules-fix -%patch1 -p1 -b .bigendian -%patch2 -p1 -b .build-fix +%patch0 -p1 -b .uhd-fft-err #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -141,7 +133,7 @@ ln -s GnuradioConfig.cmake FindGnuradio.cmake popd # install some more docs -mv %{buildroot}%{_docdir}/%{name}-%{version}%{alphatag} %{buildroot}%{_docdir}/%{name} +mv %{buildroot}%{_docdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name} install -m 644 -t %{buildroot}%{_docdir}/%{name} COPYING AUTHORS # remove atsc example (bytecompilation problem) @@ -187,6 +179,13 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Mon Sep 2 2013 Jaroslav Škarvada - 3.7.1-1 +- New version + Resolves: rhbz#1003319 +- Dropped cmake-modules-fix, bigendian, build-fix patches (upstreamed) +- Fixed uhd_fft error handling + Resolves: rhbz#1003075 + * Tue Aug 6 2013 Jaroslav Škarvada - 3.7.0-0.5.rc0 - Used unversioned doc directory Resolves: rhbz#993794 diff --git a/sources b/sources index 3d49614..2776062 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0b53c4794d24a816c8a12122fe4eaf7e gnuradio-3.7.0rc0.tar.gz +6c5e67da6ed8724dd900d8e343b64be4 gnuradio-3.7.1.tar.gz From 96ba683225c49244b5fc7af98c7081e82acbc864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 2 Sep 2013 11:01:08 +0200 Subject: [PATCH 085/313] Added uhd-fft-err patch --- gnuradio-3.6.5-uhd-fft-err.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 gnuradio-3.6.5-uhd-fft-err.patch diff --git a/gnuradio-3.6.5-uhd-fft-err.patch b/gnuradio-3.6.5-uhd-fft-err.patch new file mode 100644 index 0000000..18164a4 --- /dev/null +++ b/gnuradio-3.6.5-uhd-fft-err.patch @@ -0,0 +1,18 @@ +--- a/gr-uhd/apps/uhd_fft 2013-06-24 13:37:11.000000000 +0200 ++++ b/gr-uhd/apps/uhd_fft 2013-09-02 10:13:17.039408121 +0200 +@@ -334,8 +334,13 @@ + + + def main (): +- app = stdgui2.stdapp(app_top_block, "UHD FFT", nstatus=1) +- app.MainLoop() ++ try: ++ app = stdgui2.stdapp(app_top_block, "UHD FFT", nstatus=1) ++ app.MainLoop() ++ ++ except RuntimeError, e: ++ print e ++ sys.exit(1) + + if __name__ == '__main__': + main () From d5d14c09a36e49e07b1d655ebe785d27d0bf7166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 2 Sep 2013 11:37:49 +0200 Subject: [PATCH 086/313] Removed FindGnuradio.cmake symlink --- gnuradio.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 6c75bba..9a16c8d 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -127,11 +127,6 @@ pushd build make install DESTDIR=%{buildroot} popd -# Symlink FindGnuradio.cmake -pushd %{buildroot}%{_datadir}/cmake/Modules -ln -s GnuradioConfig.cmake FindGnuradio.cmake -popd - # install some more docs mv %{buildroot}%{_docdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name} install -m 644 -t %{buildroot}%{_docdir}/%{name} COPYING AUTHORS From e7f3f4b40b64829cb89a4d4769f9316e3ce9f0be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 2 Sep 2013 12:08:53 +0200 Subject: [PATCH 087/313] New version Resolves: rhbz#1003319 - Dropped cmake-modules-fix, bigendian, build-fix patches (upstreamed) - Fixed uhd_fft error handling Resolves: rhbz#1003075 --- gnuradio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 9a16c8d..59b9d94 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -129,7 +129,7 @@ popd # install some more docs mv %{buildroot}%{_docdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name} -install -m 644 -t %{buildroot}%{_docdir}/%{name} COPYING AUTHORS +install -m 644 -t %{buildroot}%{_docdir}/%{name} COPYING # remove atsc example (bytecompilation problem) # the examples shouldn't be probably bytecompiled, From 1ddf17f631da469b95b7d5f9f4d2c239d832dc34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 2 Sep 2013 15:36:39 +0200 Subject: [PATCH 088/313] Do not install bundled cmake modules --- gnuradio.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 59b9d94..5559659 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -137,6 +137,10 @@ install -m 644 -t %{buildroot}%{_docdir}/%{name} COPYING # thus letting it as is rm -rf %{buildroot}%{_datadir}/%{name}/examples/atsc +# remove bundled cmake modules +pushd %{buildroot}%{_datadir}/cmake/Modules && rm -f `ls | sed '/^FindGnuradio.cmake\|^FindUHD.cmake\|^Gr.*\|^Gnuradio.*/ d'` +popd + %clean rm -rf %{buildroot} @@ -174,6 +178,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Mon Sep 2 2013 Jaroslav Škarvada - 3.7.1-2 +- Do not install bundled cmake modules + * Mon Sep 2 2013 Jaroslav Škarvada - 3.7.1-1 - New version Resolves: rhbz#1003319 From 9e800dad9a4f37aeb3f89bccce2aed9aa4357c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 4 Sep 2013 17:59:30 +0200 Subject: [PATCH 089/313] Fixed FindGnuradio.cmake (by findgnuradio-cmake-fix patch) --- gnuradio.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 5559659..c75a410 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -50,8 +50,11 @@ Requires: numpy, wxPython, scipy, portaudio, python-lxml Requires: pygtk2, python-cheetah, PyQt4, PyQwt Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 -# Fix uhd_fft error handling, sent upstream, ticket 590 +# Fix uhd_fft error handling, sent upstream, upstream ticket 590 Patch0: gnuradio-3.6.5-uhd-fft-err.patch +# Fix FindGnuradio.cmake to allow compilation of out of tree projects +# upstream ticket 591 +Patch1: gnuradio-3.7.1-findgnuradio-cmake-fix.patch %description GNU Radio is a collection of software that when combined with minimal @@ -90,6 +93,7 @@ GNU Radio examples %setup -q %patch0 -p1 -b .uhd-fft-err +%patch1 -p1 -b .findgnuradio-cmake-fix #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -137,7 +141,7 @@ install -m 644 -t %{buildroot}%{_docdir}/%{name} COPYING # thus letting it as is rm -rf %{buildroot}%{_datadir}/%{name}/examples/atsc -# remove bundled cmake modules +# remove bundled cmake modules, upstream ticket 592 pushd %{buildroot}%{_datadir}/cmake/Modules && rm -f `ls | sed '/^FindGnuradio.cmake\|^FindUHD.cmake\|^Gr.*\|^Gnuradio.*/ d'` popd @@ -178,6 +182,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Sep 4 2013 Jaroslav Škarvada - 3.7.1-3 +- Fixed FindGnuradio.cmake (by findgnuradio-cmake-fix patch) + * Mon Sep 2 2013 Jaroslav Škarvada - 3.7.1-2 - Do not install bundled cmake modules From 26cfd2d44c7b2546922b1acbe59fe3e030202853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 4 Sep 2013 18:01:53 +0200 Subject: [PATCH 090/313] Added patch to fix FindGnuradio.cmake --- gnuradio-3.7.1-findgnuradio-cmake-fix.patch | 62 +++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 gnuradio-3.7.1-findgnuradio-cmake-fix.patch diff --git a/gnuradio-3.7.1-findgnuradio-cmake-fix.patch b/gnuradio-3.7.1-findgnuradio-cmake-fix.patch new file mode 100644 index 0000000..22cefa9 --- /dev/null +++ b/gnuradio-3.7.1-findgnuradio-cmake-fix.patch @@ -0,0 +1,62 @@ +diff -up gnuradio-3.7.1/cmake/Modules/FindGnuradio.cmake.orig gnuradio-3.7.1/cmake/Modules/FindGnuradio.cmake +--- gnuradio-3.7.1/cmake/Modules/FindGnuradio.cmake.orig 2013-06-30 02:05:51.000000000 +0200 ++++ gnuradio-3.7.1/cmake/Modules/FindGnuradio.cmake 2013-09-04 16:59:08.000000000 +0200 +@@ -43,11 +43,11 @@ function(GR_MODULE EXTVAR PCNAME INCFILE + FIND_PATH( + ${INCVAR_NAME} + NAMES ${INCFILE} +- HINTS $ENV{GNURADIO_RUNTIME_DIR}/include/gnuradio ++ HINTS $ENV{GNURADIO_RUNTIME_DIR}/include + ${PC_INCDIR} +- ${CMAKE_INSTALL_PREFIX}/include/gnuradio +- PATHS /usr/local/include/gnuradio +- /usr/include/gnuradio ++ ${CMAKE_INSTALL_PREFIX}/include ++ PATHS /usr/local/include ++ /usr/include + ) + + # look for libs +@@ -85,24 +85,24 @@ function(GR_MODULE EXTVAR PCNAME INCFILE + + endfunction() + +-GR_MODULE(CORE gnuradio-runtime gr_top_block.h gnuradio-runtime) +-GR_MODULE(RUNTIME gnuradio-runtime gr_top_block.h gnuradio-runtime) +-GR_MODULE(ANALOG gnuradio-analog analog/noise_type.h gnuradio-analog) +-GR_MODULE(ATSC gnuradio-atsc atsc_api.h gnuradio-atsc) +-GR_MODULE(AUDIO gnuradio-audio audio/sink.h gnuradio-audio) +-GR_MODULE(BLOCKS gnuradio-blocks blocks/delay.h gnuradio-blocks) +-GR_MODULE(CHANNELS gnuradio-channels channels/channel_model.h gnuradio-channels) +-GR_MODULE(DIGITAL gnuradio-digital digital/lfsr.h gnuradio-digital) +-GR_MODULE(FEC gnuradio-fec fec/rs.h gnuradio-fec) +-GR_MODULE(FFT gnuradio-fft fft/fft.h gnuradio-fft) +-GR_MODULE(FILTER gnuradio-filter filter/fir_filter.h gnuradio-filter) +-GR_MODULE(NOAA gnuradio-noaa noaa/hrpt.h gnuradio-noaa) +-GR_MODULE(PAGER gnuradio-pager noaa/flex_deinterleave.h gnuradio-pager) +-GR_MODULE(QTGUI gnuradio-qtgui qtgui/utils.h gnuradio-qtgui) +-GR_MODULE(TRELLIS gnuradio-trellis trellis/fsm.h gnuradio-trellis) +-GR_MODULE(UHD gnuradio-uhd gr_uhd/usrp_sink.h gnuradio-uhd) +-GR_MODULE(VOCODER gnuradio-vocoder vocoder/alaw_encode_sb.h gnuradio-vocoder) +-GR_MODULE(WAVELET gnuradio-wavelet wavelet/wavelet_ff.h gnuradio-wavelet) ++GR_MODULE(CORE gnuradio-runtime gnuradio/top_block.h gnuradio-runtime) ++GR_MODULE(RUNTIME gnuradio-runtime gnuradio/top_block.h gnuradio-runtime) ++GR_MODULE(ANALOG gnuradio-analog gnuradio/analog/noise_type.h gnuradio-analog) ++GR_MODULE(ATSC gnuradio-atsc gnuradio/atsc/api.h gnuradio-atsc) ++GR_MODULE(AUDIO gnuradio-audio gnuradio/audio/sink.h gnuradio-audio) ++GR_MODULE(BLOCKS gnuradio-blocks gnuradio/blocks/delay.h gnuradio-blocks) ++GR_MODULE(CHANNELS gnuradio-channels gnuradio/channels/channel_model.h gnuradio-channels) ++GR_MODULE(DIGITAL gnuradio-digital gnuradio/digital/lfsr.h gnuradio-digital) ++GR_MODULE(FEC gnuradio-fec gnuradio/fec/rs.h gnuradio-fec) ++GR_MODULE(FFT gnuradio-fft gnuradio/fft/fft.h gnuradio-fft) ++GR_MODULE(FILTER gnuradio-filter gnuradio/filter/fir_filter.h gnuradio-filter) ++GR_MODULE(NOAA gnuradio-noaa gnuradio/noaa/hrpt.h gnuradio-noaa) ++GR_MODULE(PAGER gnuradio-pager gnuradio/pager/api.h gnuradio-pager) ++GR_MODULE(QTGUI gnuradio-qtgui gnuradio/qtgui/utils.h gnuradio-qtgui) ++GR_MODULE(TRELLIS gnuradio-trellis gnuradio/trellis/fsm.h gnuradio-trellis) ++GR_MODULE(UHD gnuradio-uhd gnuradio/uhd/usrp_sink.h gnuradio-uhd) ++GR_MODULE(VOCODER gnuradio-vocoder gnuradio/vocoder/api.h gnuradio-vocoder) ++GR_MODULE(WAVELET gnuradio-wavelet gnuradio/wavelet/wavelet_ff.h gnuradio-wavelet) + GR_MODULE(PMT gnuradio-pmt pmt/pmt.h gnuradio-pmt) + + From 776fc9e6eaa1752b285bebaae8be859eb423a4c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 17 Sep 2013 17:07:16 +0200 Subject: [PATCH 091/313] Moved cmake modules to libdir/cmake --- gnuradio-3.7.1-findgnuradio-cmake-fix.patch | 62 --------------------- gnuradio.spec | 18 +++--- 2 files changed, 9 insertions(+), 71 deletions(-) delete mode 100644 gnuradio-3.7.1-findgnuradio-cmake-fix.patch diff --git a/gnuradio-3.7.1-findgnuradio-cmake-fix.patch b/gnuradio-3.7.1-findgnuradio-cmake-fix.patch deleted file mode 100644 index 22cefa9..0000000 --- a/gnuradio-3.7.1-findgnuradio-cmake-fix.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -up gnuradio-3.7.1/cmake/Modules/FindGnuradio.cmake.orig gnuradio-3.7.1/cmake/Modules/FindGnuradio.cmake ---- gnuradio-3.7.1/cmake/Modules/FindGnuradio.cmake.orig 2013-06-30 02:05:51.000000000 +0200 -+++ gnuradio-3.7.1/cmake/Modules/FindGnuradio.cmake 2013-09-04 16:59:08.000000000 +0200 -@@ -43,11 +43,11 @@ function(GR_MODULE EXTVAR PCNAME INCFILE - FIND_PATH( - ${INCVAR_NAME} - NAMES ${INCFILE} -- HINTS $ENV{GNURADIO_RUNTIME_DIR}/include/gnuradio -+ HINTS $ENV{GNURADIO_RUNTIME_DIR}/include - ${PC_INCDIR} -- ${CMAKE_INSTALL_PREFIX}/include/gnuradio -- PATHS /usr/local/include/gnuradio -- /usr/include/gnuradio -+ ${CMAKE_INSTALL_PREFIX}/include -+ PATHS /usr/local/include -+ /usr/include - ) - - # look for libs -@@ -85,24 +85,24 @@ function(GR_MODULE EXTVAR PCNAME INCFILE - - endfunction() - --GR_MODULE(CORE gnuradio-runtime gr_top_block.h gnuradio-runtime) --GR_MODULE(RUNTIME gnuradio-runtime gr_top_block.h gnuradio-runtime) --GR_MODULE(ANALOG gnuradio-analog analog/noise_type.h gnuradio-analog) --GR_MODULE(ATSC gnuradio-atsc atsc_api.h gnuradio-atsc) --GR_MODULE(AUDIO gnuradio-audio audio/sink.h gnuradio-audio) --GR_MODULE(BLOCKS gnuradio-blocks blocks/delay.h gnuradio-blocks) --GR_MODULE(CHANNELS gnuradio-channels channels/channel_model.h gnuradio-channels) --GR_MODULE(DIGITAL gnuradio-digital digital/lfsr.h gnuradio-digital) --GR_MODULE(FEC gnuradio-fec fec/rs.h gnuradio-fec) --GR_MODULE(FFT gnuradio-fft fft/fft.h gnuradio-fft) --GR_MODULE(FILTER gnuradio-filter filter/fir_filter.h gnuradio-filter) --GR_MODULE(NOAA gnuradio-noaa noaa/hrpt.h gnuradio-noaa) --GR_MODULE(PAGER gnuradio-pager noaa/flex_deinterleave.h gnuradio-pager) --GR_MODULE(QTGUI gnuradio-qtgui qtgui/utils.h gnuradio-qtgui) --GR_MODULE(TRELLIS gnuradio-trellis trellis/fsm.h gnuradio-trellis) --GR_MODULE(UHD gnuradio-uhd gr_uhd/usrp_sink.h gnuradio-uhd) --GR_MODULE(VOCODER gnuradio-vocoder vocoder/alaw_encode_sb.h gnuradio-vocoder) --GR_MODULE(WAVELET gnuradio-wavelet wavelet/wavelet_ff.h gnuradio-wavelet) -+GR_MODULE(CORE gnuradio-runtime gnuradio/top_block.h gnuradio-runtime) -+GR_MODULE(RUNTIME gnuradio-runtime gnuradio/top_block.h gnuradio-runtime) -+GR_MODULE(ANALOG gnuradio-analog gnuradio/analog/noise_type.h gnuradio-analog) -+GR_MODULE(ATSC gnuradio-atsc gnuradio/atsc/api.h gnuradio-atsc) -+GR_MODULE(AUDIO gnuradio-audio gnuradio/audio/sink.h gnuradio-audio) -+GR_MODULE(BLOCKS gnuradio-blocks gnuradio/blocks/delay.h gnuradio-blocks) -+GR_MODULE(CHANNELS gnuradio-channels gnuradio/channels/channel_model.h gnuradio-channels) -+GR_MODULE(DIGITAL gnuradio-digital gnuradio/digital/lfsr.h gnuradio-digital) -+GR_MODULE(FEC gnuradio-fec gnuradio/fec/rs.h gnuradio-fec) -+GR_MODULE(FFT gnuradio-fft gnuradio/fft/fft.h gnuradio-fft) -+GR_MODULE(FILTER gnuradio-filter gnuradio/filter/fir_filter.h gnuradio-filter) -+GR_MODULE(NOAA gnuradio-noaa gnuradio/noaa/hrpt.h gnuradio-noaa) -+GR_MODULE(PAGER gnuradio-pager gnuradio/pager/api.h gnuradio-pager) -+GR_MODULE(QTGUI gnuradio-qtgui gnuradio/qtgui/utils.h gnuradio-qtgui) -+GR_MODULE(TRELLIS gnuradio-trellis gnuradio/trellis/fsm.h gnuradio-trellis) -+GR_MODULE(UHD gnuradio-uhd gnuradio/uhd/usrp_sink.h gnuradio-uhd) -+GR_MODULE(VOCODER gnuradio-vocoder gnuradio/vocoder/api.h gnuradio-vocoder) -+GR_MODULE(WAVELET gnuradio-wavelet gnuradio/wavelet/wavelet_ff.h gnuradio-wavelet) - GR_MODULE(PMT gnuradio-pmt pmt/pmt.h gnuradio-pmt) - - diff --git a/gnuradio.spec b/gnuradio.spec index c75a410..f80f946 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -52,9 +52,6 @@ Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 # Fix uhd_fft error handling, sent upstream, upstream ticket 590 Patch0: gnuradio-3.6.5-uhd-fft-err.patch -# Fix FindGnuradio.cmake to allow compilation of out of tree projects -# upstream ticket 591 -Patch1: gnuradio-3.7.1-findgnuradio-cmake-fix.patch %description GNU Radio is a collection of software that when combined with minimal @@ -67,6 +64,7 @@ performance wireless devices into software problems. Summary: GNU Radio Group: Applications/Engineering Requires: %{name} = %{version}-%{release} +Requires: cmake Obsoletes: usrp-devel < 3.3.0-1 %description devel @@ -93,7 +91,6 @@ GNU Radio examples %setup -q %patch0 -p1 -b .uhd-fft-err -%patch1 -p1 -b .findgnuradio-cmake-fix #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -116,7 +113,7 @@ cd build -DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \ -DENABLE_GR_FCD=FORCE \ -DSYSCONFDIR=%{_sysconfdir} \ --DCMAKE_MODULES_DIR=%{_datadir}/cmake/Modules \ +-DCMAKE_MODULES_DIR=%{_libdir}/cmake/gnuradio \ %{?mfpu_neon} \ .. @@ -142,7 +139,7 @@ install -m 644 -t %{buildroot}%{_docdir}/%{name} COPYING rm -rf %{buildroot}%{_datadir}/%{name}/examples/atsc # remove bundled cmake modules, upstream ticket 592 -pushd %{buildroot}%{_datadir}/cmake/Modules && rm -f `ls | sed '/^FindGnuradio.cmake\|^FindUHD.cmake\|^Gr.*\|^Gnuradio.*/ d'` +pushd %{buildroot}%{_libdir}/cmake/gnuradio && rm -f `ls | sed '/^FindUHD.cmake\|^Gr.*\|^Gnuradio.*/ d'` popd %clean @@ -169,8 +166,8 @@ rm -rf %{buildroot} %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc -%{_libdir}/cmake/volk/*.cmake -%{_datadir}/cmake/Modules/*.cmake +%{_libdir}/cmake/volk +%{_libdir}/cmake/gnuradio %files doc %defattr(-,root,root,-) @@ -182,6 +179,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Sep 17 2013 Jaroslav Škarvada - 3.7.1-4 +- Moved cmake modules to libdir/cmake + * Wed Sep 4 2013 Jaroslav Škarvada - 3.7.1-3 - Fixed FindGnuradio.cmake (by findgnuradio-cmake-fix patch) From aad5da401dfca0a3a3c70cf7046680b8c7154bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 17 Sep 2013 18:05:47 +0200 Subject: [PATCH 092/313] Fixed defaults to use libdir for cmake modules (by cmake-libdir patch) - Defuzzified uhd-fft-err patch --- gnuradio-3.7.1-cmake-libdir.patch | 12 ++++++++++++ ...fft-err.patch => gnuradio-3.7.1-uhd-fft-err.patch | 8 +++++--- gnuradio.spec | 12 +++++++++--- 3 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 gnuradio-3.7.1-cmake-libdir.patch rename gnuradio-3.6.5-uhd-fft-err.patch => gnuradio-3.7.1-uhd-fft-err.patch (60%) diff --git a/gnuradio-3.7.1-cmake-libdir.patch b/gnuradio-3.7.1-cmake-libdir.patch new file mode 100644 index 0000000..ef6d704 --- /dev/null +++ b/gnuradio-3.7.1-cmake-libdir.patch @@ -0,0 +1,12 @@ +diff -up gnuradio-3.7.1/CMakeLists.txt.orig gnuradio-3.7.1/CMakeLists.txt +--- gnuradio-3.7.1/CMakeLists.txt.orig 2013-08-29 19:17:16.000000000 +0200 ++++ gnuradio-3.7.1/CMakeLists.txt 2013-09-17 17:53:44.518199207 +0200 +@@ -312,7 +312,7 @@ SET(cmake_configs + ) + + if(NOT CMAKE_MODULES_DIR) +- set(CMAKE_MODULES_DIR lib/cmake/gnuradio) ++ set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake/gnuradio) + endif(NOT CMAKE_MODULES_DIR) + + # Install all other cmake files into same directory diff --git a/gnuradio-3.6.5-uhd-fft-err.patch b/gnuradio-3.7.1-uhd-fft-err.patch similarity index 60% rename from gnuradio-3.6.5-uhd-fft-err.patch rename to gnuradio-3.7.1-uhd-fft-err.patch index 18164a4..4508121 100644 --- a/gnuradio-3.6.5-uhd-fft-err.patch +++ b/gnuradio-3.7.1-uhd-fft-err.patch @@ -1,6 +1,8 @@ ---- a/gr-uhd/apps/uhd_fft 2013-06-24 13:37:11.000000000 +0200 -+++ b/gr-uhd/apps/uhd_fft 2013-09-02 10:13:17.039408121 +0200 -@@ -334,8 +334,13 @@ +diff --git a/gr-uhd/apps/uhd_fft b/gr-uhd/apps/uhd_fft +index c1ccc33..41da61a 100755 +--- a/gr-uhd/apps/uhd_fft ++++ b/gr-uhd/apps/uhd_fft +@@ -336,8 +336,13 @@ class app_top_block(stdgui2.std_top_block): def main (): diff --git a/gnuradio.spec b/gnuradio.spec index f80f946..9d71d81 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.7.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -51,7 +51,9 @@ Requires: pygtk2, python-cheetah, PyQt4, PyQwt Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 # Fix uhd_fft error handling, sent upstream, upstream ticket 590 -Patch0: gnuradio-3.6.5-uhd-fft-err.patch +Patch0: gnuradio-3.7.1-uhd-fft-err.patch +# Fix cmake files location, upstream ticket 591 +Patch1: gnuradio-3.7.1-cmake-libdir.patch %description GNU Radio is a collection of software that when combined with minimal @@ -91,6 +93,7 @@ GNU Radio examples %setup -q %patch0 -p1 -b .uhd-fft-err +%patch1 -p1 -b .cmake-libdir #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -113,7 +116,6 @@ cd build -DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \ -DENABLE_GR_FCD=FORCE \ -DSYSCONFDIR=%{_sysconfdir} \ --DCMAKE_MODULES_DIR=%{_libdir}/cmake/gnuradio \ %{?mfpu_neon} \ .. @@ -179,6 +181,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Sep 17 2013 Jaroslav Škarvada - 3.7.1-5 +- Fixed defaults to use libdir for cmake modules (by cmake-libdir patch) +- Defuzzified uhd-fft-err patch + * Tue Sep 17 2013 Jaroslav Škarvada - 3.7.1-4 - Moved cmake modules to libdir/cmake From 823625a3fa74f5d0d4499076e2ef62a181217ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 18 Nov 2013 16:09:33 +0100 Subject: [PATCH 093/313] New version Resolves: rhbz#1030865 - Dropped uhd-fft-err, cmake-libdir patches (all upstreamed) --- gnuradio-3.7.1-cmake-libdir.patch | 12 ------------ gnuradio-3.7.1-uhd-fft-err.patch | 20 -------------------- gnuradio.spec | 16 +++++++--------- sources | 2 +- 4 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 gnuradio-3.7.1-cmake-libdir.patch delete mode 100644 gnuradio-3.7.1-uhd-fft-err.patch diff --git a/gnuradio-3.7.1-cmake-libdir.patch b/gnuradio-3.7.1-cmake-libdir.patch deleted file mode 100644 index ef6d704..0000000 --- a/gnuradio-3.7.1-cmake-libdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gnuradio-3.7.1/CMakeLists.txt.orig gnuradio-3.7.1/CMakeLists.txt ---- gnuradio-3.7.1/CMakeLists.txt.orig 2013-08-29 19:17:16.000000000 +0200 -+++ gnuradio-3.7.1/CMakeLists.txt 2013-09-17 17:53:44.518199207 +0200 -@@ -312,7 +312,7 @@ SET(cmake_configs - ) - - if(NOT CMAKE_MODULES_DIR) -- set(CMAKE_MODULES_DIR lib/cmake/gnuradio) -+ set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake/gnuradio) - endif(NOT CMAKE_MODULES_DIR) - - # Install all other cmake files into same directory diff --git a/gnuradio-3.7.1-uhd-fft-err.patch b/gnuradio-3.7.1-uhd-fft-err.patch deleted file mode 100644 index 4508121..0000000 --- a/gnuradio-3.7.1-uhd-fft-err.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/gr-uhd/apps/uhd_fft b/gr-uhd/apps/uhd_fft -index c1ccc33..41da61a 100755 ---- a/gr-uhd/apps/uhd_fft -+++ b/gr-uhd/apps/uhd_fft -@@ -336,8 +336,13 @@ class app_top_block(stdgui2.std_top_block): - - - def main (): -- app = stdgui2.stdapp(app_top_block, "UHD FFT", nstatus=1) -- app.MainLoop() -+ try: -+ app = stdgui2.stdapp(app_top_block, "UHD FFT", nstatus=1) -+ app.MainLoop() -+ -+ except RuntimeError, e: -+ print e -+ sys.exit(1) - - if __name__ == '__main__': - main () diff --git a/gnuradio.spec b/gnuradio.spec index 9d71d81..7999150 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -18,8 +18,8 @@ #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a Name: gnuradio -Version: 3.7.1 -Release: 5%{?dist} +Version: 3.7.2 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -50,10 +50,6 @@ Requires: numpy, wxPython, scipy, portaudio, python-lxml Requires: pygtk2, python-cheetah, PyQt4, PyQwt Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 -# Fix uhd_fft error handling, sent upstream, upstream ticket 590 -Patch0: gnuradio-3.7.1-uhd-fft-err.patch -# Fix cmake files location, upstream ticket 591 -Patch1: gnuradio-3.7.1-cmake-libdir.patch %description GNU Radio is a collection of software that when combined with minimal @@ -92,9 +88,6 @@ GNU Radio examples %prep %setup -q -%patch0 -p1 -b .uhd-fft-err -%patch1 -p1 -b .cmake-libdir - #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -181,6 +174,11 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Mon Nov 18 2013 Jaroslav Škarvada - 3.7.2-1 +- New version + Resolves: rhbz#1030865 +- Dropped uhd-fft-err, cmake-libdir patches (all upstreamed) + * Tue Sep 17 2013 Jaroslav Škarvada - 3.7.1-5 - Fixed defaults to use libdir for cmake modules (by cmake-libdir patch) - Defuzzified uhd-fft-err patch diff --git a/sources b/sources index 2776062..cd75f0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c5e67da6ed8724dd900d8e343b64be4 gnuradio-3.7.1.tar.gz +9a9da8458fd0c1b452487524ed29f3fd gnuradio-3.7.2.tar.gz From 1645035d2e1b30c7ab015d19702f8582c40d00b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 2 Dec 2013 10:51:17 +0100 Subject: [PATCH 094/313] New version Resolves: rhbz#1036554 --- gnuradio.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 7999150..5f8b0c1 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -18,7 +18,7 @@ #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a Name: gnuradio -Version: 3.7.2 +Version: 3.7.2.1 Release: 1%{?dist} Summary: Software defined radio framework @@ -174,6 +174,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Mon Dec 2 2013 Jaroslav Škarvada - 3.7.2.1-1 +- New version + Resolves: rhbz#1036554 + * Mon Nov 18 2013 Jaroslav Škarvada - 3.7.2-1 - New version Resolves: rhbz#1030865 diff --git a/sources b/sources index cd75f0a..03ed4f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a9da8458fd0c1b452487524ed29f3fd gnuradio-3.7.2.tar.gz +f2ea23a30cb02802870fe8cb9bf272c9 gnuradio-3.7.2.1.tar.gz From 60b2f2d484136814158ddf0a40c2490670834583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 3 Jan 2014 18:47:15 +0100 Subject: [PATCH 095/313] Added boost-devel as requirement for gnuradio-devel Resolves: rhbz#1002148 --- gnuradio.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 5f8b0c1..cb8fe5c 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.7.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -62,7 +62,7 @@ performance wireless devices into software problems. Summary: GNU Radio Group: Applications/Engineering Requires: %{name} = %{version}-%{release} -Requires: cmake +Requires: cmake, boost-devel Obsoletes: usrp-devel < 3.3.0-1 %description devel @@ -174,6 +174,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Fri Jan 3 2014 Jaroslav Škarvada - 3.7.2.1-2 +- Added boost-devel as requirement for gnuradio-devel + Resolves: rhbz#1002148 + * Mon Dec 2 2013 Jaroslav Škarvada - 3.7.2.1-1 - New version Resolves: rhbz#1036554 From f617d0ea7a2494a1abe7fb35114dbe7b47828fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 6 Jan 2014 14:53:19 +0100 Subject: [PATCH 096/313] Enabled use of qwt61 (by qwt61 patch) Resolves: rhbz#1045935 - Added sphinx to buildrequires Related: rhbz#1045935 - Fixed whitespaces in description --- gnuradio-3.7.2.1-qwt61.patch | 455 +++++++++++++++++++++++++++++++++++ gnuradio.spec | 23 +- 2 files changed, 472 insertions(+), 6 deletions(-) create mode 100644 gnuradio-3.7.2.1-qwt61.patch diff --git a/gnuradio-3.7.2.1-qwt61.patch b/gnuradio-3.7.2.1-qwt61.patch new file mode 100644 index 0000000..3420664 --- /dev/null +++ b/gnuradio-3.7.2.1-qwt61.patch @@ -0,0 +1,455 @@ +commit d16393700d1f286fb2c67ea53ddebaad151f4803 +Author: Tom Rondeau +Date: Tue Dec 17 19:22:03 2013 -0500 + + qtgui: enables use of QWT 6.1. + +diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake +index d3dc7a5..a940558 100644 +--- a/cmake/Modules/FindQwt.cmake ++++ b/cmake/Modules/FindQwt.cmake +@@ -39,7 +39,7 @@ if(QWT_INCLUDE_DIRS) + QWT_STRING_VERSION REGEX "QWT_VERSION_STR") + string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" QWT_VERSION ${QWT_STRING_VERSION}) + string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION) +- string(COMPARE GREATER ${QWT_VERSION} "6.0.2" QWT_WRONG_VERSION) ++ string(COMPARE GREATER ${QWT_VERSION} "6.1.2" QWT_WRONG_VERSION) + + message(STATUS "QWT Version: ${QWT_VERSION}") + if(NOT QWT_WRONG_VERSION) +diff --git a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h +index 3b31191..517f69f 100644 +--- a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h ++++ b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h +@@ -269,6 +269,7 @@ signals: + + protected slots: + virtual void legendEntryChecked(QwtPlotItem *plotItem, bool on); ++ virtual void legendEntryChecked(const QVariant &plotItem, bool on, int index); + + protected: + int d_nplots; +diff --git a/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h +index 4e0d0bd..8874a7e 100644 +--- a/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h ++++ b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h +@@ -59,6 +59,7 @@ public slots: + void setSemilogy(bool en); + + void legendEntryChecked(QwtPlotItem *plotItem, bool on); ++ void legendEntryChecked(const QVariant &plotItem, bool on, int index); + + void enableTagMarker(int which, bool en); + +diff --git a/gr-qtgui/include/gnuradio/qtgui/utils.h b/gr-qtgui/include/gnuradio/qtgui/utils.h +index c427128..7794feb 100644 +--- a/gr-qtgui/include/gnuradio/qtgui/utils.h ++++ b/gr-qtgui/include/gnuradio/qtgui/utils.h +@@ -31,7 +31,12 @@ + class QTGUI_API QwtDblClickPlotPicker: public QwtPlotPicker + { + public: ++#if QWT_VERSION < 0x060100 + QwtDblClickPlotPicker(QwtPlotCanvas *); ++#else /* QWT_VERSION < 0x060100 */ ++ QwtDblClickPlotPicker(QWidget *); ++#endif /* QWT_VERSION < 0x060100 */ ++ + ~QwtDblClickPlotPicker(); + + virtual QwtPickerMachine * stateMachine(int) const; +diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc +index af27fc4..47e6b0b 100644 +--- a/gr-qtgui/lib/ConstellationDisplayPlot.cc ++++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc +@@ -33,7 +33,12 @@ + class ConstellationDisplayZoomer: public QwtPlotZoomer + { + public: +- ConstellationDisplayZoomer(QwtPlotCanvas* canvas):QwtPlotZoomer(canvas) ++#if QWT_VERSION < 0x060100 ++ ConstellationDisplayZoomer(QwtPlotCanvas* canvas) ++#else /* QWT_VERSION < 0x060100 */ ++ ConstellationDisplayZoomer(QWidget* canvas) ++#endif /* QWT_VERSION < 0x060100 */ ++ : QwtPlotZoomer(canvas) + { + setTrackerMode(QwtPicker::AlwaysOn); + } +diff --git a/gr-qtgui/lib/DisplayPlot.cc b/gr-qtgui/lib/DisplayPlot.cc +index 5c29381..6f1f106 100644 +--- a/gr-qtgui/lib/DisplayPlot.cc ++++ b/gr-qtgui/lib/DisplayPlot.cc +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + + DisplayPlot::DisplayPlot(int nplots, QWidget* parent) +@@ -81,11 +82,19 @@ DisplayPlot::DisplayPlot(int nplots, QWidget* parent) + sd->setMinimumExtent( fm.width("100.00") ); + + QwtLegend* legendDisplay = new QwtLegend(this); ++ ++#if QWT_VERSION < 0x060100 + legendDisplay->setItemMode(QwtLegend::CheckableItem); + insertLegend(legendDisplay); +- + connect(this, SIGNAL(legendChecked(QwtPlotItem *, bool)), + this, SLOT(legendEntryChecked(QwtPlotItem *, bool))); ++#else /* QWT_VERSION < 0x060100 */ ++ legendDisplay->setDefaultItemMode(QwtLegendData::Checkable); ++ insertLegend(legendDisplay); ++ connect(legendDisplay, SIGNAL(checked(const QVariant&, bool, int)), ++ this, SLOT(legendEntryChecked(const QVariant&, bool, int))); ++#endif /* QWT_VERSION < 0x060100 */ ++ + } + + DisplayPlot::~DisplayPlot() +@@ -403,6 +412,16 @@ void DisplayPlot::legendEntryChecked(QwtPlotItem* plotItem, bool on) + replot(); + } + ++void DisplayPlot::legendEntryChecked(const QVariant &plotItem, bool on, int index) ++{ ++#if QWT_VERSION < 0x060100 ++ std::runtime_error("DisplayPlot::legendEntryChecked with QVariant not enabled in this version of QWT.\n"); ++#else ++ QwtPlotItem *p = infoToItem(plotItem); ++ legendEntryChecked(p, on); ++#endif /* QWT_VERSION < 0x060100 */ ++} ++ + void + DisplayPlot::onPickerPointSelected(const QwtDoublePoint & p) + { +diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc +index 85fd14f..60cfcd2 100644 +--- a/gr-qtgui/lib/FrequencyDisplayPlot.cc ++++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc +@@ -28,17 +28,27 @@ + #include + #include + #include +-#include + #include + #include + ++#if QWT_VERSION < 0x060100 ++#include ++#else /* QWT_VERSION < 0x060100 */ ++#include ++#include ++#endif /* QWT_VERSION < 0x060100 */ ++ + /*********************************************************************** + * Widget to provide mouse pointer coordinate text + **********************************************************************/ + class FreqDisplayZoomer: public QwtPlotZoomer, public FreqOffsetAndPrecisionClass + { + public: ++#if QWT_VERSION < 0x060100 + FreqDisplayZoomer(QwtPlotCanvas* canvas, const unsigned int freqPrecision) ++#else /* QWT_VERSION < 0x060100 */ ++ FreqDisplayZoomer(QWidget* canvas, const unsigned int freqPrecision) ++#endif /* QWT_VERSION < 0x060100 */ + : QwtPlotZoomer(canvas), + FreqOffsetAndPrecisionClass(freqPrecision) + { +@@ -205,12 +215,20 @@ FrequencyDisplayPlot::FrequencyDisplayPlot(int nplots, QWidget* parent) + _resetXAxisPoints(); + + // Turn off min/max hold plots in legend ++#if QWT_VERSION < 0x060100 + QWidget *w; + QwtLegend* legendDisplay = legend(); + w = legendDisplay->find(d_min_fft_plot_curve); + ((QwtLegendItem*)w)->setChecked(true); + w = legendDisplay->find(d_max_fft_plot_curve); + ((QwtLegendItem*)w)->setChecked(true); ++#else /* QWT_VERSION < 0x060100 */ ++ QWidget *w; ++ w = ((QwtLegend*)legend())->legendWidget(itemToInfo(d_min_fft_plot_curve)); ++ ((QwtLegendLabel*)w)->setChecked(true); ++ w = ((QwtLegend*)legend())->legendWidget(itemToInfo(d_max_fft_plot_curve)); ++ ((QwtLegendLabel*)w)->setChecked(true); ++#endif /* QWT_VERSION < 0x060100 */ + + replot(); + } +diff --git a/gr-qtgui/lib/HistogramDisplayPlot.cc b/gr-qtgui/lib/HistogramDisplayPlot.cc +index 301cb13..ce9ed3c 100644 +--- a/gr-qtgui/lib/HistogramDisplayPlot.cc ++++ b/gr-qtgui/lib/HistogramDisplayPlot.cc +@@ -67,7 +67,11 @@ protected: + class HistogramDisplayZoomer: public QwtPlotZoomer, public TimePrecisionClass + { + public: ++#if QWT_VERSION < 0x060100 + HistogramDisplayZoomer(QwtPlotCanvas* canvas, const unsigned int timeprecision) ++#else /* QWT_VERSION < 0x060100 */ ++ HistogramDisplayZoomer(QWidget* canvas, const unsigned int timeprecision) ++#endif /* QWT_VERSION < 0x060100 */ + : QwtPlotZoomer(canvas),TimePrecisionClass(timeprecision) + { + setTrackerMode(QwtPicker::AlwaysOn); +@@ -273,7 +277,12 @@ HistogramDisplayPlot::_resetXAxisPoints(double left, double right) + for(long loc = 0; loc < d_bins; loc++){ + d_xdata[loc] = d_left + loc*d_width; + } ++#if QWT_VERSION < 0x060100 + axisScaleDiv(QwtPlot::xBottom)->setInterval(d_left, d_right); ++#else /* QWT_VERSION < 0x060100 */ ++ QwtScaleDiv scalediv(d_left, d_right); ++ setAxisScaleDiv(QwtPlot::xBottom, scalediv); ++#endif /* QWT_VERSION < 0x060100 */ + + // Set up zoomer base for maximum unzoom x-axis + // and reset to maximum unzoom level +@@ -333,7 +342,11 @@ HistogramDisplayPlot::setSemilogx(bool en) + setAxisScaleEngine(QwtPlot::xBottom, new QwtLinearScaleEngine); + } + else { ++#if QWT_VERSION < 0x060100 + setAxisScaleEngine(QwtPlot::xBottom, new QwtLog10ScaleEngine); ++#else /* QWT_VERSION < 0x060100 */ ++ setAxisScaleEngine(QwtPlot::xBottom, new QwtLogScaleEngine); ++#endif /* QWT_VERSION < 0x060100 */ + } + } + +@@ -342,13 +355,23 @@ HistogramDisplayPlot::setSemilogy(bool en) + { + if(d_semilogy != en) { + d_semilogy = en; ++ ++#if QWT_VERSION < 0x060100 + double max = axisScaleDiv(QwtPlot::yLeft)->upperBound(); ++#else /* QWT_VERSION < 0x060100 */ ++ double max = axisScaleDiv(QwtPlot::yLeft).upperBound(); ++#endif /* QWT_VERSION < 0x060100 */ ++ + if(!d_semilogy) { + setAxisScaleEngine(QwtPlot::yLeft, new QwtLinearScaleEngine); + setYaxis(-pow(10.0, max/10.0), pow(10.0, max/10.0)); + } + else { ++#if QWT_VERSION < 0x060100 + setAxisScaleEngine(QwtPlot::yLeft, new QwtLog10ScaleEngine); ++#else /* QWT_VERSION < 0x060100 */ ++ setAxisScaleEngine(QwtPlot::yLeft, new QwtLogScaleEngine); ++#endif /* QWT_VERSION < 0x060100 */ + setYaxis(1e-10, 10.0*log10(100*max)); + } + } +diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc +index 8d65630..8be3f90 100644 +--- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc ++++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc +@@ -61,7 +61,11 @@ protected: + class TimeDomainDisplayZoomer: public QwtPlotZoomer, public TimePrecisionClass + { + public: ++#if QWT_VERSION < 0x060100 + TimeDomainDisplayZoomer(QwtPlotCanvas* canvas, const unsigned int timePrecision) ++#else /* QWT_VERSION < 0x060100 */ ++ TimeDomainDisplayZoomer(QWidget* canvas, const unsigned int timePrecision) ++#endif /* QWT_VERSION < 0x060100 */ + : QwtPlotZoomer(canvas),TimePrecisionClass(timePrecision) + { + setTrackerMode(QwtPicker::AlwaysOn); +@@ -394,6 +398,17 @@ TimeDomainDisplayPlot::legendEntryChecked(QwtPlotItem* plotItem, bool on) + } + + void ++TimeDomainDisplayPlot::legendEntryChecked(const QVariant &plotItem, bool on, int index) ++{ ++#if QWT_VERSION < 0x060100 ++ std::runtime_error("TimeDomainDisplayPlot::legendEntryChecked with QVariant not enabled in this version of QWT.\n"); ++#else ++ QwtPlotItem *p = infoToItem(plotItem); ++ legendEntryChecked(p, on); ++#endif /* QWT_VERSION < 0x060100 */ ++} ++ ++void + TimeDomainDisplayPlot::_resetXAxisPoints() + { + double delt = 1.0/d_sample_rate; +@@ -490,7 +505,11 @@ TimeDomainDisplayPlot::setSemilogx(bool en) + setAxisScaleEngine(QwtPlot::xBottom, new QwtLinearScaleEngine); + } + else { ++#if QWT_VERSION < 0x060100 + setAxisScaleEngine(QwtPlot::xBottom, new QwtLog10ScaleEngine); ++#else /* QWT_VERSION < 0x060100 */ ++ setAxisScaleEngine(QwtPlot::xBottom, new QwtLogScaleEngine); ++#endif /*QWT_VERSION < 0x060100 */ + } + _resetXAxisPoints(); + } +@@ -500,13 +519,23 @@ TimeDomainDisplayPlot::setSemilogy(bool en) + { + if(d_semilogy != en) { + d_semilogy = en; ++ ++#if QWT_VERSION < 0x060100 + double max = axisScaleDiv(QwtPlot::yLeft)->upperBound(); ++#else /* QWT_VERSION < 0x060100 */ ++ double max = axisScaleDiv(QwtPlot::yLeft).upperBound(); ++#endif /* QWT_VERSION < 0x060100 */ ++ + if(!d_semilogy) { + setAxisScaleEngine(QwtPlot::yLeft, new QwtLinearScaleEngine); + setYaxis(-pow(10.0, max/10.0), pow(10.0, max/10.0)); + } + else { ++#if QWT_VERSION < 0x060100 + setAxisScaleEngine(QwtPlot::yLeft, new QwtLog10ScaleEngine); ++#else /* QWT_VERSION < 0x060100 */ ++ setAxisScaleEngine(QwtPlot::yLeft, new QwtLogScaleEngine); ++#endif /*QWT_VERSION < 0x060100 */ + setYaxis(1e-10, 10.0*log10(max)); + } + } +diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc +index b26f7f0..afe326b 100644 +--- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc ++++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc +@@ -29,11 +29,17 @@ + #include + #include + #include +-#include + #include + #include + #include + ++#if QWT_VERSION < 0x060100 ++#include ++#else /* QWT_VERSION < 0x060100 */ ++#include ++#include ++#endif /* QWT_VERSION < 0x060100 */ ++ + #include + namespace pt = boost::posix_time; + +@@ -125,8 +131,13 @@ class TimeRasterZoomer: public QwtPlotZoomer, public TimePrecisionClass, + public TimeScaleData + { + public: ++#if QWT_VERSION < 0x060100 + TimeRasterZoomer(QwtPlotCanvas* canvas, double rows, double cols, + const unsigned int timePrecision) ++#else /* QWT_VERSION < 0x060100 */ ++ TimeRasterZoomer(QWidget* canvas, double rows, double cols, ++ const unsigned int timePrecision) ++#endif /* QWT_VERSION < 0x060100 */ + : QwtPlotZoomer(canvas), TimePrecisionClass(timePrecision), TimeScaleData(), + d_rows(static_cast(rows)), d_cols(static_cast(cols)) + { +diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc +index 47d6624..92fcb38 100644 +--- a/gr-qtgui/lib/WaterfallDisplayPlot.cc ++++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc +@@ -29,11 +29,17 @@ + #include + #include + #include +-#include + #include + #include + #include + ++#if QWT_VERSION < 0x060100 ++#include ++#else /* QWT_VERSION < 0x060100 */ ++#include ++#include ++#endif /* QWT_VERSION < 0x060100 */ ++ + #include + namespace pt = boost::posix_time; + +@@ -79,7 +85,11 @@ class WaterfallZoomer: public QwtPlotZoomer, public TimeScaleData, + public FreqOffsetAndPrecisionClass + { + public: ++#if QWT_VERSION < 0x060100 + WaterfallZoomer(QwtPlotCanvas* canvas, const unsigned int freqPrecision) ++#else /* QWT_VERSION < 0x060100 */ ++ WaterfallZoomer(QWidget* canvas, const unsigned int freqPrecision) ++#endif /* QWT_VERSION < 0x060100 */ + : QwtPlotZoomer(canvas), TimeScaleData(), + FreqOffsetAndPrecisionClass(freqPrecision) + { +diff --git a/gr-qtgui/lib/qtgui_util.cc b/gr-qtgui/lib/qtgui_util.cc +index 539f7ba..bb06f58 100644 +--- a/gr-qtgui/lib/qtgui_util.cc ++++ b/gr-qtgui/lib/qtgui_util.cc +@@ -61,7 +61,11 @@ QwtPickerDblClickPointMachine::transition(const QwtEventPattern &eventPattern, + return cmdList; + } + ++#if QWT_VERSION < 0x060100 + QwtDblClickPlotPicker::QwtDblClickPlotPicker(QwtPlotCanvas* canvas) ++#else /* QWT_VERSION < 0x060100 */ ++QwtDblClickPlotPicker::QwtDblClickPlotPicker(QWidget* canvas) ++#endif /* QWT_VERSION < 0x060100 */ + : QwtPlotPicker(canvas) + { + #if QWT_VERSION < 0x060000 +diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc +index 0d16b95..aeda7d0 100644 +--- a/gr-qtgui/lib/spectrumdisplayform.cc ++++ b/gr-qtgui/lib/spectrumdisplayform.cc +@@ -50,9 +50,15 @@ SpectrumDisplayForm::SpectrumDisplayForm(QWidget* parent) + minHoldCheckBox_toggled( false ); + maxHoldCheckBox_toggled( false ); + ++#if QWT_VERSION < 0x060100 + WaterfallMaximumIntensitySlider->setRange(-200, 0); + WaterfallMinimumIntensitySlider->setRange(-200, 0); + WaterfallMinimumIntensitySlider->setValue(-200); ++#else /* QWT_VERSION < 0x060100 */ ++ WaterfallMaximumIntensitySlider->setScale(-200, 0); ++ WaterfallMinimumIntensitySlider->setScale(-200, 0); ++ WaterfallMinimumIntensitySlider->setValue(-200); ++#endif /* QWT_VERSION < 0x060100 */ + + _peakFrequency = 0; + _peakAmplitude = -HUGE_VAL; +@@ -606,14 +612,26 @@ void + SpectrumDisplayForm::waterfallAutoScaleBtnCB() + { + double minimumIntensity = _noiseFloorAmplitude - 5; +- if(minimumIntensity < WaterfallMinimumIntensitySlider->minValue()){ ++ double maximumIntensity = _peakAmplitude + 10; ++ ++#if QWT_VERSION < 0x060100 ++ if(minimumIntensity < WaterfallMinimumIntensitySlider->minValue()) { + minimumIntensity = WaterfallMinimumIntensitySlider->minValue(); + } + WaterfallMinimumIntensitySlider->setValue(minimumIntensity); +- double maximumIntensity = _peakAmplitude + 10; +- if(maximumIntensity > WaterfallMaximumIntensitySlider->maxValue()){ ++ if(maximumIntensity > WaterfallMaximumIntensitySlider->maxValue()) { + maximumIntensity = WaterfallMaximumIntensitySlider->maxValue(); + } ++#else /* QWT_VERSION < 0x060100 */ ++ if(minimumIntensity < WaterfallMinimumIntensitySlider->lowerBound()) { ++ minimumIntensity = WaterfallMinimumIntensitySlider->lowerBound(); ++ } ++ WaterfallMinimumIntensitySlider->setValue(minimumIntensity); ++ if(maximumIntensity > WaterfallMaximumIntensitySlider->upperBound()) { ++ maximumIntensity = WaterfallMaximumIntensitySlider->upperBound(); ++ } ++#endif /* QWT_VERSION < 0x060100 */ ++ + WaterfallMaximumIntensitySlider->setValue(maximumIntensity); + waterfallMaximumIntensityChangedCB(maximumIntensity); + } diff --git a/gnuradio.spec b/gnuradio.spec index cb8fe5c..f2dd1e4 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.7.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -45,17 +45,19 @@ BuildRequires: portaudio-devel, libtool BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, PyQwt-devel BuildRequires: qwt-devel, qwtplot3d-qt4-devel, python-cheetah BuildRequires: xdg-utils, python-lxml, pygtk2-devel, orc-devel -BuildRequires: uhd-devel, dos2unix +BuildRequires: uhd-devel, dos2unix, sphinx Requires: numpy, wxPython, scipy, portaudio, python-lxml Requires: pygtk2, python-cheetah, PyQt4, PyQwt Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 +# rhbz#1045935, backported from upstream +Patch0: gnuradio-3.7.2.1-qwt61.patch %description -GNU Radio is a collection of software that when combined with minimal -hardware, allows the construction of radios where the actual waveforms -transmitted and received are defined by software. What this means is -that it turns the digital modulation schemes used in today's high +GNU Radio is a collection of software that when combined with minimal +hardware, allows the construction of radios where the actual waveforms +transmitted and received are defined by software. What this means is +that it turns the digital modulation schemes used in today's high performance wireless devices into software problems. %package devel @@ -88,6 +90,8 @@ GNU Radio examples %prep %setup -q +%patch0 -p1 -b .qwt61 + #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -174,6 +178,13 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Mon Jan 6 2014 Jaroslav Škarvada - 3.7.2.1-3 +- Enabled use of qwt61 (by qwt61 patch) + Resolves: rhbz#1045935 +- Added sphinx to buildrequires + Related: rhbz#1045935 +- Fixed whitespaces in description + * Fri Jan 3 2014 Jaroslav Škarvada - 3.7.2.1-2 - Added boost-devel as requirement for gnuradio-devel Resolves: rhbz#1002148 From 936cac4323a813af517a4efadcda6f0096d3c87f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 11 Feb 2014 14:04:16 +0100 Subject: [PATCH 097/313] Rebuilt due to new uhd --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index f2dd1e4..02fad9a 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.7.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -178,6 +178,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Feb 11 2014 Jaroslav Škarvada - 3.7.2.1-4 +- Rebuilt due to new uhd + * Mon Jan 6 2014 Jaroslav Škarvada - 3.7.2.1-3 - Enabled use of qwt61 (by qwt61 patch) Resolves: rhbz#1045935 From 6731606d286bf622f2163ea2d04f61e56153a295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 11 Mar 2014 11:18:28 +0100 Subject: [PATCH 098/313] New version Resolves: rhbz#1074899 - Dropped qwt61 patch (not needed) --- gnuradio-3.7.2.1-qwt61.patch | 455 ----------------------------------- gnuradio.spec | 13 +- sources | 2 +- 3 files changed, 8 insertions(+), 462 deletions(-) delete mode 100644 gnuradio-3.7.2.1-qwt61.patch diff --git a/gnuradio-3.7.2.1-qwt61.patch b/gnuradio-3.7.2.1-qwt61.patch deleted file mode 100644 index 3420664..0000000 --- a/gnuradio-3.7.2.1-qwt61.patch +++ /dev/null @@ -1,455 +0,0 @@ -commit d16393700d1f286fb2c67ea53ddebaad151f4803 -Author: Tom Rondeau -Date: Tue Dec 17 19:22:03 2013 -0500 - - qtgui: enables use of QWT 6.1. - -diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake -index d3dc7a5..a940558 100644 ---- a/cmake/Modules/FindQwt.cmake -+++ b/cmake/Modules/FindQwt.cmake -@@ -39,7 +39,7 @@ if(QWT_INCLUDE_DIRS) - QWT_STRING_VERSION REGEX "QWT_VERSION_STR") - string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" QWT_VERSION ${QWT_STRING_VERSION}) - string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION) -- string(COMPARE GREATER ${QWT_VERSION} "6.0.2" QWT_WRONG_VERSION) -+ string(COMPARE GREATER ${QWT_VERSION} "6.1.2" QWT_WRONG_VERSION) - - message(STATUS "QWT Version: ${QWT_VERSION}") - if(NOT QWT_WRONG_VERSION) -diff --git a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h -index 3b31191..517f69f 100644 ---- a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h -+++ b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h -@@ -269,6 +269,7 @@ signals: - - protected slots: - virtual void legendEntryChecked(QwtPlotItem *plotItem, bool on); -+ virtual void legendEntryChecked(const QVariant &plotItem, bool on, int index); - - protected: - int d_nplots; -diff --git a/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h -index 4e0d0bd..8874a7e 100644 ---- a/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h -+++ b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h -@@ -59,6 +59,7 @@ public slots: - void setSemilogy(bool en); - - void legendEntryChecked(QwtPlotItem *plotItem, bool on); -+ void legendEntryChecked(const QVariant &plotItem, bool on, int index); - - void enableTagMarker(int which, bool en); - -diff --git a/gr-qtgui/include/gnuradio/qtgui/utils.h b/gr-qtgui/include/gnuradio/qtgui/utils.h -index c427128..7794feb 100644 ---- a/gr-qtgui/include/gnuradio/qtgui/utils.h -+++ b/gr-qtgui/include/gnuradio/qtgui/utils.h -@@ -31,7 +31,12 @@ - class QTGUI_API QwtDblClickPlotPicker: public QwtPlotPicker - { - public: -+#if QWT_VERSION < 0x060100 - QwtDblClickPlotPicker(QwtPlotCanvas *); -+#else /* QWT_VERSION < 0x060100 */ -+ QwtDblClickPlotPicker(QWidget *); -+#endif /* QWT_VERSION < 0x060100 */ -+ - ~QwtDblClickPlotPicker(); - - virtual QwtPickerMachine * stateMachine(int) const; -diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc -index af27fc4..47e6b0b 100644 ---- a/gr-qtgui/lib/ConstellationDisplayPlot.cc -+++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc -@@ -33,7 +33,12 @@ - class ConstellationDisplayZoomer: public QwtPlotZoomer - { - public: -- ConstellationDisplayZoomer(QwtPlotCanvas* canvas):QwtPlotZoomer(canvas) -+#if QWT_VERSION < 0x060100 -+ ConstellationDisplayZoomer(QwtPlotCanvas* canvas) -+#else /* QWT_VERSION < 0x060100 */ -+ ConstellationDisplayZoomer(QWidget* canvas) -+#endif /* QWT_VERSION < 0x060100 */ -+ : QwtPlotZoomer(canvas) - { - setTrackerMode(QwtPicker::AlwaysOn); - } -diff --git a/gr-qtgui/lib/DisplayPlot.cc b/gr-qtgui/lib/DisplayPlot.cc -index 5c29381..6f1f106 100644 ---- a/gr-qtgui/lib/DisplayPlot.cc -+++ b/gr-qtgui/lib/DisplayPlot.cc -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - - DisplayPlot::DisplayPlot(int nplots, QWidget* parent) -@@ -81,11 +82,19 @@ DisplayPlot::DisplayPlot(int nplots, QWidget* parent) - sd->setMinimumExtent( fm.width("100.00") ); - - QwtLegend* legendDisplay = new QwtLegend(this); -+ -+#if QWT_VERSION < 0x060100 - legendDisplay->setItemMode(QwtLegend::CheckableItem); - insertLegend(legendDisplay); -- - connect(this, SIGNAL(legendChecked(QwtPlotItem *, bool)), - this, SLOT(legendEntryChecked(QwtPlotItem *, bool))); -+#else /* QWT_VERSION < 0x060100 */ -+ legendDisplay->setDefaultItemMode(QwtLegendData::Checkable); -+ insertLegend(legendDisplay); -+ connect(legendDisplay, SIGNAL(checked(const QVariant&, bool, int)), -+ this, SLOT(legendEntryChecked(const QVariant&, bool, int))); -+#endif /* QWT_VERSION < 0x060100 */ -+ - } - - DisplayPlot::~DisplayPlot() -@@ -403,6 +412,16 @@ void DisplayPlot::legendEntryChecked(QwtPlotItem* plotItem, bool on) - replot(); - } - -+void DisplayPlot::legendEntryChecked(const QVariant &plotItem, bool on, int index) -+{ -+#if QWT_VERSION < 0x060100 -+ std::runtime_error("DisplayPlot::legendEntryChecked with QVariant not enabled in this version of QWT.\n"); -+#else -+ QwtPlotItem *p = infoToItem(plotItem); -+ legendEntryChecked(p, on); -+#endif /* QWT_VERSION < 0x060100 */ -+} -+ - void - DisplayPlot::onPickerPointSelected(const QwtDoublePoint & p) - { -diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc -index 85fd14f..60cfcd2 100644 ---- a/gr-qtgui/lib/FrequencyDisplayPlot.cc -+++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc -@@ -28,17 +28,27 @@ - #include - #include - #include --#include - #include - #include - -+#if QWT_VERSION < 0x060100 -+#include -+#else /* QWT_VERSION < 0x060100 */ -+#include -+#include -+#endif /* QWT_VERSION < 0x060100 */ -+ - /*********************************************************************** - * Widget to provide mouse pointer coordinate text - **********************************************************************/ - class FreqDisplayZoomer: public QwtPlotZoomer, public FreqOffsetAndPrecisionClass - { - public: -+#if QWT_VERSION < 0x060100 - FreqDisplayZoomer(QwtPlotCanvas* canvas, const unsigned int freqPrecision) -+#else /* QWT_VERSION < 0x060100 */ -+ FreqDisplayZoomer(QWidget* canvas, const unsigned int freqPrecision) -+#endif /* QWT_VERSION < 0x060100 */ - : QwtPlotZoomer(canvas), - FreqOffsetAndPrecisionClass(freqPrecision) - { -@@ -205,12 +215,20 @@ FrequencyDisplayPlot::FrequencyDisplayPlot(int nplots, QWidget* parent) - _resetXAxisPoints(); - - // Turn off min/max hold plots in legend -+#if QWT_VERSION < 0x060100 - QWidget *w; - QwtLegend* legendDisplay = legend(); - w = legendDisplay->find(d_min_fft_plot_curve); - ((QwtLegendItem*)w)->setChecked(true); - w = legendDisplay->find(d_max_fft_plot_curve); - ((QwtLegendItem*)w)->setChecked(true); -+#else /* QWT_VERSION < 0x060100 */ -+ QWidget *w; -+ w = ((QwtLegend*)legend())->legendWidget(itemToInfo(d_min_fft_plot_curve)); -+ ((QwtLegendLabel*)w)->setChecked(true); -+ w = ((QwtLegend*)legend())->legendWidget(itemToInfo(d_max_fft_plot_curve)); -+ ((QwtLegendLabel*)w)->setChecked(true); -+#endif /* QWT_VERSION < 0x060100 */ - - replot(); - } -diff --git a/gr-qtgui/lib/HistogramDisplayPlot.cc b/gr-qtgui/lib/HistogramDisplayPlot.cc -index 301cb13..ce9ed3c 100644 ---- a/gr-qtgui/lib/HistogramDisplayPlot.cc -+++ b/gr-qtgui/lib/HistogramDisplayPlot.cc -@@ -67,7 +67,11 @@ protected: - class HistogramDisplayZoomer: public QwtPlotZoomer, public TimePrecisionClass - { - public: -+#if QWT_VERSION < 0x060100 - HistogramDisplayZoomer(QwtPlotCanvas* canvas, const unsigned int timeprecision) -+#else /* QWT_VERSION < 0x060100 */ -+ HistogramDisplayZoomer(QWidget* canvas, const unsigned int timeprecision) -+#endif /* QWT_VERSION < 0x060100 */ - : QwtPlotZoomer(canvas),TimePrecisionClass(timeprecision) - { - setTrackerMode(QwtPicker::AlwaysOn); -@@ -273,7 +277,12 @@ HistogramDisplayPlot::_resetXAxisPoints(double left, double right) - for(long loc = 0; loc < d_bins; loc++){ - d_xdata[loc] = d_left + loc*d_width; - } -+#if QWT_VERSION < 0x060100 - axisScaleDiv(QwtPlot::xBottom)->setInterval(d_left, d_right); -+#else /* QWT_VERSION < 0x060100 */ -+ QwtScaleDiv scalediv(d_left, d_right); -+ setAxisScaleDiv(QwtPlot::xBottom, scalediv); -+#endif /* QWT_VERSION < 0x060100 */ - - // Set up zoomer base for maximum unzoom x-axis - // and reset to maximum unzoom level -@@ -333,7 +342,11 @@ HistogramDisplayPlot::setSemilogx(bool en) - setAxisScaleEngine(QwtPlot::xBottom, new QwtLinearScaleEngine); - } - else { -+#if QWT_VERSION < 0x060100 - setAxisScaleEngine(QwtPlot::xBottom, new QwtLog10ScaleEngine); -+#else /* QWT_VERSION < 0x060100 */ -+ setAxisScaleEngine(QwtPlot::xBottom, new QwtLogScaleEngine); -+#endif /* QWT_VERSION < 0x060100 */ - } - } - -@@ -342,13 +355,23 @@ HistogramDisplayPlot::setSemilogy(bool en) - { - if(d_semilogy != en) { - d_semilogy = en; -+ -+#if QWT_VERSION < 0x060100 - double max = axisScaleDiv(QwtPlot::yLeft)->upperBound(); -+#else /* QWT_VERSION < 0x060100 */ -+ double max = axisScaleDiv(QwtPlot::yLeft).upperBound(); -+#endif /* QWT_VERSION < 0x060100 */ -+ - if(!d_semilogy) { - setAxisScaleEngine(QwtPlot::yLeft, new QwtLinearScaleEngine); - setYaxis(-pow(10.0, max/10.0), pow(10.0, max/10.0)); - } - else { -+#if QWT_VERSION < 0x060100 - setAxisScaleEngine(QwtPlot::yLeft, new QwtLog10ScaleEngine); -+#else /* QWT_VERSION < 0x060100 */ -+ setAxisScaleEngine(QwtPlot::yLeft, new QwtLogScaleEngine); -+#endif /* QWT_VERSION < 0x060100 */ - setYaxis(1e-10, 10.0*log10(100*max)); - } - } -diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc -index 8d65630..8be3f90 100644 ---- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc -+++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc -@@ -61,7 +61,11 @@ protected: - class TimeDomainDisplayZoomer: public QwtPlotZoomer, public TimePrecisionClass - { - public: -+#if QWT_VERSION < 0x060100 - TimeDomainDisplayZoomer(QwtPlotCanvas* canvas, const unsigned int timePrecision) -+#else /* QWT_VERSION < 0x060100 */ -+ TimeDomainDisplayZoomer(QWidget* canvas, const unsigned int timePrecision) -+#endif /* QWT_VERSION < 0x060100 */ - : QwtPlotZoomer(canvas),TimePrecisionClass(timePrecision) - { - setTrackerMode(QwtPicker::AlwaysOn); -@@ -394,6 +398,17 @@ TimeDomainDisplayPlot::legendEntryChecked(QwtPlotItem* plotItem, bool on) - } - - void -+TimeDomainDisplayPlot::legendEntryChecked(const QVariant &plotItem, bool on, int index) -+{ -+#if QWT_VERSION < 0x060100 -+ std::runtime_error("TimeDomainDisplayPlot::legendEntryChecked with QVariant not enabled in this version of QWT.\n"); -+#else -+ QwtPlotItem *p = infoToItem(plotItem); -+ legendEntryChecked(p, on); -+#endif /* QWT_VERSION < 0x060100 */ -+} -+ -+void - TimeDomainDisplayPlot::_resetXAxisPoints() - { - double delt = 1.0/d_sample_rate; -@@ -490,7 +505,11 @@ TimeDomainDisplayPlot::setSemilogx(bool en) - setAxisScaleEngine(QwtPlot::xBottom, new QwtLinearScaleEngine); - } - else { -+#if QWT_VERSION < 0x060100 - setAxisScaleEngine(QwtPlot::xBottom, new QwtLog10ScaleEngine); -+#else /* QWT_VERSION < 0x060100 */ -+ setAxisScaleEngine(QwtPlot::xBottom, new QwtLogScaleEngine); -+#endif /*QWT_VERSION < 0x060100 */ - } - _resetXAxisPoints(); - } -@@ -500,13 +519,23 @@ TimeDomainDisplayPlot::setSemilogy(bool en) - { - if(d_semilogy != en) { - d_semilogy = en; -+ -+#if QWT_VERSION < 0x060100 - double max = axisScaleDiv(QwtPlot::yLeft)->upperBound(); -+#else /* QWT_VERSION < 0x060100 */ -+ double max = axisScaleDiv(QwtPlot::yLeft).upperBound(); -+#endif /* QWT_VERSION < 0x060100 */ -+ - if(!d_semilogy) { - setAxisScaleEngine(QwtPlot::yLeft, new QwtLinearScaleEngine); - setYaxis(-pow(10.0, max/10.0), pow(10.0, max/10.0)); - } - else { -+#if QWT_VERSION < 0x060100 - setAxisScaleEngine(QwtPlot::yLeft, new QwtLog10ScaleEngine); -+#else /* QWT_VERSION < 0x060100 */ -+ setAxisScaleEngine(QwtPlot::yLeft, new QwtLogScaleEngine); -+#endif /*QWT_VERSION < 0x060100 */ - setYaxis(1e-10, 10.0*log10(max)); - } - } -diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc -index b26f7f0..afe326b 100644 ---- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc -+++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc -@@ -29,11 +29,17 @@ - #include - #include - #include --#include - #include - #include - #include - -+#if QWT_VERSION < 0x060100 -+#include -+#else /* QWT_VERSION < 0x060100 */ -+#include -+#include -+#endif /* QWT_VERSION < 0x060100 */ -+ - #include - namespace pt = boost::posix_time; - -@@ -125,8 +131,13 @@ class TimeRasterZoomer: public QwtPlotZoomer, public TimePrecisionClass, - public TimeScaleData - { - public: -+#if QWT_VERSION < 0x060100 - TimeRasterZoomer(QwtPlotCanvas* canvas, double rows, double cols, - const unsigned int timePrecision) -+#else /* QWT_VERSION < 0x060100 */ -+ TimeRasterZoomer(QWidget* canvas, double rows, double cols, -+ const unsigned int timePrecision) -+#endif /* QWT_VERSION < 0x060100 */ - : QwtPlotZoomer(canvas), TimePrecisionClass(timePrecision), TimeScaleData(), - d_rows(static_cast(rows)), d_cols(static_cast(cols)) - { -diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc -index 47d6624..92fcb38 100644 ---- a/gr-qtgui/lib/WaterfallDisplayPlot.cc -+++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc -@@ -29,11 +29,17 @@ - #include - #include - #include --#include - #include - #include - #include - -+#if QWT_VERSION < 0x060100 -+#include -+#else /* QWT_VERSION < 0x060100 */ -+#include -+#include -+#endif /* QWT_VERSION < 0x060100 */ -+ - #include - namespace pt = boost::posix_time; - -@@ -79,7 +85,11 @@ class WaterfallZoomer: public QwtPlotZoomer, public TimeScaleData, - public FreqOffsetAndPrecisionClass - { - public: -+#if QWT_VERSION < 0x060100 - WaterfallZoomer(QwtPlotCanvas* canvas, const unsigned int freqPrecision) -+#else /* QWT_VERSION < 0x060100 */ -+ WaterfallZoomer(QWidget* canvas, const unsigned int freqPrecision) -+#endif /* QWT_VERSION < 0x060100 */ - : QwtPlotZoomer(canvas), TimeScaleData(), - FreqOffsetAndPrecisionClass(freqPrecision) - { -diff --git a/gr-qtgui/lib/qtgui_util.cc b/gr-qtgui/lib/qtgui_util.cc -index 539f7ba..bb06f58 100644 ---- a/gr-qtgui/lib/qtgui_util.cc -+++ b/gr-qtgui/lib/qtgui_util.cc -@@ -61,7 +61,11 @@ QwtPickerDblClickPointMachine::transition(const QwtEventPattern &eventPattern, - return cmdList; - } - -+#if QWT_VERSION < 0x060100 - QwtDblClickPlotPicker::QwtDblClickPlotPicker(QwtPlotCanvas* canvas) -+#else /* QWT_VERSION < 0x060100 */ -+QwtDblClickPlotPicker::QwtDblClickPlotPicker(QWidget* canvas) -+#endif /* QWT_VERSION < 0x060100 */ - : QwtPlotPicker(canvas) - { - #if QWT_VERSION < 0x060000 -diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc -index 0d16b95..aeda7d0 100644 ---- a/gr-qtgui/lib/spectrumdisplayform.cc -+++ b/gr-qtgui/lib/spectrumdisplayform.cc -@@ -50,9 +50,15 @@ SpectrumDisplayForm::SpectrumDisplayForm(QWidget* parent) - minHoldCheckBox_toggled( false ); - maxHoldCheckBox_toggled( false ); - -+#if QWT_VERSION < 0x060100 - WaterfallMaximumIntensitySlider->setRange(-200, 0); - WaterfallMinimumIntensitySlider->setRange(-200, 0); - WaterfallMinimumIntensitySlider->setValue(-200); -+#else /* QWT_VERSION < 0x060100 */ -+ WaterfallMaximumIntensitySlider->setScale(-200, 0); -+ WaterfallMinimumIntensitySlider->setScale(-200, 0); -+ WaterfallMinimumIntensitySlider->setValue(-200); -+#endif /* QWT_VERSION < 0x060100 */ - - _peakFrequency = 0; - _peakAmplitude = -HUGE_VAL; -@@ -606,14 +612,26 @@ void - SpectrumDisplayForm::waterfallAutoScaleBtnCB() - { - double minimumIntensity = _noiseFloorAmplitude - 5; -- if(minimumIntensity < WaterfallMinimumIntensitySlider->minValue()){ -+ double maximumIntensity = _peakAmplitude + 10; -+ -+#if QWT_VERSION < 0x060100 -+ if(minimumIntensity < WaterfallMinimumIntensitySlider->minValue()) { - minimumIntensity = WaterfallMinimumIntensitySlider->minValue(); - } - WaterfallMinimumIntensitySlider->setValue(minimumIntensity); -- double maximumIntensity = _peakAmplitude + 10; -- if(maximumIntensity > WaterfallMaximumIntensitySlider->maxValue()){ -+ if(maximumIntensity > WaterfallMaximumIntensitySlider->maxValue()) { - maximumIntensity = WaterfallMaximumIntensitySlider->maxValue(); - } -+#else /* QWT_VERSION < 0x060100 */ -+ if(minimumIntensity < WaterfallMinimumIntensitySlider->lowerBound()) { -+ minimumIntensity = WaterfallMinimumIntensitySlider->lowerBound(); -+ } -+ WaterfallMinimumIntensitySlider->setValue(minimumIntensity); -+ if(maximumIntensity > WaterfallMaximumIntensitySlider->upperBound()) { -+ maximumIntensity = WaterfallMaximumIntensitySlider->upperBound(); -+ } -+#endif /* QWT_VERSION < 0x060100 */ -+ - WaterfallMaximumIntensitySlider->setValue(maximumIntensity); - waterfallMaximumIntensityChangedCB(maximumIntensity); - } diff --git a/gnuradio.spec b/gnuradio.spec index 02fad9a..e0cea08 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -18,8 +18,8 @@ #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a Name: gnuradio -Version: 3.7.2.1 -Release: 4%{?dist} +Version: 3.7.3 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -50,8 +50,6 @@ Requires: numpy, wxPython, scipy, portaudio, python-lxml Requires: pygtk2, python-cheetah, PyQt4, PyQwt Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 -# rhbz#1045935, backported from upstream -Patch0: gnuradio-3.7.2.1-qwt61.patch %description GNU Radio is a collection of software that when combined with minimal @@ -90,8 +88,6 @@ GNU Radio examples %prep %setup -q -%patch0 -p1 -b .qwt61 - #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -178,6 +174,11 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Mar 11 2014 Jaroslav Škarvada - 3.7.3-1 +- New version + Resolves: rhbz#1074899 +- Dropped qwt61 patch (not needed) + * Tue Feb 11 2014 Jaroslav Škarvada - 3.7.2.1-4 - Rebuilt due to new uhd diff --git a/sources b/sources index 03ed4f8..da1ed10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f2ea23a30cb02802870fe8cb9bf272c9 gnuradio-3.7.2.1.tar.gz +a51e1c2860d6b289233e453d4085514f gnuradio-3.7.3.tar.gz From 3ea32fed2dedd80bbb6a94d01101f8c8e435a43a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 17 Mar 2014 11:20:22 +0100 Subject: [PATCH 099/313] Use system gsm instead of bundled one --- gnuradio-3.7.3-system-gsm.patch | 41 +++++++++++++++++++++++++++++++++ gnuradio.spec | 10 ++++++-- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 gnuradio-3.7.3-system-gsm.patch diff --git a/gnuradio-3.7.3-system-gsm.patch b/gnuradio-3.7.3-system-gsm.patch new file mode 100644 index 0000000..ca21b7a --- /dev/null +++ b/gnuradio-3.7.3-system-gsm.patch @@ -0,0 +1,41 @@ +diff -up gnuradio-3.7.3/gr-vocoder/lib/CMakeLists.txt~ gnuradio-3.7.3/gr-vocoder/lib/CMakeLists.txt +--- gnuradio-3.7.3/gr-vocoder/lib/CMakeLists.txt~ 2013-06-30 03:05:51.000000000 +0300 ++++ gnuradio-3.7.3/gr-vocoder/lib/CMakeLists.txt 2014-03-16 13:56:08.728983153 +0200 +@@ -79,12 +79,12 @@ endif(MSVC) + ######################################################################## + GR_INCLUDE_SUBDIRECTORY(codec2) + GR_INCLUDE_SUBDIRECTORY(g7xx) +-GR_INCLUDE_SUBDIRECTORY(gsm) + + list(APPEND vocoder_libs + gnuradio-runtime + ${Boost_LIBRARIES} + ${LOG4CPP_LIBRARIES} ++ gsm + ) + + add_library(gnuradio-vocoder SHARED ${gr_vocoder_sources}) +diff -up gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc~ gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc +--- gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc~ 2013-06-30 03:05:51.000000000 +0300 ++++ gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc 2014-03-16 14:34:42.850165603 +0200 +@@ -29,6 +29,8 @@ + #include + #include + ++#define GSM_SAMPLES_PER_FRAME 160 ++ + namespace gr { + namespace vocoder { + +diff -up gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc~ gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc +--- gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc~ 2014-03-07 20:28:19.000000000 +0200 ++++ gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc 2014-03-16 14:41:43.520202465 +0200 +@@ -28,6 +28,8 @@ + #include + #include + ++#define GSM_SAMPLES_PER_FRAME 160 ++ + namespace gr { + namespace vocoder { + diff --git a/gnuradio.spec b/gnuradio.spec index e0cea08..e6273f2 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -33,12 +33,13 @@ Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}.tar.gz # cd gnuradio # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ # gzip > ../%%{name}-%%{version}.tar.gz +Patch0: %{name}-3.7.3-system-gsm.patch Requires(pre): shadow-utils BuildRequires: cmake, fftw-devel, cppunit-devel, wxPython-devel, xmlto BuildRequires: graphviz, boost-devel, python-devel, swig, doxygen BuildRequires: libusbx-devel, alsa-lib-devel, SDL-devel, guile-devel -BuildRequires: portaudio-devel, libtool +BuildRequires: portaudio-devel, libtool, gsm-devel # Gnuradio deprecated gr-comedi # http://gnuradio.org/redmine/issues/show/395 # BuildRequires: comedilib-devel @@ -87,6 +88,8 @@ GNU Radio examples %prep %setup -q +%patch0 -p1 +rm -r gr-vocoder/lib/gsm #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -174,6 +177,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Sun Mar 16 2014 Ville Skyttä - 3.7.3-2 +- Use system gsm instead of bundled one + * Tue Mar 11 2014 Jaroslav Škarvada - 3.7.3-1 - New version Resolves: rhbz#1074899 From 5a56c0e2889bf4e9ea8f21f218f9f7844271268c Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 23 May 2014 11:24:11 +0200 Subject: [PATCH 100/313] rebuild for boost 1.55.0 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index e6273f2..989bff3 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -177,6 +177,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Fri May 23 2014 David Tardon - 3.7.3-3 +- rebuild for boost 1.55.0 + * Sun Mar 16 2014 Ville Skyttä - 3.7.3-2 - Use system gsm instead of bundled one From 5a953a5325ef941fe95d6a086a366fb783bf9e5f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 12:51:50 -0500 Subject: [PATCH 101/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 989bff3..32e5c14 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.7.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -177,6 +177,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 3.7.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri May 23 2014 David Tardon - 3.7.3-3 - rebuild for boost 1.55.0 From f80f79a04d64b2540d5d3bf8fb7706cf5df81609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 16 Jul 2014 12:21:07 +0200 Subject: [PATCH 102/313] New version Resolves: rhbz#1120106 --- gnuradio.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 32e5c14..b61561d 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -18,8 +18,8 @@ #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a Name: gnuradio -Version: 3.7.3 -Release: 4%{?dist} +Version: 3.7.4 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -177,6 +177,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Jul 16 2014 Jaroslav Škarvada - 3.7.4-1 +- New version + Resolves: rhbz#1120106 + * Sat Jun 07 2014 Fedora Release Engineering - 3.7.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index da1ed10..715c196 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a51e1c2860d6b289233e453d4085514f gnuradio-3.7.3.tar.gz +94e7115ad7b46b5bc9e0b336cf74d8ba gnuradio-3.7.4.tar.gz From 715aa06815e8aa48a874bc28ae04968fb2c5c9a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 16 Jul 2014 12:39:11 +0200 Subject: [PATCH 103/313] New version Resolves: rhbz#1120106 - Dropped system-gsm patch (not needed) --- gnuradio-3.7.3-system-gsm.patch | 41 --------------------------------- gnuradio.spec | 4 +--- 2 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 gnuradio-3.7.3-system-gsm.patch diff --git a/gnuradio-3.7.3-system-gsm.patch b/gnuradio-3.7.3-system-gsm.patch deleted file mode 100644 index ca21b7a..0000000 --- a/gnuradio-3.7.3-system-gsm.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -up gnuradio-3.7.3/gr-vocoder/lib/CMakeLists.txt~ gnuradio-3.7.3/gr-vocoder/lib/CMakeLists.txt ---- gnuradio-3.7.3/gr-vocoder/lib/CMakeLists.txt~ 2013-06-30 03:05:51.000000000 +0300 -+++ gnuradio-3.7.3/gr-vocoder/lib/CMakeLists.txt 2014-03-16 13:56:08.728983153 +0200 -@@ -79,12 +79,12 @@ endif(MSVC) - ######################################################################## - GR_INCLUDE_SUBDIRECTORY(codec2) - GR_INCLUDE_SUBDIRECTORY(g7xx) --GR_INCLUDE_SUBDIRECTORY(gsm) - - list(APPEND vocoder_libs - gnuradio-runtime - ${Boost_LIBRARIES} - ${LOG4CPP_LIBRARIES} -+ gsm - ) - - add_library(gnuradio-vocoder SHARED ${gr_vocoder_sources}) -diff -up gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc~ gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc ---- gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc~ 2013-06-30 03:05:51.000000000 +0300 -+++ gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc 2014-03-16 14:34:42.850165603 +0200 -@@ -29,6 +29,8 @@ - #include - #include - -+#define GSM_SAMPLES_PER_FRAME 160 -+ - namespace gr { - namespace vocoder { - -diff -up gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc~ gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc ---- gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc~ 2014-03-07 20:28:19.000000000 +0200 -+++ gnuradio-3.7.3/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc 2014-03-16 14:41:43.520202465 +0200 -@@ -28,6 +28,8 @@ - #include - #include - -+#define GSM_SAMPLES_PER_FRAME 160 -+ - namespace gr { - namespace vocoder { - diff --git a/gnuradio.spec b/gnuradio.spec index b61561d..2384a3e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -33,7 +33,6 @@ Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}.tar.gz # cd gnuradio # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ # gzip > ../%%{name}-%%{version}.tar.gz -Patch0: %{name}-3.7.3-system-gsm.patch Requires(pre): shadow-utils BuildRequires: cmake, fftw-devel, cppunit-devel, wxPython-devel, xmlto @@ -88,8 +87,6 @@ GNU Radio examples %prep %setup -q -%patch0 -p1 -rm -r gr-vocoder/lib/gsm #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -180,6 +177,7 @@ rm -rf %{buildroot} * Wed Jul 16 2014 Jaroslav Škarvada - 3.7.4-1 - New version Resolves: rhbz#1120106 +- Dropped system-gsm patch (not needed) * Sat Jun 07 2014 Fedora Release Engineering - 3.7.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 9bf476e32837406c20729578010dd9f3c2233a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 8 Aug 2014 15:42:52 +0200 Subject: [PATCH 104/313] Added workaround to build on RHEL-7 --- gnuradio.spec | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 2384a3e..e717480 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -14,12 +14,17 @@ %endif %endif +# Workaround for rhbz#1128127 +%if ! 0%{?rhel:1} +%global build_uhd 1 +%endif + # For versions not yet on ftp, pull from git #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a Name: gnuradio Version: 3.7.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -42,10 +47,15 @@ BuildRequires: portaudio-devel, libtool, gsm-devel # Gnuradio deprecated gr-comedi # http://gnuradio.org/redmine/issues/show/395 # BuildRequires: comedilib-devel -BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, PyQwt-devel -BuildRequires: qwt-devel, qwtplot3d-qt4-devel, python-cheetah +BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, python-cheetah BuildRequires: xdg-utils, python-lxml, pygtk2-devel, orc-devel -BuildRequires: uhd-devel, dos2unix, sphinx +BuildRequires: dos2unix, sphinx +%if 0%{?build_uhd} +BuildRequires: uhd-devel +%endif +%if ! 0%{?rhel:1} +BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel +%endif Requires: numpy, wxPython, scipy, portaudio, python-lxml Requires: pygtk2, python-cheetah, PyQt4, PyQwt Obsoletes: usrp < 3.3.0-1 @@ -102,7 +112,7 @@ 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 -DENABLE_GR_UHD=FORCE \ +-DENABLE_GR_VOCODER=FORCE %{?build_uhd:-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 \ @@ -174,6 +184,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Fri Aug 8 2014 Jaroslav Škarvada - 3.7.4-2 +- Added workaround to build on RHEL-7 + * Wed Jul 16 2014 Jaroslav Škarvada - 3.7.4-1 - New version Resolves: rhbz#1120106 From 779cc353701ce49984f2483368d63c1e7b3c5556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 8 Aug 2014 16:28:05 +0200 Subject: [PATCH 105/313] Enabled UHD on RHEL-7 non ppc64 --- gnuradio.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index e717480..8c5143d 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -15,7 +15,11 @@ %endif # Workaround for rhbz#1128127 -%if ! 0%{?rhel:1} +%if 0%{?rhel:1} +%ifarch ! ppc64 +%global build_uhd 1 +%endif +%else %global build_uhd 1 %endif @@ -24,7 +28,7 @@ Name: gnuradio Version: 3.7.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -184,6 +188,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Fri Aug 8 2014 Jaroslav Škarvada - 3.7.4-3 +- Enabled UHD on RHEL-7 non ppc64 + * Fri Aug 8 2014 Jaroslav Škarvada - 3.7.4-2 - Added workaround to build on RHEL-7 From 536e1a698c3f9b81ce572745a1660a2a521e4fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 8 Aug 2014 16:42:24 +0200 Subject: [PATCH 106/313] Fixed building on RHEL-7 --- gnuradio.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 8c5143d..81ec0f5 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -16,7 +16,7 @@ # Workaround for rhbz#1128127 %if 0%{?rhel:1} -%ifarch ! ppc64 +%ifnarch ppc64 %global build_uhd 1 %endif %else @@ -28,7 +28,7 @@ Name: gnuradio Version: 3.7.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -188,6 +188,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Fri Aug 8 2014 Jaroslav Škarvada - 3.7.4-4 +- Fixed building on RHEL-7 + * Fri Aug 8 2014 Jaroslav Škarvada - 3.7.4-3 - Enabled UHD on RHEL-7 non ppc64 From 4520ab2763694495116a126caa5ac496f58f49ca Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 18:23:21 +0000 Subject: [PATCH 107/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 81ec0f5..6a6c4e6 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -28,7 +28,7 @@ Name: gnuradio Version: 3.7.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -188,6 +188,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 3.7.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Aug 8 2014 Jaroslav Škarvada - 3.7.4-4 - Fixed building on RHEL-7 From 7ea66147b83dfe3bb03a6ffa4510142594bfcba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 18 Aug 2014 14:55:05 +0200 Subject: [PATCH 108/313] Removed explicit PyQwt requirement on RHEL-7 --- gnuradio.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 6a6c4e6..98ca967 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -28,7 +28,7 @@ Name: gnuradio Version: 3.7.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -61,7 +61,10 @@ BuildRequires: uhd-devel BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel %endif Requires: numpy, wxPython, scipy, portaudio, python-lxml -Requires: pygtk2, python-cheetah, PyQt4, PyQwt +Requires: pygtk2, python-cheetah, PyQt4 +%if ! 0%{?rhel:1} +Requires: PyQwt +%endif Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 @@ -188,6 +191,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Mon Aug 18 2014 Jaroslav Škarvada - 3.7.4-6 +- Removed explicit PyQwt requirement on RHEL-7 + * Sat Aug 16 2014 Fedora Release Engineering - 3.7.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From ebba1385a5473d4a2eb2b256fd1c001328644582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 1 Sep 2014 17:00:46 +0200 Subject: [PATCH 109/313] New version Resolves: rhbz#1135814 --- gnuradio.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 98ca967..db7a723 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -27,8 +27,8 @@ #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a Name: gnuradio -Version: 3.7.4 -Release: 6%{?dist} +Version: 3.7.5 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -191,6 +191,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Mon Sep 1 2014 Jaroslav Škarvada - 3.7.5-1 +- New version + Resolves: rhbz#1135814 + * Mon Aug 18 2014 Jaroslav Škarvada - 3.7.4-6 - Removed explicit PyQwt requirement on RHEL-7 diff --git a/sources b/sources index 715c196..c4d9227 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -94e7115ad7b46b5bc9e0b336cf74d8ba gnuradio-3.7.4.tar.gz +b4a917a548f41ce25c6c88f9bc864bca gnuradio-3.7.5.tar.gz From c0d4085d927a6ccada872a8bc10086dbac4ac851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 17 Sep 2014 17:03:33 +0200 Subject: [PATCH 110/313] Added PyOpenGL requirement Resolves: rhbz#1049770 --- gnuradio.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index db7a723..479f764 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -28,7 +28,7 @@ Name: gnuradio Version: 3.7.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -63,7 +63,7 @@ BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel Requires: numpy, wxPython, scipy, portaudio, python-lxml Requires: pygtk2, python-cheetah, PyQt4 %if ! 0%{?rhel:1} -Requires: PyQwt +Requires: PyQwt, PyOpenGL %endif Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 @@ -191,6 +191,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Sep 17 2014 Jaroslav Škarvada - 3.7.5-2 +- Added PyOpenGL requirement + Resolves: rhbz#1049770 + * Mon Sep 1 2014 Jaroslav Škarvada - 3.7.5-1 - New version Resolves: rhbz#1135814 From 940b56cda395918144e6e1322b6227603593bfd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 7 Oct 2014 16:31:45 +0200 Subject: [PATCH 111/313] Fixed swig bug regarding size_t (by size_t patch) This fixes building on s390 Resolves: rhbz#1143914 --- gnuradio-3.7.5-size_t.patch | 403 ++++++++++++++++++++++++++++++++++++ gnuradio.spec | 11 +- 2 files changed, 413 insertions(+), 1 deletion(-) create mode 100644 gnuradio-3.7.5-size_t.patch diff --git a/gnuradio-3.7.5-size_t.patch b/gnuradio-3.7.5-size_t.patch new file mode 100644 index 0000000..f55d4a4 --- /dev/null +++ b/gnuradio-3.7.5-size_t.patch @@ -0,0 +1,403 @@ +--- 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 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}) +--- a/docs/doxygen/other/thread_affinity.dox ++++ a/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() + +--- a/gnuradio-runtime/include/gnuradio/basic_block.h ++++ a/gnuradio-runtime/include/gnuradio/basic_block.h +@@ -375,13 +375,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."); } + }; + +--- a/gnuradio-runtime/include/gnuradio/block.h ++++ a/gnuradio-runtime/include/gnuradio/block.h +@@ -532,9 +532,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. +@@ -544,7 +544,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 +@@ -589,7 +589,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? +--- a/gnuradio-runtime/include/gnuradio/block_detail.h ++++ a/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. +--- a/gnuradio-runtime/include/gnuradio/hier_block2.h ++++ a/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(); + }; + + /*! +--- a/gnuradio-runtime/include/gnuradio/thread/thread.h ++++ a/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. +--- a/gnuradio-runtime/lib/block.cc ++++ a/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) { +--- a/gnuradio-runtime/lib/block_detail.cc ++++ a/gnuradio-runtime/lib/block_detail.cc +@@ -220,7 +220,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 { +--- a/gnuradio-runtime/lib/hier_block2.cc ++++ a/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(); +--- a/gnuradio-runtime/lib/hier_block2_detail.cc ++++ a/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(); +--- a/gnuradio-runtime/lib/hier_block2_detail.h ++++ a/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 +--- a/gnuradio-runtime/lib/thread/thread.cc ++++ a/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++) +--- 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(); + + // 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(); +--- 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 > >; + %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 */ +--- a/gnuradio-runtime/swig/hier_block2.i ++++ a/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 + }; +--- a/gr-blocks/lib/qa_gr_top_block.cc ++++ a/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 479f764..68db03a 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -28,7 +28,7 @@ Name: gnuradio Version: 3.7.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -67,6 +67,9 @@ Requires: PyQwt, PyOpenGL %endif 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 %description GNU Radio is a collection of software that when combined with minimal @@ -104,6 +107,7 @@ GNU Radio examples %prep %setup -q +%patch0 -p1 -b .size_t #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -191,6 +195,11 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Oct 7 2014 Jaroslav Škarvada - 3.7.5-3 +- Fixed swig bug regarding size_t (by size_t patch) + This fixes building on s390 + Resolves: rhbz#1143914 + * Wed Sep 17 2014 Jaroslav Škarvada - 3.7.5-2 - Added PyOpenGL requirement Resolves: rhbz#1049770 From 12c861b2cd0d6f8e186b3b3aff7b6bfddbcc7585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 21 Oct 2014 19:47:04 +0200 Subject: [PATCH 112/313] New versio Resolves: rhbz#1155252 --- gnuradio.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 68db03a..e885045 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -27,8 +27,8 @@ #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a Name: gnuradio -Version: 3.7.5 -Release: 3%{?dist} +Version: 3.7.5.1 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -195,6 +195,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Oct 21 2014 Jaroslav Škarvada - 3.7.5.1-1 +- New versio + Resolves: rhbz#1155252 + * Tue Oct 7 2014 Jaroslav Škarvada - 3.7.5-3 - Fixed swig bug regarding size_t (by size_t patch) This fixes building on s390 From a838bd3765bfc926e63bb1b69f3e1295aa93f937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 21 Oct 2014 21:30:17 +0200 Subject: [PATCH 113/313] Added new sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index c4d9227..09ff652 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b4a917a548f41ce25c6c88f9bc864bca gnuradio-3.7.5.tar.gz +bfd2116b344a949aacc3d7e2eff07642 gnuradio-3.7.5.1.tar.gz From 9ee13d05f9f6c4f05b8496dfc05315c7331c16b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 26 Jan 2015 12:11:49 +0100 Subject: [PATCH 114/313] Workaround for volk memalign (by volk-memalign-fix patch) Resolves: rhbz#1185710 - Rebuilt for current uhd Resolves: rhbz#1185508 --- gnuradio-3.7.5-volk-memalign-fix.patch | 14 ++++++++++++++ gnuradio.spec | 11 ++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 gnuradio-3.7.5-volk-memalign-fix.patch diff --git a/gnuradio-3.7.5-volk-memalign-fix.patch b/gnuradio-3.7.5-volk-memalign-fix.patch new file mode 100644 index 0000000..59c81cd --- /dev/null +++ b/gnuradio-3.7.5-volk-memalign-fix.patch @@ -0,0 +1,14 @@ +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.spec b/gnuradio.spec index e885045..d3a9c9c 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -28,7 +28,7 @@ Name: gnuradio Version: 3.7.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -70,6 +70,8 @@ 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 +# rhbz#1185710, workaround from upstream +Patch1: gnuradio-3.7.5-volk-memalign-fix.patch %description GNU Radio is a collection of software that when combined with minimal @@ -108,6 +110,7 @@ GNU Radio examples %prep %setup -q %patch0 -p1 -b .size_t +%patch1 -p1 -b .volk-memalign-fix #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -195,6 +198,12 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Mon Jan 26 2015 Jaroslav Škarvada - 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 - 3.7.5.1-1 - New versio Resolves: rhbz#1155252 From af5a5b8e73673fc7e529049288c3a5f457d0fac2 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 28 Jan 2015 00:30:48 +0100 Subject: [PATCH 115/313] Rebuild for boost 1.57.0 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index d3a9c9c..2430c52 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -28,7 +28,7 @@ Name: gnuradio Version: 3.7.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -198,6 +198,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Jan 27 2015 Petr Machata - 3.7.5.1-3 +- Rebuild for boost 1.57.0 + * Mon Jan 26 2015 Jaroslav Škarvada - 3.7.5.1-2 - Workaround for volk memalign (by volk-memalign-fix patch) Resolves: rhbz#1185710 From 2e651de9c32aef269c7c4e8e71d46e85f2f34db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 29 Jan 2015 14:31:33 +0100 Subject: [PATCH 116/313] Added fix for wxPython3 (by wxpython3-gtk3 patch). Patch provided by Scott Talbert --- gnuradio-3.7.5-wxpython3-gtk3.patch | 28 ++++++++++++++++++++++++++++ gnuradio.spec | 9 ++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gnuradio-3.7.5-wxpython3-gtk3.patch diff --git a/gnuradio-3.7.5-wxpython3-gtk3.patch b/gnuradio-3.7.5-wxpython3-gtk3.patch new file mode 100644 index 0000000..cca9220 --- /dev/null +++ b/gnuradio-3.7.5-wxpython3-gtk3.patch @@ -0,0 +1,28 @@ +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.spec b/gnuradio.spec index 2430c52..fff6096 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -28,7 +28,7 @@ Name: gnuradio Version: 3.7.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -72,6 +72,8 @@ Obsoletes: grc < 0.80-1 Patch0: gnuradio-3.7.5-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 %description GNU Radio is a collection of software that when combined with minimal @@ -111,6 +113,7 @@ GNU Radio examples %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 {} \; @@ -198,6 +201,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Thu Jan 29 2015 Jaroslav Škarvada - 3.7.5.1-4 +- Added fix for wxPython3 (by wxpython3-gtk3 patch). Patch + provided by Scott Talbert + * Tue Jan 27 2015 Petr Machata - 3.7.5.1-3 - Rebuild for boost 1.57.0 From 628c81475d1e64a06a16742756e8948cf409c755 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 4 Feb 2015 14:13:26 +0100 Subject: [PATCH 117/313] Bump for rebuild. --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index fff6096..463b38d 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -28,7 +28,7 @@ Name: gnuradio Version: 3.7.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -201,6 +201,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Feb 04 2015 Petr Machata - 3.7.5.1-5 +- Bump for rebuild. + * Thu Jan 29 2015 Jaroslav Škarvada - 3.7.5.1-4 - Added fix for wxPython3 (by wxpython3-gtk3 patch). Patch provided by Scott Talbert From 025abfab47a67fdfc490b84e5948f1887709bbe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 6 Mar 2015 15:48:09 +0100 Subject: [PATCH 118/313] New version Resolves: rhbz#1193588 - De-fuzzified size_t patch --- ...e_t.patch => gnuradio-3.7.6.1-size_t.patch | 116 +++++++++++------- gnuradio.spec | 11 +- sources | 2 +- 3 files changed, 84 insertions(+), 45 deletions(-) rename gnuradio-3.7.5-size_t.patch => gnuradio-3.7.6.1-size_t.patch (77%) 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 &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 > >; %template(gr_vector_vector_complexd) std::vector< std::vector< std::complex > >; @@ -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 - 3.7.6.1-1 +- New version + Resolves: rhbz#1193588 +- De-fuzzified size_t patch + * Wed Feb 04 2015 Petr Machata - 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 From c94d21e53d97139ae4b5b104852bda2735f5ca68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 11 Mar 2015 20:42:05 +0100 Subject: [PATCH 119/313] Enabled optional building with NEON support on aarch64 --- gnuradio.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 5b879d5..539ecdc 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -4,7 +4,7 @@ %{!?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} +%ifarch %{arm} aarch64 %if %{with neon} %global my_optflags %(echo -n "%{optflags}" | sed 's/-mfpu=[^ \\t]\\+//g'; echo " -mfpu=neon") %{expand: %global optflags %{my_optflags}} @@ -28,7 +28,7 @@ Name: gnuradio Version: 3.7.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -201,6 +201,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Mar 11 2015 Jaroslav Škarvada - 3.7.6.1-2 +- Enabled optional building with NEON support on aarch64 + * Thu Feb 19 2015 Jaroslav Škarvada - 3.7.6.1-1 - New version Resolves: rhbz#1193588 From ad93107ec2e413106aa043d2ee4020a4efedc99d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 12 Mar 2015 09:08:30 +0100 Subject: [PATCH 120/313] Enabled optional building with NEON support on aarch64 - Built with -j1 to prevent internal compiler errors due to excessive use of resources --- gnuradio.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 539ecdc..f95f99a 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,6 @@ %bcond_with neon %{!?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} aarch64 %if %{with neon} @@ -139,10 +138,11 @@ cd build %{?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 -j1 to prevent internal compiler errors due to excessive +# use of resources +make -j1 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} @@ -203,6 +203,8 @@ rm -rf %{buildroot} %changelog * Wed Mar 11 2015 Jaroslav Škarvada - 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 - 3.7.6.1-1 - New version From a4e8adb931edded9748bcc668bd8be6d36cd45a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 12 Mar 2015 14:49:59 +0100 Subject: [PATCH 121/313] Enabled uhd on ppc64 on RHEL-7 - Built with -j2 to speed-up the build process a bit --- gnuradio.spec | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index f95f99a..6f68fab 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -13,21 +13,12 @@ %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 Name: gnuradio Version: 3.7.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -53,9 +44,7 @@ BuildRequires: portaudio-devel, libtool, gsm-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: uhd-devel -%endif %if ! 0%{?rhel:1} BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel %endif @@ -128,7 +117,7 @@ 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 \ @@ -138,9 +127,9 @@ cd build %{?mfpu_neon} \ .. -# make with -j1 to prevent internal compiler errors due to excessive +# make with -j2 to prevent internal compiler errors due to excessive # use of resources -make -j1 CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing" +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" @@ -201,6 +190,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Thu Mar 12 2015 Jaroslav Škarvada - 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 - 3.7.6.1-2 - Enabled optional building with NEON support on aarch64 - Built with -j1 to prevent internal compiler errors due to excessive From 75efd66eda3c61cceae86aa50eed5c6d04761dab Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 3 May 2015 10:30:03 +0200 Subject: [PATCH 122/313] Rebuilt for GCC 5 C++11 ABI change --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 6f68fab..fb5342f 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -18,7 +18,7 @@ Name: gnuradio Version: 3.7.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -190,6 +190,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Sun May 03 2015 Kalev Lember - 3.7.6.1-4 +- Rebuilt for GCC 5 C++11 ABI change + * Thu Mar 12 2015 Jaroslav Škarvada - 3.7.6.1-3 - Enabled uhd on ppc64 on RHEL-7 - Built with -j2 to speed-up the build process a bit From d84e5c341fa959e618a05f4d4f135dec7f2f6b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 12 May 2015 14:33:27 +0200 Subject: [PATCH 123/313] New version Resolves: rhbz#1220588 - Rebased size_t patch - Dropped volk-memalign-fix patch (not needed) - Dropped wxpython3-gtk3 patch (upstreamed) --- gnuradio-3.7.5-volk-memalign-fix.patch | 14 ------ gnuradio-3.7.5-wxpython3-gtk3.patch | 28 ------------ ...e_t.patch => gnuradio-3.7.7.1-size_t.patch | 44 +++++++++---------- gnuradio.spec | 19 ++++---- sources | 2 +- 5 files changed, 33 insertions(+), 74 deletions(-) delete mode 100644 gnuradio-3.7.5-volk-memalign-fix.patch delete mode 100644 gnuradio-3.7.5-wxpython3-gtk3.patch rename gnuradio-3.7.6.1-size_t.patch => gnuradio-3.7.7.1-size_t.patch (95%) 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.7.1-size_t.patch similarity index 95% rename from gnuradio-3.7.6.1-size_t.patch rename to gnuradio-3.7.7.1-size_t.patch index 77c07c6..fe80065 100644 --- a/gnuradio-3.7.6.1-size_t.patch +++ b/gnuradio-3.7.7.1-size_t.patch @@ -44,7 +44,7 @@ index edac813..03d2129 100644 - 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 +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 { @@ -64,10 +64,10 @@ index da07dd9..f79c471 100644 }; diff --git a/gnuradio-runtime/include/gnuradio/block.h b/gnuradio-runtime/include/gnuradio/block.h -index 4a534b7..edcff0e 100644 +index c6185d9..8480ec7 100644 --- a/gnuradio-runtime/include/gnuradio/block.h +++ b/gnuradio-runtime/include/gnuradio/block.h -@@ -538,9 +538,9 @@ namespace gr { +@@ -593,9 +593,9 @@ namespace gr { /*! * \brief Set the thread's affinity to processor core \p n. * @@ -79,7 +79,7 @@ index 4a534b7..edcff0e 100644 /*! * \brief Remove processor affinity to a specific core. -@@ -550,7 +550,7 @@ namespace gr { +@@ -605,7 +605,7 @@ namespace gr { /*! * \brief Get the current processor affinity. */ @@ -88,7 +88,7 @@ index 4a534b7..edcff0e 100644 /*! * \brief Get the current thread priority in use -@@ -595,7 +595,7 @@ namespace gr { +@@ -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 @@ -115,10 +115,10 @@ index 916c0a4..1d52824 100644 /*! * \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 +index 08a5389..d4f9696 100644 --- a/gnuradio-runtime/include/gnuradio/hier_block2.h +++ b/gnuradio-runtime/include/gnuradio/hier_block2.h -@@ -216,7 +216,7 @@ namespace gr { +@@ -248,7 +248,7 @@ namespace gr { * * \param mask a vector of ints of the core numbers available to this block. */ @@ -127,15 +127,15 @@ index 1bf8ddd..3d243d2 100644 /*! * \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 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 @@ -168,7 +168,7 @@ index a58d172..6c6c1bf 100644 /*! \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 +index f26d6bb..342ad95 100644 --- a/gnuradio-runtime/lib/block.cc +++ b/gnuradio-runtime/lib/block.cc @@ -325,7 +325,7 @@ namespace gr { @@ -194,7 +194,7 @@ index 9463e8d..96b54d0 100644 if(threaded) { try { diff --git a/gnuradio-runtime/lib/hier_block2.cc b/gnuradio-runtime/lib/hier_block2.cc -index f145b93..e4e7110 100644 +index eeb5669..b83f563 100644 --- a/gnuradio-runtime/lib/hier_block2.cc +++ b/gnuradio-runtime/lib/hier_block2.cc @@ -159,7 +159,7 @@ namespace gr { @@ -216,10 +216,10 @@ index f145b93..e4e7110 100644 { 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 +index 948c05d..30a0721 100644 --- a/gnuradio-runtime/lib/hier_block2_detail.cc +++ b/gnuradio-runtime/lib/hier_block2_detail.cc -@@ -685,7 +685,7 @@ namespace gr { +@@ -870,7 +870,7 @@ namespace gr { } void @@ -228,7 +228,7 @@ index ad8fc87..ddf41ca 100644 { 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 { +@@ -887,7 +887,7 @@ namespace gr { } } @@ -238,7 +238,7 @@ index ad8fc87..ddf41ca 100644 { 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 +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 { @@ -250,9 +250,9 @@ index 8067383..7c16b32 100644 void unset_processor_affinity(); - std::vector processor_affinity(); + std::vector processor_affinity(); - - private: - // Private implementation data + + // 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 @@ -407,7 +407,7 @@ index 8ae953b..fa2c764 100644 - #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 +index 12190d0..de79e3f 100644 --- a/gnuradio-runtime/swig/hier_block2.i +++ b/gnuradio-runtime/swig/hier_block2.i @@ -87,9 +87,9 @@ namespace gr { @@ -420,8 +420,8 @@ index 053f247..52b2714 100644 - std::vector processor_affinity(); + std::vector processor_affinity(); - gr::hier_block2_sptr to_hier_block2(); // Needed for Python type coercion - }; + // 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 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 From 4e8b6d39486cd86ddba665b511f1bcb79488b375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 15 May 2015 22:12:30 +0200 Subject: [PATCH 124/313] 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) --- gnuradio-3.7.7.1-docdir-override.patch | 15 +++++++++++++++ gnuradio.spec | 11 +++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 gnuradio-3.7.7.1-docdir-override.patch diff --git a/gnuradio-3.7.7.1-docdir-override.patch b/gnuradio-3.7.7.1-docdir-override.patch new file mode 100644 index 0000000..7804548 --- /dev/null +++ b/gnuradio-3.7.7.1-docdir-override.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 271e93c..f5b3094 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,7 +149,9 @@ set(GR_INCLUDE_DIR include) + set(GR_DATA_DIR share) + set(GR_PKG_DATA_DIR ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME}) + set(GR_DOC_DIR ${GR_DATA_DIR}/doc) +-set(GR_PKG_DOC_DIR ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}-${DOCVER}) ++if (NOT GR_PKG_DOC_DIR) ++ set(GR_PKG_DOC_DIR ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}-${DOCVER}) ++endif() + set(GR_CONF_DIR etc) + set(GR_PKG_CONF_DIR ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d) + set(GR_LIBEXEC_DIR libexec) diff --git a/gnuradio.spec b/gnuradio.spec index bbbaf10..058faf5 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -58,6 +58,9 @@ 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.7.1-size_t.patch +# patch sent upstream, upstream report: +# http://gnuradio.org/redmine/issues/791 +Patch1: gnuradio-3.7.7.1-docdir-override.patch %description GNU Radio is a collection of software that when combined with minimal @@ -96,6 +99,7 @@ GNU Radio examples %prep %setup -q %patch0 -p1 -b .size_t +%patch1 -p1 -b .docdir-override #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -118,6 +122,7 @@ cd build -DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \ -DENABLE_GR_FCD=FORCE \ -DSYSCONFDIR=%{_sysconfdir} \ +-DGR_PKG_DOC_DIR=%{_docdir}/%{name} \ %{?mfpu_neon} \ .. @@ -133,10 +138,6 @@ 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, @@ -154,6 +155,7 @@ rm -rf %{buildroot} %postun -n gnuradio -p /sbin/ldconfig %files +%license COPYING %defattr(-,root,root,-) %{python_sitearch}/* %{_bindir}/* @@ -190,6 +192,7 @@ rm -rf %{buildroot} - 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 - 3.7.6.1-4 - Rebuilt for GCC 5 C++11 ABI change From c5b79c43fd80b3b771cbcd265b5dbeef2c427c35 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 09:12:12 +0000 Subject: [PATCH 125/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 058faf5..785adf7 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -18,7 +18,7 @@ Name: gnuradio Version: 3.7.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -186,6 +186,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 3.7.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue May 12 2015 Jaroslav Škarvada - 3.7.7.1-1 - New version Resolves: rhbz#1220588 From 1ec90b8031867e5d2eeb8b7be3ddf5a46e26f825 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 22 Jul 2015 18:34:59 +0200 Subject: [PATCH 126/313] rebuild for Boost 1.58 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 785adf7..499a045 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -18,7 +18,7 @@ Name: gnuradio Version: 3.7.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -186,6 +186,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Jul 22 2015 David Tardon - 3.7.7.1-3 +- rebuild for Boost 1.58 + * Wed Jun 17 2015 Fedora Release Engineering - 3.7.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From b2008f864363207392a2fef00c59ce85eef8e6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 27 Jul 2015 16:34:07 +0200 Subject: [PATCH 127/313] New version Resolves: rhbz#1246803 - Updated size_t patch - Dropped docdir-override (not needed) --- gnuradio-3.7.7.1-docdir-override.patch | 15 ------- ...t.patch => gnuradio-3.7.8.rc1-size_t.patch | 43 ------------------- gnuradio.spec | 24 ++++++----- sources | 2 +- 4 files changed, 15 insertions(+), 69 deletions(-) delete mode 100644 gnuradio-3.7.7.1-docdir-override.patch rename gnuradio-3.7.7.1-size_t.patch => gnuradio-3.7.8.rc1-size_t.patch (89%) diff --git a/gnuradio-3.7.7.1-docdir-override.patch b/gnuradio-3.7.7.1-docdir-override.patch deleted file mode 100644 index 7804548..0000000 --- a/gnuradio-3.7.7.1-docdir-override.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 271e93c..f5b3094 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -149,7 +149,9 @@ set(GR_INCLUDE_DIR include) - set(GR_DATA_DIR share) - set(GR_PKG_DATA_DIR ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME}) - set(GR_DOC_DIR ${GR_DATA_DIR}/doc) --set(GR_PKG_DOC_DIR ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}-${DOCVER}) -+if (NOT GR_PKG_DOC_DIR) -+ set(GR_PKG_DOC_DIR ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}-${DOCVER}) -+endif() - set(GR_CONF_DIR etc) - set(GR_PKG_CONF_DIR ${GR_CONF_DIR}/${CMAKE_PROJECT_NAME}/conf.d) - set(GR_LIBEXEC_DIR libexec) diff --git a/gnuradio-3.7.7.1-size_t.patch b/gnuradio-3.7.8.rc1-size_t.patch similarity index 89% rename from gnuradio-3.7.7.1-size_t.patch rename to gnuradio-3.7.8.rc1-size_t.patch index fe80065..44c9828 100644 --- a/gnuradio-3.7.7.1-size_t.patch +++ b/gnuradio-3.7.8.rc1-size_t.patch @@ -1,26 +1,3 @@ -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 @@ -386,26 +363,6 @@ index 945cea7..7d2b29e 100644 // 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 diff --git a/gnuradio.spec b/gnuradio.spec index 499a045..d9f7235 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -16,9 +16,11 @@ # For versions not yet on ftp, pull from git #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a +%global alphatag rc1 + Name: gnuradio -Version: 3.7.7.1 -Release: 3%{?dist} +Version: 3.7.8 +Release: 0.1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -26,8 +28,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} | \ @@ -57,10 +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.7.1-size_t.patch -# patch sent upstream, upstream report: -# http://gnuradio.org/redmine/issues/791 -Patch1: gnuradio-3.7.7.1-docdir-override.patch +Patch0: gnuradio-3.7.8.rc1-size_t.patch %description GNU Radio is a collection of software that when combined with minimal @@ -97,9 +96,8 @@ Requires: %{name} = %{version}-%{release} GNU Radio examples %prep -%setup -q +%setup -q -n %{name}-%{version}%{?alphatag} %patch0 -p1 -b .size_t -%patch1 -p1 -b .docdir-override #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -186,6 +184,12 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Mon Jul 27 2015 Jaroslav Škarvada - 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 - 3.7.7.1-3 - rebuild for Boost 1.58 diff --git a/sources b/sources index 54ffd93..0549bc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca8e47abcb01edc72014ccabe38123a3 gnuradio-3.7.7.1.tar.gz +e26d478e7ad51b7f889abb38f76d7aa1 gnuradio-3.7.8rc1.tar.gz From 64446ead159bbb2170bb3b31b8cd5ba46c23461a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 29 Jul 2015 12:20:41 -0500 Subject: [PATCH 128/313] - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index d9f7235..1aa0fdf 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -20,7 +20,7 @@ Name: gnuradio Version: 3.7.8 -Release: 0.1%{?alphatag:.%{alphatag}}%{?dist} +Release: 0.2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -184,6 +184,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Jul 29 2015 Fedora Release Engineering - 3.7.8-0.2.rc1 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + * Mon Jul 27 2015 Jaroslav Škarvada - 3.7.8-0.1.rc1 - New version Resolves: rhbz#1246803 From 1f168a5fe3bdc6eaac3ce8feae5bb93314643924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 12 Aug 2015 15:07:23 +0200 Subject: [PATCH 129/313] New version Resolves: rhbz#1251650 --- gnuradio.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 1aa0fdf..4aa3456 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -16,11 +16,11 @@ # For versions not yet on ftp, pull from git #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a -%global alphatag rc1 +#%%global alphatag rc1 Name: gnuradio Version: 3.7.8 -Release: 0.2%{?alphatag:.%{alphatag}}%{?dist} +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -184,6 +184,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Wed Aug 12 2015 Jaroslav Škarvada - 3.7.8-1 +- New version + Resolves: rhbz#1251650 + * Wed Jul 29 2015 Fedora Release Engineering - 3.7.8-0.2.rc1 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 From f8435094ebc5ecdbbedd8c48d3ff908702e9082b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 12 Aug 2015 15:11:53 +0200 Subject: [PATCH 130/313] Updated sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 0549bc4..1b54cd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e26d478e7ad51b7f889abb38f76d7aa1 gnuradio-3.7.8rc1.tar.gz +afc83b06136537071397007c3243c02a gnuradio-3.7.8.tar.gz From dbc05ea5b7000fbb2718f1f6024a3e22a48c0561 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 27 Aug 2015 21:36:11 +0100 Subject: [PATCH 131/313] Rebuilt for Boost 1.59 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 4aa3456..c62a366 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -20,7 +20,7 @@ Name: gnuradio Version: 3.7.8 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -184,6 +184,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Thu Aug 27 2015 Jonathan Wakely - 3.7.8-2 +- Rebuilt for Boost 1.59 + * Wed Aug 12 2015 Jaroslav Škarvada - 3.7.8-1 - New version Resolves: rhbz#1251650 From fc005b51578ce61d7f5b53346b8bacd4d8026a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 1 Oct 2015 18:34:48 +0200 Subject: [PATCH 132/313] Fixed icon and desktop file locations Resolves: rhbz#1266700 --- gnuradio.spec | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index c62a366..1f9839f 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -20,7 +20,7 @@ Name: gnuradio Version: 3.7.8 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -45,7 +45,7 @@ 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 +BuildRequires: dos2unix, sphinx, desktop-file-utils BuildRequires: uhd-devel %if ! 0%{?rhel:1} BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel @@ -146,11 +146,41 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples/atsc 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 %license COPYING @@ -160,6 +190,9 @@ rm -rf %{buildroot} %{_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 @@ -184,6 +217,10 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Thu Oct 1 2015 Jaroslav Škarvada - 3.7.8-3 +- Fixed icon and desktop file locations + Resolves: rhbz#1266700 + * Thu Aug 27 2015 Jonathan Wakely - 3.7.8-2 - Rebuilt for Boost 1.59 From dcef5c44373e566ce0780d282b332cbaa43a2eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 5 Nov 2015 12:39:08 +0100 Subject: [PATCH 133/313] New version Resolves: rhbz#1276888 --- gnuradio.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 1f9839f..e46d7d0 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,8 +19,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.7.8 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.7.8.1 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -217,6 +217,10 @@ fi %{_datadir}/gnuradio/examples %changelog +* Thu Nov 5 2015 Jaroslav Škarvada - 3.7.8.1-1 +- New version + Resolves: rhbz#1276888 + * Thu Oct 1 2015 Jaroslav Škarvada - 3.7.8-3 - Fixed icon and desktop file locations Resolves: rhbz#1266700 diff --git a/sources b/sources index 1b54cd2..37ffb3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -afc83b06136537071397007c3243c02a gnuradio-3.7.8.tar.gz +961d5ba5089f409f0c9e5e5b7f6ee0f2 gnuradio-3.7.8.1.tar.gz From c83a7414bf69cc7ca1fe57c401c8c1de5b1150f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 15 Dec 2015 17:50:34 +0100 Subject: [PATCH 134/313] New version Resolves: rhbz#1291659 - Dropped dos2unix and conversion from CR + LF to LF (not needed) --- ...t.patch => gnuradio-3.7.9.rc1-size_t.patch | 10 +++++----- gnuradio.spec | 19 ++++++++++--------- sources | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) rename gnuradio-3.7.8.rc1-size_t.patch => gnuradio-3.7.9.rc1-size_t.patch (98%) diff --git a/gnuradio-3.7.8.rc1-size_t.patch b/gnuradio-3.7.9.rc1-size_t.patch similarity index 98% rename from gnuradio-3.7.8.rc1-size_t.patch rename to gnuradio-3.7.9.rc1-size_t.patch index 44c9828..2623556 100644 --- a/gnuradio-3.7.8.rc1-size_t.patch +++ b/gnuradio-3.7.9.rc1-size_t.patch @@ -21,7 +21,7 @@ index edac813..03d2129 100644 - 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 +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 { @@ -145,7 +145,7 @@ index a58d172..6c6c1bf 100644 /*! \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 +index 2bae8ea..9641022 100644 --- a/gnuradio-runtime/lib/block.cc +++ b/gnuradio-runtime/lib/block.cc @@ -325,7 +325,7 @@ namespace gr { @@ -193,10 +193,10 @@ index eeb5669..b83f563 100644 { 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 +index 60910d0..40779e7 100644 --- a/gnuradio-runtime/lib/hier_block2_detail.cc +++ b/gnuradio-runtime/lib/hier_block2_detail.cc -@@ -870,7 +870,7 @@ namespace gr { +@@ -892,7 +892,7 @@ namespace gr { } void @@ -205,7 +205,7 @@ index 948c05d..30a0721 100644 { 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 { +@@ -909,7 +909,7 @@ namespace gr { } } diff --git a/gnuradio.spec b/gnuradio.spec index e46d7d0..0dfa89d 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -16,11 +16,11 @@ # For versions not yet on ftp, pull from git #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a -#%%global alphatag rc1 +%global alphatag rc1 Name: gnuradio -Version: 3.7.8.1 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.7.9 +Release: 0.1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -45,7 +45,7 @@ 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, desktop-file-utils +BuildRequires: sphinx, desktop-file-utils BuildRequires: uhd-devel %if ! 0%{?rhel:1} BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel @@ -59,7 +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.8.rc1-size_t.patch +Patch0: gnuradio-3.7.9.rc1-size_t.patch %description GNU Radio is a collection of software that when combined with minimal @@ -102,10 +102,6 @@ GNU Radio examples #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 @@ -217,6 +213,11 @@ fi %{_datadir}/gnuradio/examples %changelog +* Tue Dec 15 2015 Jaroslav Škarvada - 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 - 3.7.8.1-1 - New version Resolves: rhbz#1276888 diff --git a/sources b/sources index 37ffb3e..9e80ab5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -961d5ba5089f409f0c9e5e5b7f6ee0f2 gnuradio-3.7.8.1.tar.gz +a812f735b556a4b6a61311696c8abec9 gnuradio-3.7.9rc1.tar.gz From f49f2f34661db34a890f4b1b227180a9ea5e2433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 4 Jan 2016 12:08:18 +0100 Subject: [PATCH 135/313] New version Resolves: rhbz#1294379 --- gnuradio.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 0dfa89d..70ef228 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -16,11 +16,11 @@ # For versions not yet on ftp, pull from git #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a -%global alphatag rc1 +#%%global alphatag rc1 Name: gnuradio Version: 3.7.9 -Release: 0.1%{?alphatag:.%{alphatag}}%{?dist} +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -29,7 +29,7 @@ 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}.tar.gz # git clone git://gnuradio.org/gnuradio # cd gnuradio # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ @@ -213,6 +213,10 @@ fi %{_datadir}/gnuradio/examples %changelog +* Mon Jan 4 2016 Jaroslav Škarvada - 3.7.9-1 +- New version + Resolves: rhbz#1294379 + * Tue Dec 15 2015 Jaroslav Škarvada - 3.7.9-0.1.rc1 - New version Resolves: rhbz#1291659 diff --git a/sources b/sources index 9e80ab5..caebbbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a812f735b556a4b6a61311696c8abec9 gnuradio-3.7.9rc1.tar.gz +bf1a2abd0abc492c7f67cba1080ceb8c gnuradio-3.7.9.tar.gz From 8c9ab940f80833cc18f748892fe7c035142de99a Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 16 Jan 2016 11:07:55 +0000 Subject: [PATCH 136/313] Rebuilt for Boost 1.60 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 70ef228..932f49d 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -20,7 +20,7 @@ Name: gnuradio Version: 3.7.9 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -213,6 +213,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Sat Jan 16 2016 Jonathan Wakely - 3.7.9-2 +- Rebuilt for Boost 1.60 + * Mon Jan 4 2016 Jaroslav Škarvada - 3.7.9-1 - New version Resolves: rhbz#1294379 From 533ecf272733b00c1e175a0c44ef03041e48c80d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 22:40:15 +0000 Subject: [PATCH 137/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 932f49d..659bdf1 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -20,7 +20,7 @@ Name: gnuradio Version: 3.7.9 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -213,6 +213,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 3.7.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Jan 16 2016 Jonathan Wakely - 3.7.9-2 - Rebuilt for Boost 1.60 From 20a9abda158baaec275f9ca238f17680cc85701e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 10 Feb 2016 12:37:14 +0100 Subject: [PATCH 138/313] New version Resolves: rhbz#1306066 --- ...1-size_t.patch => gnuradio-3.7.9.1-size_t.patch | 14 +++++++------- gnuradio.spec | 10 +++++++--- sources | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) rename gnuradio-3.7.9.rc1-size_t.patch => gnuradio-3.7.9.1-size_t.patch (98%) diff --git a/gnuradio-3.7.9.rc1-size_t.patch b/gnuradio-3.7.9.1-size_t.patch similarity index 98% rename from gnuradio-3.7.9.rc1-size_t.patch rename to gnuradio-3.7.9.1-size_t.patch index 2623556..4817dc7 100644 --- a/gnuradio-3.7.9.rc1-size_t.patch +++ b/gnuradio-3.7.9.1-size_t.patch @@ -171,10 +171,10 @@ index 9463e8d..96b54d0 100644 if(threaded) { try { diff --git a/gnuradio-runtime/lib/hier_block2.cc b/gnuradio-runtime/lib/hier_block2.cc -index eeb5669..b83f563 100644 +index 597ae03..031ec30 100644 --- a/gnuradio-runtime/lib/hier_block2.cc +++ b/gnuradio-runtime/lib/hier_block2.cc -@@ -159,7 +159,7 @@ namespace gr { +@@ -161,7 +161,7 @@ namespace gr { } void @@ -183,7 +183,7 @@ index eeb5669..b83f563 100644 { d_detail->set_processor_affinity(mask); } -@@ -170,7 +170,7 @@ namespace gr { +@@ -172,7 +172,7 @@ namespace gr { d_detail->unset_processor_affinity(); } @@ -193,10 +193,10 @@ index eeb5669..b83f563 100644 { return d_detail->processor_affinity(); diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc -index 60910d0..40779e7 100644 +index 0d0ddf5..175e787 100644 --- a/gnuradio-runtime/lib/hier_block2_detail.cc +++ b/gnuradio-runtime/lib/hier_block2_detail.cc -@@ -892,7 +892,7 @@ namespace gr { +@@ -932,7 +932,7 @@ namespace gr { } void @@ -205,7 +205,7 @@ index 60910d0..40779e7 100644 { basic_block_vector_t tmp = d_fg->calc_used_blocks(); for(basic_block_viter_t p = tmp.begin(); p != tmp.end(); p++) { -@@ -909,7 +909,7 @@ namespace gr { +@@ -949,7 +949,7 @@ namespace gr { } } @@ -215,7 +215,7 @@ index 60910d0..40779e7 100644 { 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 +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 { diff --git a/gnuradio.spec b/gnuradio.spec index 659bdf1..fbf0ccb 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,8 +19,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.7.9 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.7.9.1 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -59,7 +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.rc1-size_t.patch +Patch0: gnuradio-3.7.9.1-size_t.patch %description GNU Radio is a collection of software that when combined with minimal @@ -213,6 +213,10 @@ fi %{_datadir}/gnuradio/examples %changelog +* Wed Feb 10 2016 Jaroslav Škarvada - 3.7.9.1-1 +- New version + Resolves: rhbz#1306066 + * Wed Feb 03 2016 Fedora Release Engineering - 3.7.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index caebbbd..f4dbeb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bf1a2abd0abc492c7f67cba1080ceb8c gnuradio-3.7.9.tar.gz +653155499bcefb1478b1963f11841434 gnuradio-3.7.9.1.tar.gz From f4cce32c093c1103c8afc6e73692c2b2d6700400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 10 Feb 2016 19:40:47 +0100 Subject: [PATCH 139/313] New version Resolves: rhbz#1306066 --- gnuradio-3.7.9.1-stdc11-fix.patch | 16 ++++++++++++++++ gnuradio.spec | 3 +++ 2 files changed, 19 insertions(+) create mode 100644 gnuradio-3.7.9.1-stdc11-fix.patch diff --git a/gnuradio-3.7.9.1-stdc11-fix.patch b/gnuradio-3.7.9.1-stdc11-fix.patch new file mode 100644 index 0000000..34be130 --- /dev/null +++ b/gnuradio-3.7.9.1-stdc11-fix.patch @@ -0,0 +1,16 @@ +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.spec b/gnuradio.spec index fbf0ccb..1bebc9b 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -60,6 +60,8 @@ 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 %description GNU Radio is a collection of software that when combined with minimal @@ -98,6 +100,7 @@ GNU Radio examples %prep %setup -q -n %{name}-%{version}%{?alphatag} %patch0 -p1 -b .size_t +%patch1 -p1 -b .stdc11-fix #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; From 5a8915856807aa86757ca28377298371fbe2de6d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 23 Feb 2016 13:11:43 -0700 Subject: [PATCH 140/313] Drop %defattr() --- gnuradio.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 1bebc9b..ec36fac 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -183,7 +183,6 @@ fi %files %license COPYING -%defattr(-,root,root,-) %{python_sitearch}/* %{_bindir}/* %{_libdir}/lib*.so.* @@ -199,7 +198,6 @@ fi %doc %{_docdir}/%{name} %files devel -%defattr(-,root,root,-) %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc @@ -207,12 +205,10 @@ fi %{_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 From 1faec1538b4b57562255beb5fe29051102ec6d16 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 23 Feb 2016 13:11:55 -0700 Subject: [PATCH 141/313] Rebuild for gsl 2.1 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index ec36fac..1cd85e7 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -20,7 +20,7 @@ Name: gnuradio Version: 3.7.9.1 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -212,6 +212,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Tue Feb 23 2016 Orion Poplawski - 3.7.9.1-2 +- Rebuild for gsl 2.1 + * Wed Feb 10 2016 Jaroslav Škarvada - 3.7.9.1-1 - New version Resolves: rhbz#1306066 From 98ede8cf1513d0c05bae83b511e3843a84db4276 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 23 Feb 2016 16:17:01 -0700 Subject: [PATCH 142/313] Use cmake's FindGSL.cmake --- gnuradio.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnuradio.spec b/gnuradio.spec index 1cd85e7..baa9e61 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -101,6 +101,8 @@ GNU Radio examples %setup -q -n %{name}-%{version}%{?alphatag} %patch0 -p1 -b .size_t %patch1 -p1 -b .stdc11-fix +# Use cmake's FindGSL.cmake instead +rm cmake/Modules/FindGSL.cmake #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; From b50c7e66f6e3a1e6a84e25505d3fd873756c2027 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 23 Feb 2016 20:53:39 -0700 Subject: [PATCH 143/313] Add patch for cmake 3.5 (bug #1311358) --- gnuradio-cmake35.patch | 158 +++++++++++++++++++++++++++++++++++++++++ gnuradio.spec | 5 ++ 2 files changed, 163 insertions(+) create mode 100644 gnuradio-cmake35.patch diff --git a/gnuradio-cmake35.patch b/gnuradio-cmake35.patch new file mode 100644 index 0000000..878da6f --- /dev/null +++ b/gnuradio-cmake35.patch @@ -0,0 +1,158 @@ +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 baa9e61..3361a6e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -62,6 +62,9 @@ Obsoletes: grc < 0.80-1 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 %description GNU Radio is a collection of software that when combined with minimal @@ -101,6 +104,7 @@ GNU Radio examples %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 @@ -216,6 +220,7 @@ fi %changelog * Tue Feb 23 2016 Orion Poplawski - 3.7.9.1-2 - Rebuild for gsl 2.1 +- Add patch for cmake 3.5 (bug #1311358) * Wed Feb 10 2016 Jaroslav Škarvada - 3.7.9.1-1 - New version From ab1fd4e1d10e06ac273b245c73dc49ffd190b35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 7 Mar 2016 22:07:34 +0100 Subject: [PATCH 144/313] Rebuilt for new gsl --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 3361a6e..0680ec1 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -20,7 +20,7 @@ Name: gnuradio Version: 3.7.9.1 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -218,6 +218,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Mon Mar 7 2016 Jaroslav Škarvada - 3.7.9.1-3 +- Rebuilt for new gsl + * Tue Feb 23 2016 Orion Poplawski - 3.7.9.1-2 - Rebuild for gsl 2.1 - Add patch for cmake 3.5 (bug #1311358) From 140ba835087ae2f70e944c66a8c2d0b4862c6a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 10 May 2016 11:32:22 +0200 Subject: [PATCH 145/313] Rebuilt for new uhd --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 0680ec1..765a303 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -20,7 +20,7 @@ Name: gnuradio Version: 3.7.9.1 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -218,6 +218,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Tue May 10 2016 Jaroslav Škarvada - 3.7.9.1-4 +- Rebuilt for new uhd + * Mon Mar 7 2016 Jaroslav Škarvada - 3.7.9.1-3 - Rebuilt for new gsl From 9a4b0fed3e532ec6544227b93b67cea11973d93b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 4 Jul 2016 16:45:18 +0200 Subject: [PATCH 146/313] New version Resolves: rhbz#1352483 - Dropped stdc11-fix and cmake35 patches (both upstreamed) - Defuzzified size_t patch --- ...ze_t.patch => gnuradio-3.7.10-size_t.patch | 22 +-- gnuradio-3.7.9.1-stdc11-fix.patch | 16 -- gnuradio-cmake35.patch | 158 ------------------ gnuradio.spec | 19 +-- sources | 2 +- 5 files changed, 21 insertions(+), 196 deletions(-) rename gnuradio-3.7.9.1-size_t.patch => gnuradio-3.7.10-size_t.patch (97%) delete mode 100644 gnuradio-3.7.9.1-stdc11-fix.patch delete mode 100644 gnuradio-cmake35.patch diff --git a/gnuradio-3.7.9.1-size_t.patch b/gnuradio-3.7.10-size_t.patch similarity index 97% rename from gnuradio-3.7.9.1-size_t.patch rename to gnuradio-3.7.10-size_t.patch index 4817dc7..48f2bde 100644 --- a/gnuradio-3.7.9.1-size_t.patch +++ b/gnuradio-3.7.10-size_t.patch @@ -41,10 +41,10 @@ index 25d9fb5..2a43a8a 100644 }; diff --git a/gnuradio-runtime/include/gnuradio/block.h b/gnuradio-runtime/include/gnuradio/block.h -index c6185d9..8480ec7 100644 +index 3e85f22..d37f68d 100644 --- a/gnuradio-runtime/include/gnuradio/block.h +++ b/gnuradio-runtime/include/gnuradio/block.h -@@ -593,9 +593,9 @@ namespace gr { +@@ -595,9 +595,9 @@ namespace gr { /*! * \brief Set the thread's affinity to processor core \p n. * @@ -56,7 +56,7 @@ index c6185d9..8480ec7 100644 /*! * \brief Remove processor affinity to a specific core. -@@ -605,7 +605,7 @@ namespace gr { +@@ -607,7 +607,7 @@ namespace gr { /*! * \brief Get the current processor affinity. */ @@ -65,7 +65,7 @@ index c6185d9..8480ec7 100644 /*! * \brief Get the current thread priority in use -@@ -650,7 +650,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 @@ -75,10 +75,10 @@ index c6185d9..8480ec7 100644 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 +index 8a9f4ab..a0a8f83 100644 --- a/gnuradio-runtime/include/gnuradio/block_detail.h +++ b/gnuradio-runtime/include/gnuradio/block_detail.h -@@ -174,10 +174,10 @@ namespace gr { +@@ -181,10 +181,10 @@ namespace gr { * \brief Set core affinity of block to the cores in the vector * mask. * @@ -158,10 +158,10 @@ index 2bae8ea..9641022 100644 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 +index 9e2e29f..cc47b52 100644 --- a/gnuradio-runtime/lib/block_detail.cc +++ b/gnuradio-runtime/lib/block_detail.cc -@@ -223,7 +223,7 @@ namespace gr { +@@ -251,7 +251,7 @@ namespace gr { } void @@ -231,7 +231,7 @@ index a5584fe..0cdb149 100644 // 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 +index f2606c7..563715a 100644 --- a/gnuradio-runtime/lib/thread/thread.cc +++ b/gnuradio-runtime/lib/thread/thread.cc @@ -40,33 +40,33 @@ namespace gr { @@ -276,7 +276,7 @@ index 483dfed..e05a8ba 100644 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 @@ -306,7 +306,7 @@ index 483dfed..e05a8ba 100644 { // Not implemented on OSX } -@@ -254,32 +254,32 @@ namespace gr { +@@ -262,32 +262,32 @@ namespace gr { } void 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 From cddb6fdb7870f1ac2306961d084bbd7c54bb7bd5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 07:16:34 +0000 Subject: [PATCH 147/313] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 01028f3..a9b6a5c 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -20,7 +20,7 @@ Name: gnuradio Version: 3.7.10 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -211,6 +211,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 3.7.10-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Mon Jul 4 2016 Jaroslav Škarvada - 3.7.10-1 - New version Resolves: rhbz#1352483 From 45b49ff1f7d276fb62add69556940cf74289f1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 31 Aug 2016 13:59:34 +0200 Subject: [PATCH 148/313] New version Resolves: rhbz#1370728 --- gnuradio.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index a9b6a5c..0c4fb04 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,8 +19,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.7.10 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.7.10.1 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -211,6 +211,10 @@ fi %{_datadir}/gnuradio/examples %changelog +* Wed Aug 31 2016 Jaroslav Škarvada - 3.7.10.1-1 +- New version + Resolves: rhbz#1370728 + * Tue Jul 19 2016 Fedora Release Engineering - 3.7.10-2 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/sources b/sources index 6c98dea..161ca92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fc40fadcc3c9ac339c9618c6dc8c303b gnuradio-3.7.10.tar.gz +c7bd3743b1c8f1c1d97c3d8085efbf74 gnuradio-3.7.10.1.tar.gz From 94bf5749161603729cc18b1ab6881390e1c2a3bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 15 Sep 2016 16:30:07 +0200 Subject: [PATCH 149/313] Added updated sources fixing http://gnuradio.org/redmine/issues/932 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 161ca92..429f553 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7bd3743b1c8f1c1d97c3d8085efbf74 gnuradio-3.7.10.1.tar.gz +885d637669c2dfc2b005c24e16327c96 gnuradio-3.7.10.1.tar.gz From b0c37b6eec472f04d12b3ae0d2355ecbc7098fd0 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 17 Sep 2016 13:47:02 +0100 Subject: [PATCH 150/313] NEON is compulary part of aarch64 so enable unconditionally on that arch --- gnuradio.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 0c4fb04..a1408d3 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -1,9 +1,9 @@ -# NEON support is by default disabled on ARMs +# NEON support is by default disabled on ARMv7 (it's a compulsory part of aarch64) %bcond_with neon %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%ifarch %{arm} aarch64 +%ifarch %{arm} %if %{with neon} %global my_optflags %(echo -n "%{optflags}" | sed 's/-mfpu=[^ \\t]\\+//g'; echo " -mfpu=neon") %{expand: %global optflags %{my_optflags}} @@ -20,7 +20,7 @@ Name: gnuradio Version: 3.7.10.1 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -211,6 +211,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Fri Sep 16 2016 Peter Robinson 3.7.10.1-2 +- NEON is compulary part of aarch64 so enable unconditionally on that arch + * Wed Aug 31 2016 Jaroslav Škarvada - 3.7.10.1-1 - New version Resolves: rhbz#1370728 From e02a6c290d8c42b49043baaa3f2f84b48c7118d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 22 Sep 2016 14:37:36 +0200 Subject: [PATCH 151/313] Uncoditionally enabled NEON support on aarch64 --- gnuradio.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index a1408d3..d642612 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -1,5 +1,9 @@ -# NEON support is by default disabled on ARMv7 (it's a compulsory part of aarch64) +# 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))")} @@ -20,7 +24,7 @@ Name: gnuradio Version: 3.7.10.1 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -211,6 +215,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Thu Sep 22 2016 Jaroslav Škarvada - 3.7.10.1-3 +- Uncoditionally enabled NEON support on aarch64 + * Fri Sep 16 2016 Peter Robinson 3.7.10.1-2 - NEON is compulary part of aarch64 so enable unconditionally on that arch From 32b3433ad1e566a958db690c2e1f23dda5a785b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 22 Nov 2016 15:54:00 +0100 Subject: [PATCH 152/313] Rebuilt for new uhd --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index d642612..30c7487 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.10.1 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -215,6 +215,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Tue Nov 22 2016 Jaroslav Škarvada - 3.7.10.1-4 +- Rebuilt for new uhd + * Thu Sep 22 2016 Jaroslav Škarvada - 3.7.10.1-3 - Uncoditionally enabled NEON support on aarch64 From 0352f41b9fbd7a0c0c9d048bfa86d928d3893de7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 7 Feb 2017 18:20:21 +0100 Subject: [PATCH 153/313] Rebuilt for Boost 1.63 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 30c7487..c8b55d5 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.10.1 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -215,6 +215,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Tue Feb 07 2017 Kalev Lember - 3.7.10.1-5 +- Rebuilt for Boost 1.63 + * Tue Nov 22 2016 Jaroslav Škarvada - 3.7.10.1-4 - Rebuilt for new uhd From 302f4c4cbc00249309f6c6babf5ebb1d70157ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 24 May 2017 10:51:41 +0200 Subject: [PATCH 154/313] New version --- ...o-3.7.10-size_t.patch => gnuradio-3.7.11-size_t.patch | 8 ++++---- gnuradio.spec | 9 ++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) rename gnuradio-3.7.10-size_t.patch => gnuradio-3.7.11-size_t.patch (99%) diff --git a/gnuradio-3.7.10-size_t.patch b/gnuradio-3.7.11-size_t.patch similarity index 99% rename from gnuradio-3.7.10-size_t.patch rename to gnuradio-3.7.11-size_t.patch index 48f2bde..bd40fe0 100644 --- a/gnuradio-3.7.10-size_t.patch +++ b/gnuradio-3.7.11-size_t.patch @@ -41,7 +41,7 @@ index 25d9fb5..2a43a8a 100644 }; diff --git a/gnuradio-runtime/include/gnuradio/block.h b/gnuradio-runtime/include/gnuradio/block.h -index 3e85f22..d37f68d 100644 +index 10742e0..ab93280 100644 --- a/gnuradio-runtime/include/gnuradio/block.h +++ b/gnuradio-runtime/include/gnuradio/block.h @@ -595,9 +595,9 @@ namespace gr { @@ -193,10 +193,10 @@ index 597ae03..031ec30 100644 { 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 +index 49eb34a..65d23d4 100644 --- a/gnuradio-runtime/lib/hier_block2_detail.cc +++ b/gnuradio-runtime/lib/hier_block2_detail.cc -@@ -932,7 +932,7 @@ namespace gr { +@@ -928,7 +928,7 @@ namespace gr { } void @@ -205,7 +205,7 @@ index 0d0ddf5..175e787 100644 { 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 { +@@ -945,7 +945,7 @@ namespace gr { } } diff --git a/gnuradio.spec b/gnuradio.spec index c8b55d5..87d4290 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -23,8 +23,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.7.10.1 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.7.11 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -63,7 +63,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.10-size_t.patch +Patch0: gnuradio-3.7.11-size_t.patch %description GNU Radio is a collection of software that when combined with minimal @@ -215,6 +215,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Wed May 24 2017 Jaroslav Škarvada - 3.7.11-1 +- New version + * Tue Feb 07 2017 Kalev Lember - 3.7.10.1-5 - Rebuilt for Boost 1.63 diff --git a/sources b/sources index 429f553..d6e291c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -885d637669c2dfc2b005c24e16327c96 gnuradio-3.7.10.1.tar.gz +SHA512 (gnuradio-3.7.11.tar.gz) = a3b44e04e63056ad5238ddbda7967ebaf5802d2ed7e24649190bde67a533b50780ec1260dc7710c5388c966b71e153d3d21468bbfee4529c62ac5b89b589dd14 From b2f5f351c1181867ea28146e2cfd91d9d6d57cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 24 May 2017 17:47:43 +0200 Subject: [PATCH 155/313] Added fix for compilation with gcc-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio-3.7.11-gcc-7-compile-fix.patch | 71 +++++++++++++++++++++++++ gnuradio.spec | 3 ++ 2 files changed, 74 insertions(+) create mode 100644 gnuradio-3.7.11-gcc-7-compile-fix.patch diff --git a/gnuradio-3.7.11-gcc-7-compile-fix.patch b/gnuradio-3.7.11-gcc-7-compile-fix.patch new file mode 100644 index 0000000..13c1835 --- /dev/null +++ b/gnuradio-3.7.11-gcc-7-compile-fix.patch @@ -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 + #include ++#include + + 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 + #include ++#include + + 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 + #include ++#include + + 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: diff --git a/gnuradio.spec b/gnuradio.spec index 87d4290..acb3c3d 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -64,6 +64,7 @@ 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.11-size_t.patch +Patch1: gnuradio-3.7.11-gcc-7-compile-fix.patch %description GNU Radio is a collection of software that when combined with minimal @@ -102,6 +103,8 @@ GNU Radio examples %prep %setup -q -n %{name}-%{version}%{?alphatag} %patch0 -p1 -b .size_t +%patch1 -p1 -b .gcc-7-compile-fix + # Use cmake's FindGSL.cmake instead rm cmake/Modules/FindGSL.cmake From 9c9855aaca9a77a05c37b5216d2232cad1b87859 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 21 Jul 2017 09:49:29 +0200 Subject: [PATCH 156/313] Rebuilt for Boost 1.64 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index acb3c3d..2fd1344 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.11 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -218,6 +218,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Fri Jul 21 2017 Kalev Lember - 3.7.11-2 +- Rebuilt for Boost 1.64 + * Wed May 24 2017 Jaroslav Škarvada - 3.7.11-1 - New version From 686882e03e53414d2d521ca1606defc58589b9bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 26 Jul 2017 11:07:48 +0200 Subject: [PATCH 157/313] Rebuilt for new gsl --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 2fd1344..f615930 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.11 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -218,6 +218,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Wed Jul 26 2017 Jaroslav Škarvada - 3.7.11-3 +- Rebuilt for new gsl + * Fri Jul 21 2017 Kalev Lember - 3.7.11-2 - Rebuilt for Boost 1.64 From 3e5b212f2453df8cb8927dde3b83f4fd67fafa6b Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sun, 30 Jul 2017 19:45:31 +0200 Subject: [PATCH 158/313] Rebuild with fixed binutils for ppc64le (#1475636) --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index f615930..8895de4 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.11 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -218,6 +218,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Sun Jul 30 2017 Florian Weimer - 3.7.11-4 +- Rebuild with binutils fix for ppc64le (#1475636) + * Wed Jul 26 2017 Jaroslav Škarvada - 3.7.11-3 - Rebuilt for new gsl From 79ed0ec42cf760126bec01d4d640aef4256e06a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 22:11:41 +0000 Subject: [PATCH 159/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 8895de4..d398ed7 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.11 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -218,6 +218,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 3.7.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Sun Jul 30 2017 Florian Weimer - 3.7.11-4 - Rebuild with binutils fix for ppc64le (#1475636) From 3d5778017b14337a31ed94f510d4104d72221547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 7 Aug 2017 10:45:43 +0200 Subject: [PATCH 160/313] Rebuilt for AutoReq cmake-filesystem --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index d398ed7..d7b9d8f 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.11 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Release: 6%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -218,6 +218,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Mon Aug 07 2017 Björn Esser - 3.7.11-6 +- Rebuilt for AutoReq cmake-filesystem + * Wed Aug 02 2017 Fedora Release Engineering - 3.7.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From b160325ba4cf7ea58b9808297bae31a078130cc8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 6 Jan 2018 10:06:57 +0100 Subject: [PATCH 161/313] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- gnuradio.spec | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index d7b9d8f..e399fe4 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.11 -Release: 6%{?alphatag:.%{alphatag}}%{?dist} +Release: 7%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -165,27 +165,9 @@ done rm -f %{buildroot}%{_datadir}/%{name}/grc/freedesktop/* rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop -%clean -rm -rf %{buildroot} +%post -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 || : +%postun -p /sbin/ldconfig %files %license COPYING @@ -218,6 +200,9 @@ fi %{_datadir}/gnuradio/examples %changelog +* Sat Jan 06 2018 Igor Gnatenko - 3.7.11-7 +- Remove obsolete scriptlets + * Mon Aug 07 2017 Björn Esser - 3.7.11-6 - Rebuilt for AutoReq cmake-filesystem From c9c7ba7b575fd071198747a45aebd2912bc62e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 2 Feb 2018 16:55:38 +0100 Subject: [PATCH 162/313] Rebuilt for new boost --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index e399fe4..f52e3df 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.11 -Release: 7%{?alphatag:.%{alphatag}}%{?dist} +Release: 8%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -200,6 +200,9 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Fri Feb 2 2018 Jaroslav Škarvada - 3.7.11-8 +- Rebuilt for new boost + * Sat Jan 06 2018 Igor Gnatenko - 3.7.11-7 - Remove obsolete scriptlets From 06008f559fbe44e4584d8f3c94f5e0272ce6b340 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 13:43:54 +0000 Subject: [PATCH 163/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index f52e3df..eaeb7b6 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.11 -Release: 8%{?alphatag:.%{alphatag}}%{?dist} +Release: 9%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -200,6 +200,9 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 3.7.11-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Feb 2 2018 Jaroslav Škarvada - 3.7.11-8 - Rebuilt for new boost From f1b5d1c7d8cf825e94a359e1dcd42a6b45a352bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 22 Feb 2018 18:15:29 +0100 Subject: [PATCH 164/313] Rebuilt for new python-cheetah --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index eaeb7b6..b978baa 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.11 -Release: 9%{?alphatag:.%{alphatag}}%{?dist} +Release: 10%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -200,6 +200,9 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Thu Feb 22 2018 Jaroslav Škarvada - 3.7.11-10 +- Rebuilt for new python-cheetah + * Wed Feb 07 2018 Fedora Release Engineering - 3.7.11-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From e5a2bad9bbf29836f3f1287fa43eeedaffbc25ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 15 Jun 2018 12:19:57 +0200 Subject: [PATCH 165/313] New version Resolves: rhbz#1591524 Dropped gcc-7-compile fix patch (not needed) De-fuzzified size_t patch --- gnuradio-3.7.11-gcc-7-compile-fix.patch | 71 ------------------- ..._t.patch => gnuradio-3.7.13.3-size_t.patch | 36 +++++----- gnuradio.spec | 16 +++-- 3 files changed, 28 insertions(+), 95 deletions(-) delete mode 100644 gnuradio-3.7.11-gcc-7-compile-fix.patch rename gnuradio-3.7.11-size_t.patch => gnuradio-3.7.13.3-size_t.patch (95%) diff --git a/gnuradio-3.7.11-gcc-7-compile-fix.patch b/gnuradio-3.7.11-gcc-7-compile-fix.patch deleted file mode 100644 index 13c1835..0000000 --- a/gnuradio-3.7.11-gcc-7-compile-fix.patch +++ /dev/null @@ -1,71 +0,0 @@ -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 - #include -+#include - - 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 - #include -+#include - - 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 - #include -+#include - - 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: diff --git a/gnuradio-3.7.11-size_t.patch b/gnuradio-3.7.13.3-size_t.patch similarity index 95% rename from gnuradio-3.7.11-size_t.patch rename to gnuradio-3.7.13.3-size_t.patch index bd40fe0..c187aa3 100644 --- a/gnuradio-3.7.11-size_t.patch +++ b/gnuradio-3.7.13.3-size_t.patch @@ -1,8 +1,8 @@ diff --git a/docs/doxygen/other/thread_affinity.dox b/docs/doxygen/other/thread_affinity.dox -index edac813..03d2129 100644 +index 405477b..dc6ed3e 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: +@@ -59,7 +59,7 @@ Each block has two new data members: A block can set and unset its affinity at any time using the following member functions: @@ -11,7 +11,7 @@ index edac813..03d2129 100644 - 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. +@@ -85,7 +85,7 @@ to that affinity setting. The gr::hier_block2 class supports the same API interface to the block thread affinity: @@ -41,10 +41,10 @@ index 25d9fb5..2a43a8a 100644 }; diff --git a/gnuradio-runtime/include/gnuradio/block.h b/gnuradio-runtime/include/gnuradio/block.h -index 10742e0..ab93280 100644 +index c3de303..bfb7327 100644 --- a/gnuradio-runtime/include/gnuradio/block.h +++ b/gnuradio-runtime/include/gnuradio/block.h -@@ -595,9 +595,9 @@ namespace gr { +@@ -621,9 +621,9 @@ namespace gr { /*! * \brief Set the thread's affinity to processor core \p n. * @@ -56,7 +56,7 @@ index 10742e0..ab93280 100644 /*! * \brief Remove processor affinity to a specific core. -@@ -607,7 +607,7 @@ namespace gr { +@@ -633,7 +633,7 @@ namespace gr { /*! * \brief Get the current processor affinity. */ @@ -65,7 +65,7 @@ index 10742e0..ab93280 100644 /*! * \brief Get the current thread priority in use -@@ -652,7 +652,7 @@ namespace gr { +@@ -678,7 +678,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 @@ -114,10 +114,10 @@ index 08a5389..d4f9696 100644 /*! * \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 +index 3fda5d8..816abd0 100644 --- a/gnuradio-runtime/include/gnuradio/thread/thread.h +++ b/gnuradio-runtime/include/gnuradio/thread/thread.h -@@ -77,7 +77,7 @@ namespace gr { +@@ -81,7 +81,7 @@ namespace gr { * do support in this way since 10.5 is not what we want or can * use in this fashion). */ @@ -126,7 +126,7 @@ index a58d172..6c6c1bf 100644 /*! \brief Convineince function to bind the current thread to a single core. * -@@ -89,7 +89,7 @@ namespace gr { +@@ -93,7 +93,7 @@ namespace gr { * do support in this way since 10.5 is not what we want or can * use in this fashion). */ @@ -135,7 +135,7 @@ index a58d172..6c6c1bf 100644 /*! \brief Bind a thread to a set of cores. * -@@ -104,7 +104,7 @@ namespace gr { +@@ -108,7 +108,7 @@ namespace gr { * use in this fashion). */ GR_RUNTIME_API void thread_bind_to_processor(gr_thread_t thread, @@ -145,10 +145,10 @@ index a58d172..6c6c1bf 100644 /*! \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 +index 86c4aa7..36c3c99 100644 --- a/gnuradio-runtime/lib/block.cc +++ b/gnuradio-runtime/lib/block.cc -@@ -325,7 +325,7 @@ namespace gr { +@@ -327,7 +327,7 @@ namespace gr { } void @@ -158,7 +158,7 @@ index 2bae8ea..9641022 100644 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 +index 3da150e..972a823 100644 --- a/gnuradio-runtime/lib/block_detail.cc +++ b/gnuradio-runtime/lib/block_detail.cc @@ -251,7 +251,7 @@ namespace gr { @@ -193,10 +193,10 @@ index 597ae03..031ec30 100644 { return d_detail->processor_affinity(); diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc -index 49eb34a..65d23d4 100644 +index 82a40fe..0ab1bf9 100644 --- a/gnuradio-runtime/lib/hier_block2_detail.cc +++ b/gnuradio-runtime/lib/hier_block2_detail.cc -@@ -928,7 +928,7 @@ namespace gr { +@@ -931,7 +931,7 @@ namespace gr { } void @@ -205,7 +205,7 @@ index 49eb34a..65d23d4 100644 { basic_block_vector_t tmp = d_fg->calc_used_blocks(); for(basic_block_viter_t p = tmp.begin(); p != tmp.end(); p++) { -@@ -945,7 +945,7 @@ namespace gr { +@@ -948,7 +948,7 @@ namespace gr { } } @@ -231,7 +231,7 @@ index a5584fe..0cdb149 100644 // 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 +index 4db91d4..6a5854c 100644 --- a/gnuradio-runtime/lib/thread/thread.cc +++ b/gnuradio-runtime/lib/thread/thread.cc @@ -40,33 +40,33 @@ namespace gr { diff --git a/gnuradio.spec b/gnuradio.spec index b978baa..63edec3 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -23,8 +23,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.7.11 -Release: 10%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.7.13.3 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -32,7 +32,7 @@ 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}%{?alphatag}.tar.xz #Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}.tar.gz # git clone git://gnuradio.org/gnuradio # cd gnuradio @@ -63,8 +63,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.11-size_t.patch -Patch1: gnuradio-3.7.11-gcc-7-compile-fix.patch +Patch0: gnuradio-3.7.13.3-size_t.patch %description GNU Radio is a collection of software that when combined with minimal @@ -103,7 +102,6 @@ GNU Radio examples %prep %setup -q -n %{name}-%{version}%{?alphatag} %patch0 -p1 -b .size_t -%patch1 -p1 -b .gcc-7-compile-fix # Use cmake's FindGSL.cmake instead rm cmake/Modules/FindGSL.cmake @@ -200,6 +198,12 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Fri Jun 15 2018 Jaroslav Škarvada - 3.7.13.3-1 +- New version + Resolves: rhbz#1591524 +- Dropped gcc-7-compile fix patch (not needed) +- De-fuzzified size_t patch + * Thu Feb 22 2018 Jaroslav Škarvada - 3.7.11-10 - Rebuilt for new python-cheetah From 14bbd27208c7a1ec252dc01f7e772bebe1e50aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 15 Jun 2018 12:22:42 +0200 Subject: [PATCH 166/313] Added sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e8ee128..8cc588e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ gnuradio-*.tar.gz +/gnuradio-3.7.13.3.tar.xz diff --git a/sources b/sources index d6e291c..7020faa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.7.11.tar.gz) = a3b44e04e63056ad5238ddbda7967ebaf5802d2ed7e24649190bde67a533b50780ec1260dc7710c5388c966b71e153d3d21468bbfee4529c62ac5b89b589dd14 +SHA512 (gnuradio-3.7.13.3.tar.xz) = 21b7ac468cd8ba27d269794c9ee8392a441cf91d047f511b94f47313f045d91cc5147a432e9f8e4608b7cd9fec142b4ad43b4a4b94f9c6871c09c81186d29452 From 784618105ec18b716869df0bd6a7d864b9f629ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 15 Jun 2018 12:33:43 +0200 Subject: [PATCH 167/313] Added missing python requirements (mako and six) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 63edec3..63fe82a 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -49,7 +49,7 @@ 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: sphinx, desktop-file-utils +BuildRequires: sphinx, desktop-file-utils, python2-mako, python2-six BuildRequires: uhd-devel %if ! 0%{?rhel:1} BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel From 00bf6d0d8781b53c56cb2f6ae2a600dc050311a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 15 Jun 2018 13:46:51 +0200 Subject: [PATCH 168/313] Added python2 requirement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 63fe82a..4c6b30f 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -50,7 +50,7 @@ BuildRequires: portaudio-devel, libtool, gsm-devel BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, python-cheetah BuildRequires: xdg-utils, python-lxml, pygtk2-devel, orc-devel BuildRequires: sphinx, desktop-file-utils, python2-mako, python2-six -BuildRequires: uhd-devel +BuildRequires: uhd-devel, python2 %if ! 0%{?rhel:1} BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel %endif From 1e2f03b5afff768edf9132e9604393122f35f3b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 18 Jun 2018 12:23:23 +0200 Subject: [PATCH 169/313] Added some missing cmake modules --- gnuradio.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 4c6b30f..8523832 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.3 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -146,7 +146,8 @@ popd 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'` +pushd %{buildroot}%{_libdir}/cmake/gnuradio && rm -f `ls | \ +sed '/^FindUHD\.cmake\|^FindUSB\.cmake\|^CMakeParseArgumentsCopy.cmake\|^Gr.*\|^Gnuradio.*/ d'` popd # install desktop file, icons, and MIME configuration to right locations @@ -198,6 +199,9 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Mon Jun 18 2018 Jaroslav Škarvada - 3.7.13.3-2 +- Added some missing cmake modules + * Fri Jun 15 2018 Jaroslav Škarvada - 3.7.13.3-1 - New version Resolves: rhbz#1591524 From acdf8bc29d9011341119dddfb5d54f34cf7635f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 27 Jun 2018 19:01:31 +0200 Subject: [PATCH 170/313] Added all upstream cmake modules --- gnuradio.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 8523832..b638abb 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.3 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -145,11 +145,6 @@ popd # 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\|^FindUSB\.cmake\|^CMakeParseArgumentsCopy.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 \ @@ -199,6 +194,9 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Wed Jun 27 2018 Jaroslav Škarvada - 3.7.13.3-3 +- Added all upstream cmake modules + * Mon Jun 18 2018 Jaroslav Škarvada - 3.7.13.3-2 - Added some missing cmake modules From f3aa3059012cac8d4ecb81406a997133b2cf39a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 4 Jul 2018 15:53:30 +0200 Subject: [PATCH 171/313] Fixed python requirements --- gnuradio.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index b638abb..a629c3a 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.3 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -41,23 +41,23 @@ Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}%{?alphatag}.t Requires(pre): shadow-utils BuildRequires: cmake, fftw-devel, cppunit-devel, wxPython-devel, xmlto -BuildRequires: graphviz, boost-devel, python-devel, swig, doxygen +BuildRequires: graphviz, boost-devel, python2-devel, swig, doxygen BuildRequires: libusbx-devel, alsa-lib-devel, SDL-devel, guile-devel BuildRequires: portaudio-devel, libtool, gsm-devel # Gnuradio deprecated gr-comedi # http://gnuradio.org/redmine/issues/show/395 # BuildRequires: comedilib-devel -BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, python-cheetah -BuildRequires: xdg-utils, python-lxml, pygtk2-devel, orc-devel +BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, python2-cheetah +BuildRequires: xdg-utils, python2-lxml, pygtk2-devel, orc-devel BuildRequires: sphinx, desktop-file-utils, python2-mako, python2-six BuildRequires: uhd-devel, python2 %if ! 0%{?rhel:1} BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel %endif -Requires: numpy, wxPython, scipy, portaudio, python-lxml -Requires: pygtk2, python-cheetah, PyQt4 +Requires: numpy, python2-wxpython, scipy, portaudio, python2-lxml +Requires: pygtk2, python2-cheetah, PyQt4 %if ! 0%{?rhel:1} -Requires: PyQwt, PyOpenGL +Requires: PyQwt, python2-pyopengl %endif Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 @@ -194,6 +194,9 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Wed Jul 4 2018 Jaroslav Škarvada - 3.7.13.3-4 +- Fixed python requirements + * Wed Jun 27 2018 Jaroslav Škarvada - 3.7.13.3-3 - Added all upstream cmake modules From 13a0485d3d2030c45251f6f1093b3fbe90172328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 5 Jul 2018 00:23:02 +0200 Subject: [PATCH 172/313] Rebuild to fix provides --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index a629c3a..6104281 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.3 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -194,6 +194,9 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Wed Jul 4 2018 Jaroslav Škarvada - 3.7.13.3-5 +- Rebuild to fix provides + * Wed Jul 4 2018 Jaroslav Škarvada - 3.7.13.3-4 - Fixed python requirements From 451409ac568135afca590deaf02196c73b67200f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 03:08:35 +0000 Subject: [PATCH 173/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 6104281..da6dbc1 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.3 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Release: 6%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -194,6 +194,9 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 3.7.13.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Jul 4 2018 Jaroslav Škarvada - 3.7.13.3-5 - Rebuild to fix provides From ae6f069488d76be5ca90bfadd60aebfdd2b7789f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 16 Jul 2018 23:21:18 +0200 Subject: [PATCH 174/313] Fixed python2 macros --- gnuradio.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index da6dbc1..78b6a18 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -5,7 +5,7 @@ %bcond_with neon %endif -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %ifarch %{arm} %if %{with neon} @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.3 -Release: 6%{?alphatag:.%{alphatag}}%{?dist} +Release: 7%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -165,7 +165,7 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop %files %license COPYING -%{python_sitearch}/* +%{python2_sitearch}/* %{_bindir}/* %{_libdir}/lib*.so.* %{_libexecdir}/* @@ -194,6 +194,9 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Mon Jul 16 2018 Jaroslav Škarvada - 3.7.13.3-7 +- Fixed python2 macros + * Fri Jul 13 2018 Fedora Release Engineering - 3.7.13.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From e51d0b106aa9e1956ec3872d693054ab6d08d4d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 17 Jul 2018 16:58:50 +0200 Subject: [PATCH 175/313] New version Resolves: rhbz#1601288 Resolves: rhbz#1601263 --- .gitignore | 1 + gnuradio.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8cc588e..8f799b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ gnuradio-*.tar.gz /gnuradio-3.7.13.3.tar.xz +/gnuradio-3.7.13.4.tar.xz diff --git a/gnuradio.spec b/gnuradio.spec index 78b6a18..7a5236d 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -23,8 +23,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.7.13.3 -Release: 7%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.7.13.4 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -194,6 +194,11 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Tue Jul 17 2018 Jaroslav Škarvada - 3.7.13.4-1 +- New version + Resolves: rhbz#1601288 + Resolves: rhbz#1601263 + * Mon Jul 16 2018 Jaroslav Škarvada - 3.7.13.3-7 - Fixed python2 macros diff --git a/sources b/sources index 7020faa..a5a4fa0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.7.13.3.tar.xz) = 21b7ac468cd8ba27d269794c9ee8392a441cf91d047f511b94f47313f045d91cc5147a432e9f8e4608b7cd9fec142b4ad43b4a4b94f9c6871c09c81186d29452 +SHA512 (gnuradio-3.7.13.4.tar.xz) = 748a1617f2c85722d4fc0c08d240504214c1e1d2e7bd18c7845e04151d1acb0b38dbc2afddc351031b806085700acc2352d28bfb130553f894d9b0e43d5e7d40 From 9b39ffa0a3a4e74a761a37966317a4a4bdf1a0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sun, 22 Jul 2018 02:39:15 +0200 Subject: [PATCH 176/313] Rebuilt for new uhd --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 7a5236d..687fbb0 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.4 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -194,6 +194,9 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Sun Jul 22 2018 Jaroslav Škarvada - 3.7.13.4-2 +- Rebuilt for new uhd + * Tue Jul 17 2018 Jaroslav Škarvada - 3.7.13.4-1 - New version Resolves: rhbz#1601288 From f7e3a076200925e186b288aad56d9a79a5078982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 10 Aug 2018 22:28:47 +0200 Subject: [PATCH 177/313] Dropped patented content Resolves: rhbz#1608973 Enabled ZeroMQ, and sphinx Resolves: rhbz#1610513 --- clean_patent_problems.sh | 43 ++++++++++++++++++++++++++++++++++++++++ gnuradio.spec | 32 +++++++++++++++--------------- 2 files changed, 59 insertions(+), 16 deletions(-) create mode 100755 clean_patent_problems.sh diff --git a/clean_patent_problems.sh b/clean_patent_problems.sh new file mode 100755 index 0000000..ca7e2d4 --- /dev/null +++ b/clean_patent_problems.sh @@ -0,0 +1,43 @@ +#!/usr/bin/bash + +# +# No patents, no problems +# + +# Indicate the problems +PROBLEMS=( + 'gr-dtv/' + 'gr-atsc/' +) + +# Indicate the source +URL=$(spectool -S -l ./gnuradio.spec | sed -E 's/Source0:\s+//g') + +# Meta variables +SOURCE=$(basename $URL) +COMPRESSION=${SOURCE##*.} +TAR=${SOURCE%.*} + +# check if $SOURCE exists +if [ ! -f $SOURCE ]; then + # It does not, so we download it + echo "DOWNLOADING \"$SOURCE\" FROM \"$URL\"" + curl -L -O "$URL" +fi + +echo "UNCOMPRESS \"$SOURCE\" TO \"$TAR\"" +if [ "gz" = "$COMPRESSION" ]; then + COMPRESSION="gzip" +fi +$COMPRESSION -d $SOURCE + +# Getting the base DIR inside the tar +TAR_BASE=$(tar tf $TAR | head -n1 | sed 's/\/$//') +for PROBLEM in ${PROBLEMS[@]}; +do + echo "REMOVING \"$PROBLEM\" FROM \"$TAR\"" + tar -vf $TAR --delete "${TAR_BASE}/${PROBLEM}" +done + +echo "RECOMPRESS \"$TAR\" TO \"$SOURCE\"" +$COMPRESSION $TAR diff --git a/gnuradio.spec b/gnuradio.spec index 687fbb0..f770589 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -7,7 +7,7 @@ %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%ifarch %{arm} +%ifarch %{arm} aarch64 %if %{with neon} %global my_optflags %(echo -n "%{optflags}" | sed 's/-mfpu=[^ \\t]\\+//g'; echo " -mfpu=neon") %{expand: %global optflags %{my_optflags}} @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.4 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -48,14 +48,17 @@ BuildRequires: portaudio-devel, libtool, gsm-devel # http://gnuradio.org/redmine/issues/show/395 # BuildRequires: comedilib-devel BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, python2-cheetah -BuildRequires: xdg-utils, python2-lxml, pygtk2-devel, orc-devel -BuildRequires: sphinx, desktop-file-utils, python2-mako, python2-six -BuildRequires: uhd-devel, python2 +BuildRequires: xdg-utils, python2-lxml, pygtk2-devel +BuildRequires: desktop-file-utils, python2-mako, python2-six +BuildRequires: uhd-devel, python2, cppzmq-devel, zeromq-devel, thrift +BuildRequires: python2-sphinx +#BuildRequires: python3-thrift %if ! 0%{?rhel:1} BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel %endif Requires: numpy, python2-wxpython, scipy, portaudio, python2-lxml -Requires: pygtk2, python2-cheetah, PyQt4 +Requires: pygtk2, python2-cheetah, PyQt4, zeromq +#Requires: python3-thrift %if ! 0%{?rhel:1} Requires: PyQwt, python2-pyopengl %endif @@ -112,16 +115,7 @@ find . -name "*_moc.cc" -exec rm {} \; %build mkdir build cd build -%cmake -DENABLE_GR_CORE=FORCE \ --DENABLE_PYTHON=FORCE -DENABLE_DOXYGEN=FORCE \ --DENABLE_VOLK=FORCE -DENABLE_GRUEL=FORCE \ --DENABLE_GR_AUDIO=FORCE -DENABLE_GR_ATSC=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 \ +%cmake \ -DSYSCONFDIR=%{_sysconfdir} \ -DGR_PKG_DOC_DIR=%{_docdir}/%{name} \ %{?mfpu_neon} \ @@ -194,6 +188,12 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Fri Aug 10 2018 Jaroslav Škarvada - 3.7.13.4-3 +- Dropped patented content + Resolves: rhbz#1608973 +- Enabled ZeroMQ, and sphinx + Resolves: rhbz#1610513 + * Sun Jul 22 2018 Jaroslav Škarvada - 3.7.13.4-2 - Rebuilt for new uhd From 5785a011f34baaa65f4c94f1431f66f29105f243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 10 Aug 2018 22:31:15 +0200 Subject: [PATCH 178/313] Updated sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index a5a4fa0..ea09c64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.7.13.4.tar.xz) = 748a1617f2c85722d4fc0c08d240504214c1e1d2e7bd18c7845e04151d1acb0b38dbc2afddc351031b806085700acc2352d28bfb130553f894d9b0e43d5e7d40 +SHA512 (gnuradio-3.7.13.4.tar.xz) = 4e257c17f94b23ee146a9add566368c4df10692557a9f238045964d190602cab6c00d685bf786ab2b49c7552346aa19a8ce083ff1c9769dbc6d5cb664e0f2704 From cd0a4a818c5fc5fbd61882b3400885434674d8e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 10 Aug 2018 23:03:50 +0200 Subject: [PATCH 179/313] Fixed cleanup script to patch CMakeLists.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- clean_patent_problems.sh | 9 +++++++-- sources | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/clean_patent_problems.sh b/clean_patent_problems.sh index ca7e2d4..bfe703b 100755 --- a/clean_patent_problems.sh +++ b/clean_patent_problems.sh @@ -6,8 +6,8 @@ # Indicate the problems PROBLEMS=( - 'gr-dtv/' - 'gr-atsc/' + 'gr-dtv' + 'gr-atsc' ) # Indicate the source @@ -37,7 +37,12 @@ for PROBLEM in ${PROBLEMS[@]}; do echo "REMOVING \"$PROBLEM\" FROM \"$TAR\"" tar -vf $TAR --delete "${TAR_BASE}/${PROBLEM}" + tar -vf $TAR --strip=1 -x "${TAR_BASE}/CMakeLists.txt" + tar -vf $TAR --delete "${TAR_BASE}/CMakeLists.txt" + sed -i "/^add_subdirectory(${PROBLEM})$/ d" CMakeLists.txt + tar -vf $TAR --append CMakeLists.txt --transform="s|CMakeLists.txt|${TAR_BASE}/CMakeLists.txt|" done +rm -f CMakeLists.txt echo "RECOMPRESS \"$TAR\" TO \"$SOURCE\"" $COMPRESSION $TAR diff --git a/sources b/sources index ea09c64..627c498 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.7.13.4.tar.xz) = 4e257c17f94b23ee146a9add566368c4df10692557a9f238045964d190602cab6c00d685bf786ab2b49c7552346aa19a8ce083ff1c9769dbc6d5cb664e0f2704 +SHA512 (gnuradio-3.7.13.4.tar.xz) = 5df9fe5f64fd172c5eb801999ce7d43a93ccf6d5a70ba891e50a53c5c80daa56c36db621db7e8ff13b1a526ae367d390ce22fae63b7af54e0b2435dfd7503398 From 80b19b1a9b05dec732f71796e89bcbc7432f287c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 10 Aug 2018 23:32:49 +0200 Subject: [PATCH 180/313] No neon support on aarch64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index f770589..e9daad8 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -7,7 +7,7 @@ %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%ifarch %{arm} aarch64 +%ifarch %{arm} %if %{with neon} %global my_optflags %(echo -n "%{optflags}" | sed 's/-mfpu=[^ \\t]\\+//g'; echo " -mfpu=neon") %{expand: %global optflags %{my_optflags}} From e7837449c0d438a49debc6143cd5cad8a1d80524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 11 Aug 2018 01:32:05 +0200 Subject: [PATCH 181/313] Added codec2 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index e9daad8..0353a7b 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -51,7 +51,7 @@ BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, python2-cheetah BuildRequires: xdg-utils, python2-lxml, pygtk2-devel BuildRequires: desktop-file-utils, python2-mako, python2-six BuildRequires: uhd-devel, python2, cppzmq-devel, zeromq-devel, thrift -BuildRequires: python2-sphinx +BuildRequires: python2-sphinx, codec2-devel #BuildRequires: python3-thrift %if ! 0%{?rhel:1} BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel From f822cb714a4fc2ddb2afc9066051a0913b46bfd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 5 Sep 2018 17:34:17 +0200 Subject: [PATCH 182/313] Dropped patented content Resolves: rhbz#1608973 Enabled ZeroMQ, sphinx, comedilib, jack, and log4cpp Resolves: rhbz#1610513 --- gnuradio.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 0353a7b..620b040 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -51,13 +51,14 @@ BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, python2-cheetah BuildRequires: xdg-utils, python2-lxml, pygtk2-devel BuildRequires: desktop-file-utils, python2-mako, python2-six BuildRequires: uhd-devel, python2, cppzmq-devel, zeromq-devel, thrift -BuildRequires: python2-sphinx, codec2-devel +BuildRequires: python2-sphinx, codec2-devel, sphinx, jack-devel +BuildRequires: comedilib-devel #BuildRequires: python3-thrift %if ! 0%{?rhel:1} BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel %endif Requires: numpy, python2-wxpython, scipy, portaudio, python2-lxml -Requires: pygtk2, python2-cheetah, PyQt4, zeromq +Requires: pygtk2, python2-cheetah, PyQt4, zeromq, log4cpp-devel #Requires: python3-thrift %if ! 0%{?rhel:1} Requires: PyQwt, python2-pyopengl @@ -191,7 +192,7 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop * Fri Aug 10 2018 Jaroslav Škarvada - 3.7.13.4-3 - Dropped patented content Resolves: rhbz#1608973 -- Enabled ZeroMQ, and sphinx +- Enabled ZeroMQ, sphinx, comedilib, jack, and log4cpp Resolves: rhbz#1610513 * Sun Jul 22 2018 Jaroslav Škarvada - 3.7.13.4-2 From 214f62679881bb191d5efcdcd016450af6c71dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 8 Jan 2019 18:20:30 +0100 Subject: [PATCH 183/313] Various build fixes and improvements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 620b040..961607b 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -48,11 +48,11 @@ BuildRequires: portaudio-devel, libtool, gsm-devel # http://gnuradio.org/redmine/issues/show/395 # BuildRequires: comedilib-devel BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, python2-cheetah -BuildRequires: xdg-utils, python2-lxml, pygtk2-devel +BuildRequires: xdg-utils, python2-lxml, pygtk2-devel, orc-devel BuildRequires: desktop-file-utils, python2-mako, python2-six BuildRequires: uhd-devel, python2, cppzmq-devel, zeromq-devel, thrift -BuildRequires: python2-sphinx, codec2-devel, sphinx, jack-devel -BuildRequires: comedilib-devel +BuildRequires: python2-sphinx, codec2-devel, findutils +BuildRequires: comedilib-devel, jack-audio-connection-kit-devel #BuildRequires: python3-thrift %if ! 0%{?rhel:1} BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel @@ -119,14 +119,11 @@ cd build %cmake \ -DSYSCONFDIR=%{_sysconfdir} \ -DGR_PKG_DOC_DIR=%{_docdir}/%{name} \ +-DENABLE_DOXYGEN=FALSE \ %{?mfpu_neon} \ .. -# 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} @@ -154,6 +151,11 @@ done rm -f %{buildroot}%{_datadir}/%{name}/grc/freedesktop/* rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop +# fix hashbangs +pushd %{buildroot}%{_bindir} +sed -i '1 s/^\(#!\/usr\/bin\/\)\(env\|python\).*$/\1python2/' gr-ctrlport-monitor gr-perf-monitorx +popd + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -194,6 +196,11 @@ rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop Resolves: rhbz#1608973 - Enabled ZeroMQ, sphinx, comedilib, jack, and log4cpp Resolves: rhbz#1610513 +- Temporaly disabled doxygen (the doc subpackage is mostly useless now), + because due to various bugs in different packages the documentation builds + differently on different architectures +- Fixed python hashbangs +- Unlimited number of make processes * Sun Jul 22 2018 Jaroslav Škarvada - 3.7.13.4-2 - Rebuilt for new uhd From 3f99e4971c70bf98c11997ad87fe9fa2ffea44af Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:39:08 +0100 Subject: [PATCH 184/313] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- gnuradio.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 961607b..e57709c 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -156,9 +156,7 @@ pushd %{buildroot}%{_bindir} sed -i '1 s/^\(#!\/usr\/bin\/\)\(env\|python\).*$/\1python2/' gr-ctrlport-monitor gr-perf-monitorx popd -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license COPYING From ed5e023f273bf1c27e070a86256614cc0dd6dd85 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:46 +0100 Subject: [PATCH 185/313] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- gnuradio.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index e57709c..f2c0aca 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -27,7 +27,6 @@ Version: 3.7.13.4 Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework -Group: Applications/Engineering License: GPLv3 URL: http://www.gnuradio.org #Source0: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%%{version}.tar.gz @@ -78,7 +77,6 @@ performance wireless devices into software problems. %package devel Summary: GNU Radio -Group: Applications/Engineering Requires: %{name} = %{version}-%{release} Requires: cmake, boost-devel Obsoletes: usrp-devel < 3.3.0-1 @@ -88,7 +86,6 @@ GNU Radio Headers %package doc Summary: GNU Radio -Group: Applications/Engineering Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -97,7 +94,6 @@ GNU Radio Documentation %package examples Summary: GNU Radio -Group: Applications/Engineering Requires: %{name} = %{version}-%{release} %description examples From 76519957f34c37bc2eed481918eccab73a9440a4 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 25 Jan 2019 04:10:32 +0000 Subject: [PATCH 186/313] Rebuilt for Boost 1.69 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index f2c0aca..3fe5c36 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.4 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -185,6 +185,9 @@ popd %{_datadir}/gnuradio/examples %changelog +* Fri Jan 25 2019 Jonathan Wakely - 3.7.13.4-4 +- Rebuilt for Boost 1.69 + * Fri Aug 10 2018 Jaroslav Škarvada - 3.7.13.4-3 - Dropped patented content Resolves: rhbz#1608973 From 4fccd8258775b8b6625ea16284e76027b77a282b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 23:29:18 +0000 Subject: [PATCH 187/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 3fe5c36..4e88ff7 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.4 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -185,6 +185,9 @@ popd %{_datadir}/gnuradio/examples %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 3.7.13.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jan 25 2019 Jonathan Wakely - 3.7.13.4-4 - Rebuilt for Boost 1.69 From b4bc6e2f34fa183bbc644701f31322c3bd0ee9dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 24 Apr 2019 17:06:54 +0200 Subject: [PATCH 188/313] New version Updated source URL to point to github --- .gitignore | 1 + gnuradio.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8f799b1..ff78fbd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ gnuradio-*.tar.gz /gnuradio-3.7.13.3.tar.xz /gnuradio-3.7.13.4.tar.xz +/gnuradio-3.7.13.5.tar.xz diff --git a/gnuradio.spec b/gnuradio.spec index 4e88ff7..ec61a4b 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -23,16 +23,17 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.7.13.4 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.7.13.5 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework 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.xz +#Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}%{?alphatag}.tar.xz #Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}.tar.gz +Source0: http://github.com/gnuradio/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz # git clone git://gnuradio.org/gnuradio # cd gnuradio # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ @@ -185,6 +186,10 @@ popd %{_datadir}/gnuradio/examples %changelog +* Wed Apr 24 2019 Jaroslav Škarvada - 3.7.13.5-1 +- New version +- Updated source URL to point to github + * Thu Jan 31 2019 Fedora Release Engineering - 3.7.13.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 627c498..c694852 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.7.13.4.tar.xz) = 5df9fe5f64fd172c5eb801999ce7d43a93ccf6d5a70ba891e50a53c5c80daa56c36db621db7e8ff13b1a526ae367d390ce22fae63b7af54e0b2435dfd7503398 +SHA512 (gnuradio-3.7.13.5.tar.xz) = fc2991c8e81db4eaa7343a0eb509d412aed0502af9de9edee1aa98a83499f9db7ae8f0005fc3db3d2d223fe107bc7df785e3167aa2187159c58ca5a0b7585834 From 780b9ef527adc87238757f660d40592f8f664744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 24 Apr 2019 17:48:46 +0200 Subject: [PATCH 189/313] Added explicit python2 build requirement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index ec61a4b..c059323 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -31,7 +31,7 @@ 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.xz +#Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}%%{?alphatag}.tar.xz #Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}.tar.gz Source0: http://github.com/gnuradio/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz # git clone git://gnuradio.org/gnuradio @@ -43,7 +43,7 @@ Requires(pre): shadow-utils BuildRequires: cmake, fftw-devel, cppunit-devel, wxPython-devel, xmlto BuildRequires: graphviz, boost-devel, python2-devel, swig, doxygen BuildRequires: libusbx-devel, alsa-lib-devel, SDL-devel, guile-devel -BuildRequires: portaudio-devel, libtool, gsm-devel +BuildRequires: portaudio-devel, libtool, gsm-devel, python2 # Gnuradio deprecated gr-comedi # http://gnuradio.org/redmine/issues/show/395 # BuildRequires: comedilib-devel @@ -51,7 +51,8 @@ BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, python2-cheetah BuildRequires: xdg-utils, python2-lxml, pygtk2-devel, orc-devel BuildRequires: desktop-file-utils, python2-mako, python2-six BuildRequires: uhd-devel, python2, cppzmq-devel, zeromq-devel, thrift -BuildRequires: python2-sphinx, codec2-devel, findutils +#BuildRequires: python2-sphinx +BuildRequires: codec2-devel, findutils BuildRequires: comedilib-devel, jack-audio-connection-kit-devel #BuildRequires: python3-thrift %if ! 0%{?rhel:1} @@ -189,6 +190,7 @@ popd * Wed Apr 24 2019 Jaroslav Škarvada - 3.7.13.5-1 - New version - Updated source URL to point to github +- Dropped python2-sphinx support (not in Fedora) * Thu Jan 31 2019 Fedora Release Engineering - 3.7.13.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From c21320d630f9168d14204bd727c301878aadcca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 6 May 2019 14:05:32 +0200 Subject: [PATCH 190/313] Dropped PyQwt in f31+ --- gnuradio.spec | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index c059323..0c70b2a 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.5 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -55,14 +55,23 @@ BuildRequires: uhd-devel, python2, cppzmq-devel, zeromq-devel, thrift BuildRequires: codec2-devel, findutils BuildRequires: comedilib-devel, jack-audio-connection-kit-devel #BuildRequires: python3-thrift -%if ! 0%{?rhel:1} + +# qwt was dropped in fedora 31+, migration to PyQtGraph should be finished in +# gnuradio-3.8 +# https://github.com/gnuradio/gnuradio/issues/1634 +# https://github.com/gnuradio/gnuradio/pull/2399 +# https://github.com/gnuradio/gnuradio/pull/2187 +%if ! 0%{?rhel:1} && 0%{?fedora} < 31 BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel %endif Requires: numpy, python2-wxpython, scipy, portaudio, python2-lxml Requires: pygtk2, python2-cheetah, PyQt4, zeromq, log4cpp-devel #Requires: python3-thrift %if ! 0%{?rhel:1} -Requires: PyQwt, python2-pyopengl +%if 0%{?fedora} < 31 +Requires: PyQwt +%endif +Requires: python2-pyopengl %endif Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 @@ -187,6 +196,9 @@ popd %{_datadir}/gnuradio/examples %changelog +* Mon May 6 2019 Jaroslav Škarvada - 3.7.13.5-2 +- Dropped PyQwt in f31+ + * Wed Apr 24 2019 Jaroslav Škarvada - 3.7.13.5-1 - New version - Updated source URL to point to github From f721853bdafc93175b6f42b963dc0183c6ce78fe Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Tue, 9 Jul 2019 22:17:49 -0300 Subject: [PATCH 191/313] - Rebuilt for comedilib 0.11 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 0c70b2a..51b939b 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.5 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ popd %{_datadir}/gnuradio/examples %changelog +* Tue Jul 09 2019 Filipe Rosset - 3.7.13.5-3 +- Rebuilt for comedilib 0.11 + * Mon May 6 2019 Jaroslav Škarvada - 3.7.13.5-2 - Dropped PyQwt in f31+ From 5833a35b7f222cb71942aca90f42e33dcaff0a40 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Wed, 10 Jul 2019 00:33:04 -0300 Subject: [PATCH 192/313] - Rebuilt for comedilib 0.11 --- gnuradio.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 51b939b..a8d8937 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.5 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,7 +196,7 @@ popd %{_datadir}/gnuradio/examples %changelog -* Tue Jul 09 2019 Filipe Rosset - 3.7.13.5-3 +* Tue Jul 09 2019 Filipe Rosset - 3.7.13.5-4 - Rebuilt for comedilib 0.11 * Mon May 6 2019 Jaroslav Škarvada - 3.7.13.5-2 From 040945dc0f9e411e39a1b7f8a773fc30838c807b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 04:30:10 +0000 Subject: [PATCH 193/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index a8d8937..c5b695a 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.5 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ popd %{_datadir}/gnuradio/examples %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 3.7.13.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jul 09 2019 Filipe Rosset - 3.7.13.5-4 - Rebuilt for comedilib 0.11 From 6399e25430a7ed4ff5acf6706117323cb2a313aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 5 Aug 2019 14:14:35 +0200 Subject: [PATCH 194/313] Rebuilt for new uhd --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index c5b695a..25431e5 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.5 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Release: 6%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ popd %{_datadir}/gnuradio/examples %changelog +* Mon Aug 5 2019 Jaroslav Škarvada - 3.7.13.5-6 +- Rebuilt for new uhd + * Thu Jul 25 2019 Fedora Release Engineering - 3.7.13.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f7df7224fd5d1806a8d6d4221c4948724eb2b3b5 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Tue, 20 Aug 2019 22:04:28 +0200 Subject: [PATCH 195/313] Rebuilt for GSL 2.6. --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 25431e5..3dbea8a 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.5 -Release: 6%{?alphatag:.%{alphatag}}%{?dist} +Release: 7%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ popd %{_datadir}/gnuradio/examples %changelog +* Tue Aug 20 2019 Susi Lehtola - 3.7.13.5-7 +- Rebuilt for GSL 2.6. + * Mon Aug 5 2019 Jaroslav Škarvada - 3.7.13.5-6 - Rebuilt for new uhd From e694686c067a8207aeacf0eb909356d91dc27ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 26 Aug 2019 10:07:46 +0200 Subject: [PATCH 196/313] Rebuilt for new GSL --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 3dbea8a..3b48c63 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.5 -Release: 7%{?alphatag:.%{alphatag}}%{?dist} +Release: 8%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ popd %{_datadir}/gnuradio/examples %changelog +* Mon Aug 26 2019 Jaroslav Škarvada - 3.7.13.5-8 +- Rebuilt for new GSL + * Tue Aug 20 2019 Susi Lehtola - 3.7.13.5-7 - Rebuilt for GSL 2.6. From 2a08c0b1a7f25d7921169db805c6a86a2cf44788 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 31 Oct 2019 18:51:44 -0600 Subject: [PATCH 197/313] Update to 3.8.0.0 Drop old obsoletes Split out python modules into separate package Use https in URLs Re-enable Doxygen doc build --- .gitignore | 1 + gnuradio-3.7.13.3-size_t.patch | 394 --------------------------------- gnuradio.spec | 175 ++++++++------- sources | 2 +- 4 files changed, 89 insertions(+), 483 deletions(-) delete mode 100644 gnuradio-3.7.13.3-size_t.patch diff --git a/.gitignore b/.gitignore index ff78fbd..3138232 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ gnuradio-*.tar.gz /gnuradio-3.7.13.3.tar.xz /gnuradio-3.7.13.4.tar.xz /gnuradio-3.7.13.5.tar.xz +/gnuradio-3.8.0.0.tar.xz diff --git a/gnuradio-3.7.13.3-size_t.patch b/gnuradio-3.7.13.3-size_t.patch deleted file mode 100644 index c187aa3..0000000 --- a/gnuradio-3.7.13.3-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 405477b..dc6ed3e 100644 ---- a/docs/doxygen/other/thread_affinity.dox -+++ b/docs/doxygen/other/thread_affinity.dox -@@ -59,7 +59,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 -@@ -85,7 +85,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 c3de303..bfb7327 100644 ---- a/gnuradio-runtime/include/gnuradio/block.h -+++ b/gnuradio-runtime/include/gnuradio/block.h -@@ -621,9 +621,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. -@@ -633,7 +633,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 -@@ -678,7 +678,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 3fda5d8..816abd0 100644 ---- a/gnuradio-runtime/include/gnuradio/thread/thread.h -+++ b/gnuradio-runtime/include/gnuradio/thread/thread.h -@@ -81,7 +81,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. - * -@@ -93,7 +93,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. - * -@@ -108,7 +108,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 86c4aa7..36c3c99 100644 ---- a/gnuradio-runtime/lib/block.cc -+++ b/gnuradio-runtime/lib/block.cc -@@ -327,7 +327,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 3da150e..972a823 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 82a40fe..0ab1bf9 100644 ---- a/gnuradio-runtime/lib/hier_block2_detail.cc -+++ b/gnuradio-runtime/lib/hier_block2_detail.cc -@@ -931,7 +931,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++) { -@@ -948,7 +948,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 4db91d4..6a5854c 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.spec b/gnuradio.spec index 3b48c63..57633b6 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -5,8 +5,6 @@ %bcond_with neon %endif -%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} - %ifarch %{arm} %if %{with neon} %global my_optflags %(echo -n "%{optflags}" | sed 's/-mfpu=[^ \\t]\\+//g'; echo " -mfpu=neon") @@ -23,61 +21,74 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.7.13.5 -Release: 8%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.8.0.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework 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 +URL: https://www.gnuradio.org #Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}%%{?alphatag}.tar.xz #Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}.tar.gz -Source0: http://github.com/gnuradio/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz +Source0: https://github.com/gnuradio/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz # git clone git://gnuradio.org/gnuradio # cd gnuradio # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ # gzip > ../%%{name}-%%{version}.tar.gz Requires(pre): shadow-utils -BuildRequires: cmake, fftw-devel, cppunit-devel, wxPython-devel, xmlto -BuildRequires: graphviz, boost-devel, python2-devel, swig, doxygen -BuildRequires: libusbx-devel, alsa-lib-devel, SDL-devel, guile-devel -BuildRequires: portaudio-devel, libtool, gsm-devel, python2 -# Gnuradio deprecated gr-comedi -# http://gnuradio.org/redmine/issues/show/395 -# BuildRequires: comedilib-devel -BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, python2-cheetah -BuildRequires: xdg-utils, python2-lxml, pygtk2-devel, orc-devel -BuildRequires: desktop-file-utils, python2-mako, python2-six -BuildRequires: uhd-devel, python2, cppzmq-devel, zeromq-devel, thrift -#BuildRequires: python2-sphinx -BuildRequires: codec2-devel, findutils -BuildRequires: comedilib-devel, jack-audio-connection-kit-devel -#BuildRequires: python3-thrift +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: alsa-lib-devel +BuildRequires: boost-devel +BuildRequires: codec2-devel +BuildRequires: cppzmq-devel +BuildRequires: desktop-file-utils +BuildRequires: doxygen +BuildRequires: fftw-devel +BuildRequires: findutils +BuildRequires: gmp-devel +BuildRequires: graphviz +BuildRequires: gsl-devel +BuildRequires: gsm-devel +BuildRequires: gtk3-devel +BuildRequires: jack-audio-connection-kit-devel +BuildRequires: log4cpp-devel +# mpir is not yet available on ppc64le +%ifnarch ppc64le +BuildRequires: mpir-devel +%endif +BuildRequires: orc-devel +BuildRequires: portaudio-devel +BuildRequires: python3-devel +BuildRequires: python3-cairo +BuildRequires: python3-cheetah +BuildRequires: python3-click-plugins +BuildRequires: python3-gobject +BuildRequires: python3-numpy +BuildRequires: python3-pyyaml +BuildRequires: python3-lxml +BuildRequires: python3-mako +BuildRequires: python3-qt5-devel +BuildRequires: python3-scipy +BuildRequires: python3-six +BuildRequires: python3-sphinx +BuildRequires: python3-thrift +BuildRequires: qwt-qt5-devel +#BuildRequires: tex(latex) +BuildRequires: SDL-devel +BuildRequires: swig +BuildRequires: thrift +BuildRequires: uhd-devel +BuildRequires: xdg-utils +BuildRequires: xmlto +BuildRequires: zeromq-devel -# qwt was dropped in fedora 31+, migration to PyQtGraph should be finished in -# gnuradio-3.8 -# https://github.com/gnuradio/gnuradio/issues/1634 -# https://github.com/gnuradio/gnuradio/pull/2399 -# https://github.com/gnuradio/gnuradio/pull/2187 -%if ! 0%{?rhel:1} && 0%{?fedora} < 31 -BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel -%endif -Requires: numpy, python2-wxpython, scipy, portaudio, python2-lxml -Requires: pygtk2, python2-cheetah, PyQt4, zeromq, log4cpp-devel -#Requires: python3-thrift -%if ! 0%{?rhel:1} -%if 0%{?fedora} < 31 -Requires: PyQwt -%endif -Requires: python2-pyopengl -%endif -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.13.3-size_t.patch +Requires: python3-%{name} = %{version}-%{release} +Requires: python3-numpy +Requires: python3-cheetah +Requires: python3-thrift +Requires: python3-pyopengl %description GNU Radio is a collection of software that when combined with minimal @@ -86,11 +97,17 @@ transmitted and received are defined by software. What this means is that it turns the digital modulation schemes used in today's high performance wireless devices into software problems. +%package -n python3-%{name} +Summary: GNU Radio Python 3 module + +%description -n python3-%{name} +GNU Radio Python 3 module + %package devel Summary: GNU Radio -Requires: %{name} = %{version}-%{release} -Requires: cmake, boost-devel -Obsoletes: usrp-devel < 3.3.0-1 +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: cmake +Requires: boost-devel%{?_isa} %description devel GNU Radio Headers @@ -98,7 +115,6 @@ GNU Radio Headers %package doc Summary: GNU Radio Requires: %{name} = %{version}-%{release} -BuildArch: noarch %description doc GNU Radio Documentation @@ -112,13 +128,6 @@ GNU Radio examples %prep %setup -q -n %{name}-%{version}%{?alphatag} -%patch0 -p1 -b .size_t - -# Use cmake's FindGSL.cmake instead -rm cmake/Modules/FindGSL.cmake - -#force regeneration of cached moc output files -find . -name "*_moc.cc" -exec rm {} \; %build mkdir build @@ -126,48 +135,26 @@ cd build %cmake \ -DSYSCONFDIR=%{_sysconfdir} \ -DGR_PKG_DOC_DIR=%{_docdir}/%{name} \ --DENABLE_DOXYGEN=FALSE \ +-DGR_PYTHON_DIR=%{python3_sitearch} \ +-DPYTHON_EXECUTABLE=%{__python3} \ %{?mfpu_neon} \ .. +#-DENABLE_DOXYGEN=FALSE \ -make %{?_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing" +%make_build CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing" %install -rm -rf %{buildroot} -pushd build -make install DESTDIR=%{buildroot} -popd - -# 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 - -# 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 - -# fix hashbangs -pushd %{buildroot}%{_bindir} -sed -i '1 s/^\(#!\/usr\/bin\/\)\(env\|python\).*$/\1python2/' gr-ctrlport-monitor gr-perf-monitorx -popd +%make_install -C build +desktop-file-validate %{buildroot}%{_datadir}/applications/gnuradio-grc.desktop +# Remove extraneous desktop/icon/mime files +rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop +rm -r %{buildroot}%{_datadir}/icons/gnome + %ldconfig_scriptlets %files %license COPYING -%{python2_sitearch}/* %{_bindir}/* %{_libdir}/lib*.so.* %{_libexecdir}/* @@ -181,6 +168,11 @@ popd %exclude %{_docdir}/%{name}/xml %doc %{_docdir}/%{name} +%files -n python3-%{name} +%{python3_sitearch}/%{name}/ +%{python3_sitearch}/pmt/ +%{python3_sitearch}/volk_modtool/ + %files devel %{_includedir}/* %{_libdir}/lib*.so @@ -196,6 +188,13 @@ popd %{_datadir}/gnuradio/examples %changelog +* Thu Oct 31 2019 Orion Poplawski - 3.8.0.0-1 +- Update to 3.8.0.0 +- Drop old obsoletes +- Split out python modules into separate package +- Use https in URLs +- Re-enable Doxygen doc build + * Mon Aug 26 2019 Jaroslav Škarvada - 3.7.13.5-8 - Rebuilt for new GSL diff --git a/sources b/sources index c694852..fa80486 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.7.13.5.tar.xz) = fc2991c8e81db4eaa7343a0eb509d412aed0502af9de9edee1aa98a83499f9db7ae8f0005fc3db3d2d223fe107bc7df785e3167aa2187159c58ca5a0b7585834 +SHA512 (gnuradio-3.8.0.0.tar.xz) = 62b5df54d16b6649c9518f2cf69de8d5bc45a6ea7a64af6676d6b4e58ac7adf6ec0d0b88d1fc993b973d556682b34f25833ecc7771ca9f6a8e985a8b8ee3cef8 From 16bc5a38bd61e100c478294c2a5ebb3bb71d70a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 11 Nov 2019 14:02:47 +0100 Subject: [PATCH 198/313] Fixed URL and cleaned patent problems from sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 57633b6..d87012e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 -URL: https://www.gnuradio.org +URL: https://www.gnuradio.org/ #Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}%%{?alphatag}.tar.xz #Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}.tar.gz Source0: https://github.com/gnuradio/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index fa80486..ceb665e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.8.0.0.tar.xz) = 62b5df54d16b6649c9518f2cf69de8d5bc45a6ea7a64af6676d6b4e58ac7adf6ec0d0b88d1fc993b973d556682b34f25833ecc7771ca9f6a8e985a8b8ee3cef8 +SHA512 (gnuradio-3.8.0.0.tar.xz) = 1dc427bf679b9287bc02be38aa9048ed471436d6d21090e91ed48ab62f724c1842f37c6e7843b9ef0e89d9945de88b1b481925f5a9bf73f0251cad4a1773142d From 637d0a8ac236ea978cc1fc0e6f34de2d5205aba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 13 Nov 2019 12:55:55 +0100 Subject: [PATCH 199/313] Added python3-pyyaml requirement --- gnuradio.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index d87012e..6d68183 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.8.0.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -89,6 +89,7 @@ Requires: python3-numpy Requires: python3-cheetah Requires: python3-thrift Requires: python3-pyopengl +Requires: python3-pyyaml %description GNU Radio is a collection of software that when combined with minimal @@ -188,6 +189,9 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Wed Nov 13 2019 Jaroslav Škarvada - 3.8.0.0-2 +- Added python3-pyyaml requirement + * Thu Oct 31 2019 Orion Poplawski - 3.8.0.0-1 - Update to 3.8.0.0 - Drop old obsoletes From 102fdc47a552b899ea0b3fce6d7d90a7e2c25187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 13 Nov 2019 16:05:44 +0100 Subject: [PATCH 200/313] Added gtk3 requirements --- gnuradio.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 6d68183..e55c3c8 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.8.0.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -83,6 +83,7 @@ BuildRequires: uhd-devel BuildRequires: xdg-utils BuildRequires: xmlto BuildRequires: zeromq-devel +BuildRequires: python3-gobject Requires: python3-%{name} = %{version}-%{release} Requires: python3-numpy @@ -90,6 +91,8 @@ Requires: python3-cheetah Requires: python3-thrift Requires: python3-pyopengl Requires: python3-pyyaml +Requires: python3-gobject +Requires: gtk3 %description GNU Radio is a collection of software that when combined with minimal @@ -189,6 +192,9 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Wed Nov 13 2019 Jaroslav Škarvada - 3.8.0.0-3 +- Added gtk3 requirements + * Wed Nov 13 2019 Jaroslav Škarvada - 3.8.0.0-2 - Added python3-pyyaml requirement From 670152489efc1c0a2a314e8a0843564d1f6c73b4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 4 Dec 2019 20:22:53 -0700 Subject: [PATCH 201/313] Rebuild for thrift-0.13 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index e55c3c8..e360c90 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.8.0.0 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -192,6 +192,9 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Thu Dec 05 2019 Orion Poplawski - 3.8.0.0-4 +- Rebuild for thrift-0.13 + * Wed Nov 13 2019 Jaroslav Škarvada - 3.8.0.0-3 - Added gtk3 requirements From 66c3fe8d9affef9b2a33ba40accb4662b32680ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 23:06:53 +0000 Subject: [PATCH 202/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index e360c90..2643446 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.8.0.0 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -192,6 +192,9 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 3.8.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Dec 05 2019 Orion Poplawski - 3.8.0.0-4 - Rebuild for thrift-0.13 From 7bd7858ee1c6bb40fbbf1633601dd34e581188b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 23 Mar 2020 18:52:10 +0100 Subject: [PATCH 203/313] Dropped python3-pyopengl on RHEL Resolves: rhbz#1816179 --- gnuradio.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 2643446..dfc272c 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.8.0.0 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Release: 6%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -89,7 +89,9 @@ Requires: python3-%{name} = %{version}-%{release} Requires: python3-numpy Requires: python3-cheetah Requires: python3-thrift +%if ! 0%{?rhel} Requires: python3-pyopengl +%endif Requires: python3-pyyaml Requires: python3-gobject Requires: gtk3 @@ -192,6 +194,10 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Mon Mar 23 2020 Jaroslav Škarvada - 3.8.0.0-6 +- Dropped python3-pyopengl on RHEL + Resolves: rhbz#1816179 + * Tue Jan 28 2020 Fedora Release Engineering - 3.8.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f17cb1d75266904acb64cd838033d7b12b9e751b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 24 Mar 2020 16:54:46 +0100 Subject: [PATCH 204/313] Added requirement on python3-six and python3-mako --- gnuradio.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index dfc272c..eb65f08 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.8.0.0 -Release: 6%{?alphatag:.%{alphatag}}%{?dist} +Release: 7%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -94,6 +94,8 @@ Requires: python3-pyopengl %endif Requires: python3-pyyaml Requires: python3-gobject +Requires: python3-six +Requires: python3-mako Requires: gtk3 %description @@ -194,6 +196,9 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Tue Mar 24 2020 Jaroslav Škarvada - 3.8.0.0-7 +- Added requirement on python3-six and python3-mako + * Mon Mar 23 2020 Jaroslav Škarvada - 3.8.0.0-6 - Dropped python3-pyopengl on RHEL Resolves: rhbz#1816179 From a6b90a64d1f090bdfb9902d1c155f3d0805c3b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 14 Apr 2020 23:42:11 +0200 Subject: [PATCH 205/313] New version Resolves: rhbz#1822797 Resolves: rhbz#1822842 --- .gitignore | 1 + gnuradio.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3138232..cdf3903 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ gnuradio-*.tar.gz /gnuradio-3.7.13.4.tar.xz /gnuradio-3.7.13.5.tar.xz /gnuradio-3.8.0.0.tar.xz +/gnuradio-3.8.1.0.tar.xz diff --git a/gnuradio.spec b/gnuradio.spec index eb65f08..b7f0325 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,8 +21,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.8.0.0 -Release: 7%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.8.1.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,11 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Tue Apr 14 2020 Jaroslav Škarvada - 3.8.1.0-1 +- New version + Resolves: rhbz#1822797 + Resolves: rhbz#1822842 + * Tue Mar 24 2020 Jaroslav Škarvada - 3.8.0.0-7 - Added requirement on python3-six and python3-mako diff --git a/sources b/sources index ceb665e..3d9e5d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.8.0.0.tar.xz) = 1dc427bf679b9287bc02be38aa9048ed471436d6d21090e91ed48ab62f724c1842f37c6e7843b9ef0e89d9945de88b1b481925f5a9bf73f0251cad4a1773142d +SHA512 (gnuradio-3.8.1.0.tar.xz) = 8760f0b2b010e2d12107b8c285081206269ac2ae44438c37688ff238bece9f5941e3a7bdd0874d14d8695af11a52cc8d5b6e5f015f7d84c923a1e2eb98d05258 From 66f738d7ef33501dc33598d8e1a772502c692d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 4 May 2020 21:42:23 +0200 Subject: [PATCH 206/313] Rebuilt for new codec2 Resolves: rhbz#1830672 --- gnuradio.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index b7f0325..577f7e9 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.8.1.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,10 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Mon May 4 2020 Jaroslav Škarvada - 3.8.1.0-2 +- Rebuilt for new codec2 + Resolves: rhbz#1830672 + * Tue Apr 14 2020 Jaroslav Škarvada - 3.8.1.0-1 - New version Resolves: rhbz#1822797 From d66de486b12e76211add21612de29a3a16c28686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:47:07 +0200 Subject: [PATCH 207/313] Rebuilt for Python 3.9 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 577f7e9..94bd671 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.8.1.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Tue May 26 2020 Miro Hrončok - 3.8.1.0-3 +- Rebuilt for Python 3.9 + * Mon May 4 2020 Jaroslav Škarvada - 3.8.1.0-2 - Rebuilt for new codec2 Resolves: rhbz#1830672 From b13c60066129068659675d427695c6ab5e3e19c5 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 3 Jun 2020 20:41:55 +0100 Subject: [PATCH 208/313] Rebuilt and patched for Boost 1.73.0 --- gnuradio-bind-placeholders.patch | 461 +++++++++++++++++++++++++++++++ gnuradio.spec | 10 +- 2 files changed, 470 insertions(+), 1 deletion(-) create mode 100644 gnuradio-bind-placeholders.patch diff --git a/gnuradio-bind-placeholders.patch b/gnuradio-bind-placeholders.patch new file mode 100644 index 0000000..6d6fb87 --- /dev/null +++ b/gnuradio-bind-placeholders.patch @@ -0,0 +1,461 @@ +--- gnuradio-3.8.1.0/gnuradio-runtime/lib/block.cc~ 2020-06-03 15:51:57.779451140 +0100 ++++ gnuradio-3.8.1.0/gnuradio-runtime/lib/block.cc 2020-06-03 15:52:03.567451466 +0100 +@@ -34,6 +34,8 @@ + + namespace gr { + ++using namespace boost::placeholders; ++ + block::block(const std::string& name, + io_signature::sptr input_signature, + io_signature::sptr output_signature) +--- gnuradio-3.8.1.0/gr-blocks/lib/copy_impl.cc~ 2020-06-03 16:48:48.001299713 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/copy_impl.cc 2020-06-03 16:48:15.300285011 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + copy::sptr copy::make(size_t itemsize) + { + return gnuradio::get_initial_sptr(new copy_impl(itemsize)); +--- gnuradio-3.8.1.0/gr-blocks/lib/message_debug_impl.cc~ 2020-06-03 16:52:57.083411688 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/message_debug_impl.cc 2020-06-03 16:52:59.468412760 +0100 +@@ -32,6 +32,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + message_debug::sptr message_debug::make() + { + return gnuradio::get_initial_sptr(new message_debug_impl()); +--- gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_impl.cc~ 2020-06-03 16:53:34.139428345 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_impl.cc 2020-06-03 16:53:35.651429024 +0100 +@@ -38,6 +38,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + message_strobe::sptr message_strobe::make(pmt::pmt_t msg, long period_ms) + { + return gnuradio::get_initial_sptr(new message_strobe_impl(msg, period_ms)); +--- gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_random_impl.cc~ 2020-06-03 16:53:52.959436804 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_random_impl.cc 2020-06-03 16:53:55.259437840 +0100 +@@ -38,6 +38,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + message_strobe_random::sptr + message_strobe_random::make(pmt::pmt_t msg, + message_strobe_random_distribution_t dist, +--- gnuradio-3.8.1.0/gr-blocks/lib/multiply_matrix_impl.cc~ 2020-06-03 16:48:42.217297113 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/multiply_matrix_impl.cc 2020-06-03 16:48:44.149297981 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + // Copy tags from input k to output l if A[l][k] is not zero + template <> + void multiply_matrix_impl::propagate_tags_by_A(int noutput_items, +--- gnuradio-3.8.1.0/gr-blocks/lib/mute_impl.cc~ 2020-06-03 16:44:53.010194065 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/mute_impl.cc 2020-06-03 16:45:12.423202794 +0100 +@@ -33,6 +33,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + template + typename mute_blk::sptr mute_blk::make(bool mute) + { +--- gnuradio-3.8.1.0/gr-blocks/lib/pdu_filter_impl.cc~ 2020-06-03 16:55:05.835454141 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/pdu_filter_impl.cc 2020-06-03 16:55:08.074454516 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + pdu_filter::sptr pdu_filter::make(pmt::pmt_t k, pmt::pmt_t v, bool invert) + { + return gnuradio::get_initial_sptr(new pdu_filter_impl(k, v, invert)); +--- gnuradio-3.8.1.0/gr-blocks/lib/pdu_remove_impl.cc~ 2020-06-03 16:56:03.653466103 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/pdu_remove_impl.cc 2020-06-03 16:56:05.132466450 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + pdu_remove::sptr pdu_remove::make(pmt::pmt_t k) + { + return gnuradio::get_initial_sptr(new pdu_remove_impl(k)); +--- gnuradio-3.8.1.0/gr-blocks/lib/pdu_set_impl.cc~ 2020-06-03 16:55:43.765461437 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/pdu_set_impl.cc 2020-06-03 16:55:45.990461957 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + pdu_set::sptr pdu_set::make(pmt::pmt_t k, pmt::pmt_t v) + { + return gnuradio::get_initial_sptr(new pdu_set_impl(k, v)); +--- gnuradio-3.8.1.0/gr-blocks/lib/random_pdu_impl.cc~ 2020-06-03 16:56:32.885472969 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/random_pdu_impl.cc 2020-06-03 16:56:34.848473430 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + random_pdu::sptr + random_pdu::make(int min_items, int max_items, unsigned char byte_mask, int length_modulo) + { +--- gnuradio-3.8.1.0/gr-blocks/lib/repeat_impl.cc~ 2020-06-03 16:57:12.092482177 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/repeat_impl.cc 2020-06-03 16:57:13.822482583 +0100 +@@ -30,6 +30,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + repeat::sptr repeat::make(size_t itemsize, int interp) + { + return gnuradio::get_initial_sptr(new repeat_impl(itemsize, interp)); +--- gnuradio-3.8.1.0/gr-zeromq/lib/push_msg_sink_impl.cc~ 2020-06-03 16:48:54.673302712 +0100 ++++ gnuradio-3.8.1.0/gr-zeromq/lib/push_msg_sink_impl.cc 2020-06-03 16:47:55.975276324 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace zeromq { + ++using namespace boost::placeholders; ++ + push_msg_sink::sptr push_msg_sink::make(char* address, int timeout) + { + return gnuradio::get_initial_sptr(new push_msg_sink_impl(address, timeout)); +--- gnuradio-3.8.1.0/gr-blocks/lib/socket_pdu_impl.cc~ 2020-06-03 17:20:39.245825015 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/socket_pdu_impl.cc 2020-06-03 17:20:52.819828566 +0100 +@@ -32,6 +32,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + socket_pdu::sptr socket_pdu::make(std::string type, + std::string addr, + std::string port, +--- gnuradio-3.8.1.0/gr-zeromq/lib/pub_msg_sink_impl.cc~ 2020-06-03 17:21:50.046843529 +0100 ++++ gnuradio-3.8.1.0/gr-zeromq/lib/pub_msg_sink_impl.cc 2020-06-03 17:21:57.819845564 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace zeromq { + ++using namespace boost::placeholders; ++ + pub_msg_sink::sptr pub_msg_sink::make(char* address, int timeout) + { + return gnuradio::get_initial_sptr(new pub_msg_sink_impl(address, timeout)); +--- gnuradio-3.8.1.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc~ 2020-06-03 17:35:50.436093636 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc 2020-06-03 17:36:01.704097517 +0100 +@@ -30,6 +30,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + tagged_stream_multiply_length::sptr tagged_stream_multiply_length::make( + size_t itemsize, const std::string& lengthtagname, double scalar) + { +--- gnuradio-3.8.1.0/gr-blocks/lib/tuntap_pdu_impl.cc~ 2020-06-03 17:46:10.583307228 +0100 ++++ gnuradio-3.8.1.0/gr-blocks/lib/tuntap_pdu_impl.cc 2020-06-03 17:46:23.642311727 +0100 +@@ -42,6 +42,8 @@ + namespace gr { + namespace blocks { + ++using namespace boost::placeholders; ++ + tuntap_pdu::sptr tuntap_pdu::make(std::string dev, int MTU, bool istunflag) + { + #if (defined(linux) || defined(__linux) || defined(__linux__)) +--- gnuradio-3.8.1.0/gr-fec/lib/async_encoder_impl.cc~ 2020-06-03 17:53:59.572468794 +0100 ++++ gnuradio-3.8.1.0/gr-fec/lib/async_encoder_impl.cc 2020-06-03 17:54:10.438472537 +0100 +@@ -32,6 +32,8 @@ + namespace gr { + namespace fec { + ++using namespace boost::placeholders; ++ + async_encoder::sptr async_encoder::make(generic_encoder::sptr my_encoder, + bool packed, + bool rev_unpack, +--- gnuradio-3.8.1.0/gr-fec/lib/async_decoder_impl.cc~ 2020-06-03 17:54:23.920477182 +0100 ++++ gnuradio-3.8.1.0/gr-fec/lib/async_decoder_impl.cc 2020-06-03 17:54:33.581480511 +0100 +@@ -32,6 +32,8 @@ + namespace gr { + namespace fec { + ++using namespace boost::placeholders; ++ + async_decoder::sptr + async_decoder::make(generic_decoder::sptr my_decoder, bool packed, bool rev_pack, int mtu) + { +--- gnuradio-3.8.1.0/gr-filter/lib/freq_xlating_fir_filter_impl.cc~ 2020-06-03 17:54:45.106484482 +0100 ++++ gnuradio-3.8.1.0/gr-filter/lib/freq_xlating_fir_filter_impl.cc 2020-06-03 17:54:57.687488823 +0100 +@@ -32,6 +32,8 @@ + namespace gr { + namespace filter { + ++using namespace boost::placeholders; ++ + template + typename freq_xlating_fir_filter::sptr + freq_xlating_fir_filter::make(int decimation, +--- gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_ff_impl.cc~ 2020-06-03 18:11:26.622789087 +0100 ++++ gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_ff_impl.cc 2020-06-03 18:11:49.178794574 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace filter { + ++using namespace boost::placeholders; ++ + mmse_resampler_ff::sptr mmse_resampler_ff::make(float phase_shift, float resamp_ratio) + { + return gnuradio::get_initial_sptr( +--- gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_cc_impl.cc~ 2020-06-03 18:12:00.982797440 +0100 ++++ gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_cc_impl.cc 2020-06-03 18:12:09.225799444 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace filter { + ++using namespace boost::placeholders; ++ + mmse_resampler_cc::sptr mmse_resampler_cc::make(float phase_shift, float resamp_ratio) + { + return gnuradio::get_initial_sptr( +--- gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_f_impl.cc~ 2020-06-03 18:33:55.755116400 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_f_impl.cc 2020-06-03 18:34:05.401118739 +0100 +@@ -37,6 +37,7 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; + + freq_sink_f::sptr freq_sink_f::make(int fftsize, + int wintype, +--- gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_c_impl.cc~ 2020-06-03 18:34:16.116121337 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_c_impl.cc 2020-06-03 18:34:26.130123766 +0100 +@@ -38,6 +38,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + freq_sink_c::sptr freq_sink_c::make(int fftsize, + int wintype, + double fc, +--- gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_f_impl.cc~ 2020-06-03 18:34:49.413129410 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_f_impl.cc 2020-06-03 18:35:00.258132040 +0100 +@@ -36,6 +36,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + time_raster_sink_f::sptr time_raster_sink_f::make(double samp_rate, + double rows, + double cols, +--- gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_b_impl.cc~ 2020-06-03 18:35:16.004135858 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_b_impl.cc 2020-06-03 18:35:28.818138965 +0100 +@@ -36,6 +36,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + time_raster_sink_b::sptr time_raster_sink_b::make(double samp_rate, + double rows, + double cols, +--- gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_f_impl.cc~ 2020-06-03 18:35:46.982143370 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_f_impl.cc 2020-06-03 18:35:58.555146176 +0100 +@@ -40,6 +40,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + time_sink_f::sptr time_sink_f::make(int size, + double samp_rate, + const std::string& name, +--- gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_c_impl.cc~ 2020-06-03 18:36:10.189148997 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_c_impl.cc 2020-06-03 18:36:21.394151714 +0100 +@@ -39,6 +39,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + time_sink_c::sptr time_sink_c::make(int size, + double samp_rate, + const std::string& name, +--- gnuradio-3.8.1.0/gr-qtgui/lib/sink_f_impl.cc~ 2020-06-03 18:36:31.583154184 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/sink_f_impl.cc 2020-06-03 18:36:41.626156620 +0100 +@@ -36,6 +36,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + sink_f::sptr sink_f::make(int fftsize, + int wintype, + double fc, +--- gnuradio-3.8.1.0/gr-qtgui/lib/sink_c_impl.cc~ 2020-06-03 18:36:54.167159661 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/sink_c_impl.cc 2020-06-03 18:37:04.898162263 +0100 +@@ -36,6 +36,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + sink_c::sptr sink_c::make(int fftsize, + int wintype, + double fc, +--- gnuradio-3.8.1.0/gr-analog/lib/sig_source_impl.cc~ 2020-06-03 18:37:26.774167567 +0100 ++++ gnuradio-3.8.1.0/gr-analog/lib/sig_source_impl.cc 2020-06-03 18:37:38.170170330 +0100 +@@ -36,6 +36,8 @@ + namespace gr { + namespace analog { + ++using namespace boost::placeholders; ++ + template + typename sig_source::sptr sig_source::make(double sampling_freq, + gr_waveform_t waveform, +--- gnuradio-3.8.1.0/gr-digital/lib/chunks_to_symbols_impl.cc~ 2020-06-03 19:28:24.388506913 +0100 ++++ gnuradio-3.8.1.0/gr-digital/lib/chunks_to_symbols_impl.cc 2020-06-03 19:28:36.713514932 +0100 +@@ -32,6 +32,8 @@ + namespace gr { + namespace digital { + ++using namespace boost::placeholders; ++ + template + typename chunks_to_symbols::sptr + chunks_to_symbols::make(const std::vector& symbol_table, const int D) +--- gnuradio-3.8.1.0/gr-digital/lib/constellation_receiver_cb_impl.cc~ 2020-06-03 19:28:46.334521192 +0100 ++++ gnuradio-3.8.1.0/gr-digital/lib/constellation_receiver_cb_impl.cc 2020-06-03 19:28:57.697528585 +0100 +@@ -34,6 +34,8 @@ + namespace gr { + namespace digital { + ++using namespace boost::placeholders; ++ + #define VERBOSE_MM 0 // Used for debugging symbol timing loop + #define VERBOSE_COSTAS 0 // Used for debugging phase and frequency tracking + +--- gnuradio-3.8.1.0/gr-digital/lib/costas_loop_cc_impl.cc~ 2020-06-03 19:29:06.799534507 +0100 ++++ gnuradio-3.8.1.0/gr-digital/lib/costas_loop_cc_impl.cc 2020-06-03 19:29:16.802541015 +0100 +@@ -34,6 +34,8 @@ + namespace gr { + namespace digital { + ++using namespace boost::placeholders; ++ + costas_loop_cc::sptr costas_loop_cc::make(float loop_bw, int order, bool use_snr) + { + return gnuradio::get_initial_sptr(new costas_loop_cc_impl(loop_bw, order, use_snr)); +--- gnuradio-3.8.1.0/gr-qtgui/lib/const_sink_c_impl.cc~ 2020-06-03 19:29:29.694549403 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/const_sink_c_impl.cc 2020-06-03 19:29:38.089554865 +0100 +@@ -35,6 +35,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + const_sink_c::sptr + const_sink_c::make(int size, const std::string& name, int nconnections, QWidget* parent) + { +--- gnuradio-3.8.1.0/gr-digital/lib/crc32_async_bb_impl.cc~ 2020-06-03 19:29:48.487561630 +0100 ++++ gnuradio-3.8.1.0/gr-digital/lib/crc32_async_bb_impl.cc 2020-06-03 19:30:02.250570584 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace digital { + ++using namespace boost::placeholders; ++ + crc32_async_bb::sptr crc32_async_bb::make(bool check) + { + return gnuradio::get_initial_sptr(new crc32_async_bb_impl(check)); +--- gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_f_impl.cc~ 2020-06-03 19:30:17.822580714 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_f_impl.cc 2020-06-03 19:30:28.490587655 +0100 +@@ -37,6 +37,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + waterfall_sink_f::sptr waterfall_sink_f::make(int fftsize, + int wintype, + double fc, +--- gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_c_impl.cc~ 2020-06-03 19:32:58.390685182 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_c_impl.cc 2020-06-03 19:33:14.002695338 +0100 +@@ -39,6 +39,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + waterfall_sink_c::sptr waterfall_sink_c::make(int fftsize, + int wintype, + double fc, +--- gnuradio-3.8.1.0/gr-qtgui/lib/histogram_sink_f_impl.cc~ 2020-06-03 19:33:35.366709261 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/histogram_sink_f_impl.cc 2020-06-03 19:33:41.602713329 +0100 +@@ -37,6 +37,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + histogram_sink_f::sptr histogram_sink_f::make(int size, + int bins, + double xmin, +--- gnuradio-3.8.1.0/gr-qtgui/lib/edit_box_msg_impl.cc~ 2020-06-03 19:33:51.836719995 +0100 ++++ gnuradio-3.8.1.0/gr-qtgui/lib/edit_box_msg_impl.cc 2020-06-03 19:34:00.055725357 +0100 +@@ -35,6 +35,8 @@ + namespace gr { + namespace qtgui { + ++using namespace boost::placeholders; ++ + edit_box_msg::sptr edit_box_msg::make(data_type_t type, + const std::string& label, + const std::string& value, +--- gnuradio-3.8.1.0/gr-digital/lib/header_payload_demux_impl.cc~ 2020-06-03 19:34:13.356734041 +0100 ++++ gnuradio-3.8.1.0/gr-digital/lib/header_payload_demux_impl.cc 2020-06-03 19:34:20.622738782 +0100 +@@ -31,6 +31,8 @@ + namespace gr { + namespace digital { + ++using namespace boost::placeholders; ++ + const pmt::pmt_t header_payload_demux_impl::msg_port_id() + { + static const pmt::pmt_t msg_port_id = pmt::mp("header_data"); +--- gnuradio-3.8.1.0/gr-digital/lib/protocol_formatter_async_impl.cc~ 2020-06-03 19:34:29.133744331 +0100 ++++ gnuradio-3.8.1.0/gr-digital/lib/protocol_formatter_async_impl.cc 2020-06-03 19:34:34.557747861 +0100 +@@ -32,6 +32,8 @@ + namespace gr { + namespace digital { + ++using namespace boost::placeholders; ++ + protocol_formatter_async::sptr + protocol_formatter_async::make(const header_format_base::sptr& format) + { diff --git a/gnuradio.spec b/gnuradio.spec index 94bd671..e1f1f85 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.8.1.0 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -35,6 +35,10 @@ Source0: https://github.com/gnuradio/%{name}/releases/download/v%{version}/%{nam # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ # gzip > ../%%{name}-%%{version}.tar.gz +# Fix errors due to Boost.Bind placeholders +# See also https://github.com/gnuradio/gnuradio/pull/3489 +Patch0: %{name}-bind-placeholders.patch + Requires(pre): shadow-utils BuildRequires: cmake BuildRequires: gcc-c++ @@ -136,6 +140,7 @@ GNU Radio examples %prep %setup -q -n %{name}-%{version}%{?alphatag} +%patch0 -p1 %build mkdir build @@ -196,6 +201,9 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Wed Jun 03 2020 Jonathan Wakely - 3.8.1.0-4 +- Rebuilt and patched for Boost 1.73.0 + * Tue May 26 2020 Miro Hrončok - 3.8.1.0-3 - Rebuilt for Python 3.9 From 924434cb4516d56f1f7d1d9a2499a9bb1f539f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 18 Jun 2020 21:47:54 +0200 Subject: [PATCH 209/313] Removed spurious whitespaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index e1f1f85..a955640 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -162,7 +162,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/gnuradio-grc.desktop # Remove extraneous desktop/icon/mime files rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop rm -r %{buildroot}%{_datadir}/icons/gnome - %ldconfig_scriptlets From b38dfa06f946a453d572bc80e951ca43b825d803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= Date: Fri, 19 Jun 2020 20:59:15 +0200 Subject: [PATCH 210/313] Require python3-click-plugins gr_modtool appears to use python3-click for command line processing. If python3-click or python3-click-plugins are not installed, I get the following tracebacks. python3-click-plugins Requires python3-click, so it's sufficient to Require the former. [root@69f00c035e8c /]# gr_modtool --help Traceback (most recent call last): File "/usr/bin/gr_modtool", line 25, in from gnuradio.modtool.cli.base import cli File "/usr/lib64/python3.8/site-packages/gnuradio/modtool/cli/__init__.py", line 26, in from .base import cli, common_params, block_name, ModToolException File "/usr/lib64/python3.8/site-packages/gnuradio/modtool/cli/base.py", line 35, in import click ModuleNotFoundError: No module named 'click' [root@69f00c035e8c /]# gr_modtool --help Traceback (most recent call last): File "/usr/bin/gr_modtool", line 25, in from gnuradio.modtool.cli.base import cli File "/usr/lib64/python3.8/site-packages/gnuradio/modtool/cli/__init__.py", line 26, in from .base import cli, common_params, block_name, ModToolException File "/usr/lib64/python3.8/site-packages/gnuradio/modtool/cli/base.py", line 37, in from click_plugins import with_plugins ModuleNotFoundError: No module named 'click_plugins' --- gnuradio.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gnuradio.spec b/gnuradio.spec index a955640..8671ba6 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -100,6 +100,7 @@ Requires: python3-pyyaml Requires: python3-gobject Requires: python3-six Requires: python3-mako +Requires: python3-click-plugins Requires: gtk3 %description From 106084c0458c21f0244532b90a05de211a8d729d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 20:53:28 +0000 Subject: [PATCH 211/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 8671ba6..c02953a 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.8.1.0 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -201,6 +201,9 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 3.8.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jun 03 2020 Jonathan Wakely - 3.8.1.0-4 - Rebuilt and patched for Boost 1.73.0 From 99ea70f352d72ffef1b7a7a7d220fff13f7c61ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 02:25:37 +0000 Subject: [PATCH 212/313] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnuradio.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index c02953a..76dc6c8 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.8.1.0 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Release: 6%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -201,6 +201,10 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 3.8.1.0-6 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 3.8.1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 03e331e562e6e94bd05086c3e8af52be66927254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 4 Aug 2020 12:37:48 +0200 Subject: [PATCH 213/313] Fixed FTBFS due to cmake changes Resolves: rhbz#1863736 --- gnuradio.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 76dc6c8..e58d9da 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.8.1.0 -Release: 6%{?alphatag:.%{alphatag}}%{?dist} +Release: 7%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -144,8 +144,6 @@ GNU Radio examples %patch0 -p1 %build -mkdir build -cd build %cmake \ -DSYSCONFDIR=%{_sysconfdir} \ -DGR_PKG_DOC_DIR=%{_docdir}/%{name} \ @@ -155,10 +153,10 @@ cd build .. #-DENABLE_DOXYGEN=FALSE \ -%make_build CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing" +%cmake_build %install -%make_install -C build +%cmake_install desktop-file-validate %{buildroot}%{_datadir}/applications/gnuradio-grc.desktop # Remove extraneous desktop/icon/mime files rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop @@ -201,6 +199,10 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Tue Aug 4 2020 Jaroslav Škarvada - 3.8.1.0-7 +- Fixed FTBFS due to cmake changes + Resolves: rhbz#1863736 + * Sat Aug 01 2020 Fedora Release Engineering - 3.8.1.0-6 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 0f7b40819696d31d80e1a9abbefb1ab29224df12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 24 Aug 2020 18:57:56 +0200 Subject: [PATCH 214/313] New version Resolves: rhbz#1871259 --- .gitignore | 1 + gnuradio.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cdf3903..c9887db 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ gnuradio-*.tar.gz /gnuradio-3.7.13.5.tar.xz /gnuradio-3.8.0.0.tar.xz /gnuradio-3.8.1.0.tar.xz +/gnuradio-3.8.2.0.tar.xz diff --git a/gnuradio.spec b/gnuradio.spec index e58d9da..02c6ef3 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,8 +21,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.8.1.0 -Release: 7%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.8.2.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -199,6 +199,10 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Mon Aug 24 2020 Jaroslav Škarvada - 3.8.2.0-1 +- New version + Resolves: rhbz#1871259 + * Tue Aug 4 2020 Jaroslav Škarvada - 3.8.1.0-7 - Fixed FTBFS due to cmake changes Resolves: rhbz#1863736 diff --git a/sources b/sources index 3d9e5d1..84610e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.8.1.0.tar.xz) = 8760f0b2b010e2d12107b8c285081206269ac2ae44438c37688ff238bece9f5941e3a7bdd0874d14d8695af11a52cc8d5b6e5f015f7d84c923a1e2eb98d05258 +SHA512 (gnuradio-3.8.2.0.tar.xz) = 1e9e68836e8ec1677887793599005ef1bd2cfb3a66d6cdec8c32ca5845fb4e920dbf0d3ecc3c6b02e2129d0c5048ba20400bf909fabd13740511af4319a9f881 From c4f78f33a44a965c354a506dc04906d58b320cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 24 Aug 2020 19:22:30 +0200 Subject: [PATCH 215/313] Updated boost patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio-bind-placeholders.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnuradio-bind-placeholders.patch b/gnuradio-bind-placeholders.patch index 6d6fb87..612526c 100644 --- a/gnuradio-bind-placeholders.patch +++ b/gnuradio-bind-placeholders.patch @@ -138,9 +138,9 @@ +using namespace boost::placeholders; + - push_msg_sink::sptr push_msg_sink::make(char* address, int timeout) + push_msg_sink::sptr push_msg_sink::make(char* address, int timeout, bool bind) { - return gnuradio::get_initial_sptr(new push_msg_sink_impl(address, timeout)); + return gnuradio::get_initial_sptr(new push_msg_sink_impl(address, timeout, bind)); --- gnuradio-3.8.1.0/gr-blocks/lib/socket_pdu_impl.cc~ 2020-06-03 17:20:39.245825015 +0100 +++ gnuradio-3.8.1.0/gr-blocks/lib/socket_pdu_impl.cc 2020-06-03 17:20:52.819828566 +0100 @@ -32,6 +32,8 @@ @@ -160,9 +160,9 @@ +using namespace boost::placeholders; + - pub_msg_sink::sptr pub_msg_sink::make(char* address, int timeout) + pub_msg_sink::sptr pub_msg_sink::make(char* address, int timeout, bool bind) { - return gnuradio::get_initial_sptr(new pub_msg_sink_impl(address, timeout)); + return gnuradio::get_initial_sptr(new pub_msg_sink_impl(address, timeout, bind)); --- gnuradio-3.8.1.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc~ 2020-06-03 17:35:50.436093636 +0100 +++ gnuradio-3.8.1.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc 2020-06-03 17:36:01.704097517 +0100 @@ -30,6 +30,8 @@ From c750883e81435cb2b89f8a878b1d3e2c2e4b925a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 25 Aug 2020 10:55:45 +0200 Subject: [PATCH 216/313] Explicitly disabled in-source build --- gnuradio.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 02c6ef3..09877d3 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.8.2.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -144,13 +144,15 @@ GNU Radio examples %patch0 -p1 %build +# this could be dropped when f32 get retired (not counting EPEL) +%undefine __cmake_in_source_build + %cmake \ -DSYSCONFDIR=%{_sysconfdir} \ -DGR_PKG_DOC_DIR=%{_docdir}/%{name} \ -DGR_PYTHON_DIR=%{python3_sitearch} \ -DPYTHON_EXECUTABLE=%{__python3} \ -%{?mfpu_neon} \ -.. +%{?mfpu_neon} #-DENABLE_DOXYGEN=FALSE \ %cmake_build @@ -199,6 +201,9 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Tue Aug 25 2020 Jaroslav Škarvada - 3.8.2.0-2 +- Explicitly disabled in-source build + * Mon Aug 24 2020 Jaroslav Škarvada - 3.8.2.0-1 - New version Resolves: rhbz#1871259 From ec936b98a0d8259f8e4dc3e0e580ceec13cbdd01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 30 Nov 2020 12:49:28 +0100 Subject: [PATCH 217/313] use GMP exclusively --- gnuradio.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 09877d3..f017370 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.8.2.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -58,10 +58,6 @@ BuildRequires: gsm-devel BuildRequires: gtk3-devel BuildRequires: jack-audio-connection-kit-devel BuildRequires: log4cpp-devel -# mpir is not yet available on ppc64le -%ifnarch ppc64le -BuildRequires: mpir-devel -%endif BuildRequires: orc-devel BuildRequires: portaudio-devel BuildRequires: python3-devel @@ -201,6 +197,9 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Mon Nov 30 2020 Dan Horák - 3.8.2.0-3 +- use GMP exclusively + * Tue Aug 25 2020 Jaroslav Škarvada - 3.8.2.0-2 - Explicitly disabled in-source build From 230d70d2cbd945620cb56165b048d0e32e879d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 18 Jan 2021 11:15:07 +0100 Subject: [PATCH 218/313] New version Resolves: rhbz#1917167 --- .gitignore | 1 + gnuradio.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c9887db..781afd5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ gnuradio-*.tar.gz /gnuradio-3.8.0.0.tar.xz /gnuradio-3.8.1.0.tar.xz /gnuradio-3.8.2.0.tar.xz +/gnuradio-3.9.0.0.tar.xz diff --git a/gnuradio.spec b/gnuradio.spec index f017370..1651440 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,8 +21,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.8.2.0 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.9.0.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -197,6 +197,10 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Mon Jan 18 2021 Jaroslav Škarvada - 3.9.0.0-1 +- New version + Resolves: rhbz#1917167 + * Mon Nov 30 2020 Dan Horák - 3.8.2.0-3 - use GMP exclusively diff --git a/sources b/sources index 84610e8..5968c18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.8.2.0.tar.xz) = 1e9e68836e8ec1677887793599005ef1bd2cfb3a66d6cdec8c32ca5845fb4e920dbf0d3ecc3c6b02e2129d0c5048ba20400bf909fabd13740511af4319a9f881 +SHA512 (gnuradio-3.9.0.0.tar.xz) = 6d2a9ad833487a3eda987a1993a823af8eef990b8570a5adf4533a951f477361ca1edfe7ded1e352605cbe05059160ee1c9b5575ebcf9e4a70a3c42f4e8ae458 From dc8e7e695497fa3785a1df57cfe6ece9c084d8aa Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 22 Jan 2021 21:03:34 +0000 Subject: [PATCH 219/313] Rebuilt for Boost 1.75 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 1651440..b768f38 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.0.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -197,6 +197,9 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Fri Jan 22 2021 Jonathan Wakely - 3.9.0.0-2 +- Rebuilt for Boost 1.75 + * Mon Jan 18 2021 Jaroslav Škarvada - 3.9.0.0-1 - New version Resolves: rhbz#1917167 From 1ab6c962cbc7113f1e167a4a8b1c135165deeb27 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 08:53:41 +0000 Subject: [PATCH 220/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index b768f38..1803192 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.0.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -197,6 +197,9 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.9.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jan 22 2021 Jonathan Wakely - 3.9.0.0-2 - Rebuilt for Boost 1.75 From f9d06f9211bff748de211da7cc9c900a23cd34cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 4 Feb 2021 00:39:25 +0100 Subject: [PATCH 221/313] FTBFS fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio-bind-placeholders.patch | 461 ------------------------------- gnuradio.spec | 18 +- 2 files changed, 9 insertions(+), 470 deletions(-) delete mode 100644 gnuradio-bind-placeholders.patch diff --git a/gnuradio-bind-placeholders.patch b/gnuradio-bind-placeholders.patch deleted file mode 100644 index 612526c..0000000 --- a/gnuradio-bind-placeholders.patch +++ /dev/null @@ -1,461 +0,0 @@ ---- gnuradio-3.8.1.0/gnuradio-runtime/lib/block.cc~ 2020-06-03 15:51:57.779451140 +0100 -+++ gnuradio-3.8.1.0/gnuradio-runtime/lib/block.cc 2020-06-03 15:52:03.567451466 +0100 -@@ -34,6 +34,8 @@ - - namespace gr { - -+using namespace boost::placeholders; -+ - block::block(const std::string& name, - io_signature::sptr input_signature, - io_signature::sptr output_signature) ---- gnuradio-3.8.1.0/gr-blocks/lib/copy_impl.cc~ 2020-06-03 16:48:48.001299713 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/copy_impl.cc 2020-06-03 16:48:15.300285011 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - copy::sptr copy::make(size_t itemsize) - { - return gnuradio::get_initial_sptr(new copy_impl(itemsize)); ---- gnuradio-3.8.1.0/gr-blocks/lib/message_debug_impl.cc~ 2020-06-03 16:52:57.083411688 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/message_debug_impl.cc 2020-06-03 16:52:59.468412760 +0100 -@@ -32,6 +32,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - message_debug::sptr message_debug::make() - { - return gnuradio::get_initial_sptr(new message_debug_impl()); ---- gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_impl.cc~ 2020-06-03 16:53:34.139428345 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_impl.cc 2020-06-03 16:53:35.651429024 +0100 -@@ -38,6 +38,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - message_strobe::sptr message_strobe::make(pmt::pmt_t msg, long period_ms) - { - return gnuradio::get_initial_sptr(new message_strobe_impl(msg, period_ms)); ---- gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_random_impl.cc~ 2020-06-03 16:53:52.959436804 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_random_impl.cc 2020-06-03 16:53:55.259437840 +0100 -@@ -38,6 +38,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - message_strobe_random::sptr - message_strobe_random::make(pmt::pmt_t msg, - message_strobe_random_distribution_t dist, ---- gnuradio-3.8.1.0/gr-blocks/lib/multiply_matrix_impl.cc~ 2020-06-03 16:48:42.217297113 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/multiply_matrix_impl.cc 2020-06-03 16:48:44.149297981 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - // Copy tags from input k to output l if A[l][k] is not zero - template <> - void multiply_matrix_impl::propagate_tags_by_A(int noutput_items, ---- gnuradio-3.8.1.0/gr-blocks/lib/mute_impl.cc~ 2020-06-03 16:44:53.010194065 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/mute_impl.cc 2020-06-03 16:45:12.423202794 +0100 -@@ -33,6 +33,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - template - typename mute_blk::sptr mute_blk::make(bool mute) - { ---- gnuradio-3.8.1.0/gr-blocks/lib/pdu_filter_impl.cc~ 2020-06-03 16:55:05.835454141 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/pdu_filter_impl.cc 2020-06-03 16:55:08.074454516 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - pdu_filter::sptr pdu_filter::make(pmt::pmt_t k, pmt::pmt_t v, bool invert) - { - return gnuradio::get_initial_sptr(new pdu_filter_impl(k, v, invert)); ---- gnuradio-3.8.1.0/gr-blocks/lib/pdu_remove_impl.cc~ 2020-06-03 16:56:03.653466103 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/pdu_remove_impl.cc 2020-06-03 16:56:05.132466450 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - pdu_remove::sptr pdu_remove::make(pmt::pmt_t k) - { - return gnuradio::get_initial_sptr(new pdu_remove_impl(k)); ---- gnuradio-3.8.1.0/gr-blocks/lib/pdu_set_impl.cc~ 2020-06-03 16:55:43.765461437 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/pdu_set_impl.cc 2020-06-03 16:55:45.990461957 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - pdu_set::sptr pdu_set::make(pmt::pmt_t k, pmt::pmt_t v) - { - return gnuradio::get_initial_sptr(new pdu_set_impl(k, v)); ---- gnuradio-3.8.1.0/gr-blocks/lib/random_pdu_impl.cc~ 2020-06-03 16:56:32.885472969 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/random_pdu_impl.cc 2020-06-03 16:56:34.848473430 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - random_pdu::sptr - random_pdu::make(int min_items, int max_items, unsigned char byte_mask, int length_modulo) - { ---- gnuradio-3.8.1.0/gr-blocks/lib/repeat_impl.cc~ 2020-06-03 16:57:12.092482177 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/repeat_impl.cc 2020-06-03 16:57:13.822482583 +0100 -@@ -30,6 +30,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - repeat::sptr repeat::make(size_t itemsize, int interp) - { - return gnuradio::get_initial_sptr(new repeat_impl(itemsize, interp)); ---- gnuradio-3.8.1.0/gr-zeromq/lib/push_msg_sink_impl.cc~ 2020-06-03 16:48:54.673302712 +0100 -+++ gnuradio-3.8.1.0/gr-zeromq/lib/push_msg_sink_impl.cc 2020-06-03 16:47:55.975276324 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace zeromq { - -+using namespace boost::placeholders; -+ - push_msg_sink::sptr push_msg_sink::make(char* address, int timeout, bool bind) - { - return gnuradio::get_initial_sptr(new push_msg_sink_impl(address, timeout, bind)); ---- gnuradio-3.8.1.0/gr-blocks/lib/socket_pdu_impl.cc~ 2020-06-03 17:20:39.245825015 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/socket_pdu_impl.cc 2020-06-03 17:20:52.819828566 +0100 -@@ -32,6 +32,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - socket_pdu::sptr socket_pdu::make(std::string type, - std::string addr, - std::string port, ---- gnuradio-3.8.1.0/gr-zeromq/lib/pub_msg_sink_impl.cc~ 2020-06-03 17:21:50.046843529 +0100 -+++ gnuradio-3.8.1.0/gr-zeromq/lib/pub_msg_sink_impl.cc 2020-06-03 17:21:57.819845564 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace zeromq { - -+using namespace boost::placeholders; -+ - pub_msg_sink::sptr pub_msg_sink::make(char* address, int timeout, bool bind) - { - return gnuradio::get_initial_sptr(new pub_msg_sink_impl(address, timeout, bind)); ---- gnuradio-3.8.1.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc~ 2020-06-03 17:35:50.436093636 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc 2020-06-03 17:36:01.704097517 +0100 -@@ -30,6 +30,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - tagged_stream_multiply_length::sptr tagged_stream_multiply_length::make( - size_t itemsize, const std::string& lengthtagname, double scalar) - { ---- gnuradio-3.8.1.0/gr-blocks/lib/tuntap_pdu_impl.cc~ 2020-06-03 17:46:10.583307228 +0100 -+++ gnuradio-3.8.1.0/gr-blocks/lib/tuntap_pdu_impl.cc 2020-06-03 17:46:23.642311727 +0100 -@@ -42,6 +42,8 @@ - namespace gr { - namespace blocks { - -+using namespace boost::placeholders; -+ - tuntap_pdu::sptr tuntap_pdu::make(std::string dev, int MTU, bool istunflag) - { - #if (defined(linux) || defined(__linux) || defined(__linux__)) ---- gnuradio-3.8.1.0/gr-fec/lib/async_encoder_impl.cc~ 2020-06-03 17:53:59.572468794 +0100 -+++ gnuradio-3.8.1.0/gr-fec/lib/async_encoder_impl.cc 2020-06-03 17:54:10.438472537 +0100 -@@ -32,6 +32,8 @@ - namespace gr { - namespace fec { - -+using namespace boost::placeholders; -+ - async_encoder::sptr async_encoder::make(generic_encoder::sptr my_encoder, - bool packed, - bool rev_unpack, ---- gnuradio-3.8.1.0/gr-fec/lib/async_decoder_impl.cc~ 2020-06-03 17:54:23.920477182 +0100 -+++ gnuradio-3.8.1.0/gr-fec/lib/async_decoder_impl.cc 2020-06-03 17:54:33.581480511 +0100 -@@ -32,6 +32,8 @@ - namespace gr { - namespace fec { - -+using namespace boost::placeholders; -+ - async_decoder::sptr - async_decoder::make(generic_decoder::sptr my_decoder, bool packed, bool rev_pack, int mtu) - { ---- gnuradio-3.8.1.0/gr-filter/lib/freq_xlating_fir_filter_impl.cc~ 2020-06-03 17:54:45.106484482 +0100 -+++ gnuradio-3.8.1.0/gr-filter/lib/freq_xlating_fir_filter_impl.cc 2020-06-03 17:54:57.687488823 +0100 -@@ -32,6 +32,8 @@ - namespace gr { - namespace filter { - -+using namespace boost::placeholders; -+ - template - typename freq_xlating_fir_filter::sptr - freq_xlating_fir_filter::make(int decimation, ---- gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_ff_impl.cc~ 2020-06-03 18:11:26.622789087 +0100 -+++ gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_ff_impl.cc 2020-06-03 18:11:49.178794574 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace filter { - -+using namespace boost::placeholders; -+ - mmse_resampler_ff::sptr mmse_resampler_ff::make(float phase_shift, float resamp_ratio) - { - return gnuradio::get_initial_sptr( ---- gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_cc_impl.cc~ 2020-06-03 18:12:00.982797440 +0100 -+++ gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_cc_impl.cc 2020-06-03 18:12:09.225799444 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace filter { - -+using namespace boost::placeholders; -+ - mmse_resampler_cc::sptr mmse_resampler_cc::make(float phase_shift, float resamp_ratio) - { - return gnuradio::get_initial_sptr( ---- gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_f_impl.cc~ 2020-06-03 18:33:55.755116400 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_f_impl.cc 2020-06-03 18:34:05.401118739 +0100 -@@ -37,6 +37,7 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; - - freq_sink_f::sptr freq_sink_f::make(int fftsize, - int wintype, ---- gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_c_impl.cc~ 2020-06-03 18:34:16.116121337 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_c_impl.cc 2020-06-03 18:34:26.130123766 +0100 -@@ -38,6 +38,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - freq_sink_c::sptr freq_sink_c::make(int fftsize, - int wintype, - double fc, ---- gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_f_impl.cc~ 2020-06-03 18:34:49.413129410 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_f_impl.cc 2020-06-03 18:35:00.258132040 +0100 -@@ -36,6 +36,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - time_raster_sink_f::sptr time_raster_sink_f::make(double samp_rate, - double rows, - double cols, ---- gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_b_impl.cc~ 2020-06-03 18:35:16.004135858 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_b_impl.cc 2020-06-03 18:35:28.818138965 +0100 -@@ -36,6 +36,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - time_raster_sink_b::sptr time_raster_sink_b::make(double samp_rate, - double rows, - double cols, ---- gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_f_impl.cc~ 2020-06-03 18:35:46.982143370 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_f_impl.cc 2020-06-03 18:35:58.555146176 +0100 -@@ -40,6 +40,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - time_sink_f::sptr time_sink_f::make(int size, - double samp_rate, - const std::string& name, ---- gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_c_impl.cc~ 2020-06-03 18:36:10.189148997 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_c_impl.cc 2020-06-03 18:36:21.394151714 +0100 -@@ -39,6 +39,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - time_sink_c::sptr time_sink_c::make(int size, - double samp_rate, - const std::string& name, ---- gnuradio-3.8.1.0/gr-qtgui/lib/sink_f_impl.cc~ 2020-06-03 18:36:31.583154184 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/sink_f_impl.cc 2020-06-03 18:36:41.626156620 +0100 -@@ -36,6 +36,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - sink_f::sptr sink_f::make(int fftsize, - int wintype, - double fc, ---- gnuradio-3.8.1.0/gr-qtgui/lib/sink_c_impl.cc~ 2020-06-03 18:36:54.167159661 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/sink_c_impl.cc 2020-06-03 18:37:04.898162263 +0100 -@@ -36,6 +36,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - sink_c::sptr sink_c::make(int fftsize, - int wintype, - double fc, ---- gnuradio-3.8.1.0/gr-analog/lib/sig_source_impl.cc~ 2020-06-03 18:37:26.774167567 +0100 -+++ gnuradio-3.8.1.0/gr-analog/lib/sig_source_impl.cc 2020-06-03 18:37:38.170170330 +0100 -@@ -36,6 +36,8 @@ - namespace gr { - namespace analog { - -+using namespace boost::placeholders; -+ - template - typename sig_source::sptr sig_source::make(double sampling_freq, - gr_waveform_t waveform, ---- gnuradio-3.8.1.0/gr-digital/lib/chunks_to_symbols_impl.cc~ 2020-06-03 19:28:24.388506913 +0100 -+++ gnuradio-3.8.1.0/gr-digital/lib/chunks_to_symbols_impl.cc 2020-06-03 19:28:36.713514932 +0100 -@@ -32,6 +32,8 @@ - namespace gr { - namespace digital { - -+using namespace boost::placeholders; -+ - template - typename chunks_to_symbols::sptr - chunks_to_symbols::make(const std::vector& symbol_table, const int D) ---- gnuradio-3.8.1.0/gr-digital/lib/constellation_receiver_cb_impl.cc~ 2020-06-03 19:28:46.334521192 +0100 -+++ gnuradio-3.8.1.0/gr-digital/lib/constellation_receiver_cb_impl.cc 2020-06-03 19:28:57.697528585 +0100 -@@ -34,6 +34,8 @@ - namespace gr { - namespace digital { - -+using namespace boost::placeholders; -+ - #define VERBOSE_MM 0 // Used for debugging symbol timing loop - #define VERBOSE_COSTAS 0 // Used for debugging phase and frequency tracking - ---- gnuradio-3.8.1.0/gr-digital/lib/costas_loop_cc_impl.cc~ 2020-06-03 19:29:06.799534507 +0100 -+++ gnuradio-3.8.1.0/gr-digital/lib/costas_loop_cc_impl.cc 2020-06-03 19:29:16.802541015 +0100 -@@ -34,6 +34,8 @@ - namespace gr { - namespace digital { - -+using namespace boost::placeholders; -+ - costas_loop_cc::sptr costas_loop_cc::make(float loop_bw, int order, bool use_snr) - { - return gnuradio::get_initial_sptr(new costas_loop_cc_impl(loop_bw, order, use_snr)); ---- gnuradio-3.8.1.0/gr-qtgui/lib/const_sink_c_impl.cc~ 2020-06-03 19:29:29.694549403 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/const_sink_c_impl.cc 2020-06-03 19:29:38.089554865 +0100 -@@ -35,6 +35,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - const_sink_c::sptr - const_sink_c::make(int size, const std::string& name, int nconnections, QWidget* parent) - { ---- gnuradio-3.8.1.0/gr-digital/lib/crc32_async_bb_impl.cc~ 2020-06-03 19:29:48.487561630 +0100 -+++ gnuradio-3.8.1.0/gr-digital/lib/crc32_async_bb_impl.cc 2020-06-03 19:30:02.250570584 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace digital { - -+using namespace boost::placeholders; -+ - crc32_async_bb::sptr crc32_async_bb::make(bool check) - { - return gnuradio::get_initial_sptr(new crc32_async_bb_impl(check)); ---- gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_f_impl.cc~ 2020-06-03 19:30:17.822580714 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_f_impl.cc 2020-06-03 19:30:28.490587655 +0100 -@@ -37,6 +37,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - waterfall_sink_f::sptr waterfall_sink_f::make(int fftsize, - int wintype, - double fc, ---- gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_c_impl.cc~ 2020-06-03 19:32:58.390685182 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_c_impl.cc 2020-06-03 19:33:14.002695338 +0100 -@@ -39,6 +39,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - waterfall_sink_c::sptr waterfall_sink_c::make(int fftsize, - int wintype, - double fc, ---- gnuradio-3.8.1.0/gr-qtgui/lib/histogram_sink_f_impl.cc~ 2020-06-03 19:33:35.366709261 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/histogram_sink_f_impl.cc 2020-06-03 19:33:41.602713329 +0100 -@@ -37,6 +37,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - histogram_sink_f::sptr histogram_sink_f::make(int size, - int bins, - double xmin, ---- gnuradio-3.8.1.0/gr-qtgui/lib/edit_box_msg_impl.cc~ 2020-06-03 19:33:51.836719995 +0100 -+++ gnuradio-3.8.1.0/gr-qtgui/lib/edit_box_msg_impl.cc 2020-06-03 19:34:00.055725357 +0100 -@@ -35,6 +35,8 @@ - namespace gr { - namespace qtgui { - -+using namespace boost::placeholders; -+ - edit_box_msg::sptr edit_box_msg::make(data_type_t type, - const std::string& label, - const std::string& value, ---- gnuradio-3.8.1.0/gr-digital/lib/header_payload_demux_impl.cc~ 2020-06-03 19:34:13.356734041 +0100 -+++ gnuradio-3.8.1.0/gr-digital/lib/header_payload_demux_impl.cc 2020-06-03 19:34:20.622738782 +0100 -@@ -31,6 +31,8 @@ - namespace gr { - namespace digital { - -+using namespace boost::placeholders; -+ - const pmt::pmt_t header_payload_demux_impl::msg_port_id() - { - static const pmt::pmt_t msg_port_id = pmt::mp("header_data"); ---- gnuradio-3.8.1.0/gr-digital/lib/protocol_formatter_async_impl.cc~ 2020-06-03 19:34:29.133744331 +0100 -+++ gnuradio-3.8.1.0/gr-digital/lib/protocol_formatter_async_impl.cc 2020-06-03 19:34:34.557747861 +0100 -@@ -32,6 +32,8 @@ - namespace gr { - namespace digital { - -+using namespace boost::placeholders; -+ - protocol_formatter_async::sptr - protocol_formatter_async::make(const header_format_base::sptr& format) - { diff --git a/gnuradio.spec b/gnuradio.spec index 1803192..df1d659 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.0.0 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -35,10 +35,6 @@ Source0: https://github.com/gnuradio/%{name}/releases/download/v%{version}/%{nam # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ # gzip > ../%%{name}-%%{version}.tar.gz -# Fix errors due to Boost.Bind placeholders -# See also https://github.com/gnuradio/gnuradio/pull/3489 -Patch0: %{name}-bind-placeholders.patch - Requires(pre): shadow-utils BuildRequires: cmake BuildRequires: gcc-c++ @@ -84,6 +80,8 @@ BuildRequires: xdg-utils BuildRequires: xmlto BuildRequires: zeromq-devel BuildRequires: python3-gobject +BuildRequires: pybind11-devel +BuildRequires: volk-devel Requires: python3-%{name} = %{version}-%{release} Requires: python3-numpy @@ -137,7 +135,6 @@ GNU Radio examples %prep %setup -q -n %{name}-%{version}%{?alphatag} -%patch0 -p1 %build # this could be dropped when f32 get retired (not counting EPEL) @@ -158,7 +155,6 @@ GNU Radio examples desktop-file-validate %{buildroot}%{_datadir}/applications/gnuradio-grc.desktop # Remove extraneous desktop/icon/mime files rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop -rm -r %{buildroot}%{_datadir}/icons/gnome %ldconfig_scriptlets @@ -171,6 +167,7 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/applications/gnuradio-grc.desktop %{_datadir}/mime/packages/gnuradio-grc.xml %{_datadir}/icons/hicolor/*/apps/gnuradio-grc.png +%{_datadir}/metainfo/org.gnuradio.grc.metainfo.xml %config(noreplace) %{_sysconfdir}/gnuradio %exclude %{_datadir}/gnuradio/examples %exclude %{_docdir}/%{name}/html @@ -180,13 +177,11 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %files -n python3-%{name} %{python3_sitearch}/%{name}/ %{python3_sitearch}/pmt/ -%{python3_sitearch}/volk_modtool/ %files devel %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc -%{_libdir}/cmake/volk %{_libdir}/cmake/gnuradio %files doc @@ -197,6 +192,11 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Wed Feb 3 2021 Jaroslav Škarvada - 3.9.0.0-4 +- Fixed FTBFS + Resolves: rhbz#1919794 + Resolves: rhbz#1921503 + * Tue Jan 26 2021 Fedora Release Engineering - 3.9.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 16f2f1a2553893387c0883f659979d0fdaf5fc85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 17 Feb 2021 19:15:35 +0100 Subject: [PATCH 222/313] Built with libsndfile --- gnuradio.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index df1d659..d6bbb1b 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.0.0 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -82,6 +82,7 @@ BuildRequires: zeromq-devel BuildRequires: python3-gobject BuildRequires: pybind11-devel BuildRequires: volk-devel +BuildRequires: libsndfile-devel Requires: python3-%{name} = %{version}-%{release} Requires: python3-numpy @@ -192,6 +193,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Wed Feb 17 2021 Jaroslav Škarvada - 3.9.0.0-5 +- Built with libsndfile + * Wed Feb 3 2021 Jaroslav Škarvada - 3.9.0.0-4 - Fixed FTBFS Resolves: rhbz#1919794 From d0fd50bd6b70fc555fae2bf53a19571b6c548fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 23 Mar 2021 17:13:52 +0100 Subject: [PATCH 223/313] New version Resolves: rhbz#1941867 --- .gitignore | 9 +-------- gnuradio.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 781afd5..1271f7a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1 @@ -gnuradio-*.tar.gz -/gnuradio-3.7.13.3.tar.xz -/gnuradio-3.7.13.4.tar.xz -/gnuradio-3.7.13.5.tar.xz -/gnuradio-3.8.0.0.tar.xz -/gnuradio-3.8.1.0.tar.xz -/gnuradio-3.8.2.0.tar.xz -/gnuradio-3.9.0.0.tar.xz +/gnuradio-*.tar.gz diff --git a/gnuradio.spec b/gnuradio.spec index d6bbb1b..0b7ecfb 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,15 +21,15 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.9.0.0 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.9.1.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 URL: https://www.gnuradio.org/ #Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}%%{?alphatag}.tar.xz #Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}.tar.gz -Source0: https://github.com/gnuradio/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz +Source0: https://github.com/gnuradio/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz # git clone git://gnuradio.org/gnuradio # cd gnuradio # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ @@ -193,6 +193,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Tue Mar 23 2021 Jaroslav Škarvada - 3.9.1.0-1 +- New version + Resolves: rhbz#1941867 + * Wed Feb 17 2021 Jaroslav Škarvada - 3.9.0.0-5 - Built with libsndfile diff --git a/sources b/sources index 5968c18..07c678a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.9.0.0.tar.xz) = 6d2a9ad833487a3eda987a1993a823af8eef990b8570a5adf4533a951f477361ca1edfe7ded1e352605cbe05059160ee1c9b5575ebcf9e4a70a3c42f4e8ae458 +SHA512 (gnuradio-3.9.1.0.tar.gz) = 77a7d7382f3c188678bd3e71101261cfe6eb76b44be281a740c346181c2b28e52e24c9ee65766927aecad596bbfbda90fc9ea76183556bf19ebfb0fa8316bced From 07e402a1bae90b1f39bf09f22c2dcd19c9125048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 3 May 2021 22:17:57 +0200 Subject: [PATCH 224/313] Added workaround to the helper script for the rhbz#1926687 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- clean_patent_problems.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clean_patent_problems.sh b/clean_patent_problems.sh index bfe703b..bc5c9de 100755 --- a/clean_patent_problems.sh +++ b/clean_patent_problems.sh @@ -10,8 +10,8 @@ PROBLEMS=( 'gr-atsc' ) -# Indicate the source -URL=$(spectool -S -l ./gnuradio.spec | sed -E 's/Source0:\s+//g') +# Indicate the source (including workaround for rhbz#1926687) +URL=$(spectool -S -l ./gnuradio.spec | sed -nE '/^\s*Source/ s/Source0:\s+//g;p') # Meta variables SOURCE=$(basename $URL) From a66c60b111173d738f32ee94b76d60ffe77c94f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 3 May 2021 22:22:06 +0200 Subject: [PATCH 225/313] Another fix to the helper script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- clean_patent_problems.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clean_patent_problems.sh b/clean_patent_problems.sh index bc5c9de..1ed9ec0 100755 --- a/clean_patent_problems.sh +++ b/clean_patent_problems.sh @@ -11,7 +11,7 @@ PROBLEMS=( ) # Indicate the source (including workaround for rhbz#1926687) -URL=$(spectool -S -l ./gnuradio.spec | sed -nE '/^\s*Source/ s/Source0:\s+//g;p') +URL=$(spectool -S -l ./gnuradio.spec | sed -nE '/^\s*Source/ s/Source0:\s+//g p') # Meta variables SOURCE=$(basename $URL) From 23c382b14fb00fcc86a3a05c23ec6c3416a4e6c5 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 10 May 2021 16:08:24 +0100 Subject: [PATCH 226/313] Rebuilt for removed libstdc++ symbols (#1937698) --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 0b7ecfb..7e01064 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.1.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -193,6 +193,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Mon May 10 2021 Jonathan Wakely - 3.9.1.0-2 +- Rebuilt for removed libstdc++ symbols (#1937698) + * Tue Mar 23 2021 Jaroslav Škarvada - 3.9.1.0-1 - New version Resolves: rhbz#1941867 From fd84d02d14749f853d479122413cf00833b2bc24 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:05:59 +0200 Subject: [PATCH 227/313] Rebuilt for Python 3.10 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 7e01064..d2d4511 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.1.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -193,6 +193,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Fri Jun 04 2021 Python Maint - 3.9.1.0-3 +- Rebuilt for Python 3.10 + * Mon May 10 2021 Jonathan Wakely - 3.9.1.0-2 - Rebuilt for removed libstdc++ symbols (#1937698) From c8bd67517ad315c012eca234524767ec84e449fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 12 Jun 2021 00:08:39 +0200 Subject: [PATCH 228/313] New version Resolves: rhbz#1970659 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index d2d4511..4bfcdf0 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,8 +21,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.9.1.0 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.9.2.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -193,6 +193,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Fri Jun 11 2021 Jaroslav Škarvada - 3.9.2.0-1 +- New version + Resolves: rhbz#1970659 + * Fri Jun 04 2021 Python Maint - 3.9.1.0-3 - Rebuilt for Python 3.10 diff --git a/sources b/sources index 07c678a..d9e4de7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.9.1.0.tar.gz) = 77a7d7382f3c188678bd3e71101261cfe6eb76b44be281a740c346181c2b28e52e24c9ee65766927aecad596bbfbda90fc9ea76183556bf19ebfb0fa8316bced +SHA512 (gnuradio-3.9.2.0.tar.gz) = 4687911740752bd233dec2cdd45d90297939af1580b186c5fd4c12e92f189e9aa4498cf89756042a65d77bbcdaa2619a207185838a7a54e49032061110af24fb From f6f5cbcdce69135132588ce1f0ae0d999029c1a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 12 Jun 2021 11:22:03 +0200 Subject: [PATCH 229/313] Enabled Soapy support --- gnuradio.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 4bfcdf0..8ab25e5 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.2.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -83,6 +83,7 @@ BuildRequires: python3-gobject BuildRequires: pybind11-devel BuildRequires: volk-devel BuildRequires: libsndfile-devel +BuildRequires: SoapySDR-devel Requires: python3-%{name} = %{version}-%{release} Requires: python3-numpy @@ -193,6 +194,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Sat Jun 12 2021 Jaroslav Škarvada - 3.9.2.0-2 +- Enabled Soapy support + * Fri Jun 11 2021 Jaroslav Škarvada - 3.9.2.0-1 - New version Resolves: rhbz#1970659 From 995e230b9cee1f28279eca9bbd9d0b5bfd02aa16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 2 Jul 2021 20:47:26 +0200 Subject: [PATCH 230/313] Rebuilt for new uhd --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 8ab25e5..6f6493e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.2.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -194,6 +194,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Fri Jul 2 2021 Jaroslav Škarvada - 3.9.2.0-3 +- Rebuilt for new uhd + * Sat Jun 12 2021 Jaroslav Škarvada - 3.9.2.0-2 - Enabled Soapy support From 21b206ee74cbfbc7be30ea74231eebabfa394fa4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 02:29:48 +0000 Subject: [PATCH 231/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 6f6493e..b4e3403 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.2.0 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -194,6 +194,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 3.9.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jul 2 2021 Jaroslav Škarvada - 3.9.2.0-3 - Rebuilt for new uhd From f1693ad2192cb47a2d4473b587b338b417577731 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 7 Aug 2021 04:44:57 +0100 Subject: [PATCH 232/313] Rebuilt for Boost 1.76 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index b4e3403..667952f 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.2.0 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -194,6 +194,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Sat Aug 07 2021 Jonathan Wakely - 3.9.2.0-5 +- Rebuilt for Boost 1.76 + * Thu Jul 22 2021 Fedora Release Engineering - 3.9.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From d0ecce833f3e90dfed8d728484db206e70569b62 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 23 Aug 2021 09:25:19 -0500 Subject: [PATCH 233/313] Rebuild for codec2 1.0. --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 667952f..d591cf1 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.2.0 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Release: 6%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -194,6 +194,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Mon Aug 23 2021 Richard Shaw - 3.9.2.0-6 +- Rebuild for codec2 1.0. + * Sat Aug 07 2021 Jonathan Wakely - 3.9.2.0-5 - Rebuilt for Boost 1.76 From cc26cc8f70265ea40274bb8eb30c425e71ae367f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 25 Aug 2021 00:46:11 +0200 Subject: [PATCH 234/313] Rebuilt for new soapy and codec2 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index d591cf1..65f2c8b 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.2.0 -Release: 6%{?alphatag:.%{alphatag}}%{?dist} +Release: 7%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -194,6 +194,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Tue Aug 24 2021 Jaroslav Škarvada - 3.9.2.0-7 +- Rebuilt for new soapy and codec2 + * Mon Aug 23 2021 Richard Shaw - 3.9.2.0-6 - Rebuild for codec2 1.0. From 51959e224c55d95fe410de14a9d06c3b06b29558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 5 Oct 2021 21:24:19 +0200 Subject: [PATCH 235/313] New version Resolves: rhbz#2009572 --- gnuradio.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 65f2c8b..f02d769 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,8 +21,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.9.2.0 -Release: 7%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.9.3.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -194,6 +194,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Tue Oct 5 2021 Jaroslav Škarvada - 3.9.3.0-1 +- New version + Resolves: rhbz#2009572 + * Tue Aug 24 2021 Jaroslav Škarvada - 3.9.2.0-7 - Rebuilt for new soapy and codec2 diff --git a/sources b/sources index d9e4de7..13c60a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.9.2.0.tar.gz) = 4687911740752bd233dec2cdd45d90297939af1580b186c5fd4c12e92f189e9aa4498cf89756042a65d77bbcdaa2619a207185838a7a54e49032061110af24fb +SHA512 (gnuradio-3.9.3.0.tar.gz) = 9ce6d0cf57b6f1b37c17ca037972038cb2f93cf9c734ba399a2c608afa2e4cc1c5f847f9aeb3440297a917f31289f2dfb9372a6683684ba2028fed1de355654d From fe9d16e6e62569d36a7beb92f1a97e4f32d70129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 19 Oct 2021 22:32:00 +0200 Subject: [PATCH 236/313] Fixed gnuradio-companion traceback on gtk init Resolves: rhbz#2014797 --- gnuradio-3.9.3.0-gtk-init.patch | 89 +++++++++++++++++++++++++++++++++ gnuradio.spec | 10 +++- 2 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 gnuradio-3.9.3.0-gtk-init.patch diff --git a/gnuradio-3.9.3.0-gtk-init.patch b/gnuradio-3.9.3.0-gtk-init.patch new file mode 100644 index 0000000..48866d6 --- /dev/null +++ b/gnuradio-3.9.3.0-gtk-init.patch @@ -0,0 +1,89 @@ +From 10edf66902f2926be1fa627a73b8cd6080973fc9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marcus=20M=C3=BCller?= +Date: Tue, 19 Oct 2021 19:37:38 +0200 +Subject: [PATCH 1/2] GRC: don't rely on GUI to inform about failure to + initialize GUI +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Marcus Müller +--- + grc/scripts/gnuradio-companion | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion +index 1d4af86b4c0..dea54a9da29 100755 +--- a/grc/scripts/gnuradio-companion ++++ b/grc/scripts/gnuradio-companion +@@ -37,10 +37,16 @@ def die(error, message): + ) + d.set_title(type(error).__name__) + d.run() +- exit(1) ++ sys.exit(1) + except ImportError: +- exit(type(error).__name__ + '\n\n' + msg) +- ++ sys.exit(type(error).__name__ + '\n\n' + msg) ++ except Exception as _exception: ++ print( ++ "While trying to display an error message, another error occurred", ++ file=sys.stderr) ++ print(_exception, file=sys.stderr) ++ print("The original error message follows.", file=sys.stderr) ++ sys.exit(type(error).__name__ + '\n\n' + msg) + + def check_gtk(): + try: + +From 3094aa222ecb5890a50476edf53b7d191207a508 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marcus=20M=C3=BCller?= +Date: Tue, 19 Oct 2021 19:49:14 +0200 +Subject: [PATCH 2/2] GRC: be tolerant against Gtk.init_check failure, which + seems to be flimsy +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Marcus Müller +--- + grc/scripts/gnuradio-companion | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion +index dea54a9da29..c1f523d02e3 100755 +--- a/grc/scripts/gnuradio-companion ++++ b/grc/scripts/gnuradio-companion +@@ -7,7 +7,6 @@ + + import os + import sys +-import warnings + + + GR_IMPORT_ERROR_MESSAGE = """\ +@@ -50,15 +49,20 @@ def die(error, message): + + def check_gtk(): + try: +- warnings.filterwarnings("error") + import gi + gi.require_version('Gtk', '3.0') + gi.require_version('PangoCairo', '1.0') + gi.require_foreign('cairo', 'Context') + + from gi.repository import Gtk +- Gtk.init_check() +- warnings.filterwarnings("always") ++ success = Gtk.init_check()[0] ++ if not success: ++ # Don't display a warning dialogue. This seems to be a Gtk bug. If it ++ # still can display warning dialogues, it does probably work! ++ print( ++ "Gtk init_check failed. GRC might not be able to start a GUI.", ++ file=sys.stderr) ++ + except Exception as err: + die(err, "Failed to initialize GTK. If you are running over ssh, " + "did you enable X forwarding and start ssh with -X?") diff --git a/gnuradio.spec b/gnuradio.spec index f02d769..ad764ad 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.3.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -98,6 +98,8 @@ Requires: python3-six Requires: python3-mako Requires: python3-click-plugins Requires: gtk3 +# https://github.com/gnuradio/gnuradio/pull/5217 +Patch0: gnuradio-3.9.3.0-gtk-init.patch %description GNU Radio is a collection of software that when combined with minimal @@ -136,7 +138,7 @@ Requires: %{name} = %{version}-%{release} GNU Radio examples %prep -%setup -q -n %{name}-%{version}%{?alphatag} +%autosetup -p1 -n %{name}-%{version}%{?alphatag} %build # this could be dropped when f32 get retired (not counting EPEL) @@ -194,6 +196,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Tue Oct 19 2021 Jaroslav Škarvada - 3.9.3.0-2 +- Fixed gnuradio-companion traceback on gtk init + Resolves: rhbz#2014797 + * Tue Oct 5 2021 Jaroslav Škarvada - 3.9.3.0-1 - New version Resolves: rhbz#2009572 From 9e2bf4d150ec2a94efdcd6f86b439009ddc879c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 20 Oct 2021 10:24:37 +0200 Subject: [PATCH 237/313] Synced gtk-init patch with the upstream Added requirement for the python3-qt5 Resolves: rhbz#2015642 --- gnuradio-3.9.3.0-gtk-init.patch | 21 +++++++++++++++------ gnuradio.spec | 8 +++++++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/gnuradio-3.9.3.0-gtk-init.patch b/gnuradio-3.9.3.0-gtk-init.patch index 48866d6..a0673a7 100644 --- a/gnuradio-3.9.3.0-gtk-init.patch +++ b/gnuradio-3.9.3.0-gtk-init.patch @@ -1,4 +1,4 @@ -From 10edf66902f2926be1fa627a73b8cd6080973fc9 Mon Sep 17 00:00:00 2001 +From 4de91e691fecb5abc3a842c9e25112de0db67e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= Date: Tue, 19 Oct 2021 19:37:38 +0200 Subject: [PATCH 1/2] GRC: don't rely on GUI to inform about failure to @@ -9,11 +9,11 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Marcus Müller --- - grc/scripts/gnuradio-companion | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) + grc/scripts/gnuradio-companion | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion -index 1d4af86b4c0..dea54a9da29 100755 +index 1d4af86b4c0..d0757e87eac 100755 --- a/grc/scripts/gnuradio-companion +++ b/grc/scripts/gnuradio-companion @@ -37,10 +37,16 @@ def die(error, message): @@ -36,8 +36,17 @@ index 1d4af86b4c0..dea54a9da29 100755 def check_gtk(): try: +@@ -82,7 +88,7 @@ def run_main(): + print("Running from source tree") + sys.path.insert(1, script_path[:-len(source_tree_subpath)]) + from grc.main import main +- exit(main()) ++ sys.exit(main()) + + + if __name__ == '__main__': -From 3094aa222ecb5890a50476edf53b7d191207a508 Mon Sep 17 00:00:00 2001 +From 5b43f4645b47f3ff862b1b645cfa6d0fb8f1e8e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= Date: Tue, 19 Oct 2021 19:49:14 +0200 Subject: [PATCH 2/2] GRC: be tolerant against Gtk.init_check failure, which @@ -52,7 +61,7 @@ Signed-off-by: Marcus Müller 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion -index dea54a9da29..c1f523d02e3 100755 +index d0757e87eac..2f299744717 100755 --- a/grc/scripts/gnuradio-companion +++ b/grc/scripts/gnuradio-companion @@ -7,7 +7,6 @@ diff --git a/gnuradio.spec b/gnuradio.spec index ad764ad..0e93e55 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.3.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -97,6 +97,7 @@ Requires: python3-gobject Requires: python3-six Requires: python3-mako Requires: python3-click-plugins +Requires: python3-qt5 Requires: gtk3 # https://github.com/gnuradio/gnuradio/pull/5217 Patch0: gnuradio-3.9.3.0-gtk-init.patch @@ -196,6 +197,11 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Wed Oct 20 2021 Jaroslav Škarvada - 3.9.3.0-3 +- Synced gtk-init patch with the upstream +- Added requirement for the python3-qt5 + Resolves: rhbz#2015642 + * Tue Oct 19 2021 Jaroslav Škarvada - 3.9.3.0-2 - Fixed gnuradio-companion traceback on gtk init Resolves: rhbz#2014797 From 6f9bbb721ef0f284bff812fb0f172c3e4688e0ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 1 Nov 2021 12:29:59 +0100 Subject: [PATCH 238/313] New version Resolves: rhbz#2018818 --- gnuradio.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 0e93e55..44a314c 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,8 +21,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.9.3.0 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.9.4.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -197,6 +197,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Mon Nov 1 2021 Jaroslav Škarvada - 3.9.4.0-1 +- New version + Resolves: rhbz#2018818 + * Wed Oct 20 2021 Jaroslav Škarvada - 3.9.3.0-3 - Synced gtk-init patch with the upstream - Added requirement for the python3-qt5 From d3570266ea531b586e1e37e9a9ef9c62eb032782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 1 Nov 2021 12:32:04 +0100 Subject: [PATCH 239/313] Dropped upstreamed patch and uploaded sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio-3.9.3.0-gtk-init.patch | 98 --------------------------------- gnuradio.spec | 2 - sources | 2 +- 3 files changed, 1 insertion(+), 101 deletions(-) delete mode 100644 gnuradio-3.9.3.0-gtk-init.patch diff --git a/gnuradio-3.9.3.0-gtk-init.patch b/gnuradio-3.9.3.0-gtk-init.patch deleted file mode 100644 index a0673a7..0000000 --- a/gnuradio-3.9.3.0-gtk-init.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 4de91e691fecb5abc3a842c9e25112de0db67e26 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcus=20M=C3=BCller?= -Date: Tue, 19 Oct 2021 19:37:38 +0200 -Subject: [PATCH 1/2] GRC: don't rely on GUI to inform about failure to - initialize GUI -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Marcus Müller ---- - grc/scripts/gnuradio-companion | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion -index 1d4af86b4c0..d0757e87eac 100755 ---- a/grc/scripts/gnuradio-companion -+++ b/grc/scripts/gnuradio-companion -@@ -37,10 +37,16 @@ def die(error, message): - ) - d.set_title(type(error).__name__) - d.run() -- exit(1) -+ sys.exit(1) - except ImportError: -- exit(type(error).__name__ + '\n\n' + msg) -- -+ sys.exit(type(error).__name__ + '\n\n' + msg) -+ except Exception as _exception: -+ print( -+ "While trying to display an error message, another error occurred", -+ file=sys.stderr) -+ print(_exception, file=sys.stderr) -+ print("The original error message follows.", file=sys.stderr) -+ sys.exit(type(error).__name__ + '\n\n' + msg) - - def check_gtk(): - try: -@@ -82,7 +88,7 @@ def run_main(): - print("Running from source tree") - sys.path.insert(1, script_path[:-len(source_tree_subpath)]) - from grc.main import main -- exit(main()) -+ sys.exit(main()) - - - if __name__ == '__main__': - -From 5b43f4645b47f3ff862b1b645cfa6d0fb8f1e8e6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcus=20M=C3=BCller?= -Date: Tue, 19 Oct 2021 19:49:14 +0200 -Subject: [PATCH 2/2] GRC: be tolerant against Gtk.init_check failure, which - seems to be flimsy -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Marcus Müller ---- - grc/scripts/gnuradio-companion | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion -index d0757e87eac..2f299744717 100755 ---- a/grc/scripts/gnuradio-companion -+++ b/grc/scripts/gnuradio-companion -@@ -7,7 +7,6 @@ - - import os - import sys --import warnings - - - GR_IMPORT_ERROR_MESSAGE = """\ -@@ -50,15 +49,20 @@ def die(error, message): - - def check_gtk(): - try: -- warnings.filterwarnings("error") - import gi - gi.require_version('Gtk', '3.0') - gi.require_version('PangoCairo', '1.0') - gi.require_foreign('cairo', 'Context') - - from gi.repository import Gtk -- Gtk.init_check() -- warnings.filterwarnings("always") -+ success = Gtk.init_check()[0] -+ if not success: -+ # Don't display a warning dialogue. This seems to be a Gtk bug. If it -+ # still can display warning dialogues, it does probably work! -+ print( -+ "Gtk init_check failed. GRC might not be able to start a GUI.", -+ file=sys.stderr) -+ - except Exception as err: - die(err, "Failed to initialize GTK. If you are running over ssh, " - "did you enable X forwarding and start ssh with -X?") diff --git a/gnuradio.spec b/gnuradio.spec index 44a314c..d1898de 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -99,8 +99,6 @@ Requires: python3-mako Requires: python3-click-plugins Requires: python3-qt5 Requires: gtk3 -# https://github.com/gnuradio/gnuradio/pull/5217 -Patch0: gnuradio-3.9.3.0-gtk-init.patch %description GNU Radio is a collection of software that when combined with minimal diff --git a/sources b/sources index 13c60a8..ea1d58f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.9.3.0.tar.gz) = 9ce6d0cf57b6f1b37c17ca037972038cb2f93cf9c734ba399a2c608afa2e4cc1c5f847f9aeb3440297a917f31289f2dfb9372a6683684ba2028fed1de355654d +SHA512 (gnuradio-3.9.4.0.tar.gz) = 74cbb7636759f2e2d222214375017d941afa4c23c0ff839d77b29af104f5867c75206b74164700d2f8e351f7d7bdcf46f543839881c0f4f0a940bfc0f31648ba From 158cb8568b372ec2485ca92c7b4e6e24e508d588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 1 Nov 2021 18:44:47 +0100 Subject: [PATCH 240/313] Added mandir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gnuradio.spec b/gnuradio.spec index d1898de..9b3906f 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -171,6 +171,7 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/mime/packages/gnuradio-grc.xml %{_datadir}/icons/hicolor/*/apps/gnuradio-grc.png %{_datadir}/metainfo/org.gnuradio.grc.metainfo.xml +%{_mandir}/man1/* %config(noreplace) %{_sysconfdir}/gnuradio %exclude %{_datadir}/gnuradio/examples %exclude %{_docdir}/%{name}/html From 225b392a7e66dfbf629b0f1ae4a387efab91fdc4 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 5 Dec 2021 08:24:05 -0600 Subject: [PATCH 241/313] Rebuild for codec2 1.0.1. --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 9b3906f..4da7dd6 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.4.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Sun Dec 05 2021 Richard Shaw - 3.9.4.0-2 +- Rebuild for codec2 1.0.1. + * Mon Nov 1 2021 Jaroslav Škarvada - 3.9.4.0-1 - New version Resolves: rhbz#2018818 From 2728dbefd30e3f4f19e7db2d56775f04a986f554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 15 Dec 2021 22:15:20 +0100 Subject: [PATCH 242/313] Added missing runtime dependencies Related: rhbz#2032668 --- gnuradio.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 4da7dd6..130f345 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.4.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -98,6 +98,8 @@ Requires: python3-six Requires: python3-mako Requires: python3-click-plugins Requires: python3-qt5 +Requires: python3-scipy +Requires: python3-pyqtgraph Requires: gtk3 %description @@ -196,6 +198,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Wed Dec 15 2021 Jaroslav Škarvada - 3.9.4.0-3 +- Added missing runtime dependencies + Related: rhbz#2032668 + * Sun Dec 05 2021 Richard Shaw - 3.9.4.0-2 - Rebuild for codec2 1.0.1. From e4ea3901b0f549d811367c0c3e01453115b17524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 10 Jan 2022 13:30:36 +0100 Subject: [PATCH 243/313] New version Resolves: rhbz#2038703 --- gnuradio.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 130f345..44a03a9 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,8 +21,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.9.4.0 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.9.5.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -198,6 +198,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Mon Jan 10 2022 Jaroslav Škarvada - 3.9.5.0-1 +- New version + Resolves: rhbz#2038703 + * Wed Dec 15 2021 Jaroslav Škarvada - 3.9.4.0-3 - Added missing runtime dependencies Related: rhbz#2032668 diff --git a/sources b/sources index ea1d58f..aeaafa7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.9.4.0.tar.gz) = 74cbb7636759f2e2d222214375017d941afa4c23c0ff839d77b29af104f5867c75206b74164700d2f8e351f7d7bdcf46f543839881c0f4f0a940bfc0f31648ba +SHA512 (gnuradio-3.9.5.0.tar.gz) = 520425a40d6989bd66c3c07ac3f35ef96233aafd5cd9c1beefd547f63a16c24922f600a4fed7c4278d564b292443638038538c6e03668b86b7dd115456fb2ed8 From 2ea32b215c97349a601df48192fa980405e8eb1f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 06:52:50 +0000 Subject: [PATCH 244/313] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 44a03a9..d982046 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.9.5.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -198,6 +198,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 3.9.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Jan 10 2022 Jaroslav Škarvada - 3.9.5.0-1 - New version Resolves: rhbz#2038703 From 90d34b9715cb152400c6eca12ac9f91a9f8518c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 20 Jan 2022 19:47:41 +0100 Subject: [PATCH 245/313] New version Resolves: rhbz#2040787 --- gnuradio.spec | 18 ++++++++---------- sources | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index d982046..494df4e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,8 +21,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.9.5.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.10.0.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -53,12 +53,9 @@ BuildRequires: gsl-devel BuildRequires: gsm-devel BuildRequires: gtk3-devel BuildRequires: jack-audio-connection-kit-devel -BuildRequires: log4cpp-devel -BuildRequires: orc-devel BuildRequires: portaudio-devel BuildRequires: python3-devel BuildRequires: python3-cairo -BuildRequires: python3-cheetah BuildRequires: python3-click-plugins BuildRequires: python3-gobject BuildRequires: python3-numpy @@ -67,13 +64,10 @@ BuildRequires: python3-lxml BuildRequires: python3-mako BuildRequires: python3-qt5-devel BuildRequires: python3-scipy -BuildRequires: python3-six -BuildRequires: python3-sphinx BuildRequires: python3-thrift BuildRequires: qwt-qt5-devel #BuildRequires: tex(latex) BuildRequires: SDL-devel -BuildRequires: swig BuildRequires: thrift BuildRequires: uhd-devel BuildRequires: xdg-utils @@ -84,23 +78,23 @@ BuildRequires: pybind11-devel BuildRequires: volk-devel BuildRequires: libsndfile-devel BuildRequires: SoapySDR-devel +BuildRequires: spdlog-devel Requires: python3-%{name} = %{version}-%{release} Requires: python3-numpy -Requires: python3-cheetah Requires: python3-thrift %if ! 0%{?rhel} Requires: python3-pyopengl %endif Requires: python3-pyyaml Requires: python3-gobject -Requires: python3-six Requires: python3-mako Requires: python3-click-plugins Requires: python3-qt5 Requires: python3-scipy Requires: python3-pyqtgraph Requires: gtk3 +Suggests: soapy-rtlsdr %description GNU Radio is a collection of software that when combined with minimal @@ -198,6 +192,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Thu Jan 20 2022 Jaroslav Škarvada - 3.10.0.0-1 +- New version + Resolves: rhbz#2040787 + * Thu Jan 20 2022 Fedora Release Engineering - 3.9.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index aeaafa7..52a02c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.9.5.0.tar.gz) = 520425a40d6989bd66c3c07ac3f35ef96233aafd5cd9c1beefd547f63a16c24922f600a4fed7c4278d564b292443638038538c6e03668b86b7dd115456fb2ed8 +SHA512 (gnuradio-3.10.0.0.tar.gz) = e5a3787821cbca0b999d60a3dd68c41a34c02caa1c0430727bd8f76bced1a22f1495d069675df6869d149b5c27076c364ec30c263aab5f74e520c49069991fb3 From 5171462c25e2bd8d4b386537d95b0a760b38cadb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 20 Jan 2022 21:52:07 +0100 Subject: [PATCH 246/313] Tried to workaround segfaults on the ppc64le builders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 494df4e..c493914 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -147,7 +147,12 @@ GNU Radio examples %{?mfpu_neon} #-DENABLE_DOXYGEN=FALSE \ -%cmake_build +# Dirty workaround for segfaults on the ppc64le +%ifarch ppc64le +%global build_opt -j1 +%endif + +%cmake_build %{?build_opt} %install %cmake_install From 51195f695e70c3efda1615b2b3152d7d8907f11a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 20 Jan 2022 22:36:29 +0100 Subject: [PATCH 247/313] Reverted non functional workaround for ppc64le MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index c493914..494df4e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -147,12 +147,7 @@ GNU Radio examples %{?mfpu_neon} #-DENABLE_DOXYGEN=FALSE \ -# Dirty workaround for segfaults on the ppc64le -%ifarch ppc64le -%global build_opt -j1 -%endif - -%cmake_build %{?build_opt} +%cmake_build %install %cmake_install From 6aa79aa94bc965ebf7633b42751a8efb5aef8bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 27 Jan 2022 16:00:43 +0100 Subject: [PATCH 248/313] Enabled latex dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 494df4e..19e0191 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -66,7 +66,7 @@ BuildRequires: python3-qt5-devel BuildRequires: python3-scipy BuildRequires: python3-thrift BuildRequires: qwt-qt5-devel -#BuildRequires: tex(latex) +BuildRequires: tex(latex) BuildRequires: SDL-devel BuildRequires: thrift BuildRequires: uhd-devel From a90d073a213b3f93fcb2e6756b6afe160a365b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 31 Jan 2022 00:57:24 +0100 Subject: [PATCH 249/313] New version Resolves: rhbz#2048110 --- gnuradio.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 19e0191..6182b44 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,7 +21,7 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.10.0.0 +Version: 3.10.1.0 Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework @@ -192,6 +192,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Sun Jan 30 2022 Jaroslav Škarvada - 3.10.1.0-1 +- New version + Resolves: rhbz#2048110 + * Thu Jan 20 2022 Jaroslav Škarvada - 3.10.0.0-1 - New version Resolves: rhbz#2040787 diff --git a/sources b/sources index 52a02c0..9793dce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.10.0.0.tar.gz) = e5a3787821cbca0b999d60a3dd68c41a34c02caa1c0430727bd8f76bced1a22f1495d069675df6869d149b5c27076c364ec30c263aab5f74e520c49069991fb3 +SHA512 (gnuradio-3.10.1.0.tar.gz) = 52cc6ecef8985dafd38d94307be926caf08825e3d97905a276c49a3c7bf97dbf8d2c29cdd02e7f152d0800d1cf05331ccd94f1b0cb6f4b51dc11303230feac83 From d2e3abc5e867e40b8755a6e5ca6b6b02d9c66633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 22 Feb 2022 12:00:28 +0100 Subject: [PATCH 250/313] New version Resolves: rhbz#2049503 --- gnuradio.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 6182b44..e8b1647 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,7 +21,7 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.10.1.0 +Version: 3.10.1.1 Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework @@ -192,6 +192,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Tue Feb 22 2022 Jaroslav Škarvada - 3.10.1.1-1 +- New version + Resolves: rhbz#2049503 + * Sun Jan 30 2022 Jaroslav Škarvada - 3.10.1.0-1 - New version Resolves: rhbz#2048110 diff --git a/sources b/sources index 9793dce..9803b05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.10.1.0.tar.gz) = 52cc6ecef8985dafd38d94307be926caf08825e3d97905a276c49a3c7bf97dbf8d2c29cdd02e7f152d0800d1cf05331ccd94f1b0cb6f4b51dc11303230feac83 +SHA512 (gnuradio-3.10.1.1.tar.gz) = 9c763f3716df87a69f6569467142ea6f9a207d645f0a036d6735b42bc79a10e40db735c261a446fa7c86cd58c99d39f928e4660751f0a303c29883cfcb40ccb5 From 39d0a383f9e57a8378dd86726de471922c0162f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 12 Apr 2022 11:15:40 +0200 Subject: [PATCH 251/313] New version Resolves: rhbz#2073766 --- gnuradio.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index e8b1647..5f4047a 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,7 +21,7 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.10.1.1 +Version: 3.10.2.0 Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework @@ -192,6 +192,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Tue Apr 12 2022 Jaroslav Škarvada - 3.10.2.0-1 +- New version + Resolves: rhbz#2073766 + * Tue Feb 22 2022 Jaroslav Škarvada - 3.10.1.1-1 - New version Resolves: rhbz#2049503 diff --git a/sources b/sources index 9803b05..ae8a497 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.10.1.1.tar.gz) = 9c763f3716df87a69f6569467142ea6f9a207d645f0a036d6735b42bc79a10e40db735c261a446fa7c86cd58c99d39f928e4660751f0a303c29883cfcb40ccb5 +SHA512 (gnuradio-3.10.2.0.tar.gz) = 49560a20b9bc9e76ea088d0de4add58dca9fc2c5baa5885dd5f56ce07946b8587ce563e12036df99a63bdab8ff5d7fc1df9b4c71a1ff6788855ac8760fdf11a2 From acceb6f645d1baa8e4166c9bf4b17a2ea2b49b2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 26 Apr 2022 00:22:27 +0200 Subject: [PATCH 252/313] Rebuilt for new uhd Resolves: rhbz#2077801 --- gnuradio.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 5f4047a..991f376 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.10.2.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -192,6 +192,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Mon Apr 25 2022 Jaroslav Škarvada - 3.10.2.0-2 +- Rebuilt for new uhd + Resolves: rhbz#2077801 + * Tue Apr 12 2022 Jaroslav Škarvada - 3.10.2.0-1 - New version Resolves: rhbz#2073766 From 3c0c96bb02561b70ea8ad60f8d462ca0ec45ab29 Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Wed, 4 May 2022 11:38:59 +0200 Subject: [PATCH 253/313] Rebuilt for Boost 1.78 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 991f376..dcf78ce 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.10.2.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -192,6 +192,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Wed May 04 2022 Thomas Rodgers - 3.10.2.0-3 +- Rebuilt for Boost 1.78 + * Mon Apr 25 2022 Jaroslav Škarvada - 3.10.2.0-2 - Rebuilt for new uhd Resolves: rhbz#2077801 From e8d36f94634dc1f13508cb5f9ce72a1dd1bbced3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 20 Jun 2022 12:20:24 +0200 Subject: [PATCH 254/313] Rebuilt for new python Resolves: rhbz#2098711 --- gnuradio.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index dcf78ce..3cf298c 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.10.2.0 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -192,6 +192,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Mon Jun 20 2022 Jaroslav Škarvada - 3.10.2.0-4 +- Rebuilt for new python + Resolves: rhbz#2098711 + * Wed May 04 2022 Thomas Rodgers - 3.10.2.0-3 - Rebuilt for Boost 1.78 From 9aabe02184565a6d7095cebc37fcb193f74eefb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 21 Jun 2022 23:24:45 +0200 Subject: [PATCH 255/313] New version Resolves: rhbz#2099614 --- gnuradio.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 3cf298c..8204638 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -21,8 +21,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.10.2.0 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.10.3.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -192,6 +192,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Tue Jun 21 2022 Jaroslav Škarvada - 3.10.3.0-1 +- New version + Resolves: rhbz#2099614 + * Mon Jun 20 2022 Jaroslav Škarvada - 3.10.2.0-4 - Rebuilt for new python Resolves: rhbz#2098711 diff --git a/sources b/sources index ae8a497..ddcacc8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.10.2.0.tar.gz) = 49560a20b9bc9e76ea088d0de4add58dca9fc2c5baa5885dd5f56ce07946b8587ce563e12036df99a63bdab8ff5d7fc1df9b4c71a1ff6788855ac8760fdf11a2 +SHA512 (gnuradio-3.10.3.0.tar.gz) = 4dee6420988d0ada2d89bab9c3406b3cf96140af191a5ff0b3151acc4cccf108bd36807ba080ad27968120d7882c0ab8ca1b6576bd8dd47997b389cc4cec5cd4 From 19f220d56267163c7f29a795613324ce50f3a12c Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sat, 9 Jul 2022 08:13:46 -0500 Subject: [PATCH 256/313] Rebuild for codec2 1.0.4. --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 8204638..a98a112 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -22,7 +22,7 @@ Name: gnuradio Version: 3.10.3.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -192,6 +192,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Sat Jul 09 2022 Richard Shaw - 3.10.3.0-2 +- Rebuild for codec2 1.0.4. + * Tue Jun 21 2022 Jaroslav Škarvada - 3.10.3.0-1 - New version Resolves: rhbz#2099614 From 3d0f2147a900dfe41723e1541818fcaacb23243f Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 17 Jul 2022 21:22:33 -0500 Subject: [PATCH 257/313] Add workaround for fmt API change. --- gnuradio.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnuradio.spec b/gnuradio.spec index a98a112..7ee4252 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -15,6 +15,10 @@ %endif %endif + +# fmt API change workaround +%global optflags %(echo %{optflags} -DFMT_DEPRECATED_OSTREAM) + # For versions not yet on ftp, pull from git #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a From bbeb25b1dc971db89472b2ab68e404461945234d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 07:11:33 +0000 Subject: [PATCH 258/313] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 7ee4252..cf66e0e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.3.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 3.10.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jul 09 2022 Richard Shaw - 3.10.3.0-2 - Rebuild for codec2 1.0.4. From 062a9b850218ba0d4711e4b3ccc397b499c3cc64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 30 Jul 2022 13:05:15 +0200 Subject: [PATCH 259/313] Rebuilt for new uhd --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index cf66e0e..2e20980 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.3.0 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Sat Jul 30 2022 Jaroslav Škarvada - 3.10.3.0-4 +- Rebuilt for new uhd + * Thu Jul 21 2022 Fedora Release Engineering - 3.10.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 155332f42008f9c0c7a731d245a3f76a2f3410d8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Aug 2022 17:07:12 +0900 Subject: [PATCH 260/313] Rebuild for gsl-2.7.1 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 2e20980..eb48224 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.3.0 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Tue Aug 23 2022 Mamoru TASAKA - 3.10.3.0-5 +- Rebuild for gsl-2.7.1 + * Sat Jul 30 2022 Jaroslav Škarvada - 3.10.3.0-4 - Rebuilt for new uhd From 9087c40a38624e383a5e08fdceee05bde8db40e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 24 Sep 2022 19:17:38 +0200 Subject: [PATCH 261/313] New version Resolves: rhbz#2127514 --- gnuradio.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index eb48224..1845595 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -25,8 +25,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.10.3.0 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.10.4.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,10 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Sat Sep 24 2022 Jaroslav Škarvada - 3.10.4.0-1 +- New version + Resolves: rhbz#2127514 + * Tue Aug 23 2022 Mamoru TASAKA - 3.10.3.0-5 - Rebuild for gsl-2.7.1 diff --git a/sources b/sources index ddcacc8..055ac20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.10.3.0.tar.gz) = 4dee6420988d0ada2d89bab9c3406b3cf96140af191a5ff0b3151acc4cccf108bd36807ba080ad27968120d7882c0ab8ca1b6576bd8dd47997b389cc4cec5cd4 +SHA512 (gnuradio-3.10.4.0.tar.gz) = 6993c7e6701033a24a584179d9c8b10e75ac7f44aa46ca689f484b18eb662ba7e0c9fa597eee3a355e60d69479182329d7575899e44dc8635f8e46e94c0c4a4e From ba7d8978aeb7c10d243aaf45cfdb4a52b1f20400 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Thu, 3 Nov 2022 15:50:36 +0100 Subject: [PATCH 262/313] Rebuilt due to spdlog update. --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 1845595..18bd446 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.4.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Thu Nov 03 2022 Vitaly Zaitsev - 3.10.4.0-2 +- Rebuilt due to spdlog update. + * Sat Sep 24 2022 Jaroslav Škarvada - 3.10.4.0-1 - New version Resolves: rhbz#2127514 From ec17ef69cffe68655580299fc207105261c1584c Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 21 Dec 2022 15:53:09 +0100 Subject: [PATCH 263/313] Rebuild (qwt) --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 18bd446..26ae073 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.4.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Wed Dec 21 2022 Sandro Mani - 3.10.4.0-3 +- Rebuild (qwt) + * Thu Nov 03 2022 Vitaly Zaitsev - 3.10.4.0-2 - Rebuilt due to spdlog update. From 9070eccefca745962f3caed1f8fdd463cdd2a406 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 05:47:30 +0000 Subject: [PATCH 264/313] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 26ae073..8cb579c 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.4.0 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 3.10.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Dec 21 2022 Sandro Mani - 3.10.4.0-3 - Rebuild (qwt) From 83f79f5ce33d8579cb10c5f34c15da6e2387bb13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 19 Jan 2023 19:13:43 +0100 Subject: [PATCH 265/313] Rebuilt for new volk --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 8cb579c..5defc07 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.4.0 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Thu Jan 19 2023 Jaroslav Škarvada - 3.10.4.0-5 +- Rebuilt for new volk + * Thu Jan 19 2023 Fedora Release Engineering - 3.10.4.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 98998f2427cbee03718524615a46f1d4c5eb39c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 1 Feb 2023 18:27:01 +0100 Subject: [PATCH 266/313] Rebuilt for new uhd --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 5defc07..9eacf49 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.4.0 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Release: 6%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Wed Feb 1 2023 Jaroslav Škarvada - 3.10.4.0-6 +- Rebuilt for new uhd + * Thu Jan 19 2023 Jaroslav Škarvada - 3.10.4.0-5 - Rebuilt for new volk From e49d0d95d056842dfb0f6f092ae34b836eb53be7 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 20 Feb 2023 21:57:41 +0000 Subject: [PATCH 267/313] Rebuilt for Boost 1.81 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 9eacf49..6d9c82e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.4.0 -Release: 6%{?alphatag:.%{alphatag}}%{?dist} +Release: 7%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Mon Feb 20 2023 Jonathan Wakely - 3.10.4.0-7 +- Rebuilt for Boost 1.81 + * Wed Feb 1 2023 Jaroslav Škarvada - 3.10.4.0-6 - Rebuilt for new uhd From 4567d70e9af917aae6561b288a00c3edccbb2acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 5 Jun 2023 10:49:06 +0200 Subject: [PATCH 268/313] New version --- gnuradio.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 6d9c82e..1402aa7 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -25,8 +25,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.10.4.0 -Release: 7%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.10.6.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -196,6 +196,9 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %{_datadir}/gnuradio/examples %changelog +* Mon Jun 5 2023 Jaroslav Škarvada - 3.10.6.0-1 +- New version + * Mon Feb 20 2023 Jonathan Wakely - 3.10.4.0-7 - Rebuilt for Boost 1.81 diff --git a/sources b/sources index 055ac20..0a2b09a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.10.4.0.tar.gz) = 6993c7e6701033a24a584179d9c8b10e75ac7f44aa46ca689f484b18eb662ba7e0c9fa597eee3a355e60d69479182329d7575899e44dc8635f8e46e94c0c4a4e +SHA512 (gnuradio-3.10.6.0.tar.gz) = ab6feab342816df50e42acd22952a106c8e3563c13246ed0b060a4b61b6e84c076e06221ce0e3f905b99f1349031ba53d52b3042e3a851236795c8910ffec897 From 3eb024a0d42f9198aa7f5ac7cbf4a1d3e2d3d372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 5 Jun 2023 23:37:20 +0200 Subject: [PATCH 269/313] Fixed build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 1402aa7..fa3be86 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -83,6 +83,8 @@ BuildRequires: volk-devel BuildRequires: libsndfile-devel BuildRequires: SoapySDR-devel BuildRequires: spdlog-devel +# for pygccxml +#BuildRequires: castxml Requires: python3-%{name} = %{version}-%{release} Requires: python3-numpy @@ -155,9 +157,22 @@ GNU Radio examples %install %cmake_install -desktop-file-validate %{buildroot}%{_datadir}/applications/gnuradio-grc.desktop -# Remove extraneous desktop/icon/mime files -rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop + +# desktop file +desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ + grc/scripts/freedesktop/gnuradio-grc.desktop +# mime +install -Dp grc/scripts/freedesktop/gnuradio-grc.xml \ + %{buildroot}%{_datadir}/mime/packages/gnuradio-grc.xml +# metainfo +install -Dp grc/scripts/freedesktop/org.gnuradio.grc.metainfo.xml \ + %{buildroot}%{_datadir}/metainfo/org.gnuradio.grc.metainfo.xml +# icons +for i in 16 24 32 48 64 128 256 +do + install -Dp grc/scripts/freedesktop/grc-icon-${i}.png \ + %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/gnuradio-grc.png +done %ldconfig_scriptlets @@ -165,7 +180,6 @@ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop %license COPYING %{_bindir}/* %{_libdir}/lib*.so.* -%{_libexecdir}/* %{_datadir}/gnuradio %{_datadir}/applications/gnuradio-grc.desktop %{_datadir}/mime/packages/gnuradio-grc.xml From ef6a979e03ebfb2761a1ff760ec1b1d76ef1b394 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 16 Jun 2023 17:30:22 +0200 Subject: [PATCH 270/313] Rebuilt for Python 3.12 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index fa3be86..020d1fa 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.6.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -210,6 +210,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Fri Jun 16 2023 Python Maint - 3.10.6.0-2 +- Rebuilt for Python 3.12 + * Mon Jun 5 2023 Jaroslav Škarvada - 3.10.6.0-1 - New version From 75185b4edd49193cde1d379dae2ce857a2cddce5 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 28 Jun 2023 11:47:37 +0200 Subject: [PATCH 271/313] Rebuilt due to fmt 10 update. --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 020d1fa..8fd619d 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.6.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -210,6 +210,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Wed Jun 28 2023 Vitaly Zaitsev - 3.10.6.0-3 +- Rebuilt due to fmt 10 update. + * Fri Jun 16 2023 Python Maint - 3.10.6.0-2 - Rebuilt for Python 3.12 From cd8aab49b3073db7aaa4677fd4d111e33fc702df Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 29 Jun 2023 00:46:23 +0900 Subject: [PATCH 272/313] Patch for fmt10 for not accepting enum by default --- gnuradio-3.10.6.0-fmt10.patch | 11 +++++++++++ gnuradio.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gnuradio-3.10.6.0-fmt10.patch diff --git a/gnuradio-3.10.6.0-fmt10.patch b/gnuradio-3.10.6.0-fmt10.patch new file mode 100644 index 0000000..b67234b --- /dev/null +++ b/gnuradio-3.10.6.0-fmt10.patch @@ -0,0 +1,11 @@ +--- gnuradio-3.10.6.0/gr-uhd/lib/rfnoc_rx_streamer_impl.cc.fmt10 2023-04-01 19:49:26.000000000 +0900 ++++ gnuradio-3.10.6.0/gr-uhd/lib/rfnoc_rx_streamer_impl.cc 2023-06-29 00:31:31.503864417 +0900 +@@ -143,7 +143,7 @@ int rfnoc_rx_streamer_impl::work(int nou + default: + d_logger->warn("RFNoC Streamer block received error {:s} (Code: {})", + d_metadata.strerror(), +- d_metadata.error_code); ++ static_cast(d_metadata.error_code)); + } + + if (d_metadata.end_of_burst) { diff --git a/gnuradio.spec b/gnuradio.spec index 8fd619d..89cd4b0 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.6.0 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -38,6 +38,9 @@ Source0: https://github.com/gnuradio/%{name}/archive/v%{version}/%{name}-%{versi # cd gnuradio # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ # gzip > ../%%{name}-%%{version}.tar.gz +# https://github.com/gnuradio/gnuradio/issues/6735 +# Tentative patch for fmt10 being not accepting enum by default +Patch0: gnuradio-3.10.6.0-fmt10.patch Requires(pre): shadow-utils BuildRequires: cmake @@ -210,6 +213,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Wed Jun 28 2023 Mamoru TASAKA - 3.10.6.0-4 +- Patch for fmt10 for not accepting enum by default + * Wed Jun 28 2023 Vitaly Zaitsev - 3.10.6.0-3 - Rebuilt due to fmt 10 update. From dfd44bf4a0e117ef2125c86a3e459f6c1a82c0fb Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 1 Jul 2023 11:44:59 +0200 Subject: [PATCH 273/313] Rebuilt for Python 3.12 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 89cd4b0..6549dff 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.6.0 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -213,6 +213,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Sat Jul 01 2023 Python Maint - 3.10.6.0-5 +- Rebuilt for Python 3.12 + * Wed Jun 28 2023 Mamoru TASAKA - 3.10.6.0-4 - Patch for fmt10 for not accepting enum by default From 71e8dc48bac9e2c7461b361ae9426272e56e33f6 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 8 Jul 2023 20:27:21 +0200 Subject: [PATCH 274/313] Rebuilt due to spdlog 1.12 update. --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 6549dff..6318171 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.6.0 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Release: 6%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -213,6 +213,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Sat Jul 08 2023 Vitaly Zaitsev - 3.10.6.0-6 +- Rebuilt due to spdlog 1.12 update. + * Sat Jul 01 2023 Python Maint - 3.10.6.0-5 - Rebuilt for Python 3.12 From 97df7ff1870054c42eca768f74749d75066f7487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 11 Jul 2023 11:34:11 +0200 Subject: [PATCH 275/313] Rebuilt for new python --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 6318171..32bb59c 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.6.0 -Release: 6%{?alphatag:.%{alphatag}}%{?dist} +Release: 7%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -213,6 +213,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Tue Jul 11 2023 Jaroslav Škarvada - 3.10.6.0-7 +- Rebuilt for new python + * Sat Jul 08 2023 Vitaly Zaitsev - 3.10.6.0-6 - Rebuilt due to spdlog 1.12 update. From 39827d87581c219b7c0ea453a26444f70879de0a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 23:56:14 +0000 Subject: [PATCH 276/313] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 32bb59c..aa4f2f2 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.6.0 -Release: 7%{?alphatag:.%{alphatag}}%{?dist} +Release: 8%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -213,6 +213,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 3.10.6.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 Jaroslav Škarvada - 3.10.6.0-7 - Rebuilt for new python From 67d606ad76b393207c55fff9e92266402d5f2ee6 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sat, 5 Aug 2023 15:52:12 -0500 Subject: [PATCH 277/313] Rebuild for codec2. --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index aa4f2f2..c8705ec 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.6.0 -Release: 8%{?alphatag:.%{alphatag}}%{?dist} +Release: 9%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -213,6 +213,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Sat Aug 05 2023 Richard Shaw - 3.10.6.0-9 +- Rebuild for codec2. + * Wed Jul 19 2023 Fedora Release Engineering - 3.10.6.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 60e35d7a5fe2e965de7d0af753bf74cccaa4e64b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 25 Sep 2023 14:59:38 +0200 Subject: [PATCH 278/313] Rebuilt for new uhd --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index c8705ec..1596b69 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.6.0 -Release: 9%{?alphatag:.%{alphatag}}%{?dist} +Release: 10%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -213,6 +213,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Mon Sep 25 2023 Jaroslav Škarvada - 3.10.6.0-10 +- Rebuilt for new uhd + * Sat Aug 05 2023 Richard Shaw - 3.10.6.0-9 - Rebuild for codec2. From 836a5f813de1df69a7f5b63fef18ede6496ca5bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 21 Nov 2023 16:35:08 +0100 Subject: [PATCH 279/313] Rebuilt for new uhd --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 1596b69..15f634b 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.6.0 -Release: 10%{?alphatag:.%{alphatag}}%{?dist} +Release: 11%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -213,6 +213,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Tue Nov 21 2023 Jaroslav Škarvada - 3.10.6.0-11 +- Rebuilt for new uhd + * Mon Sep 25 2023 Jaroslav Škarvada - 3.10.6.0-10 - Rebuilt for new uhd From 39b873e65d34c6ae2719ccfaaa1880e91375d300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 11 Dec 2023 16:51:03 +0100 Subject: [PATCH 280/313] Rebuilt for new volk --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 15f634b..a267ea7 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.6.0 -Release: 11%{?alphatag:.%{alphatag}}%{?dist} +Release: 12%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -213,6 +213,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Mon Dec 11 2023 Jaroslav Škarvada - 3.10.6.0-12 +- Rebuilt for new volk + * Tue Nov 21 2023 Jaroslav Škarvada - 3.10.6.0-11 - Rebuilt for new uhd From 20b7a9efaf9b5c8619ba8f8ec4beb9f7bdb9dd8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 2 Jan 2024 22:14:24 +0100 Subject: [PATCH 281/313] New version Resolves: rhbz#2255186 --- gnuradio.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index a267ea7..3baaa82 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -25,8 +25,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.10.6.0 -Release: 12%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.10.9.1 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -213,6 +213,10 @@ done %{_datadir}/gnuradio/examples %changelog +* Tue Jan 2 2024 Jaroslav Škarvada - 3.10.9.1-1 +- New version + Resolves: rhbz#2255186 + * Mon Dec 11 2023 Jaroslav Škarvada - 3.10.6.0-12 - Rebuilt for new volk diff --git a/sources b/sources index 0a2b09a..bade8c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.10.6.0.tar.gz) = ab6feab342816df50e42acd22952a106c8e3563c13246ed0b060a4b61b6e84c076e06221ce0e3f905b99f1349031ba53d52b3042e3a851236795c8910ffec897 +SHA512 (gnuradio-3.10.9.1.tar.gz) = b582056de7057dd16da469ebded0213c5602975f1da5794102d0eb9930431f16ec43949c25fa423fef6391172a295f80fb827dcc1ad219eac3fe7a79c47b3afa From a08332c2c6b68bc0a680baa8ecf22b0a33cdcd48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 2 Jan 2024 22:29:17 +0100 Subject: [PATCH 282/313] Dropped fmt10 patch (upstreamed) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio-3.10.6.0-fmt10.patch | 11 ----------- gnuradio.spec | 3 --- 2 files changed, 14 deletions(-) delete mode 100644 gnuradio-3.10.6.0-fmt10.patch diff --git a/gnuradio-3.10.6.0-fmt10.patch b/gnuradio-3.10.6.0-fmt10.patch deleted file mode 100644 index b67234b..0000000 --- a/gnuradio-3.10.6.0-fmt10.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnuradio-3.10.6.0/gr-uhd/lib/rfnoc_rx_streamer_impl.cc.fmt10 2023-04-01 19:49:26.000000000 +0900 -+++ gnuradio-3.10.6.0/gr-uhd/lib/rfnoc_rx_streamer_impl.cc 2023-06-29 00:31:31.503864417 +0900 -@@ -143,7 +143,7 @@ int rfnoc_rx_streamer_impl::work(int nou - default: - d_logger->warn("RFNoC Streamer block received error {:s} (Code: {})", - d_metadata.strerror(), -- d_metadata.error_code); -+ static_cast(d_metadata.error_code)); - } - - if (d_metadata.end_of_burst) { diff --git a/gnuradio.spec b/gnuradio.spec index 3baaa82..20d3aaa 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -38,9 +38,6 @@ Source0: https://github.com/gnuradio/%{name}/archive/v%{version}/%{name}-%{versi # cd gnuradio # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ # gzip > ../%%{name}-%%{version}.tar.gz -# https://github.com/gnuradio/gnuradio/issues/6735 -# Tentative patch for fmt10 being not accepting enum by default -Patch0: gnuradio-3.10.6.0-fmt10.patch Requires(pre): shadow-utils BuildRequires: cmake From 91a12f0a9b3f3c58236c9e00b50bb86a769528db Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 18 Jan 2024 05:36:56 +0000 Subject: [PATCH 283/313] Rebuilt for Boost 1.83 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 20d3aaa..fea6521 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.9.1 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -210,6 +210,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Thu Jan 18 2024 Jonathan Wakely - 3.10.9.1-2 +- Rebuilt for Boost 1.83 + * Tue Jan 2 2024 Jaroslav Škarvada - 3.10.9.1-1 - New version Resolves: rhbz#2255186 From 165d1be924f7478bc5df41558031b8b7da55cb8e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 23:14:40 +0000 Subject: [PATCH 284/313] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index fea6521..9c77bf6 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.9.1 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -210,6 +210,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 3.10.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 18 2024 Jonathan Wakely - 3.10.9.1-2 - Rebuilt for Boost 1.83 From d4784045c1255c1ecf356ff35ef0ba1e99d092db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 22 Jan 2024 18:24:17 +0100 Subject: [PATCH 285/313] New version Resolves: rhbz#2258885 --- gnuradio.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 9c77bf6..2ffbc93 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -25,8 +25,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.10.9.1 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.10.9.2 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -210,6 +210,10 @@ done %{_datadir}/gnuradio/examples %changelog +* Mon Jan 22 2024 Jaroslav Škarvada - 3.10.9.2-1 +- New version + Resolves: rhbz#2258885 + * Fri Jan 19 2024 Fedora Release Engineering - 3.10.9.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index bade8c6..3b828ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.10.9.1.tar.gz) = b582056de7057dd16da469ebded0213c5602975f1da5794102d0eb9930431f16ec43949c25fa423fef6391172a295f80fb827dcc1ad219eac3fe7a79c47b3afa +SHA512 (gnuradio-3.10.9.2.tar.gz) = 54d4e6bbe1befeb9127fe0599afd2abb715d8270ae4b3c94adec17856c47bb13d89fd836eef5620b129d32a69b43d692bdcca10d67c6bc1f021189f9ce48a4ab From 650b57e0c213f4f560ff678394358655a5fd90ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 24 Jan 2024 00:46:50 +0100 Subject: [PATCH 286/313] Temporaly added -j1 as a workaround for rhbz#2259912 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 2ffbc93..cddfbcb 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -153,7 +153,8 @@ GNU Radio examples %{?mfpu_neon} #-DENABLE_DOXYGEN=FALSE \ -%cmake_build +# -j1 workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2259912 +%cmake_build -j1 %install %cmake_install From cc14688093142e3f4c6335114d22832454260754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 1 Feb 2024 12:02:16 +0100 Subject: [PATCH 287/313] Added python3-zmq requirement Resolves: rhbz#2262173 --- gnuradio.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index cddfbcb..169c089 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.9.2 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -69,6 +69,7 @@ BuildRequires: python3-mako BuildRequires: python3-qt5-devel BuildRequires: python3-scipy BuildRequires: python3-thrift +BuildRequires: python3-zmq BuildRequires: qwt-qt5-devel BuildRequires: tex(latex) BuildRequires: SDL-devel @@ -99,6 +100,7 @@ Requires: python3-click-plugins Requires: python3-qt5 Requires: python3-scipy Requires: python3-pyqtgraph +Requires: python3-zmq Requires: gtk3 Suggests: soapy-rtlsdr @@ -211,6 +213,10 @@ done %{_datadir}/gnuradio/examples %changelog +* Thu Feb 1 2024 Jaroslav Škarvada - 3.10.9.2-2 +- Added python3-zmq requirement + Resolves: rhbz#2262173 + * Mon Jan 22 2024 Jaroslav Škarvada - 3.10.9.2-1 - New version Resolves: rhbz#2258885 From 85c88198587617be72613b5014fc897842ccd147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 20 Feb 2024 13:29:21 +0100 Subject: [PATCH 288/313] Dropped -j1 gcc s390x workaround MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 169c089..b1bf937 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -155,8 +155,7 @@ GNU Radio examples %{?mfpu_neon} #-DENABLE_DOXYGEN=FALSE \ -# -j1 workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2259912 -%cmake_build -j1 +%cmake_build %install %cmake_install From 2356474cbe9be51e70f3f144c2bbd3081c78a03f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 25 Apr 2024 12:19:31 +0200 Subject: [PATCH 289/313] New version Resolves: rhbz#2273782 --- gnuradio.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index b1bf937..b5381f2 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -25,8 +25,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.10.9.2 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.10.10.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -212,6 +212,10 @@ done %{_datadir}/gnuradio/examples %changelog +* Thu Apr 25 2024 Jaroslav Škarvada - 3.10.10.0-1 +- New version + Resolves: rhbz#2273782 + * Thu Feb 1 2024 Jaroslav Škarvada - 3.10.9.2-2 - Added python3-zmq requirement Resolves: rhbz#2262173 diff --git a/sources b/sources index 3b828ef..7a2f659 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.10.9.2.tar.gz) = 54d4e6bbe1befeb9127fe0599afd2abb715d8270ae4b3c94adec17856c47bb13d89fd836eef5620b129d32a69b43d692bdcca10d67c6bc1f021189f9ce48a4ab +SHA512 (gnuradio-3.10.10.0.tar.gz) = 9345726b54ea5cc49a0c72a25515f0977d9ac7018a97e6dfb4f6969c2ff7ce3b177cef8de009fb8e1b3b9c9c5dc658897c05a6f8f39972a32b44786ac272febb From 163c60e6bdc65554ac77edc5c1e72eb824615acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 21 May 2024 17:40:09 +0200 Subject: [PATCH 290/313] Rebuilt for spdlog 1.14.1 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index b5381f2..149d1a7 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.10.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -212,6 +212,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Tue May 21 2024 František Zatloukal - 3.10.10.0-2 +- Rebuilt for spdlog 1.14.1 + * Thu Apr 25 2024 Jaroslav Škarvada - 3.10.10.0-1 - New version Resolves: rhbz#2273782 From 80a1b6dc69740e39479a7674f939fd8f98a05a6e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 02:20:46 +0200 Subject: [PATCH 291/313] Rebuilt for Python 3.13 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 149d1a7..1fc8188 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.10.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -212,6 +212,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Sun Jun 09 2024 Python Maint - 3.10.10.0-3 +- Rebuilt for Python 3.13 + * Tue May 21 2024 František Zatloukal - 3.10.10.0-2 - Rebuilt for spdlog 1.14.1 From 701076d76b759f712c99cfa95e521a469e0069b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 15 Jul 2024 18:45:14 +0200 Subject: [PATCH 292/313] Rebuilt for new uhd --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 1fc8188..9f4f8d8 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.10.0 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -212,6 +212,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Mon Jul 15 2024 Jaroslav Škarvada - 3.10.10.0-4 +- Rebuilt for new uhd + * Sun Jun 09 2024 Python Maint - 3.10.10.0-3 - Rebuilt for Python 3.13 From 4d5b613e0f54ee065f8d899d5704667dd74d8aa8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 03:19:50 +0000 Subject: [PATCH 293/313] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 9f4f8d8..c644e3e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.10.0 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -212,6 +212,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 3.10.10.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 15 2024 Jaroslav Škarvada - 3.10.10.0-4 - Rebuilt for new uhd From 3342020a344b4e7787ca0af0d82313e4cbed9672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 26 Jul 2024 10:08:58 +0200 Subject: [PATCH 294/313] New version Resolves: rhbz#2297835 --- gnuradio.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index c644e3e..74e0eb4 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -25,8 +25,8 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.10.10.0 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.10.11.0 +Release: 1%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -212,6 +212,10 @@ done %{_datadir}/gnuradio/examples %changelog +* Fri Jul 26 2024 Jaroslav Škarvada - 3.10.11.0-1 +- New version + Resolves: rhbz#2297835 + * Thu Jul 18 2024 Fedora Release Engineering - 3.10.10.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 7a2f659..cf7ba1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.10.10.0.tar.gz) = 9345726b54ea5cc49a0c72a25515f0977d9ac7018a97e6dfb4f6969c2ff7ce3b177cef8de009fb8e1b3b9c9c5dc658897c05a6f8f39972a32b44786ac272febb +SHA512 (gnuradio-3.10.11.0.tar.gz) = f8c0b46c8d9513922a0375fc0d6c8886c877ad305ab899d72614bd464b10951da15b4845e9238b49cbd448ea99a553bb02a439394f3d88428d70382aae11ab03 From b5beab5dbeb36b25bce0b4c5f79008820955662e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 14:02:07 +0200 Subject: [PATCH 295/313] convert GPLv3 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- gnuradio.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 74e0eb4..2f0acb7 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,10 +26,11 @@ Name: gnuradio Version: 3.10.11.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 1%{?alphatag:.%{alphatag}}%{?dist}.1 Summary: Software defined radio framework -License: GPLv3 +# Automatically converted from old format: GPLv3 - review is highly recommended. +License: GPL-3.0-only URL: https://www.gnuradio.org/ #Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}%%{?alphatag}.tar.xz #Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}.tar.gz @@ -212,6 +213,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Mon Jul 29 2024 Miroslav Suchý - 3.10.11.0-1.1 +- convert license to SPDX + * Fri Jul 26 2024 Jaroslav Škarvada - 3.10.11.0-1 - New version Resolves: rhbz#2297835 From ac90d9d71e49ae45e028082dd93ffbaf042e7f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 23 Sep 2024 15:34:21 +0200 Subject: [PATCH 296/313] Fixed icon mode, dropped the executable bit Resolves: rhbz#2312386 --- gnuradio.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 2f0acb7..d1a74b0 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.11.0 -Release: 1%{?alphatag:.%{alphatag}}%{?dist}.1 +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -165,15 +165,15 @@ GNU Radio examples desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ grc/scripts/freedesktop/gnuradio-grc.desktop # mime -install -Dp grc/scripts/freedesktop/gnuradio-grc.xml \ +install -Dpm 0644 grc/scripts/freedesktop/gnuradio-grc.xml \ %{buildroot}%{_datadir}/mime/packages/gnuradio-grc.xml # metainfo -install -Dp grc/scripts/freedesktop/org.gnuradio.grc.metainfo.xml \ +install -Dpm 0644 grc/scripts/freedesktop/org.gnuradio.grc.metainfo.xml \ %{buildroot}%{_datadir}/metainfo/org.gnuradio.grc.metainfo.xml # icons for i in 16 24 32 48 64 128 256 do - install -Dp grc/scripts/freedesktop/grc-icon-${i}.png \ + install -Dpm 0644 grc/scripts/freedesktop/grc-icon-${i}.png \ %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/gnuradio-grc.png done @@ -213,6 +213,10 @@ done %{_datadir}/gnuradio/examples %changelog +* Mon Sep 23 2024 Jaroslav Škarvada - 3.10.11.0-2 +- Fixed icon mode, dropped the executable bit + Resolves: rhbz#2312386 + * Mon Jul 29 2024 Miroslav Suchý - 3.10.11.0-1.1 - convert license to SPDX From ce291c0dc188eb499a0eae41ffc0c939e2d7d615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 26 Nov 2024 10:23:47 +0100 Subject: [PATCH 297/313] Rebuilt for spdlog 1.15.0 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index d1a74b0..cb7701d 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.11.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -213,6 +213,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Tue Nov 26 2024 František Zatloukal - 3.10.11.0-3 +- Rebuilt for spdlog 1.15.0 + * Mon Sep 23 2024 Jaroslav Škarvada - 3.10.11.0-2 - Fixed icon mode, dropped the executable bit Resolves: rhbz#2312386 From aacc09d4cc28b40cee2818c2f5a6b4e76364e40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 28 Nov 2024 11:50:12 +0100 Subject: [PATCH 298/313] Rebuilt for new spdlog Rebuilt for new spdlog Rebuilt for new spdlog Rebuilt for new spdlog Rebuilt for new spdlog --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index cb7701d..7d45020 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.11.0 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -213,6 +213,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Thu Nov 28 2024 Jaroslav Škarvada - 3.10.11.0-4 +- Rebuilt for new spdlog + * Tue Nov 26 2024 František Zatloukal - 3.10.11.0-3 - Rebuilt for spdlog 1.15.0 From dec1a10e5f91a25a129c42f2713d9185ed58d22e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 23:04:58 +0000 Subject: [PATCH 299/313] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 7d45020..d8f41a7 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.11.0 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -213,6 +213,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.10.11.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Nov 28 2024 Jaroslav Škarvada - 3.10.11.0-4 - Rebuilt for new spdlog From f598f8193c173e423f724c6c9c563380e8ee07f7 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 2 Feb 2025 13:41:06 -0700 Subject: [PATCH 300/313] Rebuild with gsl 2.8 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index d8f41a7..2b6deec 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.11.0 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Release: 6%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -213,6 +213,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Sun Feb 02 2025 Orion Poplawski - 3.10.11.0-6 +- Rebuild with gsl 2.8 + * Thu Jan 16 2025 Fedora Release Engineering - 3.10.11.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 969caf6d16afaa0311508afaebaa89a787c0647f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= Date: Thu, 20 Feb 2025 16:01:52 +0100 Subject: [PATCH 301/313] New version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcus Müller --- gnuradio.spec | 23 +++++++++++++++++------ sources | 2 +- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/gnuradio.spec b/gnuradio.spec index 2b6deec..cce1e18 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -25,12 +25,11 @@ #%%global alphatag rc1 Name: gnuradio -Version: 3.10.11.0 -Release: 6%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.10.12.0 +Release: 0%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework -# Automatically converted from old format: GPLv3 - review is highly recommended. -License: GPL-3.0-only +License: GPL-3.0-or-later URL: https://www.gnuradio.org/ #Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}%%{?alphatag}.tar.xz #Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}.tar.gz @@ -61,7 +60,7 @@ BuildRequires: jack-audio-connection-kit-devel BuildRequires: portaudio-devel BuildRequires: python3-devel BuildRequires: python3-cairo -BuildRequires: python3-click-plugins +BuildRequires: python3-click BuildRequires: python3-gobject BuildRequires: python3-numpy BuildRequires: python3-pyyaml @@ -71,6 +70,7 @@ BuildRequires: python3-qt5-devel BuildRequires: python3-scipy BuildRequires: python3-thrift BuildRequires: python3-zmq +BuildRequires: python3-jsonschema BuildRequires: qwt-qt5-devel BuildRequires: tex(latex) BuildRequires: SDL-devel @@ -97,11 +97,12 @@ Requires: python3-pyopengl Requires: python3-pyyaml Requires: python3-gobject Requires: python3-mako -Requires: python3-click-plugins +Requires: python3-click Requires: python3-qt5 Requires: python3-scipy Requires: python3-pyqtgraph Requires: python3-zmq +Requires: python3-jsonschema Requires: gtk3 Suggests: soapy-rtlsdr @@ -198,6 +199,9 @@ done %files -n python3-%{name} %{python3_sitearch}/%{name}/ %{python3_sitearch}/pmt/ +%{_datadir}/bash-completion/completions/gr_modtool +%{_datadir}/fish/vendor_completions.d/gr_modtool.fish +%{_datadir}/zsh/site-functions/_gr_modtool %files devel %{_includedir}/* @@ -213,6 +217,13 @@ done %{_datadir}/gnuradio/examples %changelog +* Thu Feb 20 2025 Marcus Müller - 3.10.12.0-1 +- New version +- Corrected stated license to actually be GPLv3 (or later) +- Remove unused python3-click-plugins dependency (GNU Radio now only needs python3-click) +- Add python3-jsonschema dependency, needed for JSON configuration blocks +- Include the shell completion scripts for gr_modtool in the installed files + * Sun Feb 02 2025 Orion Poplawski - 3.10.11.0-6 - Rebuild with gsl 2.8 diff --git a/sources b/sources index cf7ba1f..d69f109 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.10.11.0.tar.gz) = f8c0b46c8d9513922a0375fc0d6c8886c877ad305ab899d72614bd464b10951da15b4845e9238b49cbd448ea99a553bb02a439394f3d88428d70382aae11ab03 +SHA512 (gnuradio-3.10.12.0.tar.gz) = 6d94d5f755a12d79ea38b84ac869dbce86b66813ac40f7204afb24d6f70f867a258e9efde0cc24fcb1ab814129da6b941970b0c736870f99139ee65a7a8effa7 From fb56bb5a7a1d4e85c123eba4d0cd52143d8a79d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 5 Mar 2025 10:45:33 +0100 Subject: [PATCH 302/313] Added sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index d69f109..b720dda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.10.12.0.tar.gz) = 6d94d5f755a12d79ea38b84ac869dbce86b66813ac40f7204afb24d6f70f867a258e9efde0cc24fcb1ab814129da6b941970b0c736870f99139ee65a7a8effa7 +SHA512 (gnuradio-3.10.12.0.tar.gz) = c69605f5df4a2a812ff88bcb26f70ae48dca996fdac0d3c4ce855a4706e751a06bcb1680ec05f6ce07f4206bc06885539f3f74f381b2302aa9e5ae068a7dc804 From 9f7ecaaa5358b9c90827b28302d5f05a656c9670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 10 Mar 2025 16:04:25 +0100 Subject: [PATCH 303/313] Rebuild for new volk --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index cce1e18..7e80c99 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.12.0 -Release: 0%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPL-3.0-or-later @@ -217,6 +217,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Mon Mar 10 2025 Jaroslav Škarvada - 3.10.12.0-2 +- Rebuild for new volk + * Thu Feb 20 2025 Marcus Müller - 3.10.12.0-1 - New version - Corrected stated license to actually be GPLv3 (or later) From 97f9db539688cb589b82808551d227b715395a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 10 Mar 2025 18:18:43 +0100 Subject: [PATCH 304/313] Added workaround for lib64 detection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- gnuradio.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 7e80c99..31aad17 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -149,12 +149,18 @@ GNU Radio examples # this could be dropped when f32 get retired (not counting EPEL) %undefine __cmake_in_source_build +# -DLIB_SUFFIX workaround due to: +# https://github.com/gnuradio/gnuradio/issues/7766 +# https://bugzilla.redhat.com/show_bug.cgi?id=2351130 %cmake \ -DSYSCONFDIR=%{_sysconfdir} \ -DGR_PKG_DOC_DIR=%{_docdir}/%{name} \ -DGR_PYTHON_DIR=%{python3_sitearch} \ -DPYTHON_EXECUTABLE=%{__python3} \ -%{?mfpu_neon} +%{?mfpu_neon} \ +%if "%{?_lib}"=="lib64" +-DLIB_SUFFIX=64 +%endif #-DENABLE_DOXYGEN=FALSE \ %cmake_build From 13c41777272495b9a4c44415d9e2ac6e7a2f15e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 17 Mar 2025 11:11:40 +0100 Subject: [PATCH 305/313] Rebuilt for new uhd --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 31aad17..82c5571 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.12.0 -Release: 2%{?alphatag:.%{alphatag}}%{?dist} +Release: 3%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPL-3.0-or-later @@ -223,6 +223,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Mon Mar 17 2025 Jaroslav Škarvada - 3.10.12.0-3 +- Rebuilt for new uhd + * Mon Mar 10 2025 Jaroslav Škarvada - 3.10.12.0-2 - Rebuild for new volk From 93a1e13df1abd8f48a9e9724a8e43cd65939f84f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 5 Jun 2025 00:32:16 +0200 Subject: [PATCH 306/313] Rebuilt for Python 3.14 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 82c5571..6589a92 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.12.0 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPL-3.0-or-later @@ -223,6 +223,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Wed Jun 04 2025 Python Maint - 3.10.12.0-4 +- Rebuilt for Python 3.14 + * Mon Mar 17 2025 Jaroslav Škarvada - 3.10.12.0-3 - Rebuilt for new uhd From c481e650678a1e439e1240c8477d875dd164c85a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 22:53:07 +0000 Subject: [PATCH 307/313] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 6589a92..a6c7107 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.12.0 -Release: 4%{?alphatag:.%{alphatag}}%{?dist} +Release: 5%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPL-3.0-or-later @@ -223,6 +223,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.10.12.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jun 04 2025 Python Maint - 3.10.12.0-4 - Rebuilt for Python 3.14 From 38b8ba4a05396c426f3e543a11b049cbdc17eb6e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:50:01 +0200 Subject: [PATCH 308/313] Rebuilt for Python 3.14.0rc2 bytecode --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index a6c7107..3867665 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.12.0 -Release: 5%{?alphatag:.%{alphatag}}%{?dist} +Release: 6%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPL-3.0-or-later @@ -223,6 +223,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Fri Aug 15 2025 Python Maint - 3.10.12.0-6 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Jul 23 2025 Fedora Release Engineering - 3.10.12.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From f8244bc6f035c78d4f026350e63e66c9980fe4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 11 Sep 2025 17:41:14 +0200 Subject: [PATCH 309/313] Rebuilt for new uhd --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 3867665..da8c4e1 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.12.0 -Release: 6%{?alphatag:.%{alphatag}}%{?dist} +Release: 7%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPL-3.0-or-later @@ -223,6 +223,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Thu Sep 11 2025 Jaroslav Škarvada - 3.10.12.0-7 +- Rebuilt for new uhd + * Fri Aug 15 2025 Python Maint - 3.10.12.0-6 - Rebuilt for Python 3.14.0rc2 bytecode From 35b83841aaa1f5e981c73343119d6b6c05083be0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:19:59 +0200 Subject: [PATCH 310/313] Rebuilt for Python 3.14.0rc3 bytecode --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index da8c4e1..7fa8b94 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.12.0 -Release: 7%{?alphatag:.%{alphatag}}%{?dist} +Release: 8%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPL-3.0-or-later @@ -223,6 +223,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Fri Sep 19 2025 Python Maint - 3.10.12.0-8 +- Rebuilt for Python 3.14.0rc3 bytecode + * Thu Sep 11 2025 Jaroslav Škarvada - 3.10.12.0-7 - Rebuilt for new uhd From 19de6670edb09ff971311d853d1e8438dbf4ae80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 12 Nov 2025 16:19:35 +0100 Subject: [PATCH 311/313] Enabled iio --- gnuradio.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 7fa8b94..8691a89 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.12.0 -Release: 8%{?alphatag:.%{alphatag}}%{?dist} +Release: 9%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPL-3.0-or-later @@ -85,6 +85,8 @@ BuildRequires: volk-devel BuildRequires: libsndfile-devel BuildRequires: SoapySDR-devel BuildRequires: spdlog-devel +BuildRequires: libiio-devel +BuildRequires: libad9361-iio-devel # for pygccxml #BuildRequires: castxml @@ -223,6 +225,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Wed Nov 12 2025 Jaroslav Škarvada - 3.10.12.0-9 +- Enabled iio + * Fri Sep 19 2025 Python Maint - 3.10.12.0-8 - Rebuilt for Python 3.14.0rc3 bytecode From e863a002b43b354ecbcfa4fae00e618ffd9ee250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 3 Jan 2026 01:45:19 +0100 Subject: [PATCH 312/313] Fixed build of gnuradio-companion Resolves: rhbz#2424093 --- gnuradio.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index 8691a89..c99f462 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.12.0 -Release: 9%{?alphatag:.%{alphatag}}%{?dist} +Release: 10%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPL-3.0-or-later @@ -58,6 +58,7 @@ BuildRequires: gsm-devel BuildRequires: gtk3-devel BuildRequires: jack-audio-connection-kit-devel BuildRequires: portaudio-devel +BuildRequires: gobject-introspection BuildRequires: python3-devel BuildRequires: python3-cairo BuildRequires: python3-click @@ -225,6 +226,10 @@ done %{_datadir}/gnuradio/examples %changelog +* Sat Jan 03 2026 Jaroslav Škarvada - 3.10.12.0-10 +- Fixed build of gnuradio-companion + Resolves: rhbz#2424093 + * Wed Nov 12 2025 Jaroslav Škarvada - 3.10.12.0-9 - Enabled iio From daf65f63aa34a8f1e030da28f32453e0b01cdb87 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 13 Jan 2026 10:52:47 +0000 Subject: [PATCH 313/313] Rebuilt for Boost 1.90 --- gnuradio.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnuradio.spec b/gnuradio.spec index c99f462..5365f9e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -26,7 +26,7 @@ Name: gnuradio Version: 3.10.12.0 -Release: 10%{?alphatag:.%{alphatag}}%{?dist} +Release: 11%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPL-3.0-or-later @@ -226,6 +226,9 @@ done %{_datadir}/gnuradio/examples %changelog +* Tue Jan 13 2026 Jonathan Wakely - 3.10.12.0-11 +- Rebuilt for Boost 1.90 + * Sat Jan 03 2026 Jaroslav Škarvada - 3.10.12.0-10 - Fixed build of gnuradio-companion Resolves: rhbz#2424093