package/gnuradio: remove qtgui option

The gr-qtgui option uses python-pyqt/Qt4, which we are about to remove, so
remove the option.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/Config.in.legacy b/Config.in.legacy
index be2f722b0505a7f93bb604e715f059c92f5f2b66..c84a9239a7f623ca59b153348558832dc307a7f2 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2019.02"
 
+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 533a49c81e95b998cf8aefd1d9155ecc148f8cbe..3fdaea850e5d3d6b8a8795318496695c3d5e3283 100644 (file)
--- a/package/gnuradio/Config.in
+++ b/package/gnuradio/Config.in
@@ -116,16 +116,6 @@ config BR2_PACKAGE_GNURADIO_PAGER
        help
          FLEX pager decoder implementation blocks
 
-config BR2_PACKAGE_GNURADIO_QTGUI
-       bool "gr-qtgui"
-       depends on BR2_PACKAGE_PYTHON_PYQT
-       depends on BR2_PACKAGE_QWT
-       depends on BR2_PACKAGE_QT_STL
-       select BR2_PACKAGE_GNURADIO_FFT
-       select BR2_PACKAGE_GNURADIO_FILTER
-       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 564ad8b2a43019e68091402c915d825b98febf57..d6d07f65666cd8f77bca9f1369ca77440bf42af2 100644 (file)
--- a/package/gnuradio/gnuradio.mk
+++ b/package/gnuradio/gnuradio.mk
@@ -25,7 +25,8 @@ endif
 GNURADIO_CONF_OPTS = \
        -DENABLE_DEFAULT=OFF \
        -DENABLE_VOLK=ON \
-       -DENABLE_GNURADIO_RUNTIME=ON
+       -DENABLE_GNURADIO_RUNTIME=ON \
+       -DENABLE_GR_QTGUI=OFF
 
 # For third-party blocks, the gnuradio libraries are mandatory at
 # compile time.
@@ -126,13 +127,6 @@ else
 GNURADIO_CONF_OPTS += -DENABLE_PAGER=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_GNURADIO_QTGUI),y)
-GNURADIO_DEPENDENCIES += python-pyqt 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