Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:StefanBruens:branches:hardware:sdr
gqrx
0001-Port-to-GNU-Radio-3.8.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0001-Port-to-GNU-Radio-3.8.patch of Package gqrx
From 37aa1a557f3319fb26b99dee39756081620a75c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de> Date: Tue, 24 Sep 2019 18:50:06 +0200 Subject: [PATCH] Port to GNU Radio 3.8 - Use new syntax for required GR components - Use gnuradio::gnuradio-* instead of GNURADIO_ALL_LIBRARIES - Update sources for renamed/consolidated headers --- CMakeLists.txt | 8 +------- src/CMakeLists.txt | 6 ++++-- src/applications/gqrx/receiver.cpp | 1 - src/applications/gqrx/receiver.h | 6 +++--- src/dsp/correct_iq_cc.h | 2 +- src/dsp/filter/fir_decim.cpp | 1 - src/dsp/filter/fir_decim.h | 2 +- src/dsp/lpf.h | 2 +- src/dsp/rx_filter.h | 4 ++-- src/dsp/rx_rds.h | 7 ++----- src/dsp/stereo_demod.h | 10 ++++------ 11 files changed, 19 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c12996..07ef34a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,15 +99,9 @@ endfunction(add_source_files) # 3rd Party Dependency Stuff find_package(Qt5 COMPONENTS Core Network Widgets Svg REQUIRED) -find_package(Boost COMPONENTS system program_options REQUIRED) -set(GR_REQUIRED_COMPONENTS RUNTIME ANALOG AUDIO BLOCKS DIGITAL FILTER FFT PMT) -find_package(Gnuradio REQUIRED) +find_package(Gnuradio "3.8" REQUIRED COMPONENTS analog audio blocks digital filter fft) find_package(Gnuradio-osmosdr REQUIRED) -if(NOT GNURADIO_RUNTIME_FOUND) - message(FATAL_ERROR "GnuRadio Runtime required to compile gqrx") -endif() - if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(NOT LINUX_AUDIO_BACKEND) set(LINUX_AUDIO_BACKEND Pulseaudio CACHE STRING "Choose the audio backend, options are: Pulseaudio, Portaudio, Gr-audio" FORCE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2598f22..649cb09 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -65,8 +65,10 @@ target_link_libraries(${PROJECT_NAME} Qt5::Network Qt5::Widgets Qt5::Svg - ${Boost_LIBRARIES} - ${GNURADIO_ALL_LIBRARIES} + gnuradio::gnuradio-analog + gnuradio::gnuradio-blocks + gnuradio::gnuradio-digital + gnuradio::gnuradio-filter ${GNURADIO_OSMOSDR_LIBRARIES} ${PULSEAUDIO_LIBRARY} ${PULSE-SIMPLE} diff --git a/src/applications/gqrx/receiver.cpp b/src/applications/gqrx/receiver.cpp index 361be52..ba50496 100644 --- a/src/applications/gqrx/receiver.cpp +++ b/src/applications/gqrx/receiver.cpp @@ -28,7 +28,6 @@ #include <iostream> -#include <gnuradio/blocks/multiply_const_ff.h> #include <gnuradio/prefs.h> #include <gnuradio/top_block.h> #include <osmosdr/source.h> diff --git a/src/applications/gqrx/receiver.h b/src/applications/gqrx/receiver.h index f86d741..2b2c7f1 100644 --- a/src/applications/gqrx/receiver.h +++ b/src/applications/gqrx/receiver.h @@ -23,10 +23,10 @@ #ifndef RECEIVER_H #define RECEIVER_H -#include <gnuradio/analog/sig_source_c.h> +#include <gnuradio/analog/sig_source.h> #include <gnuradio/blocks/file_sink.h> -#include <gnuradio/blocks/multiply_const_ff.h> -#include <gnuradio/blocks/multiply_cc.h> +#include <gnuradio/blocks/multiply_const.h> +#include <gnuradio/blocks/multiply.h> #include <gnuradio/blocks/null_sink.h> #include <gnuradio/blocks/wavfile_sink.h> #include <gnuradio/blocks/wavfile_source.h> diff --git a/src/dsp/correct_iq_cc.h b/src/dsp/correct_iq_cc.h index cb03378..1fe9687 100644 --- a/src/dsp/correct_iq_cc.h +++ b/src/dsp/correct_iq_cc.h @@ -28,7 +28,7 @@ #include <gnuradio/blocks/float_to_complex.h> #include <gnuradio/hier_block2.h> #include <gnuradio/filter/single_pole_iir_filter_cc.h> -#include <gnuradio/blocks/sub_cc.h> +#include <gnuradio/blocks/sub.h> class dc_corr_cc; class iq_swap_cc; diff --git a/src/dsp/filter/fir_decim.cpp b/src/dsp/filter/fir_decim.cpp index af2ebda..06ffdce 100644 --- a/src/dsp/filter/fir_decim.cpp +++ b/src/dsp/filter/fir_decim.cpp @@ -24,7 +24,6 @@ #include <cstdio> #include <vector> -#include <gnuradio/filter/fir_filter_ccf.h> #include <gnuradio/hier_block2.h> #include <gnuradio/io_signature.h> diff --git a/src/dsp/filter/fir_decim.h b/src/dsp/filter/fir_decim.h index 9c026f4..bd1f09f 100644 --- a/src/dsp/filter/fir_decim.h +++ b/src/dsp/filter/fir_decim.h @@ -22,7 +22,7 @@ */ #pragma once -#include <gnuradio/filter/fir_filter_ccf.h> +#include <gnuradio/filter/fir_filter_blk.h> #include <gnuradio/hier_block2.h> class fir_decim_cc; diff --git a/src/dsp/lpf.h b/src/dsp/lpf.h index 049b3a9..6663fdc 100644 --- a/src/dsp/lpf.h +++ b/src/dsp/lpf.h @@ -25,7 +25,7 @@ #include <gnuradio/hier_block2.h> #include <gnuradio/filter/firdes.h> -#include <gnuradio/filter/fir_filter_fff.h> +#include <gnuradio/filter/fir_filter_blk.h> class lpf_ff; diff --git a/src/dsp/rx_filter.h b/src/dsp/rx_filter.h index 8723be3..d1b1db6 100644 --- a/src/dsp/rx_filter.h +++ b/src/dsp/rx_filter.h @@ -24,8 +24,8 @@ #define RX_FILTER_H #include <gnuradio/hier_block2.h> -#include <gnuradio/filter/fir_filter_ccc.h> -#include <gnuradio/filter/freq_xlating_fir_filter_ccc.h> +#include <gnuradio/filter/fir_filter_blk.h> +#include <gnuradio/filter/freq_xlating_fir_filter.h> #define RX_FILTER_MIN_WIDTH 100 /*! Minimum width of filter */ diff --git a/src/dsp/rx_rds.h b/src/dsp/rx_rds.h index 17e406a..77795e0 100644 --- a/src/dsp/rx_rds.h +++ b/src/dsp/rx_rds.h @@ -24,11 +24,8 @@ #define RX_RDS_H #include <gnuradio/hier_block2.h> -#include <gnuradio/filter/fir_filter_ccc.h> -#include <gnuradio/filter/fir_filter_ccf.h> -#include <gnuradio/filter/fir_filter_fff.h> -#include <gnuradio/filter/freq_xlating_fir_filter_fcf.h> -#include <gnuradio/filter/freq_xlating_fir_filter_ccf.h> +#include <gnuradio/filter/fir_filter_blk.h> +#include <gnuradio/filter/freq_xlating_fir_filter.h> #include <gnuradio/digital/constellation_receiver_cb.h> #include <gnuradio/blocks/keep_one_in_n.h> #include <gnuradio/digital/diff_decoder_bb.h> diff --git a/src/dsp/stereo_demod.h b/src/dsp/stereo_demod.h index 28be5c0..aba0148 100644 --- a/src/dsp/stereo_demod.h +++ b/src/dsp/stereo_demod.h @@ -26,14 +26,12 @@ #include <gnuradio/hier_block2.h> #include <gnuradio/filter/firdes.h> -#include <gnuradio/filter/fir_filter_fcc.h> -#include <gnuradio/filter/fir_filter_fff.h> +#include <gnuradio/filter/fir_filter_blk.h> #include <gnuradio/analog/pll_refout_cc.h> -#include <gnuradio/blocks/multiply_cc.h> -#include <gnuradio/blocks/multiply_ff.h> -#include <gnuradio/blocks/multiply_const_ff.h> +#include <gnuradio/blocks/multiply.h> +#include <gnuradio/blocks/multiply_const.h> #include <gnuradio/blocks/complex_to_imag.h> -#include <gnuradio/blocks/add_ff.h> +#include <gnuradio/blocks/add_blk.h> #include <vector> #include "dsp/lpf.h" #include "dsp/resampler_xx.h" -- 2.23.0
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
