Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix libpng and libfreetype port with wasm exceptions are enabled #19004

Merged
merged 1 commit into from
Mar 21, 2023

Conversation

sbc100
Copy link
Collaborator

@sbc100 sbc100 commented Mar 19, 2023

Sadly, even though libpng can be compiled with setjmp/longjmp support
some libraries such as openjpeg assume that setjmp support is included.

Fixes: #19001

@sbc100 sbc100 requested a review from aheejin March 19, 2023 19:50
@sbc100 sbc100 force-pushed the freetype_wasm_longjmp branch 2 times, most recently from e14801b to 191b0d0 Compare March 20, 2023 18:32
sbc100 added a commit that referenced this pull request Mar 20, 2023
This seems to be the latest release that exists on the SDL2 branch
of the upstream repository.

I verified that both of own downstream patches that we had in the
emscripten-ports fork have since landed upstream:

libsdl-org/SDL_image@1d92df494
libsdl-org/SDL_image@840782235

I also verified that both of these made it into the 2.6.0 release.

This change is needed as part of #19004 but it also allows us to
delete our fork which is nice.
tools/ports/freetype.py Outdated Show resolved Hide resolved
test/test_other.py Outdated Show resolved Hide resolved
test/test_other.py Outdated Show resolved Hide resolved
tools/ports/freetype.py Outdated Show resolved Hide resolved
tools/ports/freetype.py Outdated Show resolved Hide resolved
sbc100 added a commit that referenced this pull request Mar 20, 2023
This seems to be the latest release that exists on the SDL2 branch
of the upstream repository.

I verified that both of own downstream patches that we had in the
emscripten-ports fork have since landed upstream:

libsdl-org/SDL_image@1d92df494
libsdl-org/SDL_image@840782235

I also verified that both of these made it into the 2.6.0 release.

This change is needed as part of #19004 but it also allows us to
delete our fork which is nice.
sbc100 added a commit that referenced this pull request Mar 20, 2023
This seems to be the latest release that exists on the SDL2 branch
of the upstream repository.

I verified that both of own downstream patches that we had in the
emscripten-ports fork have since landed upstream:

libsdl-org/SDL_image@1d92df494
libsdl-org/SDL_image@840782235

I also verified that both of these made it into the 2.6.0 release.

This change is needed as part of #19004 but it also allows us to
delete our fork which is nice.
@sbc100 sbc100 force-pushed the freetype_wasm_longjmp branch 3 times, most recently from 4fc7c02 to b0c8baa Compare March 21, 2023 00:59
@sbc100 sbc100 enabled auto-merge (squash) March 21, 2023 02:53
@sbc100 sbc100 disabled auto-merge March 21, 2023 02:53
@sbc100 sbc100 enabled auto-merge (squash) March 21, 2023 02:54
Sadly, even though libpng can be compiled with setjmp/longjmp support
some libraries such as openjpeg assume that setjmp support is included.

Fixes: #19001
Copy link
Member

@aheejin aheejin left a comment

Choose a reason for hiding this comment

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

Thanks!

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.

Ports libpng and libfreetype uses emscripten_longjmp (-s SUPPORT_LONGJMP=wasm)
2 participants