Skip to content

Conversation

@sbc100
Copy link
Collaborator

@sbc100 sbc100 commented Sep 18, 2024

Also, switch from a fork to using the upstream github repo. We had a single patch in our fork:

emscripten-ports/FreeType@40a760c

However, this was upstreamed in:

freetype/freetype@2f4b740

This change is based on #18088.

Fixes: #22571

****** *****
+****+ +****
+****+ +****
**** ****
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the rendering is slightly thinner with the new version.. do you think this kind of change is normal/acceptable when upgrading freetype.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it's intentional on the FT side, I assume.

****** *****
+****+ +****
+****+ +****
**** ****
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it's intentional on the FT side, I assume.

@sbc100 sbc100 enabled auto-merge (squash) September 18, 2024 23:11
@sbc100 sbc100 force-pushed the update_freetype branch 3 times, most recently from 3fd8daa to e2e298d Compare September 19, 2024 22:00
@sbc100
Copy link
Collaborator Author

sbc100 commented Sep 19, 2024

reftests updated. PTAL.

Copy link
Member

@kripken kripken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great!

Also, switch from a fork to using the upstream github repo.  We had a
single patch in our fork:

emscripten-ports/FreeType@40a760c

However, this was upstreamed in:

freetype/freetype@2f4b740

This change is based on emscripten-core#18088.

Fixes: emscripten-core#22571
@sbc100 sbc100 disabled auto-merge September 20, 2024 00:08
@sbc100 sbc100 merged commit 83a8e5d into emscripten-core:main Sep 20, 2024
1 of 12 checks passed
@sbc100 sbc100 deleted the update_freetype branch September 20, 2024 00:08
@dschuff
Copy link
Member

dschuff commented Sep 20, 2024

This seems to be failing on the Chromium Windows bot: https://ci.chromium.org/ui/p/emscripten-releases/builders/try/win/b8736319351635088817/overview

I haven't tried to repro locally, but let me know if you need me to; i do have a windows cloudtop.

@sbc100
Copy link
Collaborator Author

sbc100 commented Sep 20, 2024

This seems to be failing on the Chromium Windows bot: https://ci.chromium.org/ui/p/emscripten-releases/builders/try/win/b8736319351635088817/overview

I haven't tried to repro locally, but let me know if you need me to; i do have a windows cloudtop.

Thanks, I'll take a look.

sbc100 added a commit to sbc100/emscripten that referenced this pull request Sep 20, 2024
sbc100 added a commit to sbc100/emscripten that referenced this pull request Sep 20, 2024
sbc100 added a commit to sbc100/emscripten that referenced this pull request Sep 20, 2024
sbc100 added a commit to sbc100/emscripten that referenced this pull request Sep 20, 2024
sbc100 added a commit to sbc100/emscripten that referenced this pull request Sep 20, 2024
sbc100 added a commit to sbc100/emscripten that referenced this pull request Sep 20, 2024
sbc100 added a commit to sbc100/emscripten that referenced this pull request Sep 20, 2024
sbc100 added a commit to sbc100/emscripten that referenced this pull request Sep 20, 2024
The subprocess creation on windows really doesn't like it when an
argument contains < or >.  Instead of trying to defined
`FT_CONFIG_CONFIG_H` or point to our own version, just overwrite the
default version.

See emscripten-core#22585 (comment)
sbc100 added a commit to sbc100/emscripten that referenced this pull request Sep 20, 2024
The subprocess creation on windows really doesn't like it when an
argument contains < or >.  Instead of trying to defined
`FT_CONFIG_CONFIG_H` or point to our own version, just overwrite the
default version.

See emscripten-core#22585 (comment)
dschuff added a commit that referenced this pull request Sep 23, 2024
The subprocess creation on windows really doesn't like it when an
argument contains < or >.  Instead use the default 
`FT_CONFIG_CONFT_CONFIG_CONFIG_H` and define the two
`HAVE_` macros on the command line.

See
#22585 (comment)

---------

Co-authored-by: Derek Schuff <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Backport freetype patch to fix TYPEOF macro

3 participants