NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
f201ca9d0d
kumquat-buildroot/package/gqrx/0001-add_includes_for_GR38.patch
Gwenhael Goavec-Merou 0af0d5bdb6 package/gqrx: backport/adapt patch to suppport Gnuradio 3.8 
Gnuradio 3.8 has broken some APIs, and the current gqrx release does
not support these API changes.

So we add compatibility backport patches from the following
pull-request: https://github.com/csete/gqrx/pull/705

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-02-03 23:43:33 +01:00

196 lines
5.6 KiB
Diff
Raw Blame History

From 5d3a1947447c873b04720668a874b1895975fdef Mon Sep 17 00:00:00 2001
From: Alexander Fasching <fasching.a91@gmail.com>
Date: Mon, 7 Oct 2019 00:31:31 +0200
Subject: [PATCH] Add includes for GR 3.8
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
src/applications/gqrx/receiver.cpp | 3 +++
src/applications/gqrx/receiver.h | 9 ++++++++-
src/dsp/correct_iq_cc.h | 5 +++++
src/dsp/filter/fir_decim.cpp | 3 +++
src/dsp/filter/fir_decim.h | 5 +++++
src/dsp/lpf.h | 5 +++++
src/dsp/rx_filter.h | 6 ++++++
src/dsp/rx_rds.h | 7 +++++++
src/dsp/stereo_demod.h | 13 +++++++++++--
9 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/src/applications/gqrx/receiver.cpp b/src/applications/gqrx/receiver.cpp
index 361be52c..a62fb080 100644
--- a/src/applications/gqrx/receiver.cpp
+++ b/src/applications/gqrx/receiver.cpp
@@ -28,7 +28,10 @@
#include <iostream>
+#ifdef GNURADIO_37
#include <gnuradio/blocks/multiply_const_ff.h>
+#endif
+
#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 f86d741d..1109240d 100644
--- a/src/applications/gqrx/receiver.h
+++ b/src/applications/gqrx/receiver.h
@@ -23,10 +23,17 @@
#ifndef RECEIVER_H
#define RECEIVER_H
+#ifdef GNURADIO_37
#include <gnuradio/analog/sig_source_c.h>
-#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/blocks/multiply_const_ff.h>
#include <gnuradio/blocks/multiply_cc.h>
+#else
+#include <gnuradio/analog/sig_source.h>
+#include <gnuradio/blocks/multiply_const.h>
+#include <gnuradio/blocks/multiply.h>
+#endif
+
+#include <gnuradio/blocks/file_sink.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 cb033782..410af766 100644
--- a/src/dsp/correct_iq_cc.h
+++ b/src/dsp/correct_iq_cc.h
@@ -28,7 +28,12 @@
#include <gnuradio/blocks/float_to_complex.h>
#include <gnuradio/hier_block2.h>
#include <gnuradio/filter/single_pole_iir_filter_cc.h>
+
+#ifdef GNURADIO_37
#include <gnuradio/blocks/sub_cc.h>
+#else
+#include <gnuradio/blocks/sub.h>
+#endif
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 af2ebda7..7c7fc32f 100644
--- a/src/dsp/filter/fir_decim.cpp
+++ b/src/dsp/filter/fir_decim.cpp
@@ -24,7 +24,10 @@
#include <cstdio>
#include <vector>
+#ifdef GNURADIO_37
#include <gnuradio/filter/fir_filter_ccf.h>
+#endif
+
#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 9c026f48..ed40b021 100644
--- a/src/dsp/filter/fir_decim.h
+++ b/src/dsp/filter/fir_decim.h
@@ -22,7 +22,12 @@
*/
#pragma once
+#ifdef GNURADIO_37
#include <gnuradio/filter/fir_filter_ccf.h>
+#else
+#include <gnuradio/filter/fir_filter_blk.h>
+#endif
+
#include <gnuradio/hier_block2.h>
class fir_decim_cc;
diff --git a/src/dsp/lpf.h b/src/dsp/lpf.h
index 049b3a9c..953716a3 100644
--- a/src/dsp/lpf.h
+++ b/src/dsp/lpf.h
@@ -25,7 +25,12 @@
#include <gnuradio/hier_block2.h>
#include <gnuradio/filter/firdes.h>
+
+#ifdef GNURADIO_37
#include <gnuradio/filter/fir_filter_fff.h>
+#else
+#include <gnuradio/filter/fir_filter_blk.h>
+#endif
class lpf_ff;
diff --git a/src/dsp/rx_filter.h b/src/dsp/rx_filter.h
index 8723be32..82c32a1e 100644
--- a/src/dsp/rx_filter.h
+++ b/src/dsp/rx_filter.h
@@ -24,8 +24,14 @@
#define RX_FILTER_H
#include <gnuradio/hier_block2.h>
+
+#ifdef GNURADIO_37
#include <gnuradio/filter/fir_filter_ccc.h>
#include <gnuradio/filter/freq_xlating_fir_filter_ccc.h>
+#else
+#include <gnuradio/filter/fir_filter_blk.h>
+#include <gnuradio/filter/freq_xlating_fir_filter.h>
+#endif
#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 17e406ae..f975ec11 100644
--- a/src/dsp/rx_rds.h
+++ b/src/dsp/rx_rds.h
@@ -24,11 +24,18 @@
#define RX_RDS_H
#include <gnuradio/hier_block2.h>
+
+#ifdef GNURADIO_37
#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>
+#else
+#include <gnuradio/filter/fir_filter_blk.h>
+#include <gnuradio/filter/freq_xlating_fir_filter.h>
+#endif
+
#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 28be5c0c..35069615 100644
--- a/src/dsp/stereo_demod.h
+++ b/src/dsp/stereo_demod.h
@@ -26,14 +26,23 @@
#include <gnuradio/hier_block2.h>
#include <gnuradio/filter/firdes.h>
+
+#ifdef GNURADIO_37
#include <gnuradio/filter/fir_filter_fcc.h>
#include <gnuradio/filter/fir_filter_fff.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/complex_to_imag.h>
#include <gnuradio/blocks/add_ff.h>
+#else
+#include <gnuradio/filter/fir_filter_blk.h>
+#include <gnuradio/blocks/multiply.h>
+#include <gnuradio/blocks/multiply_const.h>
+#include <gnuradio/blocks/add_blk.h>
+#endif
+
+#include <gnuradio/analog/pll_refout_cc.h>
+#include <gnuradio/blocks/complex_to_imag.h>
#include <vector>
#include "dsp/lpf.h"
#include "dsp/resampler_xx.h"
Reference in New Issue View Git Blame Copy Permalink