From eab3da3afc83bf6777637533c8066637dbf2f470 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Mon, 24 Oct 2022 12:46:51 -0700 Subject: [PATCH] Switch to upstream freetype repo We were previously pointing at a version_1 tag in our custom repo. This was basically VER-2.6 which a single patch applied. I can't see anything in that patch that is useful, perhaps this code didn't previously compile cleanly with emcc but today it seems to work just fine: https://github.com/emscripten-ports/FreeType/commit/40a760c963bc2b76575918ff91a515c8474db4e0 This seems like a good intermediate step before we actually do a freetype upgrade in #18088. --- tools/ports/freetype.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/ports/freetype.py b/tools/ports/freetype.py index 05d9a85bcb13c..7d061aec3a669 100644 --- a/tools/ports/freetype.py +++ b/tools/ports/freetype.py @@ -5,8 +5,8 @@ import os -TAG = 'version_1' -HASH = '0d0b1280ba0501ad0a23cf1daa1f86821c722218b59432734d3087a89acd22aabd5c3e5e1269700dcd41e87073046e906060f167c032eb91a3ac8c5808a02783' +TAG = 'VER-2-6' +HASH = '24c1706045209a3fac64f423116318f3f97892b984e89f05600c71ac356d48d78d642d18b739f26d51d7b7723821becb991a90175accfe7a91ca16a3c759e4f8' def needed(settings): @@ -14,10 +14,10 @@ def needed(settings): def get(ports, settings, shared): - ports.fetch_project('freetype', 'https://github.com/emscripten-ports/FreeType/archive/' + TAG + '.zip', 'FreeType-' + TAG, sha512hash=HASH) + ports.fetch_project('freetype', 'https://github.com/freetype/freetype/archive/' + TAG + '.zip', 'freetype-' + TAG, sha512hash=HASH) def create(final): - source_path = os.path.join(ports.get_dir(), 'freetype', 'FreeType-' + TAG) + source_path = os.path.join(ports.get_dir(), 'freetype', 'freetype-' + TAG) ports.write_file(os.path.join(source_path, 'include/ftconfig.h'), ftconf_h) ports.install_header_dir(os.path.join(source_path, 'include'), target=os.path.join('freetype2'))