jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/gnuradio: remove qtgui option

Browse Source 
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>
This commit is contained in:
Peter Korsgaard 2019-02-06 15:10:43 +01:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 4b1c0855b3
commit fcd9c85475
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in.legacy
View File

@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2019.02" 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 config BR2_PACKAGE_LUACRYPTO
bool "luacrypto package removed" bool "luacrypto package removed"
select BR2_LEGACY select BR2_LEGACY

10
package/gnuradio/Config.in
View File

@ -116,16 +116,6 @@ 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_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 config BR2_PACKAGE_GNURADIO_TRELLIS
bool "gr-trellis support" bool "gr-trellis support"
select BR2_PACKAGE_GNURADIO_DIGITAL select BR2_PACKAGE_GNURADIO_DIGITAL

10
package/gnuradio/gnuradio.mk
View File

@ -25,7 +25,8 @@ endif
GNURADIO_CONF_OPTS = \ GNURADIO_CONF_OPTS = \
-DENABLE_DEFAULT=OFF \ -DENABLE_DEFAULT=OFF \
-DENABLE_VOLK=ON \ -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 # For third-party blocks, the gnuradio libraries are mandatory at
# compile time. # compile time.
@ -126,13 +127,6 @@ else
GNURADIO_CONF_OPTS += -DENABLE_PAGER=OFF GNURADIO_CONF_OPTS += -DENABLE_PAGER=OFF
endif 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) ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y)
GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON
else else