aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>2020-06-05 15:24:31 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2020-06-06 23:11:17 +0200
commit494d7f4a12e8c33afac583c1b641a81d28c48ee3 (patch)
treec912b33d5941275cdcc747cce19c0645c80c68c0
parent7ac245a0cb76f270b28860936245ca1abba0804a (diff)
downloadbuildroot-494d7f4a12e8c33afac583c1b641a81d28c48ee3.tar.gz
buildroot-494d7f4a12e8c33afac583c1b641a81d28c48ee3.tar.bz2
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>
-rw-r--r--Config.in.legacy6
-rw-r--r--package/gnuradio/Config.in15
-rw-r--r--package/gnuradio/gnuradio.mk8
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