fix: patch the emscripten ports, so that the program compile

it had an issue with the thread, see the listed github issues, in the section where local patches are applied

Author: Totto16

platforms/build-web.sh

@@ -15,13 +15,32 @@ fi
 "$EMSCRIPTEN_ROOT/emsdk" install latest
 "$EMSCRIPTEN_ROOT/emsdk" activate latest
 
+EMSCRIPTEN_UPSTREAM_ROOT="$EMSCRIPTEN_ROOT/upstream/emscripten"
+
+EMSCRIPTEN_PACTH_FILE="$EMSCRIPTEN_UPSTREAM_ROOT/.patched_manually.meta"
+
+PATCH_DIR="platforms/emscripten"
+
+if ! [ -e "$EMSCRIPTEN_PACTH_FILE" ]; then
+    ##TODO: upstream those patches
+    # see: https://github.com/emscripten-core/emscripten/pull/18379/commits
+    # and: https://github.com/emscripten-core/emscripten/pull/18379
+
+    git apply --unsafe-paths -p1 --directory="$EMSCRIPTEN_UPSTREAM_ROOT" "$PATCH_DIR/sdl2_image_port.diff"
+    git apply --unsafe-paths -p1 --directory="$EMSCRIPTEN_UPSTREAM_ROOT" "$PATCH_DIR/sdl2_mixer_port.diff"
+
+    touch "$EMSCRIPTEN_PACTH_FILE"
+fi
+
+# git apply path
+
 # shellcheck disable=SC1091
 EMSDK_QUIET=1 source "$EMSCRIPTEN_ROOT/emsdk_env.sh" >/dev/null
 
 ## build theneeded dependencies
-embuilder build sdl2-mt harfbuzz-mt freetype zlib sdl2_ttf mpg123 sdl2_mixer_mp3 libpng-mt "sdl2_image:formats=png,svg" icu-mt
+embuilder build sdl2-mt harfbuzz-mt freetype zlib sdl2_ttf mpg123 "sdl2_mixer:formats=mp3" libpng-mt "sdl2_image:formats=png,svg:mt=1" icu-mt
 
-export EMSCRIPTEN_SYS_ROOT="$EMSCRIPTEN_ROOT/upstream/emscripten/cache/sysroot"
+export EMSCRIPTEN_SYS_ROOT="$EMSCRIPTEN_UPSTREAM_ROOT/cache/sysroot"
 
 export BUILD_DIR="build-web"
 
@@ -38,9 +57,9 @@ export ENDIANESS="little"
 
 export ROMFS="platforms/romfs"
 
-export PACKAGE_FLAGS="'--use-port=sdl2', '--use-port=harfbuzz', '--use-port=freetype', '--use-port=zlib', '--use-port=sdl2_ttf', '--use-port=mpg123', '--use-port=sdl2_mixer', '-sSDL2_MIXER_FORMATS=[\"mp3\"]','--use-port=libpng', '--use-port=sdl2_image','-sSDL2_IMAGE_FORMATS=[\"png\",\"svg\"]', '--use-port=icu'"
+export PACKAGE_FLAGS="'--use-port=sdl2-mt', '--use-port=harfbuzz-mt', '--use-port=freetype', '--use-port=zlib', '--use-port=sdl2_ttf', '--use-port=mpg123', '--use-port=sdl2_mixer_mp3', '-sSDL2_MIXER_FORMATS=[\"mp3\"]','--use-port=libpng-mt', '--use-port=sdl2_image','-sSDL2_IMAGE_FORMATS=[\"png\",\"svg\"]', '--use-port=icu-mt'"
 
-export COMMON_FLAGS="'-fexceptions', '-pthread', '-sEXCEPTION_CATCHING_ALLOWED=[..]', $PACKAGE_FLAGS"
+export COMMON_FLAGS="'-fexceptions', '-pthread', '-sUSE_PTHREADS=1', '-sPTHREADS=1','-sEXCEPTION_CATCHING_ALLOWED=[..]', $PACKAGE_FLAGS"
 
 # TODO see if ALLOW_MEMORY_GROWTH is needed, but if we load ttf's and music it likely is and we don't have to debug OOm crahses, that aren't handled by some thrid party library, which is painful
 export LINK_FLAGS="$COMMON_FLAGS, '-sEXPORT_ALL=1', '-sUSE_WEBGPU=1', '-sWASM=1', '-sALLOW_MEMORY_GROWTH=1', '-sASSERTIONS=1','-sERROR_ON_UNDEFINED_SYMBOLS=1', '-sFETCH=1'"

platforms/emscripten/sdl2_image_port.diff

