Skip to content

Commit

Permalink
Emscripten 3.1.70
Browse files Browse the repository at this point in the history
  • Loading branch information
hoodmane committed Jan 31, 2025
1 parent 7d42758 commit 0b6d17b
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Makefile.envs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export PYVERSION ?= 3.12.7
export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.69
export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.70
export PYODIDE_VERSION ?= 0.28.0.dev0
export PYODIDE_ABI_VERSION ?= 2025_0

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From afd673d0c0622f25831bc444affc009e20979dec Mon Sep 17 00:00:00 2001
From 8100310109815f3a1feff7eacbd79d47cf372296 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
Subject: [PATCH 1/6] Add back fs.findObject and fs.readFile in loadLibData

See upstream PR:
https://github.com/emscripten-core/emscripten/pull/19513
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 02917a473bdba6994faa552be3df4d955a4b5a44 Mon Sep 17 00:00:00 2001
From 26ac6d4493a03a2c4aded68782f8d196aa4fe27b 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
Subject: [PATCH 2/6] Add useful error when symbol resolution fails

Currently if symbol resolution fails, we get:
```js
Expand Down
6 changes: 3 additions & 3 deletions emsdk/patches/0003-Changes-for-JSPI.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From bd18a45671f7c4c705d5a332f39bf69515695871 Mon Sep 17 00:00:00 2001
From ee21a7dece76d5b247fda13d842b1c20142cf092 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
Subject: [PATCH 3/6] Changes for JSPI

---
src/library.js | 2 +-
Expand All @@ -11,7 +11,7 @@ Subject: [PATCH 3/5] Changes for JSPI
4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/library.js b/src/library.js
index 38487c9fc..5ea1e5023 100644
index ef05b8791..eb94b222b 100644
--- a/src/library.js
+++ b/src/library.js
@@ -494,7 +494,7 @@ addToLibrary({
Expand Down
8 changes: 4 additions & 4 deletions emsdk/patches/0004-Raise-when-no-argument-is-given.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 02c7e8b16630f36f40b236ffdd99fe72f8461234 Mon Sep 17 00:00:00 2001
From f40976162ba771e17e3c524f0382a45a756f2f18 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
Subject: [PATCH 4/6] 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
Expand All @@ -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 617be15c1..2bbf89c34 100644
index 52ee28c27..56a12a148 100644
--- a/emcc.py
+++ b/emcc.py
@@ -642,6 +642,9 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR P
@@ -651,6 +651,9 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR P
print(libname)
return 0

Expand Down
4 changes: 2 additions & 2 deletions emsdk/patches/0005-Make-seek-work-on-dev-null-22886.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 251b4e804218019ac2712d279f003f151872e5a3 Mon Sep 17 00:00:00 2001
From 0b7fb6190f6885a647e9a1fe77c412151fa10968 Mon Sep 17 00:00:00 2001
From: Hood Chatham <[email protected]>
Date: Mon, 18 Nov 2024 20:55:25 +0100
Subject: [PATCH 5/5] Make seek work on `/dev/null` (#22886)
Subject: [PATCH 5/6] Make seek work on `/dev/null` (#22886)

Seeking `/dev/null` should work and do nothing instead of returning
`EPIPE`. This fixes it.
Expand Down
4 changes: 1 addition & 3 deletions emsdk/patches/0006-sdl2_image-wasm-sjlj-variant.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
From b234f241e1a9937d4697b6a421c9d154197b6e55 Mon Sep 17 00:00:00 2001
From 086808760eab056fff72e12e40c7e4e52bf3ce5a 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


Upstream PR:
https://github.com/emscripten-core/emscripten/pull/23554

---
tools/ports/sdl2_image.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
Expand Down
11 changes: 11 additions & 0 deletions src/js/struct_info_generated.json
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,17 @@
"__WASI_RIGHTS_SOCK_SHUTDOWN": 268435456
},
"structs": {
"AudioParamFrame": {
"__size__": 8,
"data": 4,
"length": 0
},
"AudioSampleFrame": {
"__size__": 12,
"data": 8,
"numberOfChannels": 0,
"samplesPerChannel": 4
},
"EmscriptenBatteryEvent": {
"__size__": 32,
"charging": 24,
Expand Down

0 comments on commit 0b6d17b

Please sign in to comment.