update py-matplotlib to 3.6.3

- switches from previously bundled qhull to depending on math/qhull
- no more jquery-ui
- tests turned off until someone has time to make them work

ok sthen@
This commit is contained in:
daniel 2023-01-16 17:09:43 +00:00
parent 31ff001baf
commit cd65e83104
7 changed files with 688 additions and 463 deletions

View File

@ -1,9 +1,8 @@
COMMENT= Python charting and plotting API
MODPY_EGG_VERSION = 3.2.2
MODPY_EGG_VERSION = 3.6.3
DISTNAME = matplotlib-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
REVISION = 1
CATEGORIES = graphics devel math
@ -12,7 +11,7 @@ HOMEPAGE = https://matplotlib.org/
# BSD-like
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} freetype m png z
WANTLIB += ${COMPILER_LIBCXX} freetype m png qhull_r z
COMPILER = base-clang ports-gcc base-gcc
@ -22,35 +21,40 @@ FLAVORS= python3
FLAVOR = python3
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
MODPY_PYBUILD = setuptools_scm
BUILD_DEPENDS = math/py-numpy${MODPY_FLAVOR} \
NO_TEST = Yes
BUILD_DEPENDS = devel/py-certifi${MODPY_FLAVOR}>=2020.06.20 \
math/qhull \
math/py-numpy${MODPY_FLAVOR}>=1.19 \
textproc/py-sphinx${MODPY_FLAVOR}
RUN_DEPENDS= devel/py-tz${MODPY_FLAVOR} \
devel/py-dateutil${MODPY_FLAVOR} \
devel/py-kiwisolver${MODPY_FLAVOR} \
devel/py-parsing${MODPY_FLAVOR} \
devel/py-dateutil${MODPY_FLAVOR}>=2.7 \
devel/py-kiwisolver${MODPY_FLAVOR}>=1.0.1 \
devel/py-parsing${MODPY_FLAVOR}>=2.2.1 \
devel/py-gobject3${MODPY_FLAVOR} \
math/py-numpy${MODPY_FLAVOR} \
graphics/py-Pillow${MODPY_FLAVOR} \
math/py-contourpy${MODPY_FLAVOR}>=1.0.1 \
math/py-numpy${MODPY_FLAVOR}>=1.19 \
graphics/py-Pillow${MODPY_FLAVOR}>=6.2.0 \
graphics/py-cairo${MODPY_FLAVOR} \
graphics/py-cycler${MODPY_FLAVOR} \
graphics/py-cycler${MODPY_FLAVOR}>=0.10 \
sysutils/py-packaging${MODPY_FLAVOR}>=20.0 \
${MODPY_TKINTER_DEPENDS}
# pygobject GTK3 introspection (not provided by indirect dependencies)
RUN_DEPENDS += x11/gtk+3
LIB_DEPENDS = graphics/png
TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
LIB_DEPENDS = graphics/png \
math/qhull
MAKE_ENV+= LDSHARED="${CC} -shared -fPIC"
EXAMPLESDIR= ${PREFIX}/share/examples/${MODPY_PY_PREFIX}matplotlib
post-patch:
cp ${WRKSRC}/setup.cfg{.template,}
cp ${WRKSRC}/mplsetup.cfg{.template,}
pre-configure:
@find ${WRKSRC}/examples -name \*.py -exec ${MODPY_BIN_ADJ} {} +
@ -60,12 +64,4 @@ post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
cd ${WRKSRC}/examples && pax -rw * ${EXAMPLESDIR}
${INSTALL_DATA_DIR} ${WRKINST}${MODPY_SITEPKG}/matplotlib/backends/web_backend/jquery-ui-1.12.1
cp -r ${WRKSRC}/lib/matplotlib/backends/web_backend/jquery-ui-1.12.1/* \
${WRKINST}${MODPY_SITEPKG}/matplotlib/backends/web_backend/jquery-ui-1.12.1
do-test: fake
cd ${WRKSRC} && ${MAKE_ENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \
${MODPY_BIN} tests.py --verbose
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (matplotlib-3.2.2.tar.gz) = PXemYw0JPXTLv+uqBXHQB5CWa+HtIE5Kgjn1y9aDXF0=
SIZE (matplotlib-3.2.2.tar.gz) = 40295831
SHA256 (matplotlib-3.6.3.tar.gz) = H01pcHsWd1YM2VJUTuSWL2j/B5UvuQaf+MErVjU8uMk=
SIZE (matplotlib-3.6.3.tar.gz) = 35868590

View File

@ -0,0 +1,23 @@
Index: mplsetup.cfg.template
--- mplsetup.cfg.template.orig
+++ mplsetup.cfg.template
@@ -11,8 +11,8 @@
# FreeType/Qhull. As an exception, Matplotlib defaults to the system version
# of FreeType on AIX.
#
-#system_freetype = False
-#system_qhull = False
+system_freetype = True
+system_qhull = True
[packages]
# Some of Matplotlib's components are optional: the MacOSX backend (installed
@@ -22,7 +22,7 @@
# lines. Note that the MacOSX backend is never built on Linux or Windows,
# regardless of the config value.
#
-#tests = False
+tests = True
#macosx = True
[rc_options]

View File

@ -1,21 +0,0 @@
Index: setup.cfg.template
--- setup.cfg.template.orig
+++ setup.cfg.template
@@ -8,14 +8,14 @@
# set this to True. It will download and build a specific version of
# FreeType, and then use that to build the ft2font extension. This
# ensures that test images are exactly reproducible.
-#local_freetype = False
+local_freetype = False
[packages]
# There are a number of data subpackages from Matplotlib that are
# considered optional. All except 'tests' data (meaning the baseline
# image files) are installed by default, but that can be changed here.
-#tests = False
-#sample_data = True
+tests = True
+sample_data = True
[gui_support]
# Matplotlib supports multiple GUI toolkits, including

View File

@ -1,12 +0,0 @@
Index: setup.py
--- setup.py.orig
+++ setup.py
@@ -168,7 +168,7 @@ class develop_with_jquery(DevelopCommand):
cmdclass['sdist'] = sdist_with_jquery
-cmdclass['install_lib'] = install_lib_with_jquery
+#cmdclass['install_lib'] = install_lib_with_jquery
cmdclass['develop'] = develop_with_jquery

View File

@ -1,11 +1,19 @@
Index: setupext.py
--- setupext.py.orig
+++ setupext.py
@@ -807,6 +807,7 @@ class BackendTkAgg(OptionalBackendPackage):
]
ext = Extension('matplotlib.backends._tkagg', sources)
+ ext.include_dirs.extend(['${X11BASE}/include'])
self.add_flags(ext)
@@ -435,6 +435,7 @@ class Matplotlib(SetupPackage):
ext = Extension(
"matplotlib._qhull", ["src/_qhull_wrapper.cpp"],
define_macros=[("MPL_DEVNULL", os.devnull)])
+ ext.include_dirs.extend(['${PREFIX}/include'])
add_numpy_flags(ext)
LibAgg().add_flags(ext, add_sources=False)
Qhull.add_flags(ext)
yield ext
@@ -448,6 +449,7 @@ class Matplotlib(SetupPackage):
libraries={"linux": ["dl"], "win32": ["comctl32", "psapi"],
"cygwin": ["comctl32", "psapi"]}.get(sys.platform, []),
extra_link_args={"win32": ["-mwindows"]}.get(sys.platform, []))
+ ext.include_dirs.extend(['${X11BASE}/include'])
add_numpy_flags(ext)
add_libagg_flags(ext)
yield ext

File diff suppressed because it is too large Load Diff