Sdl2

.github/actions/setup-ninja/action.yml

@@ -3,7 +3,7 @@ description: 'Download ninja and add it to the PATH environment variable'
 inputs:
   version:
     description: 'Ninja version'
-    default: '1.12.1'
+    default: '1.13.1'
 runs:
   using: 'composite'
   steps:
@@ -41,17 +41,17 @@ runs:
         path: '${{ runner.temp }}/${{ steps.calc.outputs.archive }}'
         key: ${{ steps.calc.outputs.cache-key }}
     - name: 'Download ninja ${{ inputs.version }} for ${{ runner.os }} (${{ runner.arch }})'
-      if: ${{ !steps.cache-restore.outputs.cache-hit }}
+      if: ${{ (!steps.cache-restore.outputs.cache-hit || steps.cache-restore.outputs.cache-hit == 'false') }}
       shell: pwsh
       run: |
         Invoke-WebRequest "https://github.com/ninja-build/ninja/releases/download/v${{ inputs.version }}/${{ steps.calc.outputs.archive }}" -OutFile "${{ runner.temp }}/${{ steps.calc.outputs.archive }}"
     - name: 'Cache ${{ steps.calc.outputs.archive }}'
-      if: ${{ !steps.cache-restore.outputs.cache-hit }}
+      if: ${{ (!steps.cache-restore.outputs.cache-hit || steps.cache-restore.outputs.cache-hit == 'false') }}
       uses: actions/cache/save@v4
       with:
         path: '${{ runner.temp }}/${{ steps.calc.outputs.archive }}'
         key: ${{ steps.calc.outputs.cache-key }}
-    - name: 'Extract libusb'
+    - name: 'Extract ninja'
       shell: pwsh
       run: |
         7z "-o${{ runner.temp }}/ninja-${{ inputs.version }}-${{ runner.arch }}" x "${{ runner.temp }}/${{ steps.calc.outputs.archive }}"

.github/actions/setup-yasm/action.yml

@@ -0,0 +1,60 @@
+# The pre-built yasm binaries are built with an older MSVCRT,
+# which is no longer installed on current Windows images.
+
+name: 'Setup yasm'
+description: 'Build yasm and add it to the PATH environment variable'
+runs:
+  using: 'composite'
+  steps:
+    - name: 'Calculate variables'
+      id: calc
+      shell: sh
+      run: |
+        echo "cache-key=yasm-${{ runner.os }}-${{ runner.arch }}" >> ${GITHUB_OUTPUT}
+    - name: 'Restore yasm'
+      id: restore-yasm
+      uses: actions/cache/restore@v4
+      with:
+        path: |
+          ${{ github.workspace }}/yasm
+        key: ${{ steps.calc.outputs.cache-key }}
+    - name: 'Verify cached yasm'
+      if: ${{ steps.restore-yasm.outputs.cache-hit }}
+      shell: pwsh
+      run: |
+        ${{ github.workspace }}\yasm\bin\yasm --help
+    - name: 'Download yasm sources'
+      if: ${{ !steps.restore-yasm.outputs.cache-hit }}
+      uses: actions/checkout@v4
+      with:
+        repository: yasm/yasm
+        path: yasm-src
+    - name: 'Configure, build and install yasm'
+      if: ${{ !steps.restore-yasm.outputs.cache-hit }}
+      shell: pwsh
+      run: |
+        cmake -S yasm-src -B yasm-build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/yasm -DCMAKE_INSTALL_LIBDIR=bin -DCMAKE_INSTALL_BINDIR=bin -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
+        cmake --build yasm-build --parallel
+        cmake --install yasm-build
+    - name: 'Verify built yasm'
+      if: ${{ !steps.restore-yasm.outputs.cache-hit }}
+      shell: sh
+      run: |
+        set -e
+        if [ ! -f "yasm/bin/yasm.exe" -a -f "yasm/bin/vsyasm.exe" ]; then
+          cp "yasm/bin/vsyasm.exe" "yasm/bin/yasm.exe"
+        fi
+        yasm/bin/yasm --help
+    - name: 'Cache yasm'
+      if: ${{ !steps.restore-yasm.outputs.cache-hit }}
+      uses: actions/cache/save@v4
+      with:
+        path: |
+          ${{ github.workspace }}/yasm
+        key: ${{ steps.calc.outputs.cache-key }}
+        enableCrossOsArchive: true
+    - name: 'Set output variables'
+      id: final
+      shell: pwsh
+      run: |
+        echo "${{ github.workspace }}/yasm/bin" >> $env:GITHUB_PATH

.github/workflows/main.yml

