diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in index b3d84e2b43..13894004aa 100644 --- a/package/python-matplotlib/Config.in +++ b/package/python-matplotlib/Config.in @@ -13,8 +13,10 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB select BR2_PACKAGE_PYTHON_PYBIND select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_DATEUTIL # runtime + select BR2_PACKAGE_PYTHON_FONTTOOLS # runtime select BR2_PACKAGE_PYTHON_KIWISOLVER # runtime select BR2_PACKAGE_PYTHON_NUMPY # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_PILLOW # runtime select BR2_PACKAGE_PYTHON_PYPARSING # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime diff --git a/package/python-matplotlib/python-matplotlib.hash b/package/python-matplotlib/python-matplotlib.hash index c2fb907e2c..2882997b8a 100644 --- a/package/python-matplotlib/python-matplotlib.hash +++ b/package/python-matplotlib/python-matplotlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/matplotlib/json -md5 72896b8c240903ebddc47be6451d813b matplotlib-3.8.2.tar.gz -sha256 01a978b871b881ee76017152f1f1a0cbf6bd5f7b8ff8c96df0df1bd57d8755a1 matplotlib-3.8.2.tar.gz +md5 bb92dfd3c1e9c816100b91008be5e300 matplotlib-3.9.2.tar.gz +sha256 96ab43906269ca64a6366934106fa01534454a69e471b7bf3d79083981aaab92 matplotlib-3.9.2.tar.gz # Locally computed sha256 checksums sha256 5a1a81ea301728c8bba2933da832c0cd62229daf20893a024ab3d53244468dbc LICENSE/LICENSE diff --git a/package/python-matplotlib/python-matplotlib.mk b/package/python-matplotlib/python-matplotlib.mk index 5f5d53172e..7312d2b1ec 100644 --- a/package/python-matplotlib/python-matplotlib.mk +++ b/package/python-matplotlib/python-matplotlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATPLOTLIB_VERSION = 3.8.2 +PYTHON_MATPLOTLIB_VERSION = 3.9.2 PYTHON_MATPLOTLIB_SOURCE = matplotlib-$(PYTHON_MATPLOTLIB_VERSION).tar.gz -PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/fb/ab/38a0e94cb01dacb50f06957c2bed1c83b8f9dac6618988a37b2487862944 +PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/9e/d8/3d7f706c69e024d4287c1110d74f7dabac91d9843b99eadc90de9efc8869 PYTHON_MATPLOTLIB_LICENSE = Python-2.0 PYTHON_MATPLOTLIB_LICENSE_FILES = LICENSE/LICENSE PYTHON_MATPLOTLIB_DEPENDENCIES = \ @@ -19,16 +19,16 @@ PYTHON_MATPLOTLIB_DEPENDENCIES = \ python-cycler \ python-pybind \ qhull -PYTHON_MATPLOTLIB_SETUP_TYPE = setuptools -PYTHON_MATPLOTLIB_BUILD_OPTS = --skip-dependency-check +PYTHON_MATPLOTLIB_CONF_OPTS = \ + -Dmacosx=false \ + -Dsystem-freetype=true \ + -Dsystem-qhull=true +PYTHON_MATPLOTLIB_CONF_ENV += \ + _PYTHON_SYSCONFIGDATA_NAME=$(PKG_PYTHON_SYSCONFIGDATA_NAME) \ + PYTHONPATH=$(PYTHON3_PATH) ifeq ($(BR2_PACKAGE_PYTHON_MATPLOTLIB_QT),y) PYTHON_MATPLOTLIB_DEPENDENCIES += python-pyqt5 endif -define PYTHON_MATPLOTLIB_COPY_SETUP_CFG - cp $(PYTHON_MATPLOTLIB_PKGDIR)/setup.cfg $(@D)/mplsetup.cfg -endef -PYTHON_MATPLOTLIB_PRE_CONFIGURE_HOOKS += PYTHON_MATPLOTLIB_COPY_SETUP_CFG - -$(eval $(python-package)) +$(eval $(meson-package)) diff --git a/package/python-matplotlib/setup.cfg b/package/python-matplotlib/setup.cfg deleted file mode 100644 index 4bda0d4376..0000000000 --- a/package/python-matplotlib/setup.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[libs] -# Disable LTO to prevent the following error: -# Relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `_ZSt3hexRSt8ios_base' -# which may bind externally can not be used when making a shared object; -# recompile with -fPIC -enable_lto = False - -# Freetype and qhull are provided by Buildroot -system_freetype = True -system_qhull = True