@@ -0,0 +1,57 @@
+diff --git a/tools/ports/sdl2_image.py b/tools/ports/sdl2_image.py
+index c72ef576..0c12feba 100644
+--- a/tools/ports/sdl2_image.py
++++ b/tools/ports/sdl2_image.py
+@@ -16,15 +16,17 @@ variants = {
+ }
+ 
+ OPTIONS = {
+-  'formats': 'A comma separated list of formats (ex: --use-port=sdl2_image:formats=png,jpg)'
++  'formats': 'A comma separated list of formats (ex: --use-port=sdl2_image:formats=png,jpg)',
++  'mt': 'use pthread'
+ }
+ 
+ SUPPORTED_FORMATS = {'avif', 'bmp', 'gif', 'jpg', 'jxl', 'lbm', 'pcx', 'png',
+                      'pnm', 'qoi', 'svg', 'tga', 'tif', 'webp', 'xcf', 'xpm', 'xv'}
+ 
+ # user options (from --use-port)
+-opts: Dict[str, Set] = {
+-  'formats': set()
++opts = {
++  'formats': set(),
++  'mt': 0
+ }
+ 
+ 
+@@ -42,7 +44,7 @@ def get_lib_name(settings):
+   libname = 'libSDL2_image'
+   if formats != '':
+     libname += '_' + formats
+-  return libname + '.a'
++  return libname + ('-mt' if opts['mt'] else '') + '.a'
+ 
+ 
+ def get(ports, settings, shared):
+@@ -70,6 +72,8 @@ def get(ports, settings, shared):
+ 
+     if 'jpg' in formats:
+       defs += ['-sUSE_LIBJPEG']
++    if opts['mt']:
++      defs += ['-pthread']
+ 
+     ports.build_port(src_dir, final, 'sdl2_image', flags=defs, srcs=srcs)
+ 
+@@ -99,7 +103,12 @@ def handle_options(options, error_handler):
+       error_handler(f'{format} is not a supported format')
+     else:
+       opts['formats'].add(format)
+-
++      
++  mt = options['mt']
++  if mt not in ["1","0"]:
++    error_handler(f'{mt} has to be either 0 or 1')
++  else:
++    opts['mt'] = int(mt)
+ 
+ def show():
+   return 'sdl2_image (-sUSE_SDL_IMAGE=2 or --use-port=sdl2_image; zlib license)'

platforms/emscripten/sdl2_mixer_port.diff

@@ -0,0 +1,100 @@
+diff --git a/tools/ports/sdl2_mixer.py b/tools/ports/sdl2_mixer.py
+index f77f906d..417b2a79 100644
+--- a/tools/ports/sdl2_mixer.py
++++ b/tools/ports/sdl2_mixer.py
+@@ -14,14 +14,27 @@ variants = {
+   'sdl2_mixer_none': {'SDL2_MIXER_FORMATS': []},
+ }
+ 
++OPTIONS = {
++  'formats': 'A comma separated list of formats (ex: --use-port=sdl2_mixer:formats=mp3)'
++}
++
++SUPPORTED_FORMATS = {'mp3', 'ogg', 'mod', 'mid'}
++
++# user options (from --use-port)
++opts = {
++  'formats': set(),
++}
+ 
+ def needed(settings):
+   return settings.USE_SDL_MIXER == 2
+ 
++def get_formats(settings):
++  return set(settings.SDL2_MIXER_FORMATS).union(opts['formats'])
++
++
+ 
+ def get_lib_name(settings):
+-  settings.SDL2_MIXER_FORMATS.sort()
+-  formats = '-'.join(settings.SDL2_MIXER_FORMATS)
++  formats = '-'.join(sorted(get_formats(settings)))
+ 
+   libname = 'libSDL2_mixer'
+   if formats != '':
+@@ -44,26 +57,28 @@ def get(ports, settings, shared):
+       '-O2',
+       '-DMUSIC_WAV',
+     ]
++    
++    formats = get_formats(settings)
+ 
+-    if "ogg" in settings.SDL2_MIXER_FORMATS:
++    if "ogg" in formats:
+       flags += [
+         '-sUSE_VORBIS',
+         '-DMUSIC_OGG',
+       ]
+ 
+-    if "mp3" in settings.SDL2_MIXER_FORMATS:
++    if "mp3" in formats:
+       flags += [
+         '-sUSE_MPG123',
+         '-DMUSIC_MP3_MPG123',
+       ]
+ 
+-    if "mod" in settings.SDL2_MIXER_FORMATS:
++    if "mod" in formats:
+       flags += [
+         '-sUSE_MODPLUG',
+         '-DMUSIC_MOD_MODPLUG',
+       ]
+ 
+-    if "mid" in settings.SDL2_MIXER_FORMATS:
++    if "mid" in formats:
+       flags += [
+         '-DMUSIC_MID_TIMIDITY',
+       ]
+@@ -104,16 +119,29 @@ def clear(ports, settings, shared):
+ 
+ def process_dependencies(settings):
+   settings.USE_SDL = 2
+-  if "ogg" in settings.SDL2_MIXER_FORMATS:
++  
++  formats = get_formats(settings)
++  
++  if "ogg" in formats:
+     deps.append('vorbis')
+     settings.USE_VORBIS = 1
+-  if "mp3" in settings.SDL2_MIXER_FORMATS:
++  if "mp3" in formats:
+     deps.append('mpg123')
+     settings.USE_MPG123 = 1
+-  if "mod" in settings.SDL2_MIXER_FORMATS:
++  if "mod" in formats:
+     deps.append('libmodplug')
+     settings.USE_MODPLUG = 1
+ 
++def handle_options(options, error_handler):
++  formats = options['formats'].split(',')
++  for format in formats:
++    format = format.lower().strip()
++    if format not in SUPPORTED_FORMATS:
++      error_handler(f'{format} is not a supported format')
++    else:
++      opts['formats'].add(format)
++      
++
+ 
+ def show():
+   return 'sdl2_mixer (-sUSE_SDL_MIXER=2 or --use-port=sdl2_mixer; zlib license)'

tools/dependencies/meson.build

@@ -53,7 +53,7 @@ if meson.is_cross_build()
             ['SDL2_ttf'],
             ['mpg123'],
             ['SDL2_mixer_mp3', 'SDL2_mixer'],
-            ['SDL2_image_png-svg', 'SDL2_image'],
+            ['SDL2_image_png-svg-mt', 'SDL2_image'],
             ['icu_common-mt', 'icu-uc'],
         ]
         foreach native_dependency_tuple : map_native_dependencies