From patchwork Fri Jun 5 13:24:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1304152 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=trabucayre.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49dk0P0fgzz9sSJ for ; Fri, 5 Jun 2020 23:25:09 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C3CA7871CC; Fri, 5 Jun 2020 13:25:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t0W65F_O7LDb; Fri, 5 Jun 2020 13:25:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 97CAE87179; Fri, 5 Jun 2020 13:25:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 24C601BF3D9 for ; Fri, 5 Jun 2020 13:25:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 16757253CA for ; Fri, 5 Jun 2020 13:25:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bzppLoRmajHf for ; Fri, 5 Jun 2020 13:24:58 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [212.27.42.3]) by silver.osuosl.org (Postfix) with ESMTPS id 3ACB120411 for ; Fri, 5 Jun 2020 13:24:58 +0000 (UTC) Received: from localhost.localdomain (unknown [78.252.129.8]) by smtp3-g21.free.fr (Postfix) with ESMTP id 5DC6D13F8AE; Fri, 5 Jun 2020 15:24:55 +0200 (CEST) From: Gwenhael Goavec-Merou To: buildroot@buildroot.org Date: Fri, 5 Jun 2020 15:24:31 +0200 Message-Id: <20200605132432.1749068-1-gwenj@trabucayre.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/gnuradio: re-enable gr-qtgui X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gwenhael Goavec-Merou Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou Since commit fcd9c85475b65c6e8f22d5f9b4ac7c7ecb93dc6a, gr-qtgui has been removed. With gnuradio 3.8 serie, this block requires qt5 and can be re-enabled. Signed-off-by: Gwenhael Goavec-Merou --- Config.in.legacy | 6 ------ package/gnuradio/Config.in | 15 +++++++++++++++ package/gnuradio/gnuradio.mk | 8 +++++++- 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 From patchwork Fri Jun 5 13:24:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1304151 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=trabucayre.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49dk0M3lNCz9sT8 for ; Fri, 5 Jun 2020 23:25:07 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AA83E871C8; Fri, 5 Jun 2020 13:25:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S77wnpAgkgau; Fri, 5 Jun 2020 13:25:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 69B4586949; Fri, 5 Jun 2020 13:25:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E39E21BF3D9 for ; Fri, 5 Jun 2020 13:24:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E065588C50 for ; Fri, 5 Jun 2020 13:24:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z+U3eWD9O+97 for ; Fri, 5 Jun 2020 13:24:58 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [212.27.42.3]) by hemlock.osuosl.org (Postfix) with ESMTPS id 85A8188C48 for ; Fri, 5 Jun 2020 13:24:58 +0000 (UTC) Received: from localhost.localdomain (unknown [78.252.129.8]) by smtp3-g21.free.fr (Postfix) with ESMTP id 94ADC13F88F; Fri, 5 Jun 2020 15:24:55 +0200 (CEST) From: Gwenhael Goavec-Merou To: buildroot@buildroot.org Date: Fri, 5 Jun 2020 15:24:32 +0200 Message-Id: <20200605132432.1749068-2-gwenj@trabucayre.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200605132432.1749068-1-gwenj@trabucayre.com> References: <20200605132432.1749068-1-gwenj@trabucayre.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/gnuradio: add gr-dtv support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gwenhael Goavec-Merou Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou gr-dtv provide support for a serie of gnuradio blocks for digital television standards. Signed-off-by: Gwenhael Goavec-Merou --- package/gnuradio/Config.in | 8 ++++++++ package/gnuradio/gnuradio.mk | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 01a396227f..07a33514d1 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -54,6 +54,14 @@ config BR2_PACKAGE_GNURADIO_CTRLPORT help GNU Radio ctrlport block +config BR2_PACKAGE_GNURADIO_DTV + bool "gr-dtv support" + select BR2_PACKAGE_GNURADIO_ANALOG + select BR2_PACKAGE_GNURADIO_FEC + select BR2_PACKAGE_GNURADIO_FILTER + help + various digital television standards blocks + config BR2_PACKAGE_GNURADIO_FEC bool "gr-fec support" select BR2_PACKAGE_GNURADIO_BLOCKS diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 2820334996..0a818cfc24 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -93,6 +93,12 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_DIGITAL=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_DTV),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_DTV=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_DTV=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_FEC),y) GNURADIO_DEPENDENCIES += gsl GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=ON