diff --git a/doc/api/next_api_changes/development/27676-ES.rst b/doc/api/next_api_changes/development/27676-ES.rst new file mode 100644 index 000000000000..5242c5cba943 --- /dev/null +++ b/doc/api/next_api_changes/development/27676-ES.rst @@ -0,0 +1,6 @@ +Windows on ARM64 support +~~~~~~~~~~~~~~~~~~~~~~~~ + +Windows on ARM64 bundles FreeType 2.6.1 instead of 2.11.1 when building from source. +This may cause small changes to text rendering, but should become consistent with all +other platforms. diff --git a/extern/meson.build b/extern/meson.build index af809ce2531d..662feb7872da 100644 --- a/extern/meson.build +++ b/extern/meson.build @@ -14,14 +14,7 @@ else # must match the value in `lib/matplotlib.__init__.py`. Also update the docs # in `docs/devel/dependencies.rst`. Bump the cache key in # `.circleci/config.yml` when changing requirements. - TESTING_VERSION_OF_FREETYPE = '2.6.1' - if host_machine.system() == 'windows' and host_machine.cpu_family() == 'aarch64' - # Older versions of freetype are not supported for win/arm64 - # Matplotlib tests will not pass - LOCAL_FREETYPE_VERSION = '2.11.1' - else - LOCAL_FREETYPE_VERSION = TESTING_VERSION_OF_FREETYPE - endif + LOCAL_FREETYPE_VERSION = '2.6.1' freetype_proj = subproject( f'freetype-@LOCAL_FREETYPE_VERSION@', diff --git a/subprojects/freetype-2.11.1.wrap b/subprojects/freetype-2.11.1.wrap deleted file mode 100644 index af4e91e2d0a5..000000000000 --- a/subprojects/freetype-2.11.1.wrap +++ /dev/null @@ -1,7 +0,0 @@ -[wrap-file] -source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.11.1.tar.xz -source_filename = freetype-2.11.1.tar.xz -source_hash = 3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8 - -[provide] -freetype-2.11.1 = freetype_dep