Skip to content

Update SDL2 port #20268

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

Update SDL2 port #20268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d82da33
Add changelog entry for SDL2 update. NFC
sbc100 Feb 21, 2024
d75fd74
Update SDL2 port
sbc100 Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ See docs/process.md for more on how version tagging works.

3.1.54 - 02/15/24
-----------------
- SDL2 port updated from v2.24.2 to v2.26.0. (#21337)
- The `DEMANGLE_SUPPORT` setting and the associated `demangle` function are
now deprecated since Wasm stack traces always contain demangled symbols these
days. (#21346)
- SDL2 port updated from v2.24.2 to v2.30.0.
- The type of `EMSCRIPTEN_WEBGL_CONTEXT_HANDLE` was changed to unsigned and
the only valid error returned from `emscripten_webgl_create_context` is
now zero. This allows `EMSCRIPTEN_WEBGL_CONTEXT_HANDLE` to hold a pointer
Expand Down
12 changes: 4 additions & 8 deletions tools/ports/sdl2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import os

TAG = 'release-2.26.0'
HASH = '2e53af5aa3d3ca7e2b8653f999379bf424b2190aad32a7997350fc058624818cca3a780907af74c8f72305ca18a83a2aa15839e1dbc94107128125a7df9cd7fd'
TAG = 'release-2.30.0'
HASH = '6c6c9677f0f8bda934a7762bdcb7440077fce4a2a3fc2614da5038d85716b85a0f99b16dbb089d6a37edf5b2a9c8725a4e1c491b5302af774ce261a5cc1a27cc'
SUBDIR = 'SDL-' + TAG

variants = {'sdl2-mt': {'PTHREADS': 1}}
Expand Down Expand Up @@ -38,6 +38,7 @@ def create(final):
events/SDL_events.c events/SDL_gesture.c events/SDL_keyboard.c events/SDL_mouse.c events/SDL_quit.c
events/SDL_touch.c events/SDL_windowevents.c file/SDL_rwops.c haptic/SDL_haptic.c
joystick/controller_type.c joystick/SDL_gamecontroller.c joystick/SDL_joystick.c
joystick/SDL_steam_virtual_gamepad.c
power/SDL_power.c render/SDL_d3dmath.c render/SDL_render.c
render/SDL_yuv_sw.c render/direct3d/SDL_render_d3d.c render/direct3d11/SDL_render_d3d11.c
render/opengl/SDL_render_gl.c render/opengl/SDL_shaders_gl.c render/opengles/SDL_render_gles.c
Expand All @@ -57,7 +58,7 @@ def create(final):
video/emscripten/SDL_emscriptenframebuffer.c video/emscripten/SDL_emscriptenmouse.c
video/emscripten/SDL_emscriptenopengles.c video/emscripten/SDL_emscriptenvideo.c
audio/emscripten/SDL_emscriptenaudio.c video/dummy/SDL_nullevents.c
video/dummy/SDL_nullframebuffer.c video/dummy/SDL_nullvideo.c video/yuv2rgb/yuv_rgb.c
video/dummy/SDL_nullframebuffer.c video/dummy/SDL_nullvideo.c video/yuv2rgb/yuv_rgb_std.c
audio/disk/SDL_diskaudio.c audio/dummy/SDL_dummyaudio.c loadso/dlopen/SDL_sysloadso.c
power/emscripten/SDL_syspower.c joystick/emscripten/SDL_sysjoystick.c
filesystem/emscripten/SDL_sysfilesystem.c timer/unix/SDL_systimer.c haptic/dummy/SDL_syshaptic.c
Expand All @@ -81,11 +82,6 @@ def clear(ports, settings, shared):
shared.cache.erase_lib(get_lib_name(settings))


def linker_setup(ports, settings):
# TODO(sbc): Move these into native code use EM_JS_DEPS macro.
settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$autoResumeAudioContext', '$dynCall']


def process_args(ports):
return ['-isystem', ports.get_include_dir('SDL2')]

Expand Down