@@ -15,16 +15,15 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-        - { name: Windows (MSVC+CMake),         os: windows-2019, shell: sh,   cmake: '-DSDL2MIXER_VENDORED=ON -GNinja', msvc: 1, shared: 1, static: 0 }
+        - { name: Windows (MSVC+CMake),         os: windows-latest, shell: sh,   cmake: '-DSDL2MIXER_VENDORED=ON -GNinja', msvc: 1, shared: 1, static: 0 }
         - { name: Windows (mingw32+autotools),  os: windows-latest, shell: 'msys2 {0}', msystem: mingw32, msys-env: mingw-w64-i686, shared: 1, static: 1 }
         - { name: Windows (mingw64+CMake),      os: windows-latest, shell: 'msys2 {0}', msystem: mingw64, msys-env: mingw-w64-x86_64, shared: 1, static: 0,
             cmake: '-DSDL2MIXER_VENDORED=OFF -G "Ninja Multi-Config"' }
-        - { name: Linux (autotools),            os: ubuntu-20.04,   shell: sh, shared: 1, static: 1}
-        - { name: Linux (CMake),                os: ubuntu-20.04,   shell: sh, cmake: '-DSDL2MIXER_VENDORED=ON -GNinja', shared: 1, static: 0 }
-        - { name: 'Linux (CMake, static)',      os: ubuntu-20.04,   shell: sh, cmake: '-DSDL2MIXER_VENDORED=ON -DBUILD_SHARED_LIBS=OFF -GNinja', shared: 0, static: 1 }
-        - { name: Macos (autotools),            os: macos-latest,   shell: sh, shared: 1, static: 1 }
-        - { name: Macos (CMake),                os: macos-latest,   shell: sh, cmake: '-DSDL2MIXER_VENDORED=ON -GNinja', shared: 1, static: 0 }
-
+        - { name: Linux (autotools),            os: ubuntu-latest, shell: sh, shared: 1, static: 1}
+        - { name: Linux (CMake),                os: ubuntu-latest, shell: sh, cmake: '-DSDL2MIXER_VENDORED=ON -GNinja', shared: 1, static: 0 }
+        - { name: 'Linux (CMake, static)',      os: ubuntu-latest, shell: sh, cmake: '-DSDL2MIXER_VENDORED=ON -DBUILD_SHARED_LIBS=OFF -GNinja', shared: 0, static: 1 }
+        - { name: Macos (autotools),            os: macos-latest,  shell: sh, shared: 1, static: 1 }
+        - { name: Macos (CMake),                os: macos-latest,  shell: sh, cmake: '-DSDL2MIXER_VENDORED=ON -GNinja', shared: 1, static: 0 }
 
     steps:
     - name: Set up MSYS2
@@ -95,13 +94,9 @@ jobs:
         .github/fetch_sdl_vc.ps1
         echo "SDL2_DIR=$Env:GITHUB_WORKSPACE/SDL2-devel-VC" >> $Env:GITHUB_ENV
         echo "::endgroup::"
-        echo "::group::Downloading yasm"
-        .github/fetch_yasm.ps1
-        echo "${{ github.workspace }}" >> $Env:GITHUB_PATH
-        echo "::endgroup::"
-    - name: Setup Ninja for MSVC
+    - name: Set up ninja
+      uses: ./.github/actions/setup-ninja
       if: ${{ !contains(matrix.platform.shell, 'msys2') }}
-      uses: aseprite/get-ninja@main
     - uses: ilammy/msvc-dev-cmd@v1
       if: "matrix.platform.msvc"
       with:
@@ -112,6 +107,10 @@ jobs:
       if: "runner.os == 'Linux' && matrix.platform.cmake"
       run: ./build-scripts/test-versioning.sh
 
+    - name: Set up yasm for mpg123 (MSVC only)
+      uses: ./.github/actions/setup-yasm
+      if: ${{ matrix.platform.msvc }}
+
     - name: Configure (CMake)
       if: "matrix.platform.cmake"
       run: |

.github/workflows/release.yml

@@ -262,7 +262,7 @@ jobs:
 
   msvc:
     needs: [src]
-    runs-on: windows-2019
+    runs-on: windows-2025
     outputs:
       VC-x86: ${{ steps.releaser.outputs.VC-x86 }}
       VC-x64: ${{ steps.releaser.outputs.VC-x64 }}

.gitmodules

@@ -13,11 +13,11 @@
 [submodule "external/opus"]
 	path = external/opus
 	url = https://github.com/libsdl-org/opus.git
-	branch = v1.4-SDL
+	branch = v1.4.x-SDL
 [submodule "external/opusfile"]
 	path = external/opusfile
 	url = https://github.com/libsdl-org/opusfile.git
