Skip to contentSkip to conversation

package/python-matplotlib: add QT5 support

PATCH Superseded Gwenhael Goavec-Merou 2 participants 2 messages Jul 13, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/python-matplotlib: add QT5 support

From: Gwenhael Goavec-Merou <[email protected]>

---
 package/python-matplotlib/Config.in            | 13 +++++++++++++
 package/python-matplotlib/python-matplotlib.mk |  4 ++++
 2 files changed, 17 insertions(+)
package/python-matplotlib/Config.in +13 -0
index e6ed8cda2f..e3eb465947 100644
@@ -28,3 +28,16 @@ comment "python-matplotlib needs a toolchain w/ C++"
 
 comment "python-matplotlib needs glibc or musl"
 	depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
+
+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 # runtime
+	select BR2_PACKAGE_QT5BASE_GUI # runtime
+	select BR2_PACKAGE_QT5BASE_WIDGETS # runtime
+
+endif
package/python-matplotlib/python-matplotlib.mk +4 -0
index 7082637d09..19c68e7e27 100644
@@ -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 += qt5base python-pyqt5
+endif
+
 $(eval $(python-package))
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/python-matplotlib: add QT5 support

Hello,

Quoted 5 lines · On Mon, 13 Jul 2020 13:58:55 +0200 Gwenhael Goavec-Merou…

comment "python-matplotlib needs glibc or musl"

package/python-matplotlib/Config.in +3 -0
 	depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
+
+if BR2_PACKAGE_PYTHON_MATPLOTLIB
+

package/python-matplotlib/Config.in comment "python-matplotlib needs a toolchain w/ C++" · line 43

Quoted 10 lines
package/python-matplotlib/Config.in +10 -0
+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 # runtime
+	select BR2_PACKAGE_QT5BASE_GUI # runtime
+	select BR2_PACKAGE_QT5BASE_WIDGETS # runtime
+
+endif

You need to put this before the "comment" above, otherwise your option is not going to be indented properly.

Also, PYTHON_PYQT5 already implies QT5BASE, QT5BASE_GUI. I'm not sure of the meaning of the "runtime" comments here, since they are on sub-options of QT5BASE, which is not labeled as a runtime dependency.

package/python-matplotlib/python-matplotlib.mk PYTHON_MATPLOTLIB_DEPENDENCIES = host-pkgconf freetype host-python-numpy \ · line 17

Quoted 10 lines
package/python-matplotlib/python-matplotlib.mk +2 -0
index 7082637d09..19c68e7e27 100644
@@ -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 += qt5base python-pyqt5

Why are these build-time dependencies ? Isn't python-pyqt5 sufficient ? Is there an explicit way to enable/disable qt5 support ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com