mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 14:01:57 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/gnuradio: re-enable gr-qtgui

Browse Source 
Since commit fcd9c85475, 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>
This commit is contained in:
Gwenhael Goavec-Merou
2020-06-05 15:24:31 +02:00
committed by Thomas Petazzoni
parent 7ac245a0cb
commit 494d7f4a12
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in.legacy
View File

@@ -841,12 +841,6 @@ config BR2_PACKAGE_PYTHON_PYQT
The python-pyqt package was removed. Consider python-pyqt5 The python-pyqt package was removed. Consider python-pyqt5
instead. 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 config BR2_PACKAGE_LUACRYPTO
bool "luacrypto package removed" bool "luacrypto package removed"
select BR2_LEGACY select BR2_LEGACY

15
package/gnuradio/Config.in
View File

@@ -126,6 +126,21 @@ config BR2_PACKAGE_GNURADIO_PAGER
help help
FLEX pager decoder implementation blocks 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 config BR2_PACKAGE_GNURADIO_TRELLIS
bool "gr-trellis support" bool "gr-trellis support"
select BR2_PACKAGE_GNURADIO_DIGITAL select BR2_PACKAGE_GNURADIO_DIGITAL

8
package/gnuradio/gnuradio.mk
View File

@@ -34,7 +34,6 @@ GNURADIO_CONF_OPTS = \
-DENABLE_VOLK=ON \ -DENABLE_VOLK=ON \
-DENABLE_GNURADIO_RUNTIME=ON \ -DENABLE_GNURADIO_RUNTIME=ON \
-DENABLE_TESTING=OFF \ -DENABLE_TESTING=OFF \
-DENABLE_GR_QTGUI=OFF \
-DXMLTO_EXECUTABLE=NOTFOUND -DXMLTO_EXECUTABLE=NOTFOUND
# For third-party blocks, the gnuradio libraries are mandatory at # For third-party blocks, the gnuradio libraries are mandatory at
@@ -131,6 +130,13 @@ else
GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=OFF GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=OFF
endif 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) ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y)
GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON
else else