Emscripten 3.1.72 (pyodide#5399)

Author: hoodmane

Makefile.envs

@@ -1,5 +1,5 @@
 export PYVERSION ?= 3.12.7
-export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.71
+export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.72
 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,7 +1,7 @@
-From e1dedccbf759263efeb8a9b44a68e7a3af65b1ae Mon Sep 17 00:00:00 2001
+From de71d75de3f99cf57bccbf821b458c054dd6bf4a Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Fri, 2 Jun 2023 11:59:32 -0700
-Subject: [PATCH 1/6] Add back fs.findObject and fs.readFile in loadLibData
+Subject: [PATCH 1/5] Add back fs.findObject and fs.readFile in loadLibData
 
 See upstream PR:
 https://github.com/emscripten-core/emscripten/pull/19513
@@ -10,7 +10,7 @@ https://github.com/emscripten-core/emscripten/pull/19513
  1 file changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/src/library_dylink.js b/src/library_dylink.js
-index da269a48b..7173a77c6 100644
+index dee697661..69542d2b8 100644
 --- a/src/library_dylink.js
 +++ b/src/library_dylink.js
 @@ -1013,14 +1013,23 @@ var LibraryDylink = {

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

@@ -1,7 +1,7 @@
-From 7ed66801d56b91835f1f74cd3d8e9882b3a1dba4 Mon Sep 17 00:00:00 2001
+From 030753bef38328b5b1a691d96823de60ff509182 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Fri, 19 May 2023 12:19:00 -0700
-Subject: [PATCH 2/6] Add useful error when symbol resolution fails
+Subject: [PATCH 2/5] Add useful error when symbol resolution fails
 
 Currently if symbol resolution fails, we get:
 ```js
@@ -19,7 +19,7 @@ symbol.
  1 file changed, 3 insertions(+)
 
 diff --git a/src/library_dylink.js b/src/library_dylink.js
-index 7173a77c6..e2ee18f9f 100644
+index 69542d2b8..b3440d9dc 100644
 --- a/src/library_dylink.js
 +++ b/src/library_dylink.js
 @@ -723,6 +723,9 @@ var LibraryDylink = {

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

@@ -1,17 +1,17 @@
-From 66f4951f3ca8e75c4d71e71acc8f11592e33f1b7 Mon Sep 17 00:00:00 2001
+From d4210b8a3a483bef0edce7cf6fed1c889e447e05 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Thu, 22 Jun 2023 18:53:22 -0700
-Subject: [PATCH 3/6] Changes for JSPI
+Subject: [PATCH 3/5] Changes for JSPI
 
 ---
  src/library.js        | 2 +-
  src/library_dylink.js | 3 ++-
  src/parseTools.mjs    | 2 +-
- src/preamble.js       | 7 +++++++
- 4 files changed, 11 insertions(+), 3 deletions(-)
+ src/preamble.js       | 5 +++++
+ 4 files changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/src/library.js b/src/library.js
-index 78368ba2b..636353c49 100644
+index 59f530db8..8c8121624 100644
 --- a/src/library.js
 +++ b/src/library.js
 @@ -494,7 +494,7 @@ addToLibrary({
@@ -24,7 +24,7 @@ index 78368ba2b..636353c49 100644
    },
  #elif !SUPPORT_LONGJMP
 diff --git a/src/library_dylink.js b/src/library_dylink.js
-index e2ee18f9f..10282f229 100644
+index b3440d9dc..5cbd4c487 100644
 --- a/src/library_dylink.js
 +++ b/src/library_dylink.js
 @@ -73,6 +73,7 @@ var LibraryDylink = {
@@ -45,7 +45,7 @@ index e2ee18f9f..10282f229 100644
  #endif
  #if !DISABLE_EXCEPTION_CATCHING
 diff --git a/src/parseTools.mjs b/src/parseTools.mjs
-index 0a9fb43b1..eaa9021a9 100644
+index ca474affa..300f38e38 100644
 --- a/src/parseTools.mjs
 +++ b/src/parseTools.mjs
 @@ -585,7 +585,7 @@ function makeThrow(excPtr) {
@@ -58,7 +58,7 @@ index 0a9fb43b1..eaa9021a9 100644
 
  function storeException(varName, excPtr) {
 diff --git a/src/preamble.js b/src/preamble.js
-index d37cb9fe7..b181c4401 100644
+index d924c4ab9..f80aae1ff 100644
 --- a/src/preamble.js
 +++ b/src/preamble.js
 @@ -14,6 +14,10 @@
@@ -72,16 +72,14 @@ index d37cb9fe7..b181c4401 100644
  #if RELOCATABLE
  {{{ makeModuleReceiveWithVar('dynamicLibraries', undefined, '[]', true) }}}
  #endif
-@@ -931,6 +935,9 @@ function getWasmImports() {
- // Receives the wasm imports, returns the exports.
- function createWasm() {
+@@ -1054,6 +1058,7 @@ function createWasm() {
+ #endif // WASM_ASYNC_COMPILATION
+ 
    var info = getWasmImports();
-+  if (Module.adjustWasmImports) {
-+    Module.adjustWasmImports(info);
-+  }
-   // Load the wasm module and create an instance of using native support in the JS engine.
-   // handle a generated wasm instance, receiving its exports and
-   // performing other necessary setup
++  Module.adjustWasmImports?.(info);
+ 
+ #if expectToReceiveOnModule('instantiateWasm')
+   // User shell pages can write their own Module.instantiateWasm = function(imports, successCallback) callback
 -- 
 2.34.1
 

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

@@ -1,7 +1,7 @@
-From c2a07f196033e782b999de35d50d5ba05d253aef Mon Sep 17 00:00:00 2001
+From ef90544089aa65f89f3924ff8b212c767a084b02 Mon Sep 17 00:00:00 2001
 From: ryanking13 <[email protected]>
 Date: Sat, 20 Jan 2024 19:02:32 +0900
-Subject: [PATCH 4/6] Raise when no argument is given
+Subject: [PATCH 4/5] Raise when no argument is given
 
 Emscripten 3.1.51 does not raise an error when no argument is given.
 Some build tools (e.g. ffmpeg) relies on this behavior, so we should
@@ -13,7 +13,7 @@ Upstream issue: https://github.com/emscripten-core/emscripten/issues/21116
  1 file changed, 3 insertions(+)
 
 diff --git a/emcc.py b/emcc.py
-index fcaf2b91e..385af3f67 100644
+index 520ad4041..daa296864 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

emsdk/patches/0005-Make-seek-work-on-dev-null-22886.patch

@@ -1,7 +1,7 @@
-From 032aed724e075a673bef37e97a9c1d5dfccb80b9 Mon Sep 17 00:00:00 2001
+From 37539a89a25855f8c524f9d4f8ae6c27b49ed5a7 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Fri, 31 Jan 2025 11:42:59 +0100
-Subject: [PATCH 6/6] sdl2_image wasm-sjlj variant
+Subject: [PATCH 5/5] sdl2_image wasm-sjlj variant
 
 Upstream PR:
 https://github.com/emscripten-core/emscripten/pull/23554

emsdk/patches/0006-sdl2_image-wasm-sjlj-variant.patch renamed to emsdk/patches/0005-sdl2_image-wasm-sjlj-variant.patch

@@ -321,6 +321,12 @@
         "ISIG": 1,
         "IUTF8": 16384,
         "IXON": 1024,
+        "KMOD_LALT": 256,
+        "KMOD_LCTRL": 64,
+        "KMOD_LSHIFT": 1,
+        "KMOD_RALT": 512,
+        "KMOD_RCTRL": 128,
+        "KMOD_RSHIFT": 2,
         "MAP_ANONYMOUS": 32,
         "MAP_FIXED": 16,
         "MAP_PRIVATE": 2,
@@ -364,8 +370,49 @@
         "RTLD_NODELETE": 4096,
         "RTLD_NOW": 2,
         "R_OK": 4,
+        "SDLK_LALT": 1250,
+        "SDLK_LCTRL": 1248,
+        "SDLK_LSHIFT": 1249,
+        "SDLK_RALT": 1254,
+        "SDLK_RCTRL": 1252,
+        "SDLK_RSHIFT": 1253,
+        "SDL_APPACTIVE": 4,
+        "SDL_APPINPUTFOCUS": 2,
+        "SDL_APPMOUSEFOCUS": 1,
+        "SDL_BUTTON_WHEELDOWN": 5,
+        "SDL_BUTTON_WHEELUP": 4,
+        "SDL_FINGERDOWN": 1792,
+        "SDL_FINGERMOTION": 1794,
+        "SDL_FINGERUP": 1793,
+        "SDL_GL_ALPHA_SIZE": 3,
+        "SDL_GL_DEPTH_SIZE": 6,
+        "SDL_GL_MULTISAMPLEBUFFERS": 13,
+        "SDL_GL_MULTISAMPLESAMPLES": 14,
+        "SDL_GL_STENCIL_SIZE": 7,
+        "SDL_HWPALETTE": 2097152,
+        "SDL_HWSURFACE": 134217729,
+        "SDL_INIT_JOYSTICK": 512,
+        "SDL_JOYAXISMOTION": 1536,
+        "SDL_JOYBUTTONDOWN": 1539,
+        "SDL_JOYBUTTONUP": 1540,
+        "SDL_KEYDOWN": 768,
+        "SDL_KEYUP": 769,
+        "SDL_MOUSEBUTTONDOWN": 1025,
+        "SDL_MOUSEBUTTONUP": 1026,
+        "SDL_MOUSEMOTION": 1024,
+        "SDL_MOUSEWHEEL": 1027,
+        "SDL_OPENGL": 67108864,
         "SDL_PIXELFORMAT_RGBA8888": -2042224636,
+        "SDL_QUIT": 256,
+        "SDL_SRCALPHA": 65536,
+        "SDL_TEXTINPUT": 771,
         "SDL_TOUCH_MOUSEID": -1,
+        "SDL_VIDEORESIZE": 28673,
+        "SDL_WINDOWEVENT": 512,
+        "SDL_WINDOWEVENT_FOCUS_GAINED": 12,
+        "SDL_WINDOWEVENT_FOCUS_LOST": 13,
+        "SDL_WINDOWEVENT_HIDDEN": 2,
+        "SDL_WINDOWEVENT_SHOWN": 1,
         "SEEK_CUR": 1,
         "SEEK_END": 2,
         "SEEK_SET": 0,