Skip to content

Commit eab3da3

Browse files
committed
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: emscripten-ports/FreeType@40a760c This seems like a good intermediate step before we actually do a freetype upgrade in #18088.
1 parent 00daf40 commit eab3da3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tools/ports/freetype.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55

66
import os
77

8-
TAG = 'version_1'
9-
HASH = '0d0b1280ba0501ad0a23cf1daa1f86821c722218b59432734d3087a89acd22aabd5c3e5e1269700dcd41e87073046e906060f167c032eb91a3ac8c5808a02783'
8+
TAG = 'VER-2-6'
9+
HASH = '24c1706045209a3fac64f423116318f3f97892b984e89f05600c71ac356d48d78d642d18b739f26d51d7b7723821becb991a90175accfe7a91ca16a3c759e4f8'
1010

1111

1212
def needed(settings):
1313
return settings.USE_FREETYPE
1414

1515

1616
def get(ports, settings, shared):
17-
ports.fetch_project('freetype', 'https://github.com/emscripten-ports/FreeType/archive/' + TAG + '.zip', 'FreeType-' + TAG, sha512hash=HASH)
17+
ports.fetch_project('freetype', 'https://github.com/freetype/freetype/archive/' + TAG + '.zip', 'freetype-' + TAG, sha512hash=HASH)
1818

1919
def create(final):
20-
source_path = os.path.join(ports.get_dir(), 'freetype', 'FreeType-' + TAG)
20+
source_path = os.path.join(ports.get_dir(), 'freetype', 'freetype-' + TAG)
2121
ports.write_file(os.path.join(source_path, 'include/ftconfig.h'), ftconf_h)
2222
ports.install_header_dir(os.path.join(source_path, 'include'),
2323
target=os.path.join('freetype2'))

0 commit comments

Comments
 (0)