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