Merge branch 'release-2.8.x' into MorphOS

.github/workflows/main.yml

@@ -55,7 +55,6 @@ jobs:
           autoconf \
           automake \
           libtool \
-          ninja \
           pkg-config \
           flac \
           fluidsynth \
@@ -83,7 +82,6 @@ jobs:
           libvorbis-dev \
           libxmp-dev \
           libwavpack-dev \
-          ninja-build \
           pkg-config \
           ${NULL+}
     - uses: actions/checkout@v3
@@ -103,10 +101,8 @@ jobs:
         echo "${{ github.workspace }}" >> $Env:GITHUB_PATH
         echo "::endgroup::"
     - name: Setup Ninja for MSVC
-      if: "matrix.platform.msvc"
-      uses: ashutoshvarma/setup-ninja@master
-      with:
-        version: 1.10.2
+      if: ${{ !contains(matrix.platform.shell, 'msys2') }}
+      uses: aseprite/get-ninja@main
     - uses: ilammy/msvc-dev-cmd@v1
       if: "matrix.platform.msvc"
       with:
@@ -117,11 +113,6 @@ jobs:
       if: "runner.os == 'Linux' && matrix.platform.cmake"
       run: ./test-versioning.sh
 
-    - name: Setup (CMake)
-      if: ${{ matrix.platform.cmake && !matrix.platform.msystem && !matrix.platform.msvc }}
-      uses: jwlawson/actions-setup-cmake@v1.13.1
-      with:
-        cmake-version: '3.16'
     - name: Configure (CMake)
       if: "matrix.platform.cmake"
       run: |

CMakeLists.txt

@@ -595,8 +595,7 @@ if(SDL2MIXER_GME)
         set(BUILD_SHARED_LIBS "${SDL2MIXER_GME_SHARED}")
         set(ENABLE_UBSAN OFF)
         set(BUILD_FRAMEWORK OFF)
-        set(GME_ZLIB OFF)
-        set(GME_UNRAR OFF)
+        option(GME_ZLIB "Enable GME to support compressed sound formats" OFF)
         message(STATUS "Using vendored libgme")
         sdl_check_project_in_subfolder(external/libgme libgme SDL2MIXER_VENDORED)
         add_subdirectory(external/libgme EXCLUDE_FROM_ALL)

playmus.c

@@ -73,8 +73,7 @@ void Menu(void)
     char buf[10];
 
     printf("Available commands: (p)ause (r)esume (h)alt volume(v#) > ");
-    fflush(stdin);
-    if (scanf("%s",buf) == 1) {
+    if (fgets(buf, sizeof(buf), stdin)) {
         switch(buf[0]) {
 #if defined(SEEK_TEST)
         case '0': Mix_SetMusicPosition(0); break;

src/codecs/music_flac.c

@@ -92,11 +92,11 @@ static flac_loader flac;
     if (flac.FUNC == NULL) { Mix_SetError("Missing FLAC.framework"); return -1; }
 #endif
 
-static int FLAC_Load(void)
 #ifdef __APPLE__
     /* Need to turn off optimizations so weak framework load check works */
     __attribute__ ((optnone))
 #endif
+static int FLAC_Load(void)
 {
     if (flac.loaded == 0) {
 #ifdef FLAC_DYNAMIC

src/codecs/music_gme.c

@@ -60,11 +60,11 @@ static gme_loader gme;
     if (gme.FUNC == NULL) { Mix_SetError("Missing gme.framework"); return -1; }
 #endif
 
-static int GME_Load(void)
 #ifdef __APPLE__
     /* Need to turn off optimizations so weak framework load check works */
     __attribute__ ((optnone))
 #endif
+static int GME_Load(void)
 {
     if (gme.loaded == 0) {
 #ifdef GME_DYNAMIC

src/codecs/music_modplug.c

@@ -62,11 +62,11 @@ static ModPlug_Settings settings;
     if (modplug.FUNC == NULL) { Mix_SetError("Missing libmodplug.framework"); return -1; }
 #endif
 
-static int MODPLUG_Load(void)
 #ifdef __APPLE__
     /* Need to turn off optimizations so weak framework load check works */
     __attribute__ ((optnone))
 #endif
+static int MODPLUG_Load(void)
 {
     if (modplug.loaded == 0) {
 #ifdef MODPLUG_DYNAMIC

src/codecs/music_mpg123.c

@@ -81,11 +81,11 @@ static mpg123_loader mpg123;
     if (mpg123.FUNC == NULL) { Mix_SetError("Missing mpg123.framework"); return -1; }
 #endif
 
-static int MPG123_Load(void)
 #ifdef __APPLE__
     /* Need to turn off optimizations so weak framework load check works */
     __attribute__ ((optnone))
 #endif
+static int MPG123_Load(void)
 {
     if (mpg123.loaded == 0) {
 #ifdef MPG123_DYNAMIC

src/codecs/music_ogg.c

@@ -91,11 +91,11 @@ static vorbis_loader vorbis;
     if (vorbis.FUNC == NULL) { Mix_SetError("Missing vorbis.framework or tremor.framework"); return -1; }
 #endif
 
-static int OGG_Load(void)
 #ifdef __APPLE__
     /* Need to turn off optimizations so weak framework load check works */
     __attribute__ ((optnone))
 #endif
+static int OGG_Load(void)
 {
     if (vorbis.loaded == 0) {
 #ifdef OGG_DYNAMIC

src/codecs/music_opus.c

@@ -60,11 +60,11 @@ static opus_loader opus;
     if (opus.FUNC == NULL) { Mix_SetError("Missing opus.framework"); return -1; }
 #endif
 
-static int OPUS_Load(void)
 #ifdef __APPLE__
     /* Need to turn off optimizations so weak framework load check works */
     __attribute__ ((optnone))
 #endif
+static int OPUS_Load(void)
 {
     if (opus.loaded == 0) {
 #ifdef OPUS_DYNAMIC

src/codecs/music_wavpack.c

@@ -96,11 +96,11 @@ static wavpack_loader wvpk;
     if (wvpk.FUNC == NULL) { Mix_SetError("Missing wavpack.framework"); return -1; }
 #endif
 
-static int WAVPACK_Load(void)
 #ifdef __APPLE__
     /* Need to turn off optimizations so weak framework load check works */
     __attribute__ ((optnone))
 #endif
+static int WAVPACK_Load(void)
 {
     if (wvpk.loaded == 0) {
 #ifdef WAVPACK_DYNAMIC

src/codecs/music_xmp.c

@@ -76,11 +76,11 @@ static xmp_loader libxmp;
     if (libxmp.FUNC == NULL) { Mix_SetError("Missing xmp.framework"); return -1; }
 #endif
 
-static int XMP_Load(void)
 #ifdef __APPLE__
     /* Need to turn off optimizations so weak framework load check works */
     __attribute__ ((optnone))
 #endif
+static int XMP_Load(void)
 {
     if (libxmp.loaded == 0) {
 #ifdef XMP_DYNAMIC