-	branch = v0.12-SDL
+	branch = v0.13-git-SDL
 [submodule "external/tremor"]
 	path = external/tremor
 	url = https://github.com/libsdl-org/tremor.git
@@ -26,10 +26,10 @@
 	path = external/mpg123
 	url = https://github.com/libsdl-org/mpg123.git
 	branch = v1.31.3-SDL
-[submodule "libxmp"]
+[submodule "external/libxmp"]
 	path = external/libxmp
 	url = https://github.com/libsdl-org/libxmp.git
-	branch = 4.6.2-SDL
+	branch = 4.6.3-SDL
 [submodule "external/wavpack"]
 	path = external/wavpack
 	url = https://github.com/libsdl-org/wavpack.git

Android.mk

@@ -31,7 +31,7 @@ SUPPORT_WAVPACK ?= true
 WAVPACK_LIBRARY_PATH := external/wavpack
 
 # Enable this if you want to support loading music via libgme
-SUPPORT_GME ?= true
+SUPPORT_GME ?= false
 GME_LIBRARY_PATH := external/libgme
 
 # Enable this if you want to support loading MOD music via XMP-lite
@@ -92,7 +92,6 @@ LOCAL_C_INCLUDES :=                                     \
     $(LOCAL_PATH)/src/                                  \
     $(LOCAL_PATH)/src/codecs                            \
 
-
 LOCAL_SRC_FILES :=                                      \
     $(subst $(LOCAL_PATH)/,,                            \
     $(wildcard $(LOCAL_PATH)/src/*.c)                   \

CMakeLists.txt

@@ -233,6 +233,7 @@ add_library(SDL2_mixer
     src/codecs/music_wav.c
     src/codecs/music_wavpack.c
     src/codecs/music_xmp.c
+    src/codecs/remap_channels.c
     src/effect_position.c
     src/effect_stereoreverse.c
     src/effects_internal.c
@@ -472,7 +473,7 @@ if(SDL2MIXER_VORBIS_TREMOR)
         message(STATUS "Using system tremor")
         find_package(tremor REQUIRED)
         if(NOT SDL2MIXER_VORBIS_TREMOR_SHARED)
-            list(APPEND PC_REQUIRES tremor)
+            list(APPEND PC_REQUIRES vorbisidec)
         endif()
     endif()
     if(SDL2MIXER_VORBIS_TREMOR_SHARED)

Makefile.os2

@@ -59,6 +59,7 @@ SRCS = utils.c effect_position.c effects_internal.c effect_stereoreverse.c mixer
 # codec sources:
 SRCS+= load_aiff.c load_voc.c music_wav.c &
        music_ogg.c music_ogg_stb.c music_opus.c &
+       remap_channels.c &
        music_flac.c music_drflac.c music_wavpack.c &
        mp3utils.c music_mpg123.c music_minimp3.c &
        music_xmp.c music_modplug.c music_gme.c &

README.txt

@@ -15,7 +15,7 @@ If you have built with FluidSynth support, you'll need to set the SDL_SOUNDFONTS
 (On some Linux distributions you can install the fluid-soundfont-gm package)
 
 To play MIDI files using Timidity, you'll need to get a complete set of GUS patches from:
-http://www.libsdl.org/projects/mixer/timidity/timidity.tar.gz
+https://www.libsdl.org/projects/old/SDL_mixer/timidity/timidity.tar.gz
 and unpack them in /usr/local/lib under UNIX, and C:\ under Win32.
 
 This library is under the zlib license, see the file "LICENSE.txt" for details.

SDL2_mixerConfig.cmake.in

@@ -43,17 +43,13 @@ set(SDL2MIXER_WAVE                  @SDL2MIXER_WAVE@)
 set(SDL2MIXER_WAVPACK               @SDL2MIXER_WAVPACK@)
 
 set(SDL2MIXER_SDL2_REQUIRED_VERSION @SDL_REQUIRED_VERSION@)
-
-if(NOT SDL2MIXER_VENDORED)
-    set(_sdl_cmake_module_path "${CMAKE_MODULE_PATH}")
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
-endif()
-
 if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer-shared-targets.cmake")
     include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer-shared-targets.cmake")
 endif()
 
 if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer-static-targets.cmake")
+    set(_sdl_cmake_module_path "${CMAKE_MODULE_PATH}")
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 
     include(CMakeFindDependencyMacro)
     include(PkgConfigHelper)
@@ -114,9 +110,7 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer-static-targets.cmake")
         endif()
     endif()
     include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer-static-targets.cmake")
-endif()
 
-if(NOT SDL2MIXER_VENDORED)
     set(CMAKE_MODULE_PATH "${_sdl_cmake_module_path}")
     unset(_sdl_cmake_module_path)
 endif()