Merge pull request #27676 from QuLogic/freetype-winarm

tacaswell · web-flow · commit 59f9b3c707da · 2024-01-22T12:23:36.000-05:00
BLD: Downgrade FreeType to 2.6.1 on Windows ARM
diff --git a/doc/api/next_api_changes/development/27676-ES.rst 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
@@ -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
