[Buildroot] [PATCH 1/2] package/gnuradio: re-enable gr-qtgui

[Buildroot] [PATCH 1/2] package/gnuradio: re-enable gr-qtgui

[Gwenhael Goavec-Merou]

From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>

Since commit fcd9c85475b65c6e8f22d5f9b4ac7c7ecb93dc6a, gr-qtgui has
been removed. With gnuradio 3.8 serie, this block requires qt5 and
can be re-enabled.

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
 Config.in.legacy             |  6 ------
 package/gnuradio/Config.in   | 15 +++++++++++++++
 package/gnuradio/gnuradio.mk |  8 +++++++-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index fb7b0aadd0..d65d963d45 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -841,12 +841,6 @@ config BR2_PACKAGE_PYTHON_PYQT
 	  The python-pyqt package was removed. Consider python-pyqt5
 	  instead.
 
-config BR2_PACKAGE_GNURADIO_QTGUI
-	bool "gnuradio gr-qtgui option removed"
-	select BR2_LEGACY
-	help
-	  The gr-qtgui option was removed.
-
 config BR2_PACKAGE_LUACRYPTO
 	bool "luacrypto package removed"
 	select BR2_LEGACY
diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in
index bf69ed605b..01a396227f 100644
--- a/package/gnuradio/Config.in
+++ b/package/gnuradio/Config.in
@@ -126,6 +126,21 @@ config BR2_PACKAGE_GNURADIO_PAGER
 	help
 	  FLEX pager decoder implementation blocks
 
+config BR2_PACKAGE_GNURADIO_QTGUI
+	bool "gr-qtgui"
+	depends on BR2_PACKAGE_GNURADIO_PYTHON
+	depends on BR2_PACKAGE_QT5
+	select BR2_PACKAGE_GNURADIO_FFT
+	select BR2_PACKAGE_GNURADIO_FILTER
+	select BR2_PACKAGE_PYTHON_PYQT5
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_FONTCONFIG # runtime
+	select BR2_PACKAGE_QT5BASE_GUI # runtime
+	select BR2_PACKAGE_QT5BASE_WIDGETS # runtime
+	select BR2_PACKAGE_QWT
+	help
+	  GNU Radio Qt scopes
+
 config BR2_PACKAGE_GNURADIO_TRELLIS
 	bool "gr-trellis support"
 	select BR2_PACKAGE_GNURADIO_DIGITAL
diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk
index 4d69de8dd1..2820334996 100644
--- a/package/gnuradio/gnuradio.mk
+++ b/package/gnuradio/gnuradio.mk
@@ -34,7 +34,6 @@ GNURADIO_CONF_OPTS = \
 	-DENABLE_VOLK=ON \
 	-DENABLE_GNURADIO_RUNTIME=ON \
 	-DENABLE_TESTING=OFF \
-	-DENABLE_GR_QTGUI=OFF \
 	-DXMLTO_EXECUTABLE=NOTFOUND
 
 # For third-party blocks, the gnuradio libraries are mandatory at
@@ -131,6 +130,13 @@ else
 GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_GNURADIO_QTGUI),y)
+GNURADIO_DEPENDENCIES += qt5base python-pyqt5 qwt
+GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=ON
+else
+GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y)
 GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON
 else
-- 
2.26.2

[Buildroot] [PATCH 2/2] package/gnuradio: add gr-dtv support

[Gwenhael Goavec-Merou]

From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>

gr-dtv provide support for a serie of gnuradio blocks for
digital television standards.

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
 package/gnuradio/Config.in   | 8 ++++++++
 package/gnuradio/gnuradio.mk | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in
index 01a396227f..07a33514d1 100644
--- a/package/gnuradio/Config.in
+++ b/package/gnuradio/Config.in
@@ -54,6 +54,14 @@ config BR2_PACKAGE_GNURADIO_CTRLPORT
 	help
 	  GNU Radio ctrlport block
 
+config BR2_PACKAGE_GNURADIO_DTV
+	bool "gr-dtv support"
+	select BR2_PACKAGE_GNURADIO_ANALOG
+	select BR2_PACKAGE_GNURADIO_FEC
+	select BR2_PACKAGE_GNURADIO_FILTER
+	help
+	  various digital television standards blocks
+
 config BR2_PACKAGE_GNURADIO_FEC
 	bool "gr-fec support"
 	select BR2_PACKAGE_GNURADIO_BLOCKS
diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk
index 2820334996..0a818cfc24 100644
--- a/package/gnuradio/gnuradio.mk
+++ b/package/gnuradio/gnuradio.mk
@@ -93,6 +93,12 @@ else
 GNURADIO_CONF_OPTS += -DENABLE_GR_DIGITAL=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_GNURADIO_DTV),y)
+GNURADIO_CONF_OPTS += -DENABLE_GR_DTV=ON
+else
+GNURADIO_CONF_OPTS += -DENABLE_GR_DTV=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_GNURADIO_FEC),y)
 GNURADIO_DEPENDENCIES += gsl
 GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=ON
-- 
2.26.2

[Buildroot] [PATCH 1/2] package/gnuradio: re-enable gr-qtgui

[Thomas Petazzoni]

On Fri,  5 Jun 2020 15:24:31 +0200
Gwenhael Goavec-Merou <gwenj@trabucayre.com> wrote:

> From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
> 
> Since commit fcd9c85475b65c6e8f22d5f9b4ac7c7ecb93dc6a, gr-qtgui has
> been removed. With gnuradio 3.8 serie, this block requires qt5 and
> can be re-enabled.
> 
> Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
> ---
>  Config.in.legacy             |  6 ------
>  package/gnuradio/Config.in   | 15 +++++++++++++++
>  package/gnuradio/gnuradio.mk |  8 +++++++-
>  3 files changed, 22 insertions(+), 7 deletions(-)

Both applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com