From patchwork Mon Jul 27 13:00:22 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: 1336951 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.138; helo=whitealder.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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BFg0M3zsQz9sRk for ; Mon, 27 Jul 2020 23:00:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0E7B787C13; Mon, 27 Jul 2020 13:00:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WWO5-Dxg1Bpg; Mon, 27 Jul 2020 13:00:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0353887A85; Mon, 27 Jul 2020 13:00:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id ACF411BF3E1 for ; Mon, 27 Jul 2020 13:00:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A984185E24 for ; Mon, 27 Jul 2020 13:00:46 +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 k8NNyNppHsy4 for ; Mon, 27 Jul 2020 13:00:45 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id 50A1385F18 for ; Mon, 27 Jul 2020 13:00:45 +0000 (UTC) Received: from localhost.localdomain (unknown [78.252.129.8]) by smtp3-g21.free.fr (Postfix) with ESMTP id 2596613F8CE; Mon, 27 Jul 2020 15:00:42 +0200 (CEST) From: Gwenhael Goavec-Merou To: buildroot@buildroot.org Date: Mon, 27 Jul 2020 15:00:22 +0200 Message-Id: <20200727130022.180977-1-gwenj@trabucayre.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] package/python-matplotlib: add QT5 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: Jugurtha BELKALEM , Gwenhael Goavec-Merou , Asaf Kahlon Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou python-matplotlib may be used in qt5 application. This patch add option to enable qt5. Since this backend is automatically enabled when pyqt5 is detected, list dependencies is simply an updated (no enable/disable options). Signed-off-by: Gwenhael Goavec-Merou --- Changes v1 -> v2 - move options before comment (Thomas) - remove select BR2_PACKAGE_QT5BASE_GUI (already done by python-pyqt5) (Thomas) - suppress qt5base to PYTHON_MATPLOTLIB_DEPENDENCIES (Thomas) --- package/python-matplotlib/Config.in | 12 ++++++++++++ package/python-matplotlib/python-matplotlib.mk | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in index e6ed8cda2f..cfa0bc30c3 100644 --- a/package/python-matplotlib/Config.in +++ b/package/python-matplotlib/Config.in @@ -23,6 +23,18 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB https://matplotlib.org/ +if BR2_PACKAGE_PYTHON_MATPLOTLIB + +config BR2_PACKAGE_PYTHON_MATPLOTLIB_QT + bool "qt display" + depends on BR2_PACKAGE_QT5 # python-pyqt5 + select BR2_PACKAGE_PYTHON_PYQT5 + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5BASE_FONTCONFIG + select BR2_PACKAGE_QT5BASE_WIDGETS + +endif + comment "python-matplotlib needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-matplotlib/python-matplotlib.mk b/package/python-matplotlib/python-matplotlib.mk index 7082637d09..8d00ac8a07 100644 --- a/package/python-matplotlib/python-matplotlib.mk +++ b/package/python-matplotlib/python-matplotlib.mk @@ -13,4 +13,8 @@ PYTHON_MATPLOTLIB_DEPENDENCIES = host-pkgconf freetype host-python-numpy \ libpng python-cycler PYTHON_MATPLOTLIB_SETUP_TYPE = setuptools +ifeq ($(BR2_PACKAGE_PYTHON_MATPLOTLIB_QT),y) +PYTHON_MATPLOTLIB_DEPENDENCIES += python-pyqt5 +endif + $(eval $(python-package))