From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 01/16] package/gnuradio: remove qtgui option
Date: Wed, 6 Feb 2019 15:10:43 +0100 [thread overview]
Message-ID: <20190206141058.24155-1-peter@korsgaard.com> (raw)
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>
---
Config.in.legacy | 6 ++++++
package/gnuradio/Config.in | 10 ----------
package/gnuradio/gnuradio.mk | 10 ++--------
3 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index be2f722b05..c84a9239a7 100644
--- 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 533a49c81e..3fdaea850e 100644
--- 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 564ad8b2a4..d6d07f6566 100644
--- 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
--
2.11.0
next reply other threads:[~2019-02-06 14:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-06 14:10 Peter Korsgaard [this message]
2019-02-06 14:10 ` [Buildroot] [PATCH 02/16] package/python-pyqt: remove package Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 03/16] package/python-sip: remove qt4 support Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 04/16] package/sdl: remove qtopia video driver option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 05/16] package/amd-catalyst: remove control center option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 06/16] package/opencv: remove qt backend option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 07/16] package/opencv3: " Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 08/16] package/poppler: remove qt option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 09/16] package/pinentry: remove qt4 option Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 10/16] package/qtuio: remove package Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 11/16] package/libmediaart: remove qt4 support Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 12/16] package/qextserialport: " Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 13/16] package/gjson: " Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 14/16] package/quazip: " Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 15/16] package/qwt: " Peter Korsgaard
2019-02-06 14:10 ` [Buildroot] [PATCH 16/16] package/qt: remove package Peter Korsgaard
2019-02-06 14:39 ` [Buildroot] [PATCH 01/16] package/gnuradio: remove qtgui option Gwenhael Goavec-Merou
2019-02-06 14:52 ` Thomas Petazzoni
2019-02-06 14:54 ` Arnout Vandecappelle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190206141058.24155-1-peter@korsgaard.com \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.