package/gnuradio: re-enable gr-qtgui

Since commit fcd9c85475b65c6e8f22d5f9b4ac7c7ecb93dc6a, gr-qtgui has
been removed because this Qt GUI was based on Qt4 which was no longer
supported by Buildroot.

However, gnuradio 3.8 brings a Qt5-based GUI, and therefore the option
BR2_PACKAGE_GNURADIO_QTGUI can be re-introduced.

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/Config.in.legacy b/Config.in.legacy
index fb7b0aadd0c17e3e16650a29db3f11868ca6adc1..d65d963d45fec101abe2cc1e3683c60b52aef8c3 100644 (file)
--- 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 bf69ed605b43d9455d2fff08799607ef5eb990f9..01a396227f6e9de3078501c2ef2114beaee1fbbc 100644 (file)
--- 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 4d69de8dd14e8b107da8ddd75da201383a1ad33d..2820334996f8b02c9f14f596adb498a7efc9b06d 100644 (file)
--- 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