From 343d06807babbf80cf9fb2b7ca6f8cb92c6bb483 Mon Sep 17 00:00:00 2001
From: Oleg Derevenetz <oleg-derevenetz@yandex.ru>
Date: Thu, 16 Jan 2025 10:52:20 +0300
Subject: [PATCH] Use emsdk 4.0.0, remove the temporary patch

---
 .github/workflows/make.yml | 42 +-------------------------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml
index 4ed1838829..3711fe4861 100644
--- a/.github/workflows/make.yml
+++ b/.github/workflows/make.yml
@@ -345,7 +345,7 @@ jobs:
   make-emscripten:
     name: Make (Emscripten)
     runs-on: ubuntu-latest
-    container: emscripten/emsdk:3.1.74
+    container: emscripten/emsdk:4.0.0
     timeout-minutes: 30
     defaults:
       run:
@@ -356,46 +356,6 @@ jobs:
       run: |
         sudo apt-get -y update
         sudo apt-get -y install gettext p7zip-full
-    - name: Apply temporary patch
-      run: |
-        patch -d / -p0 -f <<EOF
-        --- emsdk/upstream/emscripten/tools/ports/sdl2_mixer.py
-        +++ emsdk/upstream/emscripten/tools/ports/sdl2_mixer.py
-        @@ -10,8 +10,10 @@
-
-         deps = ['sdl2']
-         variants = {
-        -  'sdl2_mixer_mp3': {'SDL2_MIXER_FORMATS': ["mp3"]},
-        -  'sdl2_mixer_none': {'SDL2_MIXER_FORMATS': []},
-        +  'sdl2_mixer-mp3': {'SDL2_MIXER_FORMATS': ['mp3']},
-        +  'sdl2_mixer-none': {'SDL2_MIXER_FORMATS': []},
-        +  'sdl2_mixer-mp3-mt': {'SDL2_MIXER_FORMATS': ['mp3'], 'PTHREADS': 1},
-        +  'sdl2_mixer-none-mt': {'SDL2_MIXER_FORMATS': [], 'PTHREADS': 1},
-         }
-
-
-        @@ -25,7 +27,9 @@ def get_lib_name(settings):
-
-           libname = 'libSDL2_mixer'
-           if formats != '':
-        -    libname += '_' + formats
-        +    libname += '-' + formats
-        +  if settings.PTHREADS:
-        +    libname += '-mt'
-           libname += '.a'
-
-           return libname
-        @@ -68,6 +72,9 @@ def create(final):
-                 '-DMUSIC_MID_TIMIDITY',
-               ]
-
-        +    if settings.PTHREADS:
-        +      flags.append('-pthread')
-        +
-             build_dir = ports.clear_project_build('sdl2_mixer')
-             include_path = os.path.join(source_path, 'include')
-             includes = [
-        EOF
     - name: Build
       run: |
         emmake make -f Makefile.emscripten -j "$(nproc)"