Skip to content

Commit eefeb69

Browse files
committed
Update SDL2 port
1 parent 41e471e commit eefeb69

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ See docs/process.md for more on how version tagging works.
2020

2121
3.1.54 (in development)
2222
-----------------------
23+
- SDL2 port updated from v2.24.2 to v2.30.0.
2324
- The type of `EMSCRIPTEN_WEBGL_CONTEXT_HANDLE` was changed to unsigned and
2425
the only valid error returned from `emscripten_webgl_create_context` is
2526
now zero. This allows `EMSCRIPTEN_WEBGL_CONTEXT_HANDLE` to hold a pointer

tools/ports/sdl2.py

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

66
import os
77

8-
TAG = 'release-2.24.2'
9-
HASH = 'b178bdc8f7c40271e09a72f639649d1d61953dda4dc12b77437259667b63b961fd3b2c67b0de6fdc5f9f9c80c49bfafd164e4c13715bc1056e550acc8bad5a3c'
8+
TAG = 'release-2.30.0'
9+
HASH = '6c6c9677f0f8bda934a7762bdcb7440077fce4a2a3fc2614da5038d85716b85a0f99b16dbb089d6a37edf5b2a9c8725a4e1c491b5302af774ce261a5cc1a27cc'
1010
SUBDIR = 'SDL-' + TAG
1111

1212
variants = {'sdl2-mt': {'PTHREADS': 1}}
@@ -57,7 +57,7 @@ def create(final):
5757
video/emscripten/SDL_emscriptenframebuffer.c video/emscripten/SDL_emscriptenmouse.c
5858
video/emscripten/SDL_emscriptenopengles.c video/emscripten/SDL_emscriptenvideo.c
5959
audio/emscripten/SDL_emscriptenaudio.c video/dummy/SDL_nullevents.c
60-
video/dummy/SDL_nullframebuffer.c video/dummy/SDL_nullvideo.c video/yuv2rgb/yuv_rgb.c
60+
video/dummy/SDL_nullframebuffer.c video/dummy/SDL_nullvideo.c video/yuv2rgb/yuv_rgb_std.c
6161
audio/disk/SDL_diskaudio.c audio/dummy/SDL_dummyaudio.c loadso/dlopen/SDL_sysloadso.c
6262
power/emscripten/SDL_syspower.c joystick/emscripten/SDL_sysjoystick.c
6363
filesystem/emscripten/SDL_sysfilesystem.c timer/unix/SDL_systimer.c haptic/dummy/SDL_syshaptic.c
@@ -81,11 +81,6 @@ def clear(ports, settings, shared):
8181
shared.cache.erase_lib(get_lib_name(settings))
8282

8383

84-
def linker_setup(ports, settings):
85-
# TODO(sbc): Move these into native code use EM_JS_DEPS macro.
86-
settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$autoResumeAudioContext', '$dynCall']
87-
88-
8984
def process_args(ports):
9085
return ['-isystem', ports.get_include_dir('SDL2')]
9186

0 commit comments

Comments
 (0)