Bump SDL to 2.30.9, SDL_mixer to 2.8.0

bvschaik · Nov 18, 2024 · 21f64a2 · 21f64a2
1 parent f722d9c
commit 21f64a2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/.ci_scripts/install_dependencies.sh b/.ci_scripts/install_dependencies.sh
@@ -64,6 +64,11 @@ function install_sdl_macos {
   mkdir -p ~/Library/Frameworks
   echo "Installing framework:" "/Volumes/SDL2"/*.framework
   cp -rp "$VOLUME"/*.framework ~/Library/Frameworks
+  if [ -d "$VOLUME/optional" ]
+  then
+    echo "Installing optional framework:" "/Volumes/SDL2/optional"/*.framework
+    cp -rp "$VOLUME"/optional/*.framework ~/Library/Frameworks
+  fi
   hdiutil detach "$VOLUME"
 }
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,8 +24,8 @@ jobs:
           - name: Linux x64
             os: ubuntu-20.04
             cache-key: linux-x64
-            SDL_VERSION: 2.26.4
-            SDL_MIXER_VERSION: 2.6.2
+            SDL_VERSION: 2.30.9
+            SDL_MIXER_VERSION: 2.8.0
             BUILD_TARGET: linux
             DEPLOY: linux
           - name: Linux x64 (old SDL versions)
@@ -39,8 +39,8 @@ jobs:
           - name: macOS
             os: macos-latest
             cache-key: macos
-            SDL_VERSION: 2.26.4
-            SDL_MIXER_VERSION: 2.6.2
+            SDL_VERSION: 2.30.9
+            SDL_MIXER_VERSION: 2.8.0
             BUILD_TARGET: mac
             DEPLOY: mac
           - name: Nintendo Switch
@@ -54,8 +54,8 @@ jobs:
           - name: Android
             os: ubuntu-20.04
             cache-key: android
-            SDL_VERSION: 2.26.4
-            SDL_MIXER_VERSION: 2.6.2
+            SDL_VERSION: 2.30.9
+            SDL_MIXER_VERSION: 2.8.0
             BUILD_TARGET: android
             DEPLOY: android
           - name: Emscripten
@@ -125,8 +125,8 @@ jobs:
     name: ${{ matrix.name }}
     runs-on: windows-latest
     env:
-      SDL_VERSION: 2.26.4
-      SDL_MIXER_VERSION: 2.6.2
+      SDL_VERSION: 2.30.9
+      SDL_MIXER_VERSION: 2.8.0
       COMPILER: ${{ matrix.COMPILER }}
       SKIP_UPLOAD: ${{ matrix.SKIP_UPLOAD }}
     steps:

diff --git a/android/SDL2/build.gradle b/android/SDL2/build.gradle
@@ -47,7 +47,8 @@ android {
                 arguments 'SUPPORT_FLAC=false',
                         'SUPPORT_OGG=false',
                         'SUPPORT_MOD_MODPLUG=false',
-                        'SUPPORT_MID_TIMIDITY=false'
+                        'SUPPORT_MID_TIMIDITY=false',
+                        'SUPPORT_WAVPACK=false'
             }
         }
     }