Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d7b16a4

Browse files
committed
BLD: Downgrade FreeType to 2.6.1 on Windows ARM
We needed the new version because autotools didn't know about Windows-on-ARM. But we build with Meson now, and overlay a Meson build system for FreeType, so it either works for both of us or it doesn't (and it does). Dropping down to the older version means that tests pass on Windows ARM without any need to mess with tolerance or generating new images.
1 parent 879bde7 commit d7b16a4

File tree

3 files changed

+7
-15
lines changed

3 files changed

+7
-15
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Windows on ARM64 support
2+
~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
Windows on ARM64 bundles FreeType 2.6.1 instead of 2.11.1 when building from source.
5+
This may cause small changes to text rendering, but should become consistent with all
6+
other platforms.

extern/meson.build

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,7 @@ else
1414
# must match the value in `lib/matplotlib.__init__.py`. Also update the docs
1515
# in `docs/devel/dependencies.rst`. Bump the cache key in
1616
# `.circleci/config.yml` when changing requirements.
17-
TESTING_VERSION_OF_FREETYPE = '2.6.1'
18-
if host_machine.system() == 'windows' and host_machine.cpu_family() == 'aarch64'
19-
# Older versions of freetype are not supported for win/arm64
20-
# Matplotlib tests will not pass
21-
LOCAL_FREETYPE_VERSION = '2.11.1'
22-
else
23-
LOCAL_FREETYPE_VERSION = TESTING_VERSION_OF_FREETYPE
24-
endif
17+
LOCAL_FREETYPE_VERSION = '2.6.1'
2518

2619
freetype_proj = subproject(
2720
f'freetype-@LOCAL_FREETYPE_VERSION@',

subprojects/freetype-2.11.1.wrap

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)