Emscripten 3.1.73 (pyodide#5401)

Author: hoodmane

Makefile.envs

@@ -1,5 +1,5 @@
 export PYVERSION ?= 3.12.7
-export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.72
+export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.73
 export PYODIDE_VERSION ?= 0.28.0.dev0
 export PYODIDE_ABI_VERSION ?= 2025_0
 

emsdk/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch

@@ -1,4 +1,4 @@
-From de71d75de3f99cf57bccbf821b458c054dd6bf4a Mon Sep 17 00:00:00 2001
+From 103f41ba386105f3b123e5201a039c1d508edb59 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Fri, 2 Jun 2023 11:59:32 -0700
 Subject: [PATCH 1/5] Add back fs.findObject and fs.readFile in loadLibData

emsdk/patches/0002-Add-useful-error-when-symbol-resolution-fails.patch

@@ -1,4 +1,4 @@
-From 030753bef38328b5b1a691d96823de60ff509182 Mon Sep 17 00:00:00 2001
+From 24a5f3ece314cf5bc1074e167f8b549d80a12718 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Fri, 19 May 2023 12:19:00 -0700
 Subject: [PATCH 2/5] Add useful error when symbol resolution fails

emsdk/patches/0003-Changes-for-JSPI.patch

@@ -1,4 +1,4 @@
-From d4210b8a3a483bef0edce7cf6fed1c889e447e05 Mon Sep 17 00:00:00 2001
+From 3d483b35ff7ed6dbb8c438f08e5a3579725fe304 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Thu, 22 Jun 2023 18:53:22 -0700
 Subject: [PATCH 3/5] Changes for JSPI
@@ -11,10 +11,10 @@ Subject: [PATCH 3/5] Changes for JSPI
  4 files changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/src/library.js b/src/library.js
-index 59f530db8..8c8121624 100644
+index c7f26d291..caca8ff7d 100644
 --- a/src/library.js
 +++ b/src/library.js
-@@ -494,7 +494,7 @@ addToLibrary({
+@@ -492,7 +492,7 @@ addToLibrary({
  #if EXCEPTION_STACK_TRACES
      throw new EmscriptenSjLj;
  #else

emsdk/patches/0004-Raise-when-no-argument-is-given.patch

@@ -1,4 +1,4 @@
-From ef90544089aa65f89f3924ff8b212c767a084b02 Mon Sep 17 00:00:00 2001
+From 4a203cf07ee0fa0006f27b8bd1979412d2fc0099 Mon Sep 17 00:00:00 2001
 From: ryanking13 <[email protected]>
 Date: Sat, 20 Jan 2024 19:02:32 +0900
 Subject: [PATCH 4/5] Raise when no argument is given
@@ -13,10 +13,10 @@ Upstream issue: https://github.com/emscripten-core/emscripten/issues/21116
  1 file changed, 3 insertions(+)
 
 diff --git a/emcc.py b/emcc.py
-index 520ad4041..daa296864 100644
+index dfe088e7b..b2f0fe4cb 100644
 --- a/emcc.py
 +++ b/emcc.py
-@@ -660,6 +660,9 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR P
+@@ -661,6 +661,9 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR P
        print(libname)
      return 0
 

emsdk/patches/0005-sdl2_image-wasm-sjlj-variant.patch

@@ -1,56 +1,37 @@
-From 37539a89a25855f8c524f9d4f8ae6c27b49ed5a7 Mon Sep 17 00:00:00 2001
+From f917723823e81581edf8d6554edb054d28761fec Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Fri, 31 Jan 2025 11:42:59 +0100
 Subject: [PATCH 5/5] sdl2_image wasm-sjlj variant
 
 Upstream PR:
 https://github.com/emscripten-core/emscripten/pull/23554
 ---
- tools/ports/sdl2_image.py | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
+ tools/ports/sdl2_image.py | 5 +++++
+ 1 file changed, 5 insertions(+)
 
 diff --git a/tools/ports/sdl2_image.py b/tools/ports/sdl2_image.py
-index c72ef576b..0d3b758bd 100644
+index 70fa1499a..ed5ad679b 100644
 --- a/tools/ports/sdl2_image.py
 +++ b/tools/ports/sdl2_image.py
-@@ -42,6 +42,8 @@ def get_lib_name(settings):
-   libname = 'libSDL2_image'
-   if formats != '':
-     libname += '_' + formats
+@@ -46,6 +46,8 @@ def get_lib_name(settings):
+     libname += '-' + formats
+   if settings.PTHREADS:
+     libname += '-mt'
 +  if settings.SUPPORT_LONGJMP == 'wasm':
 +    libname += '-wasm-sjlj'
    return libname + '.a'
 
 
-@@ -58,20 +60,23 @@ def get(ports, settings, shared):
-               IMG_tif.c IMG_xcf.c IMG_xpm.c IMG_xv.c IMG_webp.c IMG_ImageIO.m
-               IMG_avif.c IMG_jxl.c IMG_svg.c IMG_qoi.c'''.split()
+@@ -78,6 +80,9 @@ def get(ports, settings, shared):
+     if settings.PTHREADS:
+       flags += ['-pthread']
 
--    defs = ['-O2', '-sUSE_SDL=2', '-Wno-format-security']
-+    flags = ['-O2', '-sUSE_SDL=2', '-Wno-format-security']
- 
-     formats = get_formats(settings)
- 
-     for fmt in formats:
--      defs.append('-DLOAD_' + fmt.upper())
-+      flags.append('-DLOAD_' + fmt.upper())
- 
-     if 'png' in formats:
--      defs += ['-sUSE_LIBPNG']
-+      flags += ['-sUSE_LIBPNG']
- 
-     if 'jpg' in formats:
--      defs += ['-sUSE_LIBJPEG']
-+      flags += ['-sUSE_LIBJPEG']
- 
--    ports.build_port(src_dir, final, 'sdl2_image', flags=defs, srcs=srcs)
 +    if settings.SUPPORT_LONGJMP == 'wasm':
 +      flags.append('-sSUPPORT_LONGJMP=wasm')
 +
-+    ports.build_port(src_dir, final, 'sdl2_image', flags=flags, srcs=srcs)
+     ports.build_port(src_dir, final, 'sdl2_image', flags=flags, srcs=srcs)
 
    return [shared.cache.get_lib(libname, create, what='port')]
- 
 -- 
 2.34.1
 

packages/pygame-ce/meta.yaml

@@ -68,7 +68,7 @@ build:
       ${SIDE_MODULE_LDFLAGS} \
       -fPIC \
       -lSDL2 \
-      -lSDL2_image_bmp-gif-jpg-png \
+      -lSDL2_image-bmp-gif-jpg-png \
       -lSDL2_ttf \
       -lSDL2_mixer_mid-mod-mpg-ogg \
       -lSDL2_gfx \

src/js/struct_info_generated.json

@@ -447,6 +447,7 @@
         "S_IRWXUGO": 511,
         "S_ISVTX": 512,
         "S_IWUGO": 146,
+        "S_IWUSR": 128,
         "S_IXUGO": 73,
         "TCFLSH": 21515,
         "TCGETA": 21509,