3 files changed, 153 insertions, 8 deletions

diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile
index 4ade711728f5..2bc6bb9f42c6 100644
--- a/comms/gqrx/Makefile
+++ b/comms/gqrx/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	gqrx
 PORTVERSION=	2.11.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	10
+PORTREVISION=	11
 PORTEPOCH=	1
 CATEGORIES=	comms hamradio
 
@@ -14,9 +14,6 @@ COMMENT=	Software defined radio receiver powered by GNU Radio and Qt
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-DEPRECATED=	Depends on expiring comms/gr-osmosdr
-EXPIRATION_DATE=	2019-09-04
-
 LIB_DEPENDS=	libgnuradio-runtime.so:comms/gnuradio \
 		libgnuradio-analog.so:comms/gnuradio \
 		libgnuradio-blocks.so:comms/gnuradio \
@@ -27,7 +24,9 @@ LIB_DEPENDS=	libgnuradio-runtime.so:comms/gnuradio \
 		libgnuradio-osmosdr.so:comms/gr-osmosdr \
 		libboost_system.so:devel/boost-libs \
 		libboost_program_options.so:devel/boost-libs \
-		liblog4cpp.so:devel/log4cpp
+		liblog4cpp.so:devel/log4cpp \
+		libgmpxx.so:math/gmp \
+		libgmp.so:math/gmp
 
 USES=		gl pkgconfig qmake qt:5
 
diff --git a/comms/gqrx/files/patch-00-gr38-compat.txt b/comms/gqrx/files/patch-00-gr38-compat.txt
new file mode 100644
index 000000000000..4168a83b144e
--- /dev/null
+++ b/comms/gqrx/files/patch-00-gr38-compat.txt
@@ -0,0 +1,145 @@
+Gnuradio 3.8 compatibility patch from:
+https://github.com/csete/gqrx/pull/696
+https://github.com/csete/gqrx/commit/2cc48cb8c9e71f893b04a70ff4ad3e9ee3b49b3e.diff
+
+diff --git a/src/applications/gqrx/receiver.cpp b/src/applications/gqrx/receiver.cpp
+index 361be52c..1a364521 100644
+--- src/applications/gqrx/receiver.cpp.orig
++++ src/applications/gqrx/receiver.cpp
+@@ -28,7 +28,7 @@
+ 
+ #include <iostream>
+ 
+-#include <gnuradio/blocks/multiply_const_ff.h>
++#include <gnuradio/blocks/multiply_const.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 f86d741d..2b2c7f17 100644
+--- src/applications/gqrx/receiver.h.orig
++++ 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 cb033782..1fe96878 100644
+--- src/dsp/correct_iq_cc.h.orig
++++ 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 af2ebda7..7ee3e1b2 100644
+--- src/dsp/filter/fir_decim.cpp.orig
++++ src/dsp/filter/fir_decim.cpp
+@@ -24,7 +24,7 @@
+ #include <cstdio>
+ #include <vector>
+ 
+-#include <gnuradio/filter/fir_filter_ccf.h>
++#include <gnuradio/filter/fir_filter.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 9c026f48..bd1f09f2 100644
+--- src/dsp/filter/fir_decim.h.orig
++++ 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 049b3a9c..6663fdc2 100644
+--- src/dsp/lpf.h.orig
++++ 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 8723be32..d1b1db61 100644
+--- src/dsp/rx_filter.h.orig
++++ 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 17e406ae..098b20ef 100644
+--- src/dsp/rx_rds.h.orig
++++ src/dsp/rx_rds.h
+@@ -24,11 +24,9 @@
+ #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.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 28be5c0c..d88e0890 100644
+--- src/dsp/stereo_demod.h.orig
++++ src/dsp/stereo_demod.h
+@@ -26,14 +26,13 @@
+ 
+ #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.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"
diff --git a/comms/gqrx/files/patch-gqrx.pro b/comms/gqrx/files/patch-gqrx.pro
index 02a60d27f62b..1a150843d427 100644
--- a/comms/gqrx/files/patch-gqrx.pro
+++ b/comms/gqrx/files/patch-gqrx.pro
@@ -1,10 +1,11 @@
---- ./gqrx.pro.orig	2014-08-08 08:21:20.000000000 -0500
-+++ ./gqrx.pro	2014-09-05 22:50:58.000000000 -0500
-@@ -206,7 +206,6 @@
+--- gqrx.pro.orig	2018-05-16 23:32:13.000000000 +0200
++++ gqrx.pro	2019-08-20 22:57:38.783794000 +0200
+@@ -267,7 +267,7 @@
  
  unix:!macx {
      LIBS += -lboost_system$$BOOST_SUFFIX -lboost_program_options$$BOOST_SUFFIX
 -    LIBS += -lrt  # need to include on some distros
++    LIBS += -llog4cpp
  }
  
  macx {