Updated to version 2.32.6 for release

Port #12581 to SDL2
This fixes undefined behavior resulting from adding offsets to nullptr. (cherry picked from commit a220e7c422)
2025-09-06 11:28:15 +00:00 · 2025-05-04 08:52:05 -07:00 · 2025-05-01 21:36:53 -07:00 · 2025-04-29 11:24:27 -07:00 · 2025-04-29 11:24:27 -07:00 · 2025-04-29 00:32:43 -05:00
65 changed files with 295 additions and 1255 deletions
--- a/.github/workflows/create-test-plan.py
+++ b/.github/workflows/create-test-plan.py
@@ -50,7 +50,6 @@ class SdlPlatform(Enum):
    Riscos = "riscos"
    FreeBSD = "freebsd"
    NetBSD = "netbsd"
-    OpenBSD = "openbsd"
    Watcom = "watcom"


@@ -134,7 +133,6 @@ JOB_SPECS = {
    "vita-pvr": JobSpec(name="Sony PlayStation Vita (GLES w/ PVR_PSP2)",    os=JobOs.UbuntuLatest,  platform=SdlPlatform.Vita,        artifact="SDL-vita-pvr",           container="vitasdk/vitasdk:latest", vita_gles=VitaGLES.Pvr, ),
    "riscos": JobSpec(name="RISC OS",                                       os=JobOs.UbuntuLatest,  platform=SdlPlatform.Riscos,      artifact="SDL-riscos",             container="riscosdotinfo/riscos-gccsdk-4.7:latest", ),
    "netbsd": JobSpec(name="NetBSD",                                        os=JobOs.UbuntuLatest,  platform=SdlPlatform.NetBSD,      artifact="SDL-netbsd-x64",  autotools=True, ),
-    "openbsd": JobSpec(name="OpenBSD",                                      os=JobOs.UbuntuLatest,  platform=SdlPlatform.OpenBSD,     artifact="SDL-openbsd-x64",  autotools=True, ),
    "freebsd": JobSpec(name="FreeBSD",                                      os=JobOs.UbuntuLatest,  platform=SdlPlatform.FreeBSD,     artifact="SDL-freebsd-x64", autotools=True, ),
    "watcom-win32": JobSpec(name="Watcom (Windows)",                        os=JobOs.WindowsLatest, platform=SdlPlatform.Watcom,      artifact="SDL-watcom-win32",  no_cmake=True, watcom_platform=WatcomPlatform.Windows ),
    "watcom-os2": JobSpec(name="Watcom (OS/2)",                             os=JobOs.WindowsLatest, platform=SdlPlatform.Watcom,      artifact="SDL-watcom-win32",  no_cmake=True, watcom_platform=WatcomPlatform.OS2 ),
@@ -177,7 +175,6 @@ class JobDetails:
    brew_packages: list[str] = dataclasses.field(default_factory=list)
    cmake_toolchain_file: str = ""
    cmake_arguments: list[str] = dataclasses.field(default_factory=list)
-    cmake_generator: str = "Ninja"
    cmake_build_arguments: list[str] = dataclasses.field(default_factory=list)
    cppflags: list[str] = dataclasses.field(default_factory=list)
    cc: str = ""
@@ -223,7 +220,6 @@ class JobDetails:
    setup_vita_gles_type: str = ""
    check_sources: bool = False
    watcom_makefile: str = ""
-    binutils_strings: str = "strings"

    def to_workflow(self, enable_artifacts: bool) -> dict[str, str|bool]:
        data = {
@@ -257,7 +253,6 @@ class JobDetails:
            "cflags": my_shlex_join(self.cppflags + self.cflags),
            "cxxflags": my_shlex_join(self.cppflags + self.cxxflags),
            "ldflags": my_shlex_join(self.ldflags),
-            "cmake-generator": self.cmake_generator,
            "cmake-toolchain-file": self.cmake_toolchain_file,
            "cmake-arguments": my_shlex_join(self.cmake_arguments),
            "cmake-build-arguments": my_shlex_join(self.cmake_build_arguments),
@@ -290,7 +285,6 @@ class JobDetails:
            "setup-gdk-folder": self.setup_gdk_folder,
            "check-sources": self.check_sources,
            "watcom-makefile": self.watcom_makefile,
-            "binutils-strings": self.binutils_strings,
        }
        return {k: v for k, v in data.items() if v != ""}

@@ -606,14 +600,11 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
            job.shared_lib = SharedLibType.SO_0
            job.static_lib = StaticLibType.A
        case SdlPlatform.N3ds:
-            job.cmake_generator = "Unix Makefiles"
-            job.cmake_build_arguments.append("-j$(nproc)")
            job.shared = False
-            job.apt_packages = []
+            job.apt_packages = ["ninja-build", "binutils"]
            job.run_tests = False
            job.cc_from_cmake = True
            job.cmake_toolchain_file = "${DEVKITPRO}/cmake/3DS.cmake"
-            job.binutils_strings = "/opt/devkitpro/devkitARM/bin/arm-none-eabi-strings"
            job.static_lib = StaticLibType.A
        case SdlPlatform.Msys2:
            job.shell = "msys2 {0}"
@@ -645,7 +636,7 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
            ))
            job.cmake_toolchain_file = "/home/riscos/env/toolchain-riscos.cmake"
            job.static_lib = StaticLibType.A
-        case SdlPlatform.FreeBSD | SdlPlatform.NetBSD | SdlPlatform.OpenBSD:
+        case SdlPlatform.FreeBSD | SdlPlatform.NetBSD:
            job.build_autotools_tests = False
            job.cpactions = True
            job.no_cmake = True
@@ -670,12 +661,6 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
                    job.cpactions_arch = "x86-64"
                    job.cpactions_setup_cmd = "export PATH=\"/usr/pkg/sbin:/usr/pkg/bin:/sbin:$PATH\"; export PKG_CONFIG_PATH=\"/usr/pkg/lib/pkgconfig\";export PKG_PATH=\"https://cdn.netBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -p)/$(uname -r|cut -f \"1 2\" -d.)/All/\";echo \"PKG_PATH=$PKG_PATH\";echo \"uname -a -> \"$(uname -a)\"\";sudo -E sysctl -w security.pax.aslr.enabled=0;sudo -E sysctl -w security.pax.aslr.global=0;sudo -E pkgin clean;sudo -E pkgin update"
                    job.cpactions_install_cmd = "sudo -E pkgin -y install cmake dbus pkgconf ninja-build pulseaudio libxkbcommon wayland wayland-protocols libinotify libusb1"
-                case SdlPlatform.OpenBSD:
-                    job.cpactions_os = "openbsd"
-                    job.cpactions_version = "7.4"
-                    job.cpactions_arch = "x86-64"
-                    job.cpactions_setup_cmd = "sudo pkg_add -u"
-                    job.cpactions_install_cmd = "sudo pkg_add cmake ninja pkgconf wayland wayland-protocols xwayland libxkbcommon libinotify pulseaudio dbus ibus"
        case SdlPlatform.Watcom:
            match spec.watcom_platform:
                case WatcomPlatform.OS2:
--- a/.github/workflows/generic.yml
+++ b/.github/workflows/generic.yml
@@ -177,7 +177,7 @@ jobs:
        #shell: ${{ matrix.platform.shell }}
        run: |
          ${{ matrix.platform.source-cmd }}
-          ${{ matrix.platform.cmake-config-emulator }} cmake -S . -B build -G "${{ matrix.platform.cmake-generator }}" \
+          ${{ matrix.platform.cmake-config-emulator }} cmake -S . -B build -GNinja \
            -Wdeprecated -Wdev -Werror \
            ${{ matrix.platform.cmake-toolchain-file != '' && format('-DCMAKE_TOOLCHAIN_FILE={0}', matrix.platform.cmake-toolchain-file) || '' }} \
            -DSDL_WERROR=${{ matrix.platform.werror }} \
@@ -207,9 +207,9 @@ jobs:
        run: |
          echo "This should show us the SDL_REVISION"
          echo "Shared library:"
-          ${{ (matrix.platform.shared-lib && format('{0} build/{1} | grep "Github Workflow"', matrix.platform.binutils-strings, matrix.platform.shared-lib)) || 'echo "<Shared library not supported by platform>"' }}
+          ${{ (matrix.platform.shared-lib && format('strings build/{0} | grep "Github Workflow"', matrix.platform.shared-lib)) || 'echo "<Shared library not supported by platform>"' }}
          echo "Static library:"
-          ${{ (matrix.platform.static-lib && format('{0} build/{1} | grep "Github Workflow"', matrix.platform.binutils-strings, matrix.platform.static-lib)) || 'echo "<Static library not supported by platform>"' }}
+          ${{ (matrix.platform.static-lib && format('strings build/{0} | grep "Github Workflow"', matrix.platform.static-lib)) || 'echo "<Static library not supported by platform>"' }}
      - name: 'Run build-time tests (CMake)'
        id: cmake-tests
        if: ${{ !matrix.platform.no-cmake && matrix.platform.run-tests }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -181,7 +181,7 @@ jobs:

  msvc:
    needs: [src]
-    runs-on: windows-2025
+    runs-on: windows-2019
    outputs:
      VC-x86: ${{ steps.releaser.outputs.VC-x86 }}
      VC-x64: ${{ steps.releaser.outputs.VC-x64 }}
--- a/.wikiheaders-options
+++ b/.wikiheaders-options
@@ -23,8 +23,7 @@ manpageheaderfiletext = Defined in %fname%
 # A handful of others we fix up in the header itself with /* WIKI CATEGORY: x */ comments.
 headercategoryeval = s/\ASDL_config_.*?\.h\Z//; s/\ASDL_test_.*?\.h\Z//; s/\ASDL_?(.*?)\.h\Z/$1/; ucfirst();

-# !!! FIXME: maybe later, but there are probably documentation gaps to fix first.
-quickrefenabled = 0
+quickrefenabled = 0  # !!! FIXME: maybe later, but there are probably documentation gaps to fix first.
 quickrefcategoryorder = Init,Hints,Error,Version,Properties,Log,Video,Events,Keyboard,Mouse,Touch,Gesture,GameController,Joystick,Haptic,Audio,Timer,Render,LoadSO,Thread,Mutex,Atomic,Filesystem,RWOPS,Pixels,Surface,Blendmode,Rect,Clipboard,Messagebox,Vulkan,Metal,Platform,Power,Sensor,Bits,Endian,Assert,CPUInfo,Locale,System,Misc,GUID,Main,Stdinc
 quickreftitle = SDL2 API Quick Reference
 quickrefurl = https://libsdl.org/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,8 +88,8 @@ endif()

 # See docs/release_checklist.md
 set(SDL_MAJOR_VERSION 2)
-set(SDL_MINOR_VERSION 33)
-set(SDL_MICRO_VERSION 0)
+set(SDL_MINOR_VERSION 32)
+set(SDL_MICRO_VERSION 6)
 set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}")

 # Set defaults preventing destination file conflicts
@@ -755,11 +755,6 @@ if(MSVC)
  if(MSVC_VERSION GREATER 1926 AND CMAKE_GENERATOR_PLATFORM MATCHES "Win32|x64")
    list(APPEND EXTRA_LDFLAGS_BUILD "-CETCOMPAT")
  endif()
-
-  # for VS >= 17.14 targeting ARM64: inline the Interlocked funcs
-  if(MSVC_VERSION GREATER 1943 AND SDL_CPU_ARM64 AND NOT SDL_LIBC)
-    list(APPEND EXTRA_CFLAGS /forceInterlockedFunctions-)
-  endif()
 endif()

 if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
@@ -1099,7 +1094,6 @@ if(SDL_LIBC)
    endforeach()

    check_symbol_exists(sigaction "signal.h" HAVE_SIGACTION)
-    check_symbol_exists(sigtimedwait "signal.h" HAVE_SIGTIMEDWAIT)
    check_symbol_exists(setjmp "setjmp.h" HAVE_SETJMP)
    check_symbol_exists(nanosleep "time.h" HAVE_NANOSLEEP)
    check_symbol_exists(sysconf "unistd.h" HAVE_SYSCONF)
@@ -1471,14 +1465,10 @@ elseif(EMSCRIPTEN)
 elseif(UNIX AND NOT APPLE AND NOT RISCOS AND NOT HAIKU)
  if(SDL_AUDIO)
    if(SYSV5 OR SOLARIS OR HPUX)
-        # Newer Solaris-based systems, like OpenIndiana, don't have this interface anymore. Check for the header first.
-        check_include_file(sys/audioio.h HAVE_SYS_AUDIOIO_H)
-        if(HAVE_SYS_AUDIOIO_H)
-            set(SDL_AUDIO_DRIVER_SUNAUDIO 1)
-            file(GLOB SUN_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/sun/*.c)
-            list(APPEND SOURCE_FILES ${SUN_AUDIO_SOURCES})
-            set(HAVE_SDL_AUDIO TRUE)
-        endif()
+        set(SDL_AUDIO_DRIVER_SUNAUDIO 1)
+        file(GLOB SUN_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/sun/*.c)
+        list(APPEND SOURCE_FILES ${SUN_AUDIO_SOURCES})
+        set(HAVE_SDL_AUDIO TRUE)
    elseif(NETBSD)
        set(SDL_AUDIO_DRIVER_NETBSD 1)
        file(GLOB NETBSD_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/netbsd/*.c)
--- a/Makefile.os2
+++ b/Makefile.os2
@@ -14,8 +14,8 @@

 LIBNAME = SDL2
 MAJOR_VERSION = 2
-MINOR_VERSION = 33
-MICRO_VERSION = 0
+MINOR_VERSION = 32
+MICRO_VERSION = 6
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
 DESCRIPTION = Simple DirectMedia Layer 2

--- a/Makefile.w32
+++ b/Makefile.w32
@@ -5,8 +5,8 @@

 LIBNAME = SDL2
 MAJOR_VERSION = 2
-MINOR_VERSION = 33
-MICRO_VERSION = 0
+MINOR_VERSION = 32
+MICRO_VERSION = 6
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)

 LIBHOME = .
--- a/VisualC-WinRT/SDL-UWP.vcxproj
+++ b/VisualC-WinRT/SDL-UWP.vcxproj
@@ -371,7 +371,6 @@
    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.0.0</WindowsTargetPlatformMinVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -392,7 +391,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -604,4 +603,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/Xcode-iOS/Demos/src/fireworks.c
+++ b/Xcode-iOS/Demos/src/fireworks.c
@@ -456,10 +456,7 @@ main(int argc, char *argv[])
    while (!done) {
        SDL_Event event;
        double deltaTime = updateDeltaTime();
-        SDL_bool hasEvents = SDL_FALSE;
-        
        while (SDL_PollEvent(&event)) {
-            hasEvents = SDL_TRUE;
            if (event.type == SDL_QUIT) {
                done = 1;
            }
@@ -469,17 +466,10 @@ main(int argc, char *argv[])
                spawnEmitterParticle(x, y);
            }
        }
-        
-        /* Only update and render if we have active particles or just received events */
-        if (num_active_particles > 0 || hasEvents) {
-            stepParticles(deltaTime);
-            drawParticles();
-            SDL_GL_SwapWindow(window);
-            SDL_Delay(16); // Target 60 FPS when active
-        } else {
-            /* Idle state - wait for events with longer delay to save CPU */
-            SDL_Delay(100); // Much longer delay when idle
-        }
+        stepParticles(deltaTime);
+        drawParticles();
+        SDL_GL_SwapWindow(window);
+        SDL_Delay(1);
    }

    /* delete textures */
--- a/Xcode/SDL/Info-Framework.plist
+++ b/Xcode/SDL/Info-Framework.plist
@@ -19,10 +19,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.33.0</string>
+	<string>2.32.6</string>
 	<key>CFBundleSignature</key>
 	<string>SDLX</string>
 	<key>CFBundleVersion</key>
-	<string>2.33.0</string>
+	<string>2.32.6</string>
 </dict>
 </plist>
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -9728,8 +9728,8 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEPLOYMENT_POSTPROCESSING = YES;
-				DYLIB_COMPATIBILITY_VERSION = 3301.0.0;
-				DYLIB_CURRENT_VERSION = 3301.0.0;
+				DYLIB_COMPATIBILITY_VERSION = 3201.0.0;
+				DYLIB_CURRENT_VERSION = 3201.6.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_ALTIVEC_EXTENSIONS = YES;
@@ -9770,7 +9770,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_LINK_OBJC_RUNTIME = NO;
-				MARKETING_VERSION = 2.33.0;
+				MARKETING_VERSION = 2.32.6;
 				OTHER_LDFLAGS = "-liconv";
 			};
 			name = Release;
@@ -9813,8 +9813,8 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DYLIB_COMPATIBILITY_VERSION = 3301.0.0;
-				DYLIB_CURRENT_VERSION = 3301.0.0;
+				DYLIB_COMPATIBILITY_VERSION = 3201.0.0;
+				DYLIB_CURRENT_VERSION = 3201.6.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -9856,7 +9856,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_LINK_OBJC_RUNTIME = NO;
-				MARKETING_VERSION = 2.33.0;
+				MARKETING_VERSION = 2.32.6;
 				OTHER_LDFLAGS = "-liconv";
 			};
 			name = Debug;
@@ -10062,8 +10062,8 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
-				DYLIB_COMPATIBILITY_VERSION = 3301.0.0;
-				DYLIB_CURRENT_VERSION = 3301.0.0;
+				DYLIB_COMPATIBILITY_VERSION = 3201.0.0;
+				DYLIB_CURRENT_VERSION = 3201.6.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -10114,8 +10114,8 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
-				DYLIB_COMPATIBILITY_VERSION = 3301.0.0;
-				DYLIB_CURRENT_VERSION = 3301.0.0;
+				DYLIB_COMPATIBILITY_VERSION = 3201.0.0;
+				DYLIB_CURRENT_VERSION = 3201.6.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
--- a/Xcode/SDL/pkg-support/SDL.info
+++ b/Xcode/SDL/pkg-support/SDL.info
@@ -1,4 +1,4 @@
-Title SDL 2.33.0
+Title SDL 2.32.6
 Version 1
 Description SDL Library for Mac OS X (http://www.libsdl.org)
 DefaultLocation /Library/Frameworks
--- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -60,8 +60,8 @@ import java.util.Locale;
 public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
    private static final String TAG = "SDL";
    private static final int SDL_MAJOR_VERSION = 2;
-    private static final int SDL_MINOR_VERSION = 33;
-    private static final int SDL_MICRO_VERSION = 0;
+    private static final int SDL_MINOR_VERSION = 32;
+    private static final int SDL_MICRO_VERSION = 6;
 /*
    // Display InputType.SOURCE/CLASS of events and devices
    //
--- a/build-scripts/build-release.py
+++ b/build-scripts/build-release.py
@@ -37,8 +37,6 @@ logger = logging.getLogger(__name__)
 GIT_HASH_FILENAME = ".git-hash"
 REVISION_TXT = "REVISION.txt"

-RE_ILLEGAL_MINGW_LIBRARIES = re.compile(r"(?:lib)?(?:gcc|(?:std)?c[+][+]|(?:win)?pthread).*", flags=re.I)
-

 def safe_isotime_to_datetime(str_isotime: str) -> datetime.datetime:
    try:
@@ -341,12 +339,6 @@ class ArchiveFileTree:
    def add_file(self, file: NodeInArchive):
        self._tree[file.arcpath] = file

-    def __iter__(self) -> typing.Iterable[NodeInArchive]:
-        yield from self._tree.values()
-
-    def __contains__(self, value: str) -> bool:
-        return value in self._tree
-
    def get_latest_mod_time(self) -> datetime.datetime:
        return max(item.time for item in self._tree.values() if item.time)

@@ -534,16 +526,6 @@ class SourceCollector:
        return path_times


-class AndroidApiVersion:
-    def __init__(self, name: str, ints: tuple[int, ...]):
-        self.name = name
-        self.ints = ints
-
-    def __repr__(self) -> str:
-        return f"<{self.name} ({'.'.join(str(v) for v in self.ints)})>"
-
-ANDROID_ABI_EXTRA_LINK_OPTIONS = {}
-
 class Releaser:
    def __init__(self, release_info: dict, commit: str, revision: str, root: Path, dist_path: Path, section_printer: SectionPrinter, executer: Executer, cmake_generator: str, deps_path: Path, overwrite: bool, github: bool, fast: bool):
        self.release_info = release_info
@@ -604,22 +586,12 @@ class Releaser:
    def create_source_archives(self) -> None:
        source_collector = SourceCollector(root=self.root, commit=self.commit, executer=self.executer, filter=self._path_filter)
        print(f"Collecting sources of {self.project}...")
-        archive_tree: ArchiveFileTree = source_collector.get_archive_file_tree()
+        archive_tree = source_collector.get_archive_file_tree()
        latest_mod_time = archive_tree.get_latest_mod_time()
        archive_tree.add_file(NodeInArchive.from_text(arcpath=REVISION_TXT, text=f"{self.revision}\n", time=latest_mod_time))
        archive_tree.add_file(NodeInArchive.from_text(arcpath=f"{GIT_HASH_FILENAME}", text=f"{self.commit}\n", time=latest_mod_time))
        archive_tree.add_file_mapping(arc_dir="", file_mapping=self.release_info["source"].get("files", {}), file_mapping_root=self.root, context=self.get_context(), time=latest_mod_time)

-        if "Makefile.am" in archive_tree:
-            patched_time = latest_mod_time + datetime.timedelta(minutes=1)
-            print(f"Makefile.am detected -> touching aclocal.m4, */Makefile.in, configure")
-            for node_data in archive_tree:
-                arc_name = os.path.basename(node_data.arcpath)
-                arc_name_we, arc_name_ext = os.path.splitext(arc_name)
-                if arc_name in ("aclocal.m4", "configure", "Makefile.in"):
-                    print(f"Bumping time of {node_data.arcpath}")
-                    node_data.time = patched_time
-
        archive_base = f"{self.project}-{self.version}"
        zip_path = self.dist_path / f"{archive_base}.zip"
        tgz_path = self.dist_path / f"{archive_base}.tar.gz"
@@ -696,15 +668,6 @@ class Releaser:
    def git_hash_data(self) -> bytes:
        return f"{self.commit}\n".encode()

-    def verify_mingw_library(self, triplet: str, path: Path):
-        objdump_output = self.executer.check_output([f"{triplet}-objdump", "-p", str(path)])
-        libraries = re.findall(r"DLL Name: ([^\n]+)", objdump_output)
-        logger.info("%s (%s) libraries: %r", path, triplet, libraries)
-        illegal_libraries = list(filter(RE_ILLEGAL_MINGW_LIBRARIES.match, libraries))
-        logger.error("Detected 'illegal' libraries: %r", illegal_libraries)
-        if illegal_libraries:
-            raise Exception(f"{path} links to illegal libraries: {illegal_libraries}")
-
    def create_mingw_archives(self) -> None:
        build_type = "Release"
        build_parent_dir = self.root / "build-mingw"
@@ -801,6 +764,7 @@ class Releaser:
                        f"--includedir=${{prefix}}/include",
                        f"--libdir=${{prefix}}/lib",
                        f"--bindir=${{prefix}}/bin",
+                        f"--exec-prefix=${{prefix}}/bin",
                        f"--host={triplet}",
                        f"--build=x86_64-none-linux-gnu",
                        "CFLAGS=-O2",
@@ -808,10 +772,9 @@ class Releaser:
                        "LDFLAGS=-Wl,-s",
                    ] + extra_args, cwd=build_path, env=new_env)
                with self.section_printer.group(f"Build MinGW {triplet} (autotools)"):
-                    self.executer.run(["make", f"-j{self.cpu_count}"], cwd=build_path, env=new_env)
+                    self.executer.run(["make", "V=1", f"-j{self.cpu_count}"], cwd=build_path, env=new_env)
                with self.section_printer.group(f"Install MinGW {triplet} (autotools)"):
                    self.executer.run(["make", "install"], cwd=build_path, env=new_env)
-                self.verify_mingw_library(triplet=ARCH_TO_TRIPLET[arch], path=install_path / "bin" / f"{self.project}.dll")
                archive_file_tree.add_directory_tree(arc_dir=arc_join(arc_root, triplet), path=install_path, time=self.arc_time)

                print("Recording arch-dependent extra files for MinGW development archive ...")
@@ -867,7 +830,6 @@ class Releaser:
                        self.executer.run(["cmake", "--build", str(build_path), "--verbose", "--config", build_type], cwd=build_path, env=new_env)
                    with self.section_printer.group(f"Install MinGW {triplet} (CMake)"):
                        self.executer.run(["cmake", "--install", str(build_path)], cwd=build_path, env=new_env)
-                self.verify_mingw_library(triplet=ARCH_TO_TRIPLET[arch], path=install_path / "bin" / f"{self.project}.dll")
                archive_file_tree.add_directory_tree(arc_dir=arc_join(arc_root, triplet), path=install_path, time=self.arc_time)

                print("Recording arch-dependent extra files for MinGW development archive ...")
@@ -895,25 +857,22 @@ class Releaser:
        self.artifacts["mingw-devel-tar-gz"] = tgz_path
        self.artifacts["mingw-devel-tar-xz"] = txz_path

-    def _detect_android_api(self, android_home: str) -> typing.Optional[AndroidApiVersion]:
+    def _detect_android_api(self, android_home: str) -> typing.Optional[int]:
        platform_dirs = list(Path(p) for p in glob.glob(f"{android_home}/platforms/android-*"))
-        re_platform = re.compile("^android-([0-9]+)(?:-ext([0-9]+))?$")
-        platform_versions: list[AndroidApiVersion] = []
+        re_platform = re.compile("android-([0-9]+)")
+        platform_versions = []
        for platform_dir in platform_dirs:
            logger.debug("Found Android Platform SDK: %s", platform_dir)
-            if not (platform_dir / "android.jar").is_file():
-                logger.debug("Skipping SDK, missing android.jar")
-                continue
            if m:= re_platform.match(platform_dir.name):
-                platform_versions.append(AndroidApiVersion(name=platform_dir.name, ints=(int(m.group(1)), int(m.group(2) or 0))))
-        platform_versions.sort(key=lambda v: v.ints)
+                platform_versions.append(int(m.group(1)))
+        platform_versions.sort()
        logger.info("Available platform versions: %s", platform_versions)
-        platform_versions = list(filter(lambda v: v.ints >= self._android_api_minimum.ints, platform_versions))
-        logger.info("Valid platform versions (>=%s): %s", self._android_api_minimum.ints, platform_versions)
+        platform_versions = list(filter(lambda v: v >= self._android_api_minimum, platform_versions))
+        logger.info("Valid platform versions (>=%d): %s", self._android_api_minimum, platform_versions)
        if not platform_versions:
            return None
        android_api = platform_versions[0]
-        logger.info("Selected API version %s", android_api)
+        logger.info("Selected API version %d", android_api)
        return android_api

    def _get_prefab_json_text(self) -> str:
@@ -937,19 +896,8 @@ class Releaser:
        return json.dumps(module_json_dict, indent=4)

    @property
-    def _android_api_minimum(self) -> AndroidApiVersion:
-        value = self.release_info["android"]["api-minimum"]
-        if isinstance(value, int):
-            ints = (value, )
-        elif isinstance(value, str):
-            ints = tuple(split("."))
-        else:
-            raise ValueError("Invalid android.api-minimum: must be X or X.Y")
-        match len(ints):
-            case 1: name = f"android-{ints[0]}"
-            case 2: name = f"android-{ints[0]}-ext-{ints[1]}"
-            case _: raise ValueError("Invalid android.api-minimum: must be X or X.Y")
-        return AndroidApiVersion(name=name, ints=ints)
+    def _android_api_minimum(self):
+        return self.release_info["android"]["api-minimum"]

    @property
    def _android_api_target(self):
@@ -962,7 +910,7 @@ class Releaser:
    def _get_prefab_abi_json_text(self, abi: str, cpp: bool, shared: bool) -> str:
        abi_json_dict = {
            "abi": abi,
-            "api": self._android_api_minimum.ints[0],
+            "api": self._android_api_minimum,
            "ndk": self._android_ndk_minimum,
            "stl": "c++_shared" if cpp else "none",
            "static": not shared,
@@ -975,7 +923,7 @@ class Releaser:
                xmlns:android="http://schemas.android.com/apk/res/android"
                package="org.libsdl.android.{self.project}" android:versionCode="1"
                android:versionName="1.0">
-                <uses-sdk android:minSdkVersion="{self._android_api_minimum.ints[0]}"
+                <uses-sdk android:minSdkVersion="{self._android_api_minimum}"
                          android:targetSdkVersion="{self._android_api_target}" />
            </manifest>
        """)
@@ -985,8 +933,7 @@ class Releaser:
        if not cmake_toolchain_file.exists():
            logger.error("CMake toolchain file does not exist (%s)", cmake_toolchain_file)
            raise SystemExit(1)
-        aar_path = self.root / "build-android" / f"{self.project}-{self.version}.aar"
-        android_dist_path = self.dist_path / f"{self.project}-devel-{self.version}-android.zip"
+        aar_path =  self.dist_path / f"{self.project}-{self.version}.aar"
        android_abis = self.release_info["android"]["abis"]
        java_jars_added = False
        module_data_added = False
@@ -994,27 +941,16 @@ class Releaser:
        shutil.rmtree(android_deps_path, ignore_errors=True)

        for dep, depinfo in self.release_info["android"].get("dependencies", {}).items():
-            dep_devel_zip = self.deps_path / glob.glob(depinfo["artifact"], root_dir=self.deps_path)[0]
-
-            dep_extract_path = self.deps_path / f"extract/android/{dep}"
-            shutil.rmtree(dep_extract_path, ignore_errors=True)
-            dep_extract_path.mkdir(parents=True, exist_ok=True)
-
-            with self.section_printer.group(f"Extracting Android dependency {dep} ({dep_devel_zip})"):
-                with zipfile.ZipFile(dep_devel_zip, "r") as zf:
-                    zf.extractall(dep_extract_path)
-
-                dep_devel_aar = dep_extract_path / glob.glob("*.aar", root_dir=dep_extract_path)[0]
-                self.executer.run([sys.executable, str(dep_devel_aar), "-o", str(android_deps_path)])
+            android_aar = self.deps_path / glob.glob(depinfo["artifact"], root_dir=self.deps_path)[0]
+            with self.section_printer.group(f"Extracting Android dependency {dep} ({android_aar.name})"):
+                self.executer.run([sys.executable, str(android_aar), "-o", str(android_deps_path)])

        for module_name, module_info in self.release_info["android"]["modules"].items():
            assert "type" in module_info and module_info["type"] in ("interface", "library"), f"module {module_name} must have a valid type"

-        aar_file_tree = ArchiveFileTree()
-        android_devel_file_tree = ArchiveFileTree()
+        archive_file_tree = ArchiveFileTree()

        for android_abi in android_abis:
-            extra_link_options = ANDROID_ABI_EXTRA_LINK_OPTIONS.get(android_abi, "")
            with self.section_printer.group(f"Building for Android {android_api} {android_abi}"):
                build_dir = self.root / "build-android" / f"{android_abi}-build"
                install_dir = self.root / "install-android" / f"{android_abi}-install"
@@ -1025,11 +961,8 @@ class Releaser:
                    "cmake",
                    "-S", str(self.root),
                    "-B", str(build_dir),
-                    # NDK 21e does not support -ffile-prefix-map
-                    # f'''-DCMAKE_C_FLAGS="-ffile-prefix-map={self.root}=/src/{self.project}"''',
-                    # f'''-DCMAKE_CXX_FLAGS="-ffile-prefix-map={self.root}=/src/{self.project}"''',
-                    f"-DCMAKE_EXE_LINKER_FLAGS={extra_link_options}",
-                    f"-DCMAKE_SHARED_LINKER_FLAGS={extra_link_options}",
+                    f'''-DCMAKE_C_FLAGS="-ffile-prefix-map={self.root}=/src/{self.project}"''',
+                    f'''-DCMAKE_CXX_FLAGS="-ffile-prefix-map={self.root}=/src/{self.project}"''',
                    f"-DCMAKE_TOOLCHAIN_FILE={cmake_toolchain_file}",
                    f"-DCMAKE_PREFIX_PATH={str(android_deps_path)}",
                    f"-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH",
@@ -1066,20 +999,20 @@ class Releaser:
                        assert library.suffix in (".so", ".a")
                        assert library.is_file(), f"CMake should have built library '{library}' for module {module_name}"
                        arcdir_prefab_libs = f"{arcdir_prefab_module}/libs/android.{android_abi}"
-                        aar_file_tree.add_file(NodeInArchive.from_fs(arcpath=f"{arcdir_prefab_libs}/{library.name}", path=library, time=self.arc_time))
-                        aar_file_tree.add_file(NodeInArchive.from_text(arcpath=f"{arcdir_prefab_libs}/abi.json", text=self._get_prefab_abi_json_text(abi=android_abi, cpp=False, shared=library.suffix == ".so"), time=self.arc_time))
+                        archive_file_tree.add_file(NodeInArchive.from_fs(arcpath=f"{arcdir_prefab_libs}/{library.name}", path=library, time=self.arc_time))
+                        archive_file_tree.add_file(NodeInArchive.from_text(arcpath=f"{arcdir_prefab_libs}/abi.json", text=self._get_prefab_abi_json_text(abi=android_abi, cpp=False, shared=library.suffix == ".so"), time=self.arc_time))

                    if not module_data_added:
                        library_name = None
                        if module_info["type"] == "library":
                            library_name = Path(module_info["library"]).stem.removeprefix("lib")
                        export_libraries = module_info.get("export-libraries", [])
-                        aar_file_tree.add_file(NodeInArchive.from_text(arcpath=arc_join(arcdir_prefab_module, "module.json"), text=self._get_prefab_module_json_text(library_name=library_name, export_libraries=export_libraries), time=self.arc_time))
+                        archive_file_tree.add_file(NodeInArchive.from_text(arcpath=arc_join(arcdir_prefab_module, "module.json"), text=self._get_prefab_module_json_text(library_name=library_name, export_libraries=export_libraries), time=self.arc_time))
                        arcdir_prefab_include = f"prefab/modules/{module_name}/include"
                        if "includes" in module_info:
-                            aar_file_tree.add_file_mapping(arc_dir=arcdir_prefab_include, file_mapping=module_info["includes"], file_mapping_root=install_dir, context=self.get_context(), time=self.arc_time)
+                            archive_file_tree.add_file_mapping(arc_dir=arcdir_prefab_include, file_mapping=module_info["includes"], file_mapping_root=install_dir, context=self.get_context(), time=self.arc_time)
                        else:
-                            aar_file_tree.add_file(NodeInArchive.from_text(arcpath=arc_join(arcdir_prefab_include, ".keep"), text="\n", time=self.arc_time))
+                            archive_file_tree.add_file(NodeInArchive.from_text(arcpath=arc_join(arcdir_prefab_include, ".keep"), text="\n", time=self.arc_time))
                module_data_added = True

                if not java_jars_added:
@@ -1092,28 +1025,21 @@ class Releaser:
                        assert sources_jar_path.is_file(), f"CMake should have archived the java sources into a JAR ({sources_jar_path})"
                        assert doc_jar_path.is_file(), f"CMake should have archived javadoc into a JAR ({doc_jar_path})"

-                        aar_file_tree.add_file(NodeInArchive.from_fs(arcpath="classes.jar", path=classes_jar_path, time=self.arc_time))
-                        aar_file_tree.add_file(NodeInArchive.from_fs(arcpath="classes-sources.jar", path=sources_jar_path, time=self.arc_time))
-                        aar_file_tree.add_file(NodeInArchive.from_fs(arcpath="classes-doc.jar", path=doc_jar_path, time=self.arc_time))
+                        archive_file_tree.add_file(NodeInArchive.from_fs(arcpath="classes.jar", path=classes_jar_path, time=self.arc_time))
+                        archive_file_tree.add_file(NodeInArchive.from_fs(arcpath="classes-sources.jar", path=sources_jar_path, time=self.arc_time))
+                        archive_file_tree.add_file(NodeInArchive.from_fs(arcpath="classes-doc.jar", path=doc_jar_path, time=self.arc_time))

        assert ("jars" in self.release_info["android"] and java_jars_added) or "jars" not in self.release_info["android"], "Must have archived java JAR archives"

-        aar_file_tree.add_file_mapping(arc_dir="", file_mapping=self.release_info["android"]["aar-files"], file_mapping_root=self.root, context=self.get_context(), time=self.arc_time)
+        archive_file_tree.add_file_mapping(arc_dir="", file_mapping=self.release_info["android"].get("files", {}), file_mapping_root=self.root, context=self.get_context(), time=self.arc_time)

-        aar_file_tree.add_file(NodeInArchive.from_text(arcpath="prefab/prefab.json", text=self._get_prefab_json_text(), time=self.arc_time))
-        aar_file_tree.add_file(NodeInArchive.from_text(arcpath="AndroidManifest.xml", text=self._get_android_manifest_text(), time=self.arc_time))
+        archive_file_tree.add_file(NodeInArchive.from_text(arcpath="prefab/prefab.json", text=self._get_prefab_json_text(), time=self.arc_time))
+        archive_file_tree.add_file(NodeInArchive.from_text(arcpath="AndroidManifest.xml", text=self._get_android_manifest_text(), time=self.arc_time))

        with Archiver(zip_path=aar_path) as archiver:
-            aar_file_tree.add_to_archiver(archive_base="", archiver=archiver)
+            archive_file_tree.add_to_archiver(archive_base="", archiver=archiver)
            archiver.add_git_hash(arcdir="", commit=self.commit, time=self.arc_time)
-
-        android_devel_file_tree.add_file(NodeInArchive.from_fs(arcpath=aar_path.name, path=aar_path))
-        android_devel_file_tree.add_file_mapping(arc_dir="", file_mapping=self.release_info["android"]["files"], file_mapping_root=self.root, context=self.get_context(), time=self.arc_time)
-        with Archiver(zip_path=android_dist_path) as archiver:
-            android_devel_file_tree.add_to_archiver(archive_base="", archiver=archiver)
-            archiver.add_git_hash(arcdir="", commit=self.commit, time=self.arc_time)
-
-        self.artifacts[f"android-aar"] = android_dist_path
+        self.artifacts[f"android-aar"] = aar_path

    def download_dependencies(self):
        shutil.rmtree(self.deps_path, ignore_errors=True)
@@ -1150,7 +1076,7 @@ class Releaser:
                assert len(msvc_matches) == 1, f"Exactly one archive matches msvc {dep} dependency: {msvc_matches}"
            if "android" in self.release_info:
                android_matches = glob.glob(self.release_info["android"]["dependencies"][dep]["artifact"], root_dir=self.deps_path)
-                assert len(android_matches) == 1, f"Exactly one archive matches msvc {dep} dependency: {android_matches}"
+                assert len(android_matches) == 1, f"Exactly one archive matches msvc {dep} dependency: {msvc_matches}"

    @staticmethod
    def _arch_to_vs_platform(arch: str, configuration: str="Release") -> VsArchPlatformConfig:
@@ -1276,10 +1202,6 @@ class Releaser:
        platform_context = self.get_context(extra_context=arch_platform.extra_context())

        build_type = "Release"
-        extra_context = {
-            "ARCH": arch_platform.arch,
-            "PLATFORM": arch_platform.platform,
-        }

        built_paths = set(install_path / configure_text(f, context=platform_context) for file_mapping in (self.release_info["msvc"]["cmake"]["files-lib"], self.release_info["msvc"]["cmake"]["files-devel"]) for files_list in file_mapping.values() for f in files_list)
        logger.info("CMake builds these files, to be included in the package: %s", built_paths)
@@ -1330,7 +1252,7 @@ class Releaser:
        logger.info("Collecting files...")
        archive_file_tree = ArchiveFileTree()
        archive_file_tree.add_file_mapping(arc_dir="", file_mapping=self.release_info["msvc"]["cmake"]["files-lib"], file_mapping_root=install_path, context=platform_context, time=self.arc_time)
-        archive_file_tree.add_file_mapping(arc_dir="", file_mapping=self.release_info["msvc"]["files-lib"], file_mapping_root=self.root, context=self.get_context(extra_context=extra_context), time=self.arc_time)
+        archive_file_tree.add_file_mapping(arc_dir="", file_mapping=self.release_info["msvc"]["files-lib"], file_mapping_root=self.root, context=self.get_context(), time=self.arc_time)

        logger.info("Creating %s", zip_path)
        with Archiver(zip_path=zip_path) as archiver:
@@ -1394,7 +1316,7 @@ def main(argv=None) -> int:
    parser.add_argument("--actions", choices=["download", "source", "android", "mingw", "msvc", "dmg"], required=True, nargs="+", dest="actions", help="What to do?")
    parser.set_defaults(loglevel=logging.INFO)
    parser.add_argument('--vs-year', dest="vs_year", help="Visual Studio year")
-    parser.add_argument('--android-api', dest="android_api", help="Android API version")
+    parser.add_argument('--android-api', type=int, dest="android_api", help="Android API version")
    parser.add_argument('--android-home', dest="android_home", default=os.environ.get("ANDROID_HOME"), help="Android Home folder")
    parser.add_argument('--android-ndk-home', dest="android_ndk_home", default=os.environ.get("ANDROID_NDK_HOME"), help="Android NDK Home folder")
    parser.add_argument('--cmake-generator', dest="cmake_generator", default="Ninja", help="CMake Generator")
@@ -1521,27 +1443,14 @@ def main(argv=None) -> int:
        if args.android_api is None:
            with section_printer.group("Detect Android APIS"):
                args.android_api = releaser._detect_android_api(android_home=args.android_home)
-        else:
-            try:
-                android_api_ints = tuple(int(v) for v in args.android_api.split("."))
-                match len(android_api_ints):
-                    case 1: android_api_name = f"android-{android_api_ints[0]}"
-                    case 2: android_api_name = f"android-{android_api_ints[0]}-ext-{android_api_ints[1]}"
-                    case _: raise ValueError
-            except ValueError:
-                logger.error("Invalid --android-api, must be a 'X' or 'X.Y' version")
-            args.android_api = AndroidApiVersion(ints=android_api_ints, name=android_api_name)
-        if args.android_api is None:
+        if args.android_api is None or not (Path(args.android_home) / f"platforms/android-{args.android_api}").is_dir():
            parser.error("Invalid --android-api, and/or could not be detected")
-        android_api_path = Path(args.android_home) / f"platforms/{args.android_api.name}"
-        if not android_api_path.is_dir():
-            logger.warning(f"Android API directory does not exist ({android_api_path})")
        with section_printer.group("Android arguments"):
            print(f"android_home     = {args.android_home}")
            print(f"android_ndk_home = {args.android_ndk_home}")
            print(f"android_api      = {args.android_api}")
        releaser.create_android_archives(
-            android_api=args.android_api.ints[0],
+            android_api=args.android_api,
            android_home=args.android_home,
            android_ndk_home=args.android_ndk_home,
        )
--- a/build-scripts/config.guess
+++ b/build-scripts/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2025 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.

 # shellcheck disable=SC2006,SC2268 # see below for rationale

-timestamp='2025-07-10'
+timestamp='2024-07-27'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ version="\
 GNU config.guess ($timestamp)

 Originally written by Per Bothner.
-Copyright 1992-2025 Free Software Foundation, Inc.
+Copyright 1992-2024 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -1597,11 +1597,8 @@ EOF
    *:Unleashed:*:*)
 	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
 	;;
-    x86_64:[Ii]ronclad:*:*|i?86:[Ii]ronclad:*:*)
-	GUESS=$UNAME_MACHINE-pc-ironclad-mlibc
-	;;
-    *:[Ii]ronclad:*:*)
-	GUESS=$UNAME_MACHINE-unknown-ironclad-mlibc
+    *:Ironclad:*:*)
+	GUESS=$UNAME_MACHINE-unknown-ironclad
 	;;
 esac

@@ -1811,8 +1808,8 @@ fi
 exit 1

 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp nil t)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
-# time-stamp-format: "%Y-%02m-%02d"
+# time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:
--- a/build-scripts/config.sub
+++ b/build-scripts/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2025 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.

 # shellcheck disable=SC2006,SC2268,SC2162 # see below for rationale

-timestamp='2025-07-10'
+timestamp='2024-05-27'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -76,7 +76,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)

-Copyright 1992-2025 Free Software Foundation, Inc.
+Copyright 1992-2024 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +145,6 @@ case $1 in
 			| kfreebsd*-gnu* \
 			| knetbsd*-gnu* \
 			| kopensolaris*-gnu* \
-			| ironclad-* \
 			| linux-* \
 			| managarm-* \
 			| netbsd*-eabi* \
@@ -243,6 +242,7 @@ case $1 in
 					| rombug \
 					| semi \
 					| sequent* \
+					| siemens \
 					| sgi* \
 					| siemens \
 					| sim \
@@ -261,7 +261,7 @@ case $1 in
 						basic_machine=$field1-$field2
 						basic_os=
 						;;
-					tock* | zephyr*)
+					zephyr*)
 						basic_machine=$field1-unknown
 						basic_os=$field2
 						;;
@@ -1194,7 +1194,7 @@ case $cpu-$vendor in
 	xscale-* | xscalee[bl]-*)
 		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
-	arm64-* | aarch64le-* | arm64_32-*)
+	arm64-* | aarch64le-*)
 		cpu=aarch64
 		;;

@@ -1321,7 +1321,6 @@ case $cpu-$vendor in
 			| i960 \
 			| ia16 \
 			| ia64 \
-			| intelgt \
 			| ip2k \
 			| iq2000 \
 			| javascript \
@@ -1523,10 +1522,6 @@ EOF
 		kernel=nto
 		os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
 		;;
-	ironclad*)
-		kernel=ironclad
-		os=`echo "$basic_os" | sed -e 's|ironclad|mlibc|'`
-		;;
 	linux*)
 		kernel=linux
 		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
@@ -1981,7 +1976,6 @@ case $os in
 	| atheos* \
 	| auroraux* \
 	| aux* \
-	| banan_os* \
 	| beos* \
 	| bitrig* \
 	| bme* \
@@ -2028,6 +2022,7 @@ case $os in
 	| ios* \
 	| iris* \
 	| irix* \
+	| ironclad* \
 	| isc* \
 	| its* \
 	| l4re* \
@@ -2123,7 +2118,6 @@ case $os in
 	| sysv* \
 	| tenex* \
 	| tirtos* \
-	| tock* \
 	| toppers* \
 	| tops10* \
 	| tops20* \
@@ -2220,8 +2214,6 @@ case $kernel-$os-$obj in
 		;;
 	uclinux-uclibc*- | uclinux-gnu*- )
 		;;
-	ironclad-mlibc*-)
-		;;
 	managarm-mlibc*- | managarm-kernel*- )
 		;;
 	windows*-msvc*-)
@@ -2257,8 +2249,6 @@ case $kernel-$os-$obj in
 		;;
 	*-eabi*- | *-gnueabi*-)
 		;;
-	ios*-simulator- | tvos*-simulator- | watchos*-simulator- )
-		;;
 	none--*)
 		# None (no kernel, i.e. freestanding / bare metal),
 		# can be paired with an machine code file format
@@ -2357,8 +2347,8 @@ echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}"
 exit

 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp nil t)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
-# time-stamp-format: "%Y-%02m-%02d"
+# time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:
--- a/31
+++ b/31
@@ -3515,8 +3515,8 @@ orig_CFLAGS="$CFLAGS"

 # See docs/release_checklist.md
 SDL_MAJOR_VERSION=2
-SDL_MINOR_VERSION=33
-SDL_MICRO_VERSION=0
+SDL_MINOR_VERSION=32
+SDL_MICRO_VERSION=6
 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION

 SDL_BINARY_AGE=`expr $SDL_MINOR_VERSION \* 100 + $SDL_MICRO_VERSION`
@@ -19755,12 +19755,6 @@ if test "x$ac_cv_func_sigaction" = xyes
 then :
  printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h

-fi
-ac_fn_c_check_func "$LINENO" "sigtimedwait" "ac_cv_func_sigtimedwait"
-if test "x$ac_cv_func_sigtimedwait" = xyes
-then :
-  printf "%s\n" "#define HAVE_SIGTIMEDWAIT 1" >>confdefs.h
-
 fi
 ac_fn_c_check_func "$LINENO" "setjmp" "ac_cv_func_setjmp"
 if test "x$ac_cv_func_setjmp" = xyes
@@ -22428,6 +22422,7 @@ printf %s "checking for NAS audio support... " >&6; }
            have_nas=yes
            NAS_CFLAGS="-I/usr/X11R6/include/"
            NAS_LIBS="-L/usr/X11R6/lib -laudio -lXt"
+
        fi

        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_nas" >&5
@@ -28399,8 +28394,7 @@ fi

        if test x$hidapi_support = xyes; then
            if test x$have_libusb_h = xyes; then
-
-printf "%s\n" "#define HAVE_LIBUSB 1" >>confdefs.h
+                printf "%s\n" "#define HAVE_LIBUSB 1" >>confdefs.h

                EXTRA_CFLAGS="$EXTRA_CFLAGS $LIBUSB_CFLAGS"
                if test x$require_hidapi_libusb = xyes; then
@@ -28747,23 +28741,12 @@ printf "%s\n" "#define SDL_VIDEO_DRIVER_ANDROID 1" >>confdefs.h
        if test x$enable_audio = xyes; then
          case $ARCH in
            sysv5|solaris|hpux)
-                # Newer Solaris-based systems, like OpenIndiana, don't have this interface anymore. Check for the header first.
-                ac_fn_c_check_header_compile "$LINENO" "sys/audioio.h" "ac_cv_header_sys_audioio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_audioio_h" = xyes
-then :
-  have_sys_audioio_h=yes
-else $as_nop
-  have_sys_audioio_h=no
-fi
-
-                if test x$have_sys_audioio_h = xyes; then

 printf "%s\n" "#define SDL_AUDIO_DRIVER_SUNAUDIO 1" >>confdefs.h

-                    SOURCES="$SOURCES $srcdir/src/audio/sun/*.c"
-                    SUMMARY_audio="${SUMMARY_audio} sun"
-                    have_audio=yes
-                fi
+                SOURCES="$SOURCES $srcdir/src/audio/sun/*.c"
+                SUMMARY_audio="${SUMMARY_audio} sun"
+                have_audio=yes
            ;;
            netbsd)  # Don't use this on OpenBSD, it's busted.

--- a/configure.ac
+++ b/configure.ac
@@ -12,8 +12,8 @@ orig_CFLAGS="$CFLAGS"
 dnl Set various version strings - taken gratefully from the GTk sources
 # See docs/release_checklist.md
 SDL_MAJOR_VERSION=2
-SDL_MINOR_VERSION=33
-SDL_MICRO_VERSION=0
+SDL_MINOR_VERSION=32
+SDL_MICRO_VERSION=6
 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION

 SDL_BINARY_AGE=`expr $SDL_MINOR_VERSION \* 100 + $SDL_MICRO_VERSION`
@@ -359,7 +359,7 @@ dnl Checks for library functions.
        AC_DEFINE(HAVE_MPROTECT, 1, [ ])
        ],[]),
    )
-    AC_CHECK_FUNCS(malloc calloc realloc free getenv setenv putenv unsetenv bsearch qsort abs bcopy memset memcmp memcpy memmove wcslen wcslcpy wcslcat _wcsdup wcsdup wcsstr wcscmp wcsncmp wcscasecmp _wcsicmp wcsncasecmp _wcsnicmp strlen strlcpy strlcat _strrev _strupr _strlwr index rindex strchr strrchr strstr strtok_r itoa _ltoa _uitoa _ultoa strtod strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp strcasestr vsscanf vsnprintf fopen64 fseeko fseeko64 sigaction sigtimedwait setjmp nanosleep sysconf sysctlbyname getauxval elf_aux_info poll memfd_create posix_fallocate _Exit)
+    AC_CHECK_FUNCS(malloc calloc realloc free getenv setenv putenv unsetenv bsearch qsort abs bcopy memset memcmp memcpy memmove wcslen wcslcpy wcslcat _wcsdup wcsdup wcsstr wcscmp wcsncmp wcscasecmp _wcsicmp wcsncasecmp _wcsnicmp strlen strlcpy strlcat _strrev _strupr _strlwr index rindex strchr strrchr strstr strtok_r itoa _ltoa _uitoa _ultoa strtod strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp strcasestr vsscanf vsnprintf fopen64 fseeko fseeko64 sigaction setjmp nanosleep sysconf sysctlbyname getauxval elf_aux_info poll memfd_create posix_fallocate _Exit)

    AC_CHECK_LIB(m, pow, [LIBS="$LIBS -lm"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lm"])
    AC_CHECK_FUNCS(acos acosf asin asinf atan atanf atan2 atan2f ceil ceilf copysign copysignf cos cosf exp expf fabs fabsf floor floorf trunc truncf fmod fmodf log logf log10 log10f lround lroundf pow powf round roundf scalbn scalbnf sin sinf sqrt sqrtf tan tanf)
@@ -1247,6 +1247,7 @@ CheckNAS()
            have_nas=yes
            NAS_CFLAGS="-I/usr/X11R6/include/"
            NAS_LIBS="-L/usr/X11R6/lib -laudio -lXt"
+
        fi

        AC_MSG_RESULT($have_nas)
@@ -3635,7 +3636,7 @@ CheckHIDAPI()

        if test x$hidapi_support = xyes; then
            if test x$have_libusb_h = xyes; then
-                AC_DEFINE(HAVE_LIBUSB, 1, [ ])
+                AC_DEFINE(HAVE_LIBUSB)
                EXTRA_CFLAGS="$EXTRA_CFLAGS $LIBUSB_CFLAGS"
                if test x$require_hidapi_libusb = xyes; then
                    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LIBUSB_LIBS"
@@ -3868,14 +3869,10 @@ case "$host" in
        if test x$enable_audio = xyes; then
          case $ARCH in
            sysv5|solaris|hpux)
-                # Newer Solaris-based systems, like OpenIndiana, don't have this interface anymore. Check for the header first.
-                AC_CHECK_HEADER(sys/audioio.h, have_sys_audioio_h=yes, have_sys_audioio_h=no)
-                if test x$have_sys_audioio_h = xyes; then
-                    AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO, 1, [ ])
-                    SOURCES="$SOURCES $srcdir/src/audio/sun/*.c"
-                    SUMMARY_audio="${SUMMARY_audio} sun"
-                    have_audio=yes
-                fi
+                AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO, 1, [ ])
+                SOURCES="$SOURCES $srcdir/src/audio/sun/*.c"
+                SUMMARY_audio="${SUMMARY_audio} sun"
+                have_audio=yes
            ;;
            netbsd)  # Don't use this on OpenBSD, it's busted.
                AC_DEFINE(SDL_AUDIO_DRIVER_NETBSD, 1, [ ])
--- a/docs/README-psp.md
+++ b/docs/README-psp.md
@@ -29,7 +29,7 @@ cmake --install build


 ## Compiling a HelloWorld
-[PSP Hello World](https://pspdev.github.io/basic_programs.html#hello-world)
+[PSP Hello World](https://psp-dev.org/doku.php?id=tutorial:hello_world)

 ## To Do
 - PSP Screen Keyboard
--- a/docs/README-touch.md
+++ b/docs/README-touch.md
@@ -14,6 +14,7 @@ Works out of box.
 Windows:
 Unfortunately there is no windows support as of yet. Support for Windows 7 is planned, but we currently have no way to test. If you have a Windows 7 WM_TOUCH supported device, and are willing to help test please contact me at jim.tla+sdl_touch@gmail.com

+===========================================================================
 Events
 ===========================================================================
 SDL_FINGERDOWN:
@@ -38,6 +39,7 @@ Fields:
 Same as SDL_FINGERDOWN.


+===========================================================================
 Functions
 ===========================================================================
 SDL provides the ability to access the underlying SDL_Finger structures.
@@ -74,6 +76,7 @@ A SDL_Finger has the following fields:
 	The pressure of the touch.


+===========================================================================
 Notes
 ===========================================================================
 For a complete example see test/testgesture.c
--- a/include/SDL_assert.h
+++ b/include/SDL_assert.h
@@ -153,7 +153,7 @@ extern DECLSPEC SDL_AssertState SDLCALL SDL_ReportAssertion(SDL_AssertData *,
 #define SDL_enabled_assert(condition) \
    do { \
        while ( !(condition) ) { \
-            static struct SDL_AssertData sdl_assert_data = { 0, 0, #condition, NULL, 0, NULL, NULL }; \
+            static struct SDL_AssertData sdl_assert_data = { 0, 0, #condition, 0, 0, 0, 0 }; \
            const SDL_AssertState sdl_assert_state = SDL_ReportAssertion(&sdl_assert_data, SDL_FUNCTION, SDL_FILE, SDL_LINE); \
            if (sdl_assert_state == SDL_ASSERTION_RETRY) { \
                continue; /* go again. */ \
--- a/include/SDL_audio.h
+++ b/include/SDL_audio.h
@@ -648,7 +648,7 @@ extern DECLSPEC int SDLCALL SDL_GetDefaultAudioInfo(char **name,
 * \param obtained an SDL_AudioSpec structure filled in with the actual output
 *                 format; see SDL_OpenAudio() for more information.
 * \param allowed_changes 0, or one or more flags OR'd together.
- * \returns a valid device ID > 0 on success or 0 on failure; call
+ * \returns a valid device ID that is > 0 on success or 0 on failure; call
 *          SDL_GetError() for more information.
 *
 *          For compatibility with SDL 1.2, this will never return 1, since
--- a/include/SDL_config.h.cmake
+++ b/include/SDL_config.h.cmake
@@ -193,7 +193,6 @@
 #cmakedefine HAVE_MEMFD_CREATE 1
 #cmakedefine HAVE_POSIX_FALLOCATE 1
 #cmakedefine HAVE_SIGACTION 1
-#cmakedefine HAVE_SIGTIMEDWAIT 1
 #cmakedefine HAVE_SA_SIGACTION 1
 #cmakedefine HAVE_SETJMP 1
 #cmakedefine HAVE_NANOSLEEP 1
--- a/include/SDL_config.h.in
+++ b/include/SDL_config.h.in
@@ -195,7 +195,6 @@
 #undef HAVE_FSEEKO
 #undef HAVE_FSEEKO64
 #undef HAVE_SIGACTION
-#undef HAVE_SIGTIMEDWAIT
 #undef HAVE_SA_SIGACTION
 #undef HAVE_SETJMP
 #undef HAVE_NANOSLEEP
@@ -217,7 +216,6 @@
 #undef HAVE__EXIT

 #else
-
 #define HAVE_STDARG_H 1
 #define HAVE_STDDEF_H 1
 #define HAVE_STDINT_H 1
--- a/include/SDL_keyboard.h
+++ b/include/SDL_keyboard.h
@@ -49,7 +49,7 @@ typedef struct SDL_Keysym
 {
    SDL_Scancode scancode;      /**< SDL physical key code - see SDL_Scancode for details */
    SDL_Keycode sym;            /**< SDL virtual key code - see SDL_Keycode for details */
-    Uint16 mod;                 /**< current key modifiers - see SDL_Keymod for details */
+    Uint16 mod;                 /**< current key modifiers */
    Uint32 unused;
 } SDL_Keysym;

--- a/include/SDL_keycode.h
+++ b/include/SDL_keycode.h
@@ -41,18 +41,12 @@
 *
 * A special exception is the number keys at the top of the keyboard which map
 * to SDLK_0...SDLK_9 on AZERTY layouts.
- *
- * The actual values that might be set for this type are listed in the
- * SDL_KeyCode (capital C) enumeration.
 */
 typedef Sint32 SDL_Keycode;

 #define SDLK_SCANCODE_MASK (1<<30)
 #define SDL_SCANCODE_TO_KEYCODE(X)  (X | SDLK_SCANCODE_MASK)

-/**
- * The possible values for keycodes.
- */
 typedef enum SDL_KeyCode
 {
    SDLK_UNKNOWN = 0,
--- a/include/SDL_main.h
+++ b/include/SDL_main.h
@@ -187,8 +187,8 @@ extern DECLSPEC void SDLCALL SDL_SetMainReady(void);
 * \param name the window class name, in UTF-8 encoding. If NULL, SDL
 *             currently uses "SDL_app" but this isn't guaranteed.
 * \param style the value to use in WNDCLASSEX::style. If `name` is NULL, SDL
- *              currently uses `(CS_BYTEALIGNCLIENT \| CS_OWNDC)` regardless
- *              of what is specified here.
+ *              currently uses `(CS_BYTEALIGNCLIENT | CS_OWNDC)` regardless of
+ *              what is specified here.
 * \param hInst the HINSTANCE to use in WNDCLASSEX::hInstance. If zero, SDL
 *              will use `GetModuleHandle(NULL)` instead.
 * \returns 0 on success, -1 on error. SDL_GetError() may have details.
--- a/include/SDL_render.h
+++ b/include/SDL_render.h
@@ -30,7 +30,6 @@
 * - single pixel lines
 * - filled rectangles
 * - texture images
- * - 2D polygons
 *
 * The primitives may be drawn in opaque, blended, or additive modes.
 *
@@ -39,7 +38,7 @@
 * may also be stretched with linear interpolation.
 *
 * This API is designed to accelerate simple 2D operations. You may want more
- * functionality such as 3D polygons and particle effects and in that case you
+ * functionality such as polygons and particle effects and in that case you
 * should use SDL's OpenGL/Direct3D support or one of the many good 3D
 * engines.
 *
--- a/include/SDL_stdinc.h
+++ b/include/SDL_stdinc.h
@@ -750,12 +750,8 @@ size_t wcslcpy(wchar_t *dst, const wchar_t *src, size_t size);
 size_t wcslcat(wchar_t *dst, const wchar_t *src, size_t size);
 #endif

-#ifndef _WIN32
 /* strdup is not ANSI but POSIX, and its prototype might be hidden... */
-/* not for windows: might conflict with string.h where strdup may have
- * dllimport attribute: https://github.com/libsdl-org/SDL/issues/12948 */
 char *strdup(const char *str);
-#endif

 /* Starting LLVM 16, the analyser errors out if these functions do not have
   their prototype defined (clang-diagnostic-implicit-function-declaration) */
--- a/include/SDL_surface.h
+++ b/include/SDL_surface.h
@@ -808,8 +808,8 @@ extern DECLSPEC int SDLCALL SDL_FillRects
 *
 * This assumes that the source and destination rectangles are the same size.
 * If either `srcrect` or `dstrect` are NULL, the entire surface (`src` or
- * `dst`) is copied. The final blit rectangle is saved in `dstrect` after all
- * clipping is performed.
+ * `dst`) is copied. The final blit rectangle is saved in `dstrect` after
+ * all clipping is performed.
 *
 * The blit function should not be called on a locked surface.
 *
--- a/include/SDL_version.h
+++ b/include/SDL_version.h
@@ -57,8 +57,8 @@ typedef struct SDL_version
 /* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
 */
 #define SDL_MAJOR_VERSION   2
-#define SDL_MINOR_VERSION   33
-#define SDL_PATCHLEVEL      0
+#define SDL_MINOR_VERSION   32
+#define SDL_PATCHLEVEL      6

 /**
 * Macro to determine SDL version program was compiled against.
--- a/src/audio/alsa/SDL_alsa_audio.c
+++ b/src/audio/alsa/SDL_alsa_audio.c
@@ -62,7 +62,6 @@ static int (*ALSA_snd_pcm_hw_params_set_access)(snd_pcm_t *, snd_pcm_hw_params_t
 static int (*ALSA_snd_pcm_hw_params_set_format)(snd_pcm_t *, snd_pcm_hw_params_t *, snd_pcm_format_t);
 static int (*ALSA_snd_pcm_hw_params_set_channels)(snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int);
 static int (*ALSA_snd_pcm_hw_params_get_channels)(const snd_pcm_hw_params_t *, unsigned int *);
-static int (*ALSA_snd_pcm_hw_params_get_rate)(const snd_pcm_hw_params_t *, unsigned int*, int*);
 static int (*ALSA_snd_pcm_hw_params_set_rate_near)(snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int *, int *);
 static int (*ALSA_snd_pcm_hw_params_set_period_size_near)(snd_pcm_t *, snd_pcm_hw_params_t *, snd_pcm_uframes_t *, int *);
 static int (*ALSA_snd_pcm_hw_params_get_period_size)(const snd_pcm_hw_params_t *, snd_pcm_uframes_t *, int *);
@@ -84,12 +83,6 @@ static int (*ALSA_snd_device_name_hint)(int, const char *, void ***);
 static char *(*ALSA_snd_device_name_get_hint)(const void *, const char *);
 static int (*ALSA_snd_device_name_free_hint)(void **);
 static snd_pcm_sframes_t (*ALSA_snd_pcm_avail)(snd_pcm_t *);
-static int (*ALSA_snd_pcm_info)(snd_pcm_t *, snd_pcm_info_t *);
-static const char *(*ALSA_snd_pcm_info_get_name)(const snd_pcm_info_t *);
-static int (*ALSA_snd_pcm_info_get_card)(const snd_pcm_info_t *);
-static int (*ALSA_snd_card_get_name)(int, char **);
-static int (*ALSA_snd_pcm_info_malloc)(snd_pcm_info_t **);
-static void (*ALSA_snd_pcm_info_free)(snd_pcm_info_t *);
 #ifdef SND_CHMAP_API_VERSION
 static snd_pcm_chmap_t *(*ALSA_snd_pcm_get_chmap)(snd_pcm_t *);
 static int (*ALSA_snd_pcm_chmap_print)(const snd_pcm_chmap_t *map, size_t maxlen, char *buf);
@@ -139,7 +132,6 @@ static int load_alsa_syms(void)
    SDL_ALSA_SYM(snd_pcm_hw_params_set_format);
    SDL_ALSA_SYM(snd_pcm_hw_params_set_channels);
    SDL_ALSA_SYM(snd_pcm_hw_params_get_channels);
-    SDL_ALSA_SYM(snd_pcm_hw_params_get_rate);
    SDL_ALSA_SYM(snd_pcm_hw_params_set_rate_near);
    SDL_ALSA_SYM(snd_pcm_hw_params_set_period_size_near);
    SDL_ALSA_SYM(snd_pcm_hw_params_get_period_size);
@@ -160,12 +152,6 @@ static int load_alsa_syms(void)
    SDL_ALSA_SYM(snd_device_name_get_hint);
    SDL_ALSA_SYM(snd_device_name_free_hint);
    SDL_ALSA_SYM(snd_pcm_avail);
-    SDL_ALSA_SYM(snd_pcm_info);
-    SDL_ALSA_SYM(snd_pcm_info_get_card);
-    SDL_ALSA_SYM(snd_pcm_info_get_name);
-    SDL_ALSA_SYM(snd_card_get_name);
-    SDL_ALSA_SYM(snd_pcm_info_malloc);
-    SDL_ALSA_SYM(snd_pcm_info_free);
 #ifdef SND_CHMAP_API_VERSION
    SDL_ALSA_SYM(snd_pcm_get_chmap);
    SDL_ALSA_SYM(snd_pcm_chmap_print);
@@ -480,58 +466,6 @@ static void ALSA_CloseDevice(_THIS)
    SDL_free(this->hidden);
 }

-static int ALSA_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
-{
-    const char *device = "default";
-    snd_pcm_t *pcm_handle;
-    snd_pcm_info_t *pcm_info;
-    snd_pcm_stream_t stream;
-    int card_index;
-    const char *dev_name;
-    char *card_name = NULL;
-    char final_name[256];
-
-    SDL_zero(final_name);
-    stream = iscapture ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK;
-
-    if (ALSA_snd_pcm_open(&pcm_handle, device, stream, SND_PCM_NONBLOCK) < 0) {
-        return SDL_SetError("ALSA: Couldn't open default device");
-    }
-
-    if (ALSA_snd_pcm_info_malloc(&pcm_info) < 0) {
-        ALSA_snd_pcm_close(pcm_handle);
-        return SDL_SetError("ALSA: Couldn't allocate pcm_info");
-    }
-
-    if (ALSA_snd_pcm_info(pcm_handle, pcm_info) < 0) {
-        ALSA_snd_pcm_info_free(pcm_info);
-        ALSA_snd_pcm_close(pcm_handle);
-        return SDL_SetError("ALSA: Couldn't get PCM info");
-    }
-
-    card_index = ALSA_snd_pcm_info_get_card(pcm_info);
-    dev_name = ALSA_snd_pcm_info_get_name(pcm_info);
-
-    if (card_index >= 0 && ALSA_snd_card_get_name(card_index, &card_name) >= 0) {
-        SDL_snprintf(final_name, sizeof(final_name), "%s, %s", card_name, dev_name);
-        *name = SDL_strdup(final_name);
-    } else {
-        *name = SDL_strdup(dev_name ? dev_name : "Unknown ALSA Device");
-    }
-
-    if (spec) {
-        SDL_zero(*spec);
-        spec->freq = 48000;
-        spec->format = AUDIO_S16SYS;
-        spec->channels = 2;
-        spec->samples = 512;
-    }
-
-    ALSA_snd_pcm_info_free(pcm_info);
-    ALSA_snd_pcm_close(pcm_handle);
-    return 0;
-}
-
 static int ALSA_set_buffer_size(_THIS, snd_pcm_hw_params_t *params)
 {
    int status;
@@ -782,16 +716,6 @@ static void add_device(const int iscapture, const char *name, void *hint, ALSA_D
    char *desc;
    char *handle = NULL;
    char *ptr;
-    snd_pcm_t *pcm_handle;
-    snd_pcm_stream_t stream;
-    snd_pcm_hw_params_t *hwparams;
-
-    unsigned int freq = 0;
-    int dir;
-    unsigned int channels = 0;
-    snd_pcm_uframes_t samples = 0;
-
-    SDL_AudioSpec spec;

    if (!dev) {
        return;
@@ -831,36 +755,12 @@ static void add_device(const int iscapture, const char *name, void *hint, ALSA_D
        SDL_free(dev);
        return;
    }
-    stream = iscapture ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK;
-    
-    if (ALSA_snd_pcm_open(&pcm_handle, handle, stream, SND_PCM_NONBLOCK) < 0) {
-	SDL_free(dev);
-	return;
-    }

-    snd_pcm_hw_params_alloca(&hwparams);
-    ALSA_snd_pcm_hw_params_any(pcm_handle, hwparams);
-
-    ALSA_snd_pcm_hw_params_get_rate(hwparams, &freq, &dir);
-    ALSA_snd_pcm_hw_params_get_channels(hwparams, &channels);
-    ALSA_snd_pcm_hw_params_get_period_size(hwparams, &samples, &dir);
-
-    ALSA_snd_pcm_close(pcm_handle);
-
-    /* Let's fill the spec */
-
-    spec.freq = freq;
-    spec.channels = channels;
-    spec.samples = samples;
-    spec.silence = 0;
-    spec.padding = 0;
-    /* Can't calculate size yet because this is an exploratory device opening
-     * so we don't know the sample format.
-     * Probably AUDIO_S16SYS/SND_PCM_FORMAT_S16_LE would be a good default
-     * if required.*/
-    spec.size = 0;
-
-    SDL_AddAudioDevice(iscapture, desc, &spec, handle);
+    /* Note that spec is NULL, because we are required to open the device before
+     * acquiring the mix format, making this information inaccessible at
+     * enumeration time
+     */
+    SDL_AddAudioDevice(iscapture, desc, NULL, handle);
    if (hint) {
        free(desc);
    }
@@ -1075,7 +975,6 @@ static SDL_bool ALSA_Init(SDL_AudioDriverImpl *impl)
    impl->Deinitialize = ALSA_Deinitialize;
    impl->CaptureFromDevice = ALSA_CaptureFromDevice;
    impl->FlushCapture = ALSA_FlushCapture;
-    impl->GetDefaultAudioInfo = ALSA_GetDefaultAudioInfo;

    impl->HasCaptureSupport = SDL_TRUE;
    impl->SupportsNonPow2Samples = SDL_TRUE;
--- a/src/audio/coreaudio/SDL_coreaudio.m
+++ b/src/audio/coreaudio/SDL_coreaudio.m
@@ -383,8 +383,7 @@ static BOOL update_audio_session(_THIS, SDL_bool open, SDL_bool allow_playandrec

        hint = SDL_GetHint(SDL_HINT_AUDIO_CATEGORY);
        if (hint) {
-            if (SDL_strcasecmp(hint, "AVAudioSessionCategoryAmbient") == 0 ||
-                SDL_strcasecmp(hint, "ambient") == 0) {
+            if (SDL_strcasecmp(hint, "AVAudioSessionCategoryAmbient") == 0) {
                category = AVAudioSessionCategoryAmbient;
            } else if (SDL_strcasecmp(hint, "AVAudioSessionCategorySoloAmbient") == 0) {
                category = AVAudioSessionCategorySoloAmbient;
--- a/src/audio/openslES/SDL_openslES.c
+++ b/src/audio/openslES/SDL_openslES.c
@@ -413,32 +413,27 @@ static int openslES_CreatePCMPlayer(_THIS)
    SLresult result;
    int i;

-    /* according to https://developer.android.com/ndk/guides/audio/opensl/opensl-for-android,
-       Android's OpenSL ES only supports Uint8 and _littleendian_ Sint16.
-       (and float32, with an extension we use, below.) */
+    /* If we want to add floating point audio support (requires API level 21)
+       it can be done as described here:
+        https://developer.android.com/ndk/guides/audio/opensl/android-extensions.html#floating-point
+    */
    if (SDL_GetAndroidSDKVersion() >= 21) {
        SDL_AudioFormat test_format;
        for (test_format = SDL_FirstAudioFormat(this->spec.format); test_format; test_format = SDL_NextAudioFormat()) {
-            switch (test_format) {
-            case AUDIO_U8:
-            case AUDIO_S16LSB:
-            case AUDIO_F32LSB:
+            if (SDL_AUDIO_ISSIGNED(test_format)) {
                break;
-            default:
-                continue;
            }
-            break;
        }

        if (!test_format) {
            /* Didn't find a compatible format : */
-            LOGI("No compatible audio format, using signed 16-bit LE audio");
-            test_format = AUDIO_S16LSB;
+            LOGI("No compatible audio format, using signed 16-bit audio");
+            test_format = AUDIO_S16SYS;
        }
        this->spec.format = test_format;
    } else {
        /* Just go with signed 16-bit audio as it's the most compatible */
-        this->spec.format = AUDIO_S16LSB;
+        this->spec.format = AUDIO_S16SYS;
    }

    /* Update the fragment size as size in bytes */
--- a/src/audio/pipewire/SDL_pipewire.c
+++ b/src/audio/pipewire/SDL_pipewire.c
@@ -574,25 +574,6 @@ static SDL_bool get_int_param(const struct spa_pod *param, Uint32 key, int *val)
    return SDL_FALSE;
 }

-static SDL_AudioFormat SPAFormatToSDL(enum spa_audio_format spafmt)
-{
-    switch (spafmt) {
-        #define CHECKFMT(spa,sdl) case SPA_AUDIO_FORMAT_##spa: return AUDIO_##sdl
-        CHECKFMT(U8, U8);
-        CHECKFMT(S8, S8);
-        CHECKFMT(S16_LE, S16LSB);
-        CHECKFMT(S16_BE, S16MSB);
-        CHECKFMT(S32_LE, S32LSB);
-        CHECKFMT(S32_BE, S32MSB);
-        CHECKFMT(F32_LE, F32LSB);
-        CHECKFMT(F32_BE, F32MSB);
-        #undef CHECKFMT
-        default: break;
-    }
-
-    return 0;
-}
-
 /* Interface node callbacks */
 static void node_event_info(void *object, const struct pw_node_info *info)
 {
@@ -621,15 +602,6 @@ static void node_event_param(void *object, int seq, uint32_t id, uint32_t index,
    struct node_object *node = object;
    struct io_node *io = node->userdata;

-    if ((id == SPA_PARAM_Format) && (io->spec.format == 0)) {
-        struct spa_audio_info_raw info;
-        SDL_zero(info);
-        if (spa_format_audio_raw_parse(param, &info) == 0) {
-            /*SDL_Log("Sink Format: %d, Rate: %d Hz, Channels: %d", info.format, info.rate, info.channels);*/
-            io->spec.format = SPAFormatToSDL(info.format);
-        }
-    }
-
    /* Get the default frequency */
    if (io->spec.freq == 0) {
        get_range_param(param, SPA_FORMAT_AUDIO_rate, &io->spec.freq, NULL, NULL);
@@ -747,9 +719,7 @@ static void registry_event_global_callback(void *object, uint32_t id, uint32_t p
                /* Begin setting the node properties */
                io->id = id;
                io->is_capture = is_capture;
-                if (io->spec.format == 0) {
-                    io->spec.format = AUDIO_S16;  /* we'll go conservative here if for some reason the format isn't known. */
-                }
+                io->spec.format = AUDIO_F32; /* Pipewire uses floats internally, other formats require conversion. */
                io->name = io->buf;
                io->path = io->buf + desc_buffer_len;
                SDL_strlcpy(io->buf, node_desc, desc_buffer_len);
--- a/src/audio/sun/SDL_sunaudio.c
+++ b/src/audio/sun/SDL_sunaudio.c
@@ -24,12 +24,18 @@

 /* Allow access to a raw mixing buffer */

-#include <sys/types.h>
 #include <fcntl.h>
 #include <errno.h>
+#ifdef __NETBSD__
 #include <sys/ioctl.h>
 #include <sys/audioio.h>
+#endif
+#ifdef __SVR4
+#include <sys/audioio.h>
+#else
 #include <sys/time.h>
+#include <sys/types.h>
+#endif
 #include <unistd.h>

 #include "SDL_timer.h"
--- a/src/cpuinfo/SDL_cpuinfo.c
+++ b/src/cpuinfo/SDL_cpuinfo.c
@@ -127,11 +127,7 @@
 #define CPU_CFG2_LSX  (1 << 6)
 #define CPU_CFG2_LASX (1 << 7)

-#if !defined(SDL_CPUINFO_DISABLED) && \
-    !((defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__))) || (defined(__OpenBSD__) && defined(__powerpc__))) && \
-    !(defined(__FreeBSD__) && defined(__powerpc__)) && \
-    !(defined(__LINUX__) && defined(__powerpc__) && defined(HAVE_GETAUXVAL)) && \
-    defined(SDL_ALTIVEC_BLITTERS) && defined(HAVE_SETJMP)
+#if defined(SDL_ALTIVEC_BLITTERS) && defined(HAVE_SETJMP) && !defined(__MACOSX__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
 /* This is the brute force way of detecting instruction sets...
   the idea is borrowed from the libmpeg2 library - thanks!
 */
@@ -360,8 +356,6 @@ static int CPU_haveAltiVec(void)
    elf_aux_info(AT_HWCAP, &cpufeatures, sizeof(cpufeatures));
    altivec = cpufeatures & PPC_FEATURE_HAS_ALTIVEC;
    return altivec;
-#elif defined(__LINUX__) && defined(__powerpc__) && defined(HAVE_GETAUXVAL)
-    altivec = getauxval(AT_HWCAP) & PPC_FEATURE_HAS_ALTIVEC;
 #elif defined(SDL_ALTIVEC_BLITTERS) && defined(HAVE_SETJMP)
    void (*handler)(int sig);
    handler = signal(SIGILL, illegal_instruction);
--- a/src/events/SDL_events.c
+++ b/src/events/SDL_events.c
@@ -738,17 +738,21 @@ static void SDL_CutEvent(SDL_EventEntry *entry)

 static int SDL_SendWakeupEvent(void)
 {
-    SDL_Window *wakeup_window;
    SDL_VideoDevice *_this = SDL_GetVideoDevice();
    if (_this == NULL || !_this->SendWakeupEvent) {
        return 0;
    }

-    /* We only want to do this once while waiting for an event, so set it to NULL atomically here */
-    wakeup_window = (SDL_Window *)SDL_AtomicSetPtr(&_this->wakeup_window, NULL);
-    if (wakeup_window) {
-        _this->SendWakeupEvent(_this, wakeup_window);
+    SDL_LockMutex(_this->wakeup_lock);
+    {
+        if (_this->wakeup_window) {
+            _this->SendWakeupEvent(_this, _this->wakeup_window);
+
+            /* No more wakeup events needed until we enter a new wait */
+            _this->wakeup_window = NULL;
+        }
    }
+    SDL_UnlockMutex(_this->wakeup_lock);

    return 0;
 }
@@ -1005,7 +1009,18 @@ static int SDL_WaitEventTimeout_Device(_THIS, SDL_Window *wakeup_window, SDL_Eve
        int status;
        SDL_PumpEventsInternal(SDL_TRUE);

-        status = SDL_PeepEvents(event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT);
+        SDL_LockMutex(_this->wakeup_lock);
+        {
+            status = SDL_PeepEvents(event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT);
+            /* If status == 0 we are going to block so wakeup will be needed. */
+            if (status == 0) {
+                _this->wakeup_window = wakeup_window;
+            } else {
+                _this->wakeup_window = NULL;
+            }
+        }
+        SDL_UnlockMutex(_this->wakeup_lock);
+
        if (status < 0) {
            /* Got an error: return */
            break;
@@ -1018,6 +1033,8 @@ static int SDL_WaitEventTimeout_Device(_THIS, SDL_Window *wakeup_window, SDL_Eve
        if (timeout > 0) {
            Uint32 elapsed = SDL_GetTicks() - start;
            if (elapsed >= (Uint32)timeout) {
+                /* Set wakeup_window to NULL without holding the lock. */
+                _this->wakeup_window = NULL;
                return 0;
            }
            loop_timeout = (int)((Uint32)timeout - elapsed);
@@ -1032,9 +1049,9 @@ static int SDL_WaitEventTimeout_Device(_THIS, SDL_Window *wakeup_window, SDL_Eve
            }
        }

-        SDL_AtomicSetPtr(&_this->wakeup_window, wakeup_window);
        status = _this->WaitEventTimeout(_this, loop_timeout);
-        SDL_AtomicSetPtr(&_this->wakeup_window, NULL);
+        /* Set wakeup_window to NULL without holding the lock. */
+        _this->wakeup_window = NULL;
        if (status == 0 && poll_interval != SDL_MAX_SINT16 && loop_timeout == poll_interval) {
            /* We may have woken up to poll. Try again */
            continue;
--- a/src/hidapi/SDL_hidapi.c
+++ b/src/hidapi/SDL_hidapi.c
@@ -630,9 +630,11 @@ static const SDL_UDEV_Symbols *udev_ctx = NULL;

 #ifdef SDL_JOYSTICK_HIDAPI_STEAMXBOX
 #define HAVE_DRIVER_BACKEND 1
+#else
+#define HAVE_DRIVER_BACKEND 0
 #endif

-#ifdef HAVE_DRIVER_BACKEND
+#if HAVE_DRIVER_BACKEND

 /* DRIVER HIDAPI Implementation */

@@ -903,7 +905,7 @@ IsInWhitelist(Uint16 vendor, Uint16 product)
    return SDL_FALSE;
 }

-#if defined(HAVE_PLATFORM_BACKEND) || defined(HAVE_DRIVER_BACKEND)
+#if defined(HAVE_PLATFORM_BACKEND) || HAVE_DRIVER_BACKEND
 #define use_libusb_whitelist_default  SDL_TRUE
 #else
 #define use_libusb_whitelist_default SDL_FALSE
@@ -949,7 +951,7 @@ static const struct hidapi_backend PLATFORM_Backend = {
 };
 #endif /* HAVE_PLATFORM_BACKEND */

-#ifdef HAVE_DRIVER_BACKEND
+#if HAVE_DRIVER_BACKEND
 static const struct hidapi_backend DRIVER_Backend = {
    (void *)DRIVER_hid_write,
    (void *)DRIVER_hid_read_timeout,
@@ -991,7 +993,7 @@ struct SDL_hid_device_
 };
 static char device_magic;

-#if defined(HAVE_PLATFORM_BACKEND) || defined(HAVE_DRIVER_BACKEND) || defined(HAVE_LIBUSB)
+#if defined(HAVE_PLATFORM_BACKEND) || HAVE_DRIVER_BACKEND || defined(HAVE_LIBUSB)

 static SDL_hid_device *CreateHIDDeviceWrapper(void *device, const struct hidapi_backend *backend)
 {
@@ -1017,7 +1019,7 @@ static void DeleteHIDDeviceWrapper(SDL_hid_device *device)
    }

 #ifndef SDL_HIDAPI_DISABLED
-#if defined(HAVE_PLATFORM_BACKEND) || defined(HAVE_DRIVER_BACKEND) || defined(HAVE_LIBUSB)
+#if defined(HAVE_PLATFORM_BACKEND) || HAVE_DRIVER_BACKEND || defined(HAVE_LIBUSB)

 #define COPY_IF_EXISTS(var)                \
    if (pSrc->var != NULL) {               \
@@ -1247,12 +1249,12 @@ Uint32 SDL_hid_device_change_count(void)

 struct SDL_hid_device_info *SDL_hid_enumerate(unsigned short vendor_id, unsigned short product_id)
 {
-#if defined(HAVE_PLATFORM_BACKEND) || defined(HAVE_DRIVER_BACKEND) || defined(HAVE_LIBUSB)
+#if defined(HAVE_PLATFORM_BACKEND) || HAVE_DRIVER_BACKEND || defined(HAVE_LIBUSB)
 #ifdef HAVE_LIBUSB
    struct SDL_hid_device_info *usb_devs = NULL;
    struct SDL_hid_device_info *usb_dev;
 #endif
-#ifdef HAVE_DRIVER_BACKEND
+#if HAVE_DRIVER_BACKEND
    struct SDL_hid_device_info *driver_devs = NULL;
    struct SDL_hid_device_info *driver_dev;
 #endif
@@ -1307,7 +1309,7 @@ struct SDL_hid_device_info *SDL_hid_enumerate(unsigned short vendor_id, unsigned
    }
 #endif /* HAVE_LIBUSB */

-#ifdef HAVE_DRIVER_BACKEND
+#if HAVE_DRIVER_BACKEND
    driver_devs = DRIVER_hid_enumerate(vendor_id, product_id);
    for (driver_dev = driver_devs; driver_dev; driver_dev = driver_dev->next) {
        new_dev = (struct SDL_hid_device_info *)SDL_malloc(sizeof(struct SDL_hid_device_info));
@@ -1345,7 +1347,7 @@ struct SDL_hid_device_info *SDL_hid_enumerate(unsigned short vendor_id, unsigned
                }
            }
 #endif
-#ifdef HAVE_DRIVER_BACKEND
+#if HAVE_DRIVER_BACKEND
            for (driver_dev = driver_devs; driver_dev; driver_dev = driver_dev->next) {
                if (raw_dev->vendor_id == driver_dev->vendor_id &&
                    raw_dev->product_id == driver_dev->product_id &&
@@ -1410,7 +1412,7 @@ void SDL_hid_free_enumeration(struct SDL_hid_device_info *devs)

 SDL_hid_device *SDL_hid_open(unsigned short vendor_id, unsigned short product_id, const wchar_t *serial_number)
 {
-#if defined(HAVE_PLATFORM_BACKEND) || defined(HAVE_DRIVER_BACKEND) || defined(HAVE_LIBUSB)
+#if defined(HAVE_PLATFORM_BACKEND) || HAVE_DRIVER_BACKEND || defined(HAVE_LIBUSB)
    void *pDevice = NULL;

    if (SDL_hidapi_refcount == 0 && SDL_hid_init() != 0) {
@@ -1426,7 +1428,7 @@ SDL_hid_device *SDL_hid_open(unsigned short vendor_id, unsigned short product_id
    }
 #endif /* HAVE_PLATFORM_BACKEND */

-#ifdef HAVE_DRIVER_BACKEND
+#if HAVE_DRIVER_BACKEND
    pDevice = DRIVER_hid_open(vendor_id, product_id, serial_number);
    if (pDevice != NULL) {
        return CreateHIDDeviceWrapper(pDevice, &DRIVER_Backend);
@@ -1449,7 +1451,7 @@ SDL_hid_device *SDL_hid_open(unsigned short vendor_id, unsigned short product_id

 SDL_hid_device *SDL_hid_open_path(const char *path, int bExclusive /* = false */)
 {
-#if defined(HAVE_PLATFORM_BACKEND) || defined(HAVE_DRIVER_BACKEND) || defined(HAVE_LIBUSB)
+#if defined(HAVE_PLATFORM_BACKEND) || HAVE_DRIVER_BACKEND || defined(HAVE_LIBUSB)
    void *pDevice = NULL;

    if (SDL_hidapi_refcount == 0 && SDL_hid_init() != 0) {
@@ -1465,7 +1467,7 @@ SDL_hid_device *SDL_hid_open_path(const char *path, int bExclusive /* = false */
    }
 #endif /* HAVE_PLATFORM_BACKEND */

-#ifdef HAVE_DRIVER_BACKEND
+#if HAVE_DRIVER_BACKEND
    pDevice = DRIVER_hid_open_path(path, bExclusive);
    if (pDevice != NULL) {
        return CreateHIDDeviceWrapper(pDevice, &DRIVER_Backend);
--- a/src/joystick/hidapi/SDL_hidapi_switch.c
+++ b/src/joystick/hidapi/SDL_hidapi_switch.c
@@ -62,7 +62,9 @@
 #define SWITCH_GYRO_SCALE  14.2842f
 #define SWITCH_ACCEL_SCALE 4096.f

+#define SWITCH_GYRO_SCALE_OFFSET  13371.0f
 #define SWITCH_GYRO_SCALE_MULT    936.0f
+#define SWITCH_ACCEL_SCALE_OFFSET 16384.0f
 #define SWITCH_ACCEL_SCALE_MULT   4.0f

 typedef enum
@@ -817,7 +819,7 @@ static SDL_bool LoadStickCalibration(SDL_DriverSwitch_Context *ctx)
    SwitchSPIOpData_t readFactoryParams;
    const int MAX_ATTEMPTS = 3;
    int attempt;
-
+    
    /* Read User Calibration Info */
    readUserParams.unAddress = k_unSPIStickUserCalibrationStartOffset;
    readUserParams.ucLength = k_unSPIStickUserCalibrationLength;
@@ -923,8 +925,6 @@ static SDL_bool LoadIMUCalibration(SDL_DriverSwitch_Context *ctx)
    if (WriteSubcommand(ctx, k_eSwitchSubcommandIDs_SPIFlashRead, (uint8_t *)&readParams, sizeof(readParams), &reply)) {
        Uint8 *pIMUScale;
        Sint16 sAccelRawX, sAccelRawY, sAccelRawZ, sGyroRawX, sGyroRawY, sGyroRawZ;
-        Sint16 sAccelSensCoeffX, sAccelSensCoeffY, sAccelSensCoeffZ;
-        Sint16 sGyroSensCoeffX, sGyroSensCoeffY, sGyroSensCoeffZ;

        /* IMU scale gives us multipliers for converting raw values to real world values */
        pIMUScale = reply->spiReadData.rgucReadData;
@@ -933,18 +933,10 @@ static SDL_bool LoadIMUCalibration(SDL_DriverSwitch_Context *ctx)
        sAccelRawY = (pIMUScale[3] << 8) | pIMUScale[2];
        sAccelRawZ = (pIMUScale[5] << 8) | pIMUScale[4];

-        sAccelSensCoeffX = (pIMUScale[7] << 8) | pIMUScale[6];
-        sAccelSensCoeffY = (pIMUScale[9] << 8) | pIMUScale[8];
-        sAccelSensCoeffZ = (pIMUScale[11] << 8) | pIMUScale[10];
-
        sGyroRawX = (pIMUScale[13] << 8) | pIMUScale[12];
        sGyroRawY = (pIMUScale[15] << 8) | pIMUScale[14];
        sGyroRawZ = (pIMUScale[17] << 8) | pIMUScale[16];

-        sGyroSensCoeffX = (pIMUScale[19] << 8) | pIMUScale[18];
-        sGyroSensCoeffY = (pIMUScale[21] << 8) | pIMUScale[20];
-        sGyroSensCoeffZ = (pIMUScale[23] << 8) | pIMUScale[22];
-
        /* Check for user calibration data. If it's present and set, it'll override the factory settings */
        readParams.unAddress = k_unSPIIMUUserScaleStartOffset;
        readParams.ucLength = k_unSPIIMUUserScaleLength;
@@ -961,14 +953,14 @@ static SDL_bool LoadIMUCalibration(SDL_DriverSwitch_Context *ctx)
        }

        /* Accelerometer scale */
-        ctx->m_IMUScaleData.fAccelScaleX = SWITCH_ACCEL_SCALE_MULT / ((float)sAccelSensCoeffX - (float)sAccelRawX) * SDL_STANDARD_GRAVITY;
-        ctx->m_IMUScaleData.fAccelScaleY = SWITCH_ACCEL_SCALE_MULT / ((float)sAccelSensCoeffY - (float)sAccelRawY) * SDL_STANDARD_GRAVITY;
-        ctx->m_IMUScaleData.fAccelScaleZ = SWITCH_ACCEL_SCALE_MULT / ((float)sAccelSensCoeffZ - (float)sAccelRawZ) * SDL_STANDARD_GRAVITY;
+        ctx->m_IMUScaleData.fAccelScaleX = SWITCH_ACCEL_SCALE_MULT / (SWITCH_ACCEL_SCALE_OFFSET - (float)sAccelRawX) * SDL_STANDARD_GRAVITY;
+        ctx->m_IMUScaleData.fAccelScaleY = SWITCH_ACCEL_SCALE_MULT / (SWITCH_ACCEL_SCALE_OFFSET - (float)sAccelRawY) * SDL_STANDARD_GRAVITY;
+        ctx->m_IMUScaleData.fAccelScaleZ = SWITCH_ACCEL_SCALE_MULT / (SWITCH_ACCEL_SCALE_OFFSET - (float)sAccelRawZ) * SDL_STANDARD_GRAVITY;

        /* Gyro scale */
-        ctx->m_IMUScaleData.fGyroScaleX = SWITCH_GYRO_SCALE_MULT / ((float)sGyroSensCoeffX - (float)sGyroRawX) * (float)M_PI / 180.0f;
-        ctx->m_IMUScaleData.fGyroScaleY = SWITCH_GYRO_SCALE_MULT / ((float)sGyroSensCoeffY - (float)sGyroRawY) * (float)M_PI / 180.0f;
-        ctx->m_IMUScaleData.fGyroScaleZ = SWITCH_GYRO_SCALE_MULT / ((float)sGyroSensCoeffZ - (float)sGyroRawZ) * (float)M_PI / 180.0f;
+        ctx->m_IMUScaleData.fGyroScaleX = SWITCH_GYRO_SCALE_MULT / (SWITCH_GYRO_SCALE_OFFSET - (float)sGyroRawX) * (float)M_PI / 180.0f;
+        ctx->m_IMUScaleData.fGyroScaleY = SWITCH_GYRO_SCALE_MULT / (SWITCH_GYRO_SCALE_OFFSET - (float)sGyroRawY) * (float)M_PI / 180.0f;
+        ctx->m_IMUScaleData.fGyroScaleZ = SWITCH_GYRO_SCALE_MULT / (SWITCH_GYRO_SCALE_OFFSET - (float)sGyroRawZ) * (float)M_PI / 180.0f;

    } else {
        /* Use default values */
@@ -990,17 +982,15 @@ static Sint16 ApplyStickCalibration(SDL_DriverSwitch_Context *ctx, int nStick, i
 {
    sRawValue -= ctx->m_StickCalData[nStick].axis[nAxis].sCenter;

-    if (sRawValue >= 0) {
-        if (sRawValue > ctx->m_StickExtents[nStick].axis[nAxis].sMax) {
-            ctx->m_StickExtents[nStick].axis[nAxis].sMax = sRawValue;
-        }
-        return (Sint16)HIDAPI_RemapVal(sRawValue, 0, ctx->m_StickExtents[nStick].axis[nAxis].sMax, 0, SDL_MAX_SINT16);
-    } else {
-        if (sRawValue < ctx->m_StickExtents[nStick].axis[nAxis].sMin) {
-            ctx->m_StickExtents[nStick].axis[nAxis].sMin = sRawValue;
-        }
-        return (Sint16)HIDAPI_RemapVal(sRawValue, ctx->m_StickExtents[nStick].axis[nAxis].sMin, 0, SDL_MIN_SINT16, 0);
+    if (sRawValue > ctx->m_StickExtents[nStick].axis[nAxis].sMax) {
+        ctx->m_StickExtents[nStick].axis[nAxis].sMax = sRawValue;
    }
+    if (sRawValue < ctx->m_StickExtents[nStick].axis[nAxis].sMin) {
+        ctx->m_StickExtents[nStick].axis[nAxis].sMin = sRawValue;
+    }
+
+    return (Sint16)HIDAPI_RemapVal(sRawValue, ctx->m_StickExtents[nStick].axis[nAxis].sMin, ctx->m_StickExtents[nStick].axis[nAxis].sMax,
+                                   SDL_MIN_SINT16, SDL_MAX_SINT16);
 }

 static Sint16 ApplySimpleStickCalibration(SDL_DriverSwitch_Context *ctx, int nStick, int nAxis, Sint16 sRawValue)
@@ -1010,17 +1000,15 @@ static Sint16 ApplySimpleStickCalibration(SDL_DriverSwitch_Context *ctx, int nSt

    sRawValue -= usJoystickCenter;

-    if (sRawValue >= 0) {
-        if (sRawValue > ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMax) {
-            ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMax = sRawValue;
-        }
-        return (Sint16)HIDAPI_RemapVal(sRawValue, 0, ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMax, 0, SDL_MAX_SINT16);
-    } else {
-        if (sRawValue < ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMin) {
-            ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMin = sRawValue;
-        }
-        return (Sint16)HIDAPI_RemapVal(sRawValue, ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMin, 0, SDL_MIN_SINT16, 0);
+    if (sRawValue > ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMax) {
+        ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMax = sRawValue;
    }
+    if (sRawValue < ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMin) {
+        ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMin = sRawValue;
+    }
+
+    return (Sint16)HIDAPI_RemapVal(sRawValue, ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMin, ctx->m_SimpleStickExtents[nStick].axis[nAxis].sMax,
+                                   SDL_MIN_SINT16, SDL_MAX_SINT16);
 }

 static void SDLCALL SDL_GameControllerButtonReportingHintChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
--- a/src/joystick/hidapi/SDL_hidapijoystick.c
+++ b/src/joystick/hidapi/SDL_hidapijoystick.c
@@ -822,12 +822,11 @@ SDL_bool HIDAPI_JoystickConnected(SDL_HIDAPI_Device *device, SDL_JoystickID *pJo

    ++SDL_HIDAPI_numjoysticks;

+    SDL_PrivateJoystickAdded(joystickID);
+
    if (pJoystickID) {
        *pJoystickID = joystickID;
    }
-
-    SDL_PrivateJoystickAdded(joystickID);
-
    return SDL_TRUE;
 }

--- a/src/main/windows/version.rc
+++ b/src/main/windows/version.rc
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,33,0,0
- PRODUCTVERSION 2,33,0,0
+ FILEVERSION 2,32,6,0
+ PRODUCTVERSION 2,32,6,0
 FILEFLAGSMASK 0x3fL
 FILEFLAGS 0x0L
 FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "\0"
            VALUE "FileDescription", "SDL\0"
-            VALUE "FileVersion", "2, 33, 0, 0\0"
+            VALUE "FileVersion", "2, 32, 6, 0\0"
            VALUE "InternalName", "SDL\0"
            VALUE "LegalCopyright", "Copyright (C) 2025 Sam Lantinga\0"
            VALUE "OriginalFilename", "SDL2.dll\0"
            VALUE "ProductName", "Simple DirectMedia Layer\0"
-            VALUE "ProductVersion", "2, 33, 0, 0\0"
+            VALUE "ProductVersion", "2, 32, 6, 0\0"
        END
    END
    BLOCK "VarFileInfo"
--- a/src/render/opengles2/SDL_render_gles2.c
+++ b/src/render/opengles2/SDL_render_gles2.c
@@ -2221,8 +2221,8 @@ SDL_RenderDriver GLES2_RenderDriver = {
    { "opengles2",
      (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_TARGETTEXTURE),
      4,
-      { SDL_PIXELFORMAT_RGBA32,
-        SDL_PIXELFORMAT_BGRA32,
+      { SDL_PIXELFORMAT_BGRA32,
+        SDL_PIXELFORMAT_ABGR32,
        SDL_PIXELFORMAT_BGRX32,
        SDL_PIXELFORMAT_RGBX32 },
      0,
--- a/src/render/ps2/SDL_render_ps2.c
+++ b/src/render/ps2/SDL_render_ps2.c
@@ -55,7 +55,7 @@ typedef struct
 static int vsync_sema_id = 0;

 /* PRIVATE METHODS */
-static int vsync_handler(int reason)
+static int vsync_handler(void)
 {
    iSignalSema(vsync_sema_id);

--- a/src/render/vitagxm/SDL_render_vita_gxm.c
+++ b/src/render/vitagxm/SDL_render_vita_gxm.c
@@ -826,35 +826,6 @@ static int VITA_GXM_RenderClear(SDL_Renderer *renderer, SDL_RenderCommand *cmd)
    return 0;
 }

-static void ClampCliprectToViewport(SDL_Rect *clip, const SDL_Rect *viewport)
-{
-    int max_x_v, max_y_v, max_x_c, max_y_c;
-
-    if (clip->x < 0) {
-        clip->w += clip->x;
-        clip->x = 0;
-    }
-
-    if (clip->y < 0) {
-        clip->h += clip->y;
-        clip->y = 0;
-    }
-
-    max_x_c = clip->x + clip->w;
-    max_y_c = clip->y + clip->h;
-
-    max_x_v = viewport->x + viewport->w;
-    max_y_v = viewport->y + viewport->h;
-
-    if (max_x_c > max_x_v) {
-        clip->w -= (max_x_v - max_x_c);
-    }
-
-    if (max_y_c > max_y_v) {
-        clip->h -= (max_y_v - max_y_c);
-    }
-}
-
 static int SetDrawState(VITA_GXM_RenderData *data, const SDL_RenderCommand *cmd)
 {
    SDL_Texture *texture = cmd->data.draw.texture;
@@ -897,13 +868,9 @@ static int SetDrawState(VITA_GXM_RenderData *data, const SDL_RenderCommand *cmd)
        data->drawstate.cliprect_enabled_dirty = SDL_FALSE;
    }

-    if ((data->drawstate.cliprect_enabled || data->drawstate.viewport_is_set) && data->drawstate.cliprect_dirty) {
-        SDL_Rect rect;
-        SDL_copyp(&rect, &data->drawstate.cliprect);
-        if (data->drawstate.viewport_is_set) {
-            ClampCliprectToViewport(&rect, &data->drawstate.viewport);
-        }
-        set_clip_rectangle(data, rect.x, rect.y, rect.x + rect.w, rect.y + rect.h);
+    if (data->drawstate.cliprect_enabled && data->drawstate.cliprect_dirty) {
+        const SDL_Rect *rect = &data->drawstate.cliprect;
+        set_clip_rectangle(data, rect->x, rect->y, rect->x + rect->w, rect->y + rect->h);
        data->drawstate.cliprect_dirty = SDL_FALSE;
    }

@@ -958,27 +925,20 @@ static int SetDrawState(VITA_GXM_RenderData *data, const SDL_RenderCommand *cmd)
 static int VITA_GXM_RunCommandQueue(SDL_Renderer *renderer, SDL_RenderCommand *cmd, void *vertices, size_t vertsize)
 {
    VITA_GXM_RenderData *data = (VITA_GXM_RenderData *)renderer->driverdata;
-    int w, h;
-
    StartDrawing(renderer);

    data->drawstate.target = renderer->target;
    if (!data->drawstate.target) {
+        int w, h;
        SDL_GL_GetDrawableSize(renderer->window, &w, &h);
-    } else {
-        if (SDL_QueryTexture(renderer->target, NULL, NULL, &w, &h) < 0) {
-            w = data->drawstate.drawablew;
-            h = data->drawstate.drawableh;
+        if ((w != data->drawstate.drawablew) || (h != data->drawstate.drawableh)) {
+            data->drawstate.viewport_dirty = SDL_TRUE; // if the window dimensions changed, invalidate the current viewport, etc.
+            data->drawstate.cliprect_dirty = SDL_TRUE;
+            data->drawstate.drawablew = w;
+            data->drawstate.drawableh = h;
        }
    }

-    if ((w != data->drawstate.drawablew) || (h != data->drawstate.drawableh)) {
-        data->drawstate.viewport_dirty = SDL_TRUE; // if the window dimensions changed, invalidate the current viewport, etc.
-        data->drawstate.cliprect_dirty = SDL_TRUE;
-        data->drawstate.drawablew = w;
-        data->drawstate.drawableh = h;
-    }
-
    while (cmd) {
        switch (cmd->command) {

@@ -989,16 +949,6 @@ static int VITA_GXM_RunCommandQueue(SDL_Renderer *renderer, SDL_RenderCommand *c
                SDL_copyp(viewport, &cmd->data.viewport.rect);
                data->drawstate.viewport_dirty = SDL_TRUE;
                data->drawstate.cliprect_dirty = SDL_TRUE;
-                data->drawstate.viewport_is_set = viewport->x != 0 || viewport->y != 0 || viewport->w != data->drawstate.drawablew || viewport->h != data->drawstate.drawableh;
-                if (!data->drawstate.cliprect_enabled) {
-                    if (data->drawstate.viewport_is_set) {
-                        SDL_copyp(&data->drawstate.cliprect, viewport);
-                        data->drawstate.cliprect.x = 0;
-                        data->drawstate.cliprect.y = 0;
-                    } else {
-                        data->drawstate.cliprect_enabled_dirty = SDL_TRUE;
-                    }
-                }
            }
            break;
        }
@@ -1006,15 +956,9 @@ static int VITA_GXM_RunCommandQueue(SDL_Renderer *renderer, SDL_RenderCommand *c
        case SDL_RENDERCMD_SETCLIPRECT:
        {
            const SDL_Rect *rect = &cmd->data.cliprect.rect;
-            const SDL_Rect *viewport = &data->drawstate.viewport;
            if (data->drawstate.cliprect_enabled != cmd->data.cliprect.enabled) {
                data->drawstate.cliprect_enabled = cmd->data.cliprect.enabled;
                data->drawstate.cliprect_enabled_dirty = SDL_TRUE;
-                if (!data->drawstate.cliprect_enabled && data->drawstate.viewport_is_set) {
-                    SDL_copyp(&data->drawstate.cliprect, viewport);
-                    data->drawstate.cliprect.x = 0;
-                    data->drawstate.cliprect.y = 0;
-                }
            }

            if (SDL_memcmp(&data->drawstate.cliprect, rect, sizeof(*rect)) != 0) {
--- a/src/render/vitagxm/SDL_render_vita_gxm_types.h
+++ b/src/render/vitagxm/SDL_render_vita_gxm_types.h
@@ -106,7 +106,6 @@ typedef struct
 {
    SDL_Rect viewport;
    SDL_bool viewport_dirty;
-    SDL_bool viewport_is_set;
    SDL_Texture *texture;
    SDL_Texture *target;
    SDL_Color color;
--- a/src/thread/psp/SDL_systhread.c
+++ b/src/thread/psp/SDL_systhread.c
@@ -34,8 +34,6 @@
 #include <pspkerneltypes.h>
 #include <pspthreadman.h>

-#define PSP_THREAD_NAME_MAX 32
-
 static int ThreadEntry(SceSize args, void *argp)
 {
    SDL_RunThread(*(SDL_Thread **)argp);
@@ -46,7 +44,6 @@ int SDL_SYS_CreateThread(SDL_Thread *thread)
 {
    SceKernelThreadInfo status;
    int priority = 32;
-    char thread_name[PSP_THREAD_NAME_MAX];

    /* Set priority of new thread to the same as the current thread */
    status.size = sizeof(SceKernelThreadInfo);
@@ -54,12 +51,7 @@ int SDL_SYS_CreateThread(SDL_Thread *thread)
        priority = status.currentPriority;
    }

-    SDL_strlcpy(thread_name, "SDL thread", PSP_THREAD_NAME_MAX);
-    if (thread->name) {
-        SDL_strlcpy(thread_name, thread->name, PSP_THREAD_NAME_MAX);
-    }
-
-    thread->handle = sceKernelCreateThread(thread_name, ThreadEntry,
+    thread->handle = sceKernelCreateThread(thread->name, ThreadEntry,
                                           priority, thread->stacksize ? ((int)thread->stacksize) : 0x8000,
                                           PSP_THREAD_ATTR_VFPU, NULL);
    if (thread->handle < 0) {
--- a/src/video/SDL_sysvideo.h
+++ b/src/video/SDL_sysvideo.h
@@ -355,7 +355,8 @@ struct SDL_VideoDevice
    SDL_bool checked_texture_framebuffer;
    SDL_bool is_dummy;
    SDL_bool suspend_screensaver;
-    void *wakeup_window;
+    SDL_Window *wakeup_window;
+    SDL_mutex *wakeup_lock; /* Initialized only if WaitEventTimeout/SendWakeupEvent are supported */
    int num_displays;
    SDL_VideoDisplay *displays;
    SDL_Window *windows;
@@ -399,7 +400,6 @@ struct SDL_VideoDevice
        int no_error;
        int retained_backing;
        int driver_loaded;
-        int HAS_GL_ARB_color_buffer_float;
        char driver_path[256];
        void *dll_handle;
    } gl_config;
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -70,10 +70,6 @@
 #include <dlfcn.h>
 #endif

-#ifndef GL_RGBA_FLOAT_MODE_ARB
-#define GL_RGBA_FLOAT_MODE_ARB 0x8820
-#endif /* GL_RGBA_FLOAT_MODE_ARB */
-
 /* Available video drivers */
 static VideoBootStrap *bootstrap[] = {
 #ifdef SDL_VIDEO_DRIVER_COCOA
@@ -3372,7 +3368,9 @@ void SDL_DestroyWindow(SDL_Window *window)
        _this->current_glwin = NULL;
    }

-    SDL_AtomicCASPtr(&_this->wakeup_window, window, NULL);
+    if (_this->wakeup_window == window) {
+        _this->wakeup_window = NULL;
+    }

    /* Now invalidate magic */
    window->magic = NULL;
@@ -4040,15 +4038,6 @@ int SDL_GL_GetAttribute(SDL_GLattr attr, int *value)
            *value = _this->gl_config.no_error;
            return 0;
        }
-    case SDL_GL_FLOATBUFFERS:
-    {
-        if (_this->gl_config.HAS_GL_ARB_color_buffer_float) {
-            attrib = GL_RGBA_FLOAT_MODE_ARB;
-            break;
-        } else {
-            return 0;
-        }
-    }
    default:
        return SDL_SetError("Unknown OpenGL attribute");
    }
--- a/src/video/cocoa/SDL_cocoaevents.m
+++ b/src/video/cocoa/SDL_cocoaevents.m
@@ -287,19 +287,9 @@ static void Cocoa_DispatchEvent(NSEvent *theEvent)
    /* The menu bar of SDL apps which don't have the typical .app bundle
     * structure fails to work the first time a window is created (until it's
     * de-focused and re-focused), if this call is in Cocoa_RegisterApp instead
-     * of here. https://github.com/libsdl-org/SDL/issues/1913
+     * of here. https://bugzilla.libsdl.org/show_bug.cgi?id=3051
     */
-
-    /* this apparently became unnecessary on macOS 14.0, and will addition pop up a
-       hidden dock if you're moving the mouse during launch, so change the default
-       behaviour there.  https://github.com/libsdl-org/SDL/issues/10340
-       (13.6 still needs it, presumably 13.7 does, too.) */
-    SDL_bool background_app_default = SDL_FALSE;
-    if (@available(macOS 14.0, *)) {
-        background_app_default = SDL_TRUE;  /* by default, don't explicitly activate the dock and then us again to force to foreground */
-    }
-
-    if (!SDL_GetHintBoolean(SDL_HINT_MAC_BACKGROUND_APP, background_app_default)) {
+    if (!SDL_GetHintBoolean(SDL_HINT_MAC_BACKGROUND_APP, SDL_FALSE)) {
        /* Get more aggressive for Catalina: activate the Dock first so we definitely reset all activation state. */
        for (NSRunningApplication *i in [NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.apple.dock"]) {
            [i activateWithOptions:NSApplicationActivateIgnoringOtherApps];
--- a/src/video/cocoa/SDL_cocoavideo.m
+++ b/src/video/cocoa/SDL_cocoavideo.m
@@ -48,6 +48,9 @@ static void Cocoa_VideoQuit(_THIS);
 static void Cocoa_DeleteDevice(SDL_VideoDevice * device)
 { @autoreleasepool
 {
+    if (device->wakeup_lock) {
+        SDL_DestroyMutex(device->wakeup_lock);
+    }
    CFBridgingRelease(device->driverdata);
    SDL_free(device);
 }}
@@ -73,6 +76,7 @@ static SDL_VideoDevice *Cocoa_CreateDevice(void)
        return NULL;
    }
    device->driverdata = (void *)CFBridgingRetain(data);
+    device->wakeup_lock = SDL_CreateMutex();

    /* Set the function pointers */
    device->VideoInit = Cocoa_VideoInit;
--- a/src/video/cocoa/SDL_cocoawindow.m
+++ b/src/video/cocoa/SDL_cocoawindow.m
@@ -855,11 +855,6 @@ static NSCursor *Cocoa_GetDesiredCursor(void)
    SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MOVED, x, y);
    SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, w, h);

-    /* The OS can resize the window automatically if the display density
-       changes while the window is miniaturized or hidden */
-    if (![nswindow isVisible])
-        return;
-
    /* isZoomed always returns true if the window is not resizable */
    if ((window->flags & SDL_WINDOW_RESIZABLE) && [nswindow isZoomed]) {
        zoomed = YES;
--- a/src/video/emscripten/SDL_emscriptenframebuffer.c
+++ b/src/video/emscripten/SDL_emscriptenframebuffer.c
@@ -79,7 +79,7 @@ int Emscripten_UpdateWindowFramebuffer(_THIS, SDL_Window *window, const SDL_Rect
        if (!Module['SDL2']) Module['SDL2'] = {};
        var SDL2 = Module['SDL2'];
        if (SDL2.ctxCanvas !== Module['canvas']) {
-            SDL2.ctx = Browser.createContext(Module['canvas'], false, true);
+            SDL2.ctx = Module['createContext'](Module['canvas'], false, true);
            SDL2.ctxCanvas = Module['canvas'];
        }
        if (SDL2.w !== w || SDL2.h !== h || SDL2.imageCtx !== SDL2.ctx) {
--- a/src/video/wayland/SDL_waylanddatamanager.c
+++ b/src/video/wayland/SDL_waylanddatamanager.c
@@ -40,48 +40,6 @@
 */
 #define PIPE_MS_TIMEOUT 14

-/* sigtimedwait() is an optional part of POSIX.1-2001, and OpenBSD doesn't implement it.
- * Based on https://comp.unix.programmer.narkive.com/rEDH0sPT/sigtimedwait-implementation
- */
-#ifndef HAVE_SIGTIMEDWAIT
-#include <errno.h>
-#include <time.h>
-static int sigtimedwait(const sigset_t *set, siginfo_t *info, const struct timespec *timeout)
-{
-    struct timespec elapsed = { 0 }, rem = { 0 };
-    sigset_t pending;
-    int signo;
-    do {
-        /* Check the pending signals, and call sigwait if there is at least one of interest in the set. */
-        sigpending(&pending);
-        for (signo = 1; signo < NSIG; ++signo) {
-            if (sigismember(set, signo) && sigismember(&pending, signo)) {
-                if (!sigwait(set, &signo)) {
-                    if (info) {
-                        SDL_memset(info, 0, sizeof *info);
-                        info->si_signo = signo;
-                    }
-                    return signo;
-                } else {
-                    return -1;
-                }
-            }
-        }
-
-        if (timeout->tv_sec || timeout->tv_nsec) {
-            long ns = 20000000L; // 2/100ths of a second
-            nanosleep(&(struct timespec){ 0, ns }, &rem);
-            ns -= rem.tv_nsec;
-            elapsed.tv_sec += (elapsed.tv_nsec + ns) / 1000000000L;
-            elapsed.tv_nsec = (elapsed.tv_nsec + ns) % 1000000000L;
-        }
-    } while (elapsed.tv_sec < timeout->tv_sec || (elapsed.tv_sec == timeout->tv_sec && elapsed.tv_nsec < timeout->tv_nsec));
-
-    errno = EAGAIN;
-    return -1;
-}
-#endif
-
 static ssize_t write_pipe(int fd, const void *buffer, size_t total_length, size_t *pos)
 {
    int ready = 0;
@@ -117,7 +75,7 @@ static ssize_t write_pipe(int fd, const void *buffer, size_t total_length, size_
        }
    }

-    sigtimedwait(&sig_set, NULL, &zerotime);
+    sigtimedwait(&sig_set, 0, &zerotime);

 #ifdef SDL_THREADS_DISABLED
    sigprocmask(SIG_SETMASK, &old_sig_set, NULL);
--- a/src/video/wayland/SDL_waylandvideo.c
+++ b/src/video/wayland/SDL_waylandvideo.c
@@ -162,6 +162,9 @@ static void Wayland_DeleteDevice(SDL_VideoDevice *device)
        WAYLAND_wl_display_flush(data->display);
        WAYLAND_wl_display_disconnect(data->display);
    }
+    if (device->wakeup_lock) {
+        SDL_DestroyMutex(device->wakeup_lock);
+    }
    SDL_free(data);
    SDL_free(device);
    SDL_WAYLAND_UnloadSymbols();
@@ -230,6 +233,7 @@ static SDL_VideoDevice *Wayland_CreateDevice(void)
    }

    device->driverdata = data;
+    device->wakeup_lock = SDL_CreateMutex();

    /* Set the function pointers */
    device->VideoInit = Wayland_VideoInit;
--- a/src/video/windows/SDL_windowsopengl.c
+++ b/src/video/windows/SDL_windowsopengl.c
@@ -511,10 +511,6 @@ void WIN_GL_InitExtensions(_THIS)
        _this->gl_data->HAS_WGL_ARB_create_context_no_error = SDL_TRUE;
    }

-    /* Check for WGL_ARB_pixel_format_float */
-    _this->gl_data->HAS_WGL_ARB_pixel_format_float =
-        HasExtension("WGL_ARB_pixel_format_float", extensions);
-
    _this->gl_data->wglMakeCurrent(hdc, NULL);
    _this->gl_data->wglDeleteContext(hglrc);
    ReleaseDC(hwnd, hdc);
@@ -645,7 +641,7 @@ static int WIN_GL_SetupWindowInternal(_THIS, SDL_Window *window)
        *iAttr++ = _this->gl_config.multisamplesamples;
    }

-    if (_this->gl_data->HAS_WGL_ARB_pixel_format_float && _this->gl_config.floatbuffers) {
+    if (_this->gl_config.floatbuffers) {
        *iAttr++ = WGL_PIXEL_TYPE_ARB;
        *iAttr++ = WGL_TYPE_RGBA_FLOAT_ARB;
    }
@@ -829,9 +825,6 @@ SDL_GLContext WIN_GL_CreateContext(_THIS, SDL_Window *window)
        return NULL;
    }

-    _this->gl_config.HAS_GL_ARB_color_buffer_float =
-        SDL_GL_ExtensionSupported("GL_ARB_color_buffer_float");
-
    return context;
 }

--- a/src/video/windows/SDL_windowsopengl.h
+++ b/src/video/windows/SDL_windowsopengl.h
@@ -64,7 +64,6 @@ struct SDL_GLDriverData
    SDL_bool HAS_WGL_ARB_context_flush_control;
    SDL_bool HAS_WGL_ARB_create_context_robustness;
    SDL_bool HAS_WGL_ARB_create_context_no_error;
-    SDL_bool HAS_WGL_ARB_pixel_format_float;

    /* Max version of OpenGL ES context that can be created if the
       implementation supports WGL_EXT_create_context_es2_profile.
--- a/src/video/windows/SDL_windowsvideo.c
+++ b/src/video/windows/SDL_windowsvideo.c
@@ -93,6 +93,9 @@ static void WIN_DeleteDevice(SDL_VideoDevice *device)
        SDL_UnloadObject(data->shcoreDLL);
    }
 #endif
+    if (device->wakeup_lock) {
+        SDL_DestroyMutex(device->wakeup_lock);
+    }
    SDL_free(device->driverdata);
    SDL_free(device);
 }
@@ -117,6 +120,7 @@ static SDL_VideoDevice *WIN_CreateDevice(void)
        return NULL;
    }
    device->driverdata = data;
+    device->wakeup_lock = SDL_CreateMutex();

 #if !defined(__XBOXONE__) && !defined(__XBOXSERIES__)
    data->userDLL = SDL_LoadObject("USER32.DLL");
--- a/src/video/x11/SDL_x11video.c
+++ b/src/video/x11/SDL_x11video.c
@@ -108,6 +108,9 @@ static void X11_DeleteDevice(SDL_VideoDevice *device)
        X11_XCloseDisplay(data->request_display);
    }
    SDL_free(data->windowlist);
+    if (device->wakeup_lock) {
+        SDL_DestroyMutex(device->wakeup_lock);
+    }
    SDL_free(device->driverdata);
    SDL_free(device);

@@ -201,6 +204,8 @@ static SDL_VideoDevice *X11_CreateDevice(void)
        return NULL;
    }

+    device->wakeup_lock = SDL_CreateMutex();
+
 #ifdef X11_DEBUG
    X11_XSynchronize(data->display, True);
 #endif
--- a/test/testautomation_audio.c
+++ b/test/testautomation_audio.c
@@ -67,9 +67,6 @@ static SDL_bool DriverIsProblematic(const char *driver)
         */
        "dsp",

-        /* Jack isn't always configured properly on end user systems */
-        "jack",
-
        /* OpenBSD sound API. Can be used on Linux, but very rare. */
        "sndio",

--- a/test/testautomation_hints.c
+++ b/test/testautomation_hints.c
@@ -88,19 +88,9 @@ int hints_getHint(void *arg)
    return TEST_COMPLETED;
 }

-typedef struct {
-    char *name;
-    char *value;
-    char *oldValue;
-} HintCallbackContext;
-
 static void SDLCALL hints_testHintChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
 {
-    HintCallbackContext *context = userdata;
-
-    context->name = name ? SDL_strdup(name) : NULL;
-    context->value = hint ? SDL_strdup(hint) : NULL;
-    context->oldValue = oldValue ? SDL_strdup(oldValue) : NULL;
+    *(char **)userdata = hint ? SDL_strdup(hint) : NULL;
 }

 /**
@@ -112,7 +102,7 @@ int hints_setHint(void *arg)
    const char *originalValue;
    char *value;
    const char *testValue;
-    HintCallbackContext callback_data;
+    char *callbackValue;
    SDL_bool result;
    int i, j;

@@ -162,10 +152,8 @@ int hints_setHint(void *arg)
    SDLTest_AssertPass("Call to SDL_GetHint() after saving and restoring hint");
    originalValue = SDL_GetHint(testHint);
    value = (originalValue == NULL) ? NULL : SDL_strdup(originalValue);
-    result = SDL_SetHint(testHint, "temp");
-    SDLTest_AssertCheck(!result, "SDL_SetHint(\"%s\", \"temp\") should return false", testHint);
-    result = SDL_SetHint(testHint, value);
-    SDLTest_AssertCheck(!result, "SDL_SetHint(\"%s\", \"%s\" should return false", testHint, value);
+    SDL_SetHint(testHint, "temp");
+    SDL_SetHint(testHint, value);
    SDL_free(value);
    testValue = SDL_GetHint(testHint);
    SDLTest_AssertCheck(
@@ -174,26 +162,15 @@ int hints_setHint(void *arg)
        testValue);

    SDLTest_AssertPass("Call to SDL_SetHintWithPriority(NULL, SDL_HINT_DEFAULT)");
-    result = SDL_SetHintWithPriority(testHint, NULL, SDL_HINT_DEFAULT);
-    SDLTest_AssertCheck(!result, "SDL_SetHintWithPriority(\"%s\", NULL, SDL_HINT_DEFAULT) should return false", testHint);
+    SDL_SetHintWithPriority(testHint, NULL, SDL_HINT_DEFAULT);
    testValue = SDL_GetHint(testHint);
    SDLTest_AssertCheck(
        testValue && SDL_strcmp(testValue, "original") == 0,
        "testValue = %s, expected \"original\"",
        testValue);

-    SDLTest_AssertPass("Call to SDL_SetHint(\"\", \"data\")");
-    result = SDL_SetHint("", "data");
-    SDLTest_AssertCheck(result, "SDL_SetHint(\"\", \"data\") should return true");
-    testValue = SDL_GetHint("");
-    SDLTest_AssertCheck(
-        testValue && SDL_strcmp(testValue, "data") == 0,
-        "testValue = %s, expected \"data\"",
-        testValue);
-
    SDLTest_AssertPass("Call to SDL_SetHintWithPriority(\"temp\", SDL_HINT_OVERRIDE)");
-    result = SDL_SetHintWithPriority(testHint, "temp", SDL_HINT_OVERRIDE);
-    SDLTest_AssertCheck(result, "SDL_SetHintWithPriority(\"%s\", \"temp\", SDL_HINT_OVERRIDE) should return true", testHint);
+    SDL_SetHintWithPriority(testHint, "temp", SDL_HINT_OVERRIDE);
    testValue = SDL_GetHint(testHint);
    SDLTest_AssertCheck(
        testValue && SDL_strcmp(testValue, "temp") == 0,
@@ -201,8 +178,7 @@ int hints_setHint(void *arg)
        testValue);

    SDLTest_AssertPass("Call to SDL_SetHintWithPriority(NULL, SDL_HINT_OVERRIDE)");
-    result = SDL_SetHintWithPriority(testHint, NULL, SDL_HINT_OVERRIDE);
-    SDLTest_AssertCheck(result, "SDL_SetHintWithPriority(\"%s\", NULL, SDL_HINT_OVERRIDE) should return true", testHint);
+    SDL_SetHintWithPriority(testHint, NULL, SDL_HINT_OVERRIDE);
    testValue = SDL_GetHint(testHint);
    SDLTest_AssertCheck(
        testValue == NULL,
@@ -218,75 +194,49 @@ int hints_setHint(void *arg)
        testValue);

    /* Make sure callback functionality works past a reset */
-    SDL_zero(callback_data);
    SDLTest_AssertPass("Call to SDL_AddHintCallback()");
-    SDL_AddHintCallback(testHint, hints_testHintChanged, &callback_data);
+    callbackValue = NULL;
+    SDL_AddHintCallback(testHint, hints_testHintChanged, &callbackValue);
    SDLTest_AssertCheck(
-        callback_data.name && SDL_strcmp(callback_data.name, testHint) == 0,
-        "callback_data.name = \"%s\", expected \"%s\"",
-        callback_data.name, testHint);
+        callbackValue && SDL_strcmp(callbackValue, "original") == 0,
+        "callbackValue = %s, expected \"original\"",
+        callbackValue);
+    SDL_free(callbackValue);
+
+    SDLTest_AssertPass("Call to SDL_SetHintWithPriority(\"temp\", SDL_HINT_OVERRIDE), using callback");
+    callbackValue = NULL;
+    SDL_SetHintWithPriority(testHint, "temp", SDL_HINT_OVERRIDE);
    SDLTest_AssertCheck(
-        callback_data.value && SDL_strcmp(callback_data.value, "original") == 0,
-        "callback_data.value = \"%s\", expected \"%s\"",
-        callback_data.value, "original");
-    SDL_free(callback_data.name);
-    SDL_free(callback_data.value);
-    SDL_free(callback_data.oldValue);
+        callbackValue && SDL_strcmp(callbackValue, "temp") == 0,
+        "callbackValue = %s, expected \"temp\"",
+        callbackValue);
+    SDL_free(callbackValue);

    SDLTest_AssertPass("Call to SDL_ResetHint(), using callback");
-    SDL_zero(callback_data);
+    callbackValue = NULL;
    SDL_ResetHint(testHint);
    SDLTest_AssertCheck(
-        callback_data.value && SDL_strcmp(callback_data.value, "original") == 0,
+        callbackValue && SDL_strcmp(callbackValue, "original") == 0,
        "callbackValue = %s, expected \"original\"",
-        callback_data.value);
-    SDL_free(callback_data.name);
-    SDL_free(callback_data.value);
-    SDL_free(callback_data.oldValue);
+        callbackValue);

    SDLTest_AssertPass("Call to SDL_SetHintWithPriority(\"temp\", SDL_HINT_OVERRIDE), using callback after reset");
-    SDL_zero(callback_data);
-    result = SDL_SetHintWithPriority(testHint, "temp", SDL_HINT_OVERRIDE);
-    SDLTest_AssertCheck(result, "SDL_SetHintWithPriority(\"%s\", \"temp\", SDL_HINT_OVERRIDE) should return true", testHint);
+    callbackValue = NULL;
+    SDL_SetHintWithPriority(testHint, "temp", SDL_HINT_OVERRIDE);
    SDLTest_AssertCheck(
-        callback_data.value && SDL_strcmp(callback_data.value, "temp") == 0,
+        callbackValue && SDL_strcmp(callbackValue, "temp") == 0,
        "callbackValue = %s, expected \"temp\"",
-        callback_data.value);
-    SDL_free(callback_data.name);
-    SDL_free(callback_data.value);
-    SDL_free(callback_data.oldValue);
+        callbackValue);
+    SDL_free(callbackValue);

    SDLTest_AssertPass("Call to SDL_ResetHint(), after clearing callback");
-    SDL_zero(callback_data);
-    SDL_DelHintCallback(testHint, hints_testHintChanged, &callback_data);
+    callbackValue = NULL;
+    SDL_DelHintCallback(testHint, hints_testHintChanged, &callbackValue);
    SDL_ResetHint(testHint);
    SDLTest_AssertCheck(
-        !callback_data.value,
+        callbackValue == NULL,
        "callbackValue = %s, expected \"(null)\"",
-        callback_data.value);
-    SDL_free(callback_data.name);
-    SDL_free(callback_data.value);
-    SDL_free(callback_data.oldValue);
-
-    /* Make sure callback functionality work with hint renamed in sdl3 */
-    SDLTest_AssertPass("Call to SDL_AddHintCallback()");
-    SDL_AddHintCallback(SDL_HINT_ALLOW_TOPMOST, hints_testHintChanged, &callback_data);
-    SDLTest_AssertPass("Call to SDL_SetHintWithPriority(\"temp\", SDL_HINT_OVERRIDE), using callback");
-    SDL_zero(callback_data);
-    result = SDL_SetHintWithPriority(SDL_HINT_ALLOW_TOPMOST, "temp", SDL_HINT_OVERRIDE);
-    SDLTest_AssertCheck(result, "SDL_SetHintWithPriority(\"%s\", \"temp\", SDL_HINT_OVERRIDE) should return true", testHint);
-    SDLTest_AssertCheck(
-        callback_data.name && SDL_strcmp(callback_data.name, SDL_HINT_ALLOW_TOPMOST) == 0,
-        "callback_data.name = \"%s\", expected \"%s\"",
-        callback_data.name, SDL_HINT_ALLOW_TOPMOST);
-    SDLTest_AssertCheck(
-        callback_data.value && SDL_strcmp(callback_data.value, "temp") == 0,
-        "callback_data.value = \"%s\", expected \"%s\"",
-        callback_data.value, "temp");
-    SDL_free(callback_data.name);
-    SDL_free(callback_data.value);
-    SDL_free(callback_data.oldValue);
-    SDL_ResetHint(testHint);
+        callbackValue);

    return TEST_COMPLETED;
 }
--- a/test/testautomation_rect.c
+++ b/test/testautomation_rect.c
@@ -12,38 +12,6 @@

 /* Helper functions */

-/* !
- * \brief Private helper to check SDL_FRect equality
- */
-static SDL_bool IsFRectEqual(const SDL_FRect *r1, const SDL_FRect *r2) {
-    static const float MAX_DELTA = 1e-5f;
-    SDL_FRect delta;
-    delta.x = r1->x - r2->x;
-    delta.y = r1->y - r2->y;
-    delta.w = r1->w - r2->w;
-    delta.h = r1->h - r2->h;
-
-    return -MAX_DELTA <= delta.x && delta.x <= MAX_DELTA
-        && -MAX_DELTA <= delta.y && delta.y <= MAX_DELTA
-        && -MAX_DELTA <= delta.w && delta.w <= MAX_DELTA
-        && -MAX_DELTA <= delta.w && delta.h <= MAX_DELTA;
-}
-
-/* !
- * \brief Private helper to check SDL_FPoint equality
- */
-static SDL_bool IsFPointEqual(const SDL_FPoint *p1, const SDL_FPoint *p2) {
-    static const float MAX_DELTA = 1e-5f;
-    SDL_FPoint delta;
-    delta.x = p1->x - p2->x;
-    delta.y = p1->y - p2->y;
-
-    return -MAX_DELTA <= delta.x && delta.x <= MAX_DELTA
-        && -MAX_DELTA <= delta.y && delta.y <= MAX_DELTA;
-}
-
-/* Helper functions */
-
 /* !
 * \brief Private helper to check SDL_IntersectRectAndLine results
 */
@@ -1730,226 +1698,6 @@ int rect_testFRectEqualsParam(void *arg)
    return TEST_COMPLETED;
 }

-/* !
- * \brief Test SDL_HasIntersectionF
- *
- * \sa
- * http://wiki.libsdl.org/SDL2/SDL_HasIntersectionF
- */
-int rect_testHasIntersectionF(void *arg)
-{
-    const struct {
-        SDL_FRect r1;
-        SDL_FRect r2;
-        SDL_bool expected;
-    } cases[] = {
-        { { 0, 0, 0, 0 },      {0, 0, 0, 0},            SDL_FALSE },
-        { { 0, 0, -200, 200 }, {0, 0, -200, 200},       SDL_FALSE },
-        { { 0, 0, 10, 10 },    {-5, 5, 10, 2},          SDL_TRUE },
-        { { 0, 0, 10, 10 },    {-5, -5, 10, 2},         SDL_FALSE },
-        { { 0, 0, 10, 10 },    {-5, -5, 2, 10},         SDL_FALSE },
-        { { 0, 0, 10, 10 },    {-5, -5, 5, 5},          SDL_FALSE },
-        { { 0, 0, 10, 10 },    {-5, -5, 5.1f, 5.1f},    SDL_TRUE },
-        { { 0, 0, 10, 10 },    {-4.99f, -4.99f, 5, 5},  SDL_TRUE },
-    };
-    size_t i;
-
-    for (i = 0; i < SDL_arraysize(cases); i++) {
-        SDL_bool result;
-        SDLTest_AssertPass("About to call SDL_HasIntersectionF(&{ %g, %g, %g, %g }, &{ %g, %g, %g, %g })",
-            cases[i].r1.x, cases[i].r1.y, cases[i].r1.w, cases[i].r1.h,
-            cases[i].r2.x, cases[i].r2.y, cases[i].r2.w, cases[i].r2.h
-        );
-        result = SDL_HasIntersectionF(&cases[i].r1, &cases[i].r2);
-        SDLTest_AssertCheck(result == cases[i].expected, "Got %d, expected %d", result, cases[i].expected);
-    }
-    return TEST_COMPLETED;
-}
-
-/* !
- * \brief Test SDL_IntersectFRect
- *
- * \sa
- * http://wiki.libsdl.org/SDL2/SDL_IntersectFRect
- */
-int rect_testIntersectFRect(void *arg)
-{
-    const struct {
-        SDL_FRect r1;
-        SDL_FRect r2;
-        SDL_bool result;
-        SDL_FRect intersect;
-    } cases[] = {
-        { { 0, 0, 0, 0 },       { 0, 0, 0, 0 },         SDL_FALSE },
-        { { 0, 0, -200, 200 },  { 0, 0, -200, 200 },    SDL_FALSE },
-        { { 0, 0, 10, 10 },     { -5, 5, 9.9f, 2 },     SDL_TRUE,   { 0, 5, 4.9f, 2 } },
-        { { 0, 0, 10, 10 },     { -5, -5, 10, 2 },      SDL_FALSE},
-        { { 0, 0, 10, 10 },     { -5, -5, 2, 10 },      SDL_FALSE},
-        { { 0, 0, 10, 10 },     { -5, -5, 5, 5 },       SDL_FALSE},
-        { { 0, 0, 10, 10 },     { -5, -5, 5.5f, 6 },    SDL_TRUE,   { 0, 0, 0.5f, 1 } }
-    };
-    size_t i;
-
-    for (i = 0; i < SDL_arraysize(cases); i++) {
-        SDL_bool result;
-        SDL_FRect intersect;
-        SDLTest_AssertPass("About to call SDL_IntersectFRect(&{ %g, %g, %g, %g }, &{ %g, %g, %g, %g })",
-            cases[i].r1.x, cases[i].r1.y, cases[i].r1.w, cases[i].r1.h,
-            cases[i].r2.x, cases[i].r2.y, cases[i].r2.w, cases[i].r2.h
-        );
-        result = SDL_IntersectFRect(&cases[i].r1, &cases[i].r2, &intersect);
-        SDLTest_AssertCheck(result == cases[i].result, "Got %d, expected %d", result, cases[i].result);
-        if (cases[i].result) {
-            SDLTest_AssertCheck(IsFRectEqual(&intersect, &cases[i].intersect),
-                "Got { %g, %g, %g, %g }, expected { %g, %g, %g, %g }",
-                intersect.x, intersect.y, intersect.w, intersect.h,
-                cases[i].intersect.x, cases[i].intersect.y, cases[i].intersect.w, cases[i].intersect.h);
-        }
-    }
-    return TEST_COMPLETED;
-}
-
-/* !
- * \brief Test SDL_UnionFRect
- *
- * \sa
- * http://wiki.libsdl.org/SDL2/SDL_UnionFRect
- */
-int rect_testUnionFRect(void *arg)
-{
-    const struct {
-        SDL_FRect r1;
-        SDL_FRect r2;
-        SDL_FRect expected;
-    } cases[] = {
-        { { 0, 0, 10, 10 },         { 19.9f, 20, 10, 10 },      { 0, 0, 29.9f, 30 } },
-        { { 0, 0, 0, 0 },           { 20, 20.1f, 10.1f, 10 },   { 20, 20.1f, 10.1f, 10 } },
-        { { -200, -4.5f, 450, 33 }, { 20, 20, 10, 10 },         { -200, -4.5f, 450, 34.5f } },
-        { { 0, 0, 15, 16.5f },      { 20, 20, 0, 0 },           { 0, 0, 15, 16.5f } }
-    };
-    size_t i;
-
-    for (i = 0; i < SDL_arraysize(cases); i++) {
-        SDL_FRect result;
-        SDLTest_AssertPass("About to call SDL_UnionFRect(&{ %g, %g, %g, %g }, &{ %g, %g, %g, %g })",
-            cases[i].r1.x, cases[i].r1.y, cases[i].r1.w, cases[i].r1.h,
-            cases[i].r2.x, cases[i].r2.y, cases[i].r2.w, cases[i].r2.h
-        );
-        SDL_UnionFRect(&cases[i].r1, &cases[i].r2, &result);
-        SDLTest_AssertCheck(IsFRectEqual(&result, &cases[i].expected),
-            "Got { %g, %g, %g, %g }, expected { %g, %g, %g, %g }",
-            result.x, result.y, result.w, result.h,
-            cases[i].expected.x, cases[i].expected.y, cases[i].expected.w, cases[i].expected.h);
-    }
-    return TEST_COMPLETED;
-}
-
-/* !
- * \brief Test SDL_EncloseFPointsUnionFRect
- *
- * \sa
- * http://wiki.libsdl.org/SDL2/SDL_EncloseFPoints
- */
-int rect_testEncloseFPoints(void *arg)
-{
-    const struct {
-        SDL_bool with_clip;
-        SDL_FRect clip;
-        SDL_bool result;
-        SDL_FRect enclosing;
-    } cases[] = {
-        { SDL_TRUE,    { 0, 0, 10, 10 },    SDL_TRUE,   { 0.5f, 0.1f, 6, 8 }},
-        { SDL_TRUE,    { 1.2f, 1, 10, 10 }, SDL_TRUE,   { 1.5f, 1.1f, 5, 7 }},
-        { SDL_TRUE,    { -10, -10, 3, 3 },  SDL_FALSE },
-        { SDL_FALSE,   { 0 },               SDL_TRUE,   { 0.5, 0.1f, 6, 8 }}
-    };
-    const SDL_FPoint points[] = {
-        { 0.5f, 0.1f },
-        { 5.5f, 7.1f },
-        { 1.5f, 1.1f }
-    };
-    char points_str[256];
-    size_t i;
-
-    SDL_strlcpy(points_str, "{", sizeof(points_str));
-    for (i = 0; i < SDL_arraysize(points); i++) {
-        char point_str[32];
-        SDL_snprintf(point_str, sizeof(point_str), "{ %g, %g }, ", points[i].x, points[i].y);
-        SDL_strlcat(points_str, point_str, sizeof(points_str));
-    }
-    SDL_strlcat(points_str, "}", sizeof(points_str));
-    for (i = 0; i < SDL_arraysize(cases); i++) {
-        char clip_str[64];
-        SDL_bool result;
-        SDL_FRect enclosing;
-        const SDL_FRect* clip_ptr = NULL;
-        if (cases[i].with_clip) {
-            SDL_snprintf(clip_str, sizeof(clip_str), "&{ %g, %g, %g, %g }",
-                cases[i].clip.x, cases[i].clip.y, cases[i].clip.w, cases[i].clip.h);
-            clip_ptr = &cases[i].clip;
-        } else {
-            SDL_strlcpy(clip_str, "NULL", sizeof(clip_str));
-        }
-        SDLTest_AssertPass("About to call SDL_EncloseFPoints(&%s, %d, %s)", points_str, (int)SDL_arraysize(points), clip_str);
-        result = SDL_EncloseFPoints(points, SDL_arraysize(points), clip_ptr, &enclosing);
-        SDLTest_AssertCheck(result == cases[i].result, "Got %d, expected %d", result, cases[i].result);
-        if (cases[i].result) {
-        SDLTest_AssertCheck(IsFRectEqual(&enclosing, &cases[i].enclosing),
-            "Got { %g, %g, %g, %g }, expected { %g, %g, %g, %g }",
-            enclosing.x, enclosing.y, enclosing.w, enclosing.h,
-            cases[i].enclosing.x, cases[i].enclosing.y, cases[i].enclosing.w, cases[i].enclosing.h);
-        }
-    }
-    return TEST_COMPLETED;
-}
-
-/* !
- * \brief Test SDL_IntersectFRectAndLine
- *
- * \sa
- * http://wiki.libsdl.org/SDL2/SDL_IntersectFRectAndLine
- */
-int rect_testIntersectFRectAndLine(void *arg)
-{
-    const struct {
-        SDL_FRect rect;
-        SDL_FPoint p1;
-        SDL_FPoint p2;
-        SDL_bool result;
-        SDL_FPoint expected1;
-        SDL_FPoint expected2;
-    } cases[] = {
-        { { 0, 0, 0, 0 },       { -4.8f, -4.8f },   { 5.2f, 5.2f }, SDL_FALSE },
-        { { 0, 0, 2, 2 },       { -1, -1 },         { 3.5f, 3.5f }, SDL_TRUE,   { 0, 0 }, { 1, 1 } },
-        { { -4, -4, 14, 14 },   { 8, 22 },          { 8, 33},       SDL_FALSE }
-
-    };
-    size_t i;
-
-    for (i = 0; i < SDL_arraysize(cases); i++) {
-        SDL_bool result;
-        SDL_FPoint p1 = cases[i].p1;
-        SDL_FPoint p2 = cases[i].p2;
-
-        SDLTest_AssertPass("About to call SDL_IntersectFRectAndLine(&{%g, %g, %g, %g}, &%g, &%g, &%g, &%g)",
-            cases[i].rect.x, cases[i].rect.y, cases[i].rect.w, cases[i].rect.h,
-            p1.x, p1.y, p2.x, p2.y);
-        result = SDL_IntersectFRectAndLine(&cases[i].rect, &p1.x, &p1.y, &p2.x, &p2.y);
-        SDLTest_AssertCheck(result == cases[i].result, "Got %d, expected %d", result, cases[i].result);
-        if (cases[i].result) {
-            SDLTest_AssertCheck(IsFPointEqual(&p1, &cases[i].expected1),
-                "Got p1={ %g, %g }, expected p1={ %g, %g }",
-                p1.x, p1.y,
-                cases[i].expected1.x, cases[i].expected1.y);
-            SDLTest_AssertCheck(IsFPointEqual(&p2, &cases[i].expected2),
-                "Got p2={ %g, %g }, expected p2={ %g, %g }",
-                p2.x, p2.y,
-                cases[i].expected2.x, cases[i].expected2.y);
-        }
-    }
-    return TEST_COMPLETED;
-}
-
 /* ================= Test References ================== */

 /* Rect test cases */
@@ -2088,26 +1836,6 @@ static const SDLTest_TestCaseReference rectTest31 = {
    (SDLTest_TestCaseFp)rect_testFRectEqualsParam, "rect_testFRectEqualsParam", "Negative tests against SDL_FRectEquals with invalid parameters", TEST_ENABLED
 };

-static const SDLTest_TestCaseReference rectTest32 = {
-    (SDLTest_TestCaseFp)rect_testHasIntersectionF, "rect_testHasIntersectionF", "Tests SDL_HasIntersectionF", TEST_ENABLED
-};
-
-static const SDLTest_TestCaseReference rectTest33 = {
-    (SDLTest_TestCaseFp)rect_testIntersectFRect, "rect_testIntersectFRect", "Tests SDL_IntersectFRect", TEST_ENABLED
-};
-
-static const SDLTest_TestCaseReference rectTest34 = {
-    (SDLTest_TestCaseFp)rect_testUnionFRect, "rect_testUnionFRect", "Tests SDL_UnionFRect", TEST_ENABLED
-};
-
-static const SDLTest_TestCaseReference rectTest35 = {
-    (SDLTest_TestCaseFp)rect_testEncloseFPoints, "rect_testEncloseFPoints", "Tests SDL_EncloseFPoints", TEST_ENABLED
-};
-
-static const SDLTest_TestCaseReference rectTest36 = {
-    (SDLTest_TestCaseFp)rect_testIntersectFRectAndLine, "rect_testIntersectFRectAndLine", "Tests SDL_IntersectFRectAndLine", TEST_ENABLED
-};
-
 /* !
 * \brief Sequence of Rect test cases; functions that handle simple rectangles including overlaps and merges.
 *
@@ -2117,7 +1845,7 @@ static const SDLTest_TestCaseReference rectTest36 = {
 static const SDLTest_TestCaseReference *rectTests[] = {
    &rectTest1, &rectTest2, &rectTest3, &rectTest4, &rectTest5, &rectTest6, &rectTest7, &rectTest8, &rectTest9, &rectTest10, &rectTest11, &rectTest12, &rectTest13, &rectTest14,
    &rectTest15, &rectTest16, &rectTest17, &rectTest18, &rectTest19, &rectTest20, &rectTest21, &rectTest22, &rectTest23, &rectTest24, &rectTest25, &rectTest26, &rectTest27,
-    &rectTest28, &rectTest29, &rectTest30, &rectTest31, &rectTest32, &rectTest33, &rectTest34, &rectTest35, &rectTest36, NULL
+    &rectTest28, &rectTest29, &rectTest30, &rectTest31, NULL
 };

 /* Rect test suite (global) */
--- a/test/testautomation_render.c
+++ b/test/testautomation_render.c
@@ -811,136 +811,6 @@ int render_testBlitBlend(void *arg)
    return TEST_COMPLETED;
 }

-static Uint32 read_surface_pixel32(SDL_Surface *surface, int x, int y) {
-    Uint32 result;
-
-    if (x >= surface->w || y >= surface->h) {
-        SDLTest_AssertCheck(x < surface->w, "x (%d) < surface->w (%d)", x, surface->w);
-        SDLTest_AssertCheck(y < surface->h, "y (%d) < surface->h (%d)", y, surface->h);
-        result = 0xdeadbabe;
-    } else {
-        SDL_memcpy(&result, (Uint8 *)surface->pixels + surface->pitch * y + surface->format->BytesPerPixel * x, sizeof(Uint32));
-    }
-    return result;
-}
-
-static int render_testRGBSurfaceNoAlpha(void* arg)
-{
-    SDL_Surface *surface;
-    SDL_Renderer *software_renderer;
-    SDL_Surface *surface2;
-    SDL_Texture *texture2;
-    int result;
-    SDL_Rect dest_rect;
-    SDL_Point point;
-    Uint32 pixel;
-
-    SDLTest_AssertPass("About to call SDL_CreateRGBSurface(0, 128, 128, 32, 0xff0000, 0xff00, 0xff, 0)");
-    surface = SDL_CreateRGBSurface(0, 128, 128, 32, 0xff0000, 0xff00, 0xff, 0);
-    SDLTest_AssertCheck(surface != NULL, "Returned surface must be not NULL");
-
-    SDLTest_AssertCheck(surface->format->BitsPerPixel == 32, "surface->format->BitsPerPixel should be 32, actual value is %d", surface->format->BitsPerPixel);
-    SDLTest_AssertCheck(surface->format->BytesPerPixel == 4, "surface->format->BytesPerPixels should be 4, actual value is %d", surface->format->BytesPerPixel);
-
-    SDLTest_AssertPass("About to call SDL_CreateSoftwareRenderer(surface)");
-    software_renderer = SDL_CreateSoftwareRenderer(surface);
-    SDLTest_AssertCheck(software_renderer != NULL, "Returned renderer must be not NULL");
-
-    SDLTest_AssertPass("About to call SDL_CreateRGBSurface(0, 16, 16, 32, 0xff0000, 0xff00, 0xff, 0)");
-    surface2 = SDL_CreateRGBSurface(0, 16, 16, 32, 0xff0000, 0xff00, 0xff, 0);
-    SDLTest_AssertCheck(surface2 != NULL, "Returned surface must be not NULL");
-
-    SDLTest_AssertPass("About to call SDL_FillRect(surface2, NULL, 0)");
-    result = SDL_FillRect(surface2, NULL, SDL_MapRGB(surface2->format, 0, 0, 0));
-    SDLTest_AssertCheck(result == 0, "Result should be 0, actual value is %d", result);
-
-    SDLTest_AssertPass("About to call SDL_CreateTextureFromSurface(software_renderer, surface2)");
-    texture2 = SDL_CreateTextureFromSurface(software_renderer, surface2);
-    SDLTest_AssertCheck(texture2 != NULL, "Returned texture is not NULL");
-
-    SDLTest_AssertPass("About to call SDL_SetRenderDrawColor(renderer, 0xaa, 0xbb, 0xcc, 0x0)");
-    result = SDL_SetRenderDrawColor(software_renderer, 0xaa, 0xbb, 0xcc, 0x0);
-
-    SDLTest_AssertPass("About to call SDL_RenderClear(renderer)");
-    result = SDL_RenderClear(software_renderer);
-    SDLTest_AssertCheck(result == 0, "Result should be 0, actual value is %d", result);
-
-    SDLTest_AssertPass("About to call SDL_SetRenderDrawColor(renderer, 0x0, 0x0, 0x0, 0x0)");
-    result = SDL_SetRenderDrawColor(software_renderer, 0x0, 0x0, 0x0, 0x0);
-    SDLTest_AssertCheck(result == 0, "Result should be 0, actual value is %d", result);
-
-    dest_rect.x = 32;
-    dest_rect.y = 32;
-    dest_rect.w = surface2->w;
-    dest_rect.h = surface2->h;
-    point.x = 0;
-    point.y = 0;
-    SDLTest_AssertPass("About to call SDL_RenderCopy(software_renderer, texture, NULL, &{%d, %d, %d, %d})",
-        dest_rect.x, dest_rect.h, dest_rect.w, dest_rect.h);
-    result = SDL_RenderCopyEx(software_renderer, texture2, NULL, &dest_rect, 180, &point, SDL_FLIP_NONE);
-    SDLTest_AssertCheck(result == 0, "Result should be 0, actual value is %d", result);
-
-    SDLTest_AssertPass("About to call SDL_RenderPresent(software_renderer)");
-    SDL_RenderPresent(software_renderer);
-
-    pixel = read_surface_pixel32(surface, 0, 0);
-    SDLTest_AssertCheck(pixel == 0xAABBCCu, "Pixel at (0, 0) should be 0x%08x, actual value is 0x%08" SDL_PRIx32, 0xAABBCCu, pixel);
-    pixel = read_surface_pixel32(surface, 15, 15);
-    SDLTest_AssertCheck(pixel == 0xAABBCCu, "Pixel at (15, 15) should be 0x%08x, actual value is 0x%08" SDL_PRIx32, 0xAABBCCu, pixel);
-    pixel = read_surface_pixel32(surface, 16, 16);
-    SDLTest_AssertCheck(pixel == 0xFF000000u, "Pixel at (16, 16) should be 0x%08x, actual value is 0x%08" SDL_PRIx32, 0xFF000000u, pixel);
-    pixel = read_surface_pixel32(surface, 31, 31);
-    SDLTest_AssertCheck(pixel == 0xFF000000u, "Pixel at (31, 31) should be 0x%08x, actual value is 0x%08" SDL_PRIx32, 0xFF000000u, pixel);
-    pixel = read_surface_pixel32(surface, 32, 32);
-    SDLTest_AssertCheck(pixel == 0xAABBCCu, "Pixel at (32, 32) should be 0x%08x, actual value is 0x%08" SDL_PRIx32, 0xAABBCCu, pixel);
-
-    SDL_DestroyTexture(texture2);
-    SDL_FreeSurface(surface2);
-    SDL_DestroyRenderer(software_renderer);
-    SDL_FreeSurface(surface);
-    return TEST_COMPLETED;
-}
-
-/**
- * @brief Tests setting and getting texture scale mode.
- *
- * \sa
- * http://wiki.libsdl.org/SDL2/SDL_SetTextureScaleMode
- * http://wiki.libsdl.org/SDL2/SDL_GetTextureScaleMode
- */
-int render_testGetSetTextureScaleMode(void *arg)
-{
-    const struct {
-        const char *name;
-        SDL_ScaleMode mode;
-    } modes[] = {
-        { "SDL_ScaleModeNearest", SDL_ScaleModeNearest },
-        { "SDL_ScaleModeLinear",  SDL_ScaleModeLinear },
-        { "SDL_ScaleModeBest",    SDL_ScaleModeBest }
-    };
-    size_t i;
-
-    for (i = 0; i < SDL_arraysize(modes); i++) {
-        SDL_Texture *texture;
-        int result;
-        SDL_ScaleMode actual_mode = SDL_ScaleModeNearest;
-
-        SDL_ClearError();
-        SDLTest_AssertPass("About to call SDL_CreateTexture(renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, 16, 16)");
-        texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, 16, 16);
-        SDLTest_AssertCheck(texture != NULL, "SDL_CreateTexture must return a non-NULL texture");
-        SDLTest_AssertPass("About to call SDL_SetTextureScaleMode(texture, %s)", modes[i].name);
-        result = SDL_SetTextureScaleMode(texture, modes[i].mode);
-        SDLTest_AssertCheck(result == 0, "SDL_SetTextureScaleMode must return 0, actual %d", result);
-        SDLTest_AssertPass("About to call SDL_GetTextureScaleMode(texture)");
-        result = SDL_GetTextureScaleMode(texture, &actual_mode);
-        SDLTest_AssertCheck(result == 0, "SDL_SetTextureScaleMode must return 0, actual %d", result);
-        SDLTest_AssertCheck(actual_mode == modes[i].mode, "SDL_GetTextureScaleMode must return %s (%d), actual=%d",
-            modes[i].name, modes[i].mode, actual_mode);
-    }
-    return TEST_COMPLETED;
-}
-
 /**
 * @brief Checks to see if functionality is supported. Helper function.
 */
@@ -1291,17 +1161,9 @@ static const SDLTest_TestCaseReference renderTest7 = {
    (SDLTest_TestCaseFp)render_testBlitBlend, "render_testBlitBlend", "Tests blitting with blending", TEST_DISABLED
 };

-static const SDLTest_TestCaseReference renderTest8 = {
-    (SDLTest_TestCaseFp)render_testGetSetTextureScaleMode, "render_testGetSetTextureScaleMode", "Tests setting/getting texture scale mode", TEST_ENABLED
-};
-
-static const SDLTest_TestCaseReference renderTest9 = {
-    (SDLTest_TestCaseFp)render_testRGBSurfaceNoAlpha, "render_testRGBSurfaceNoAlpha", "Tests RGB surface with no alpha using software renderer", TEST_ENABLED
-};
-
 /* Sequence of Render test cases */
 static const SDLTest_TestCaseReference *renderTests[] = {
-    &renderTest1, &renderTest2, &renderTest3, &renderTest4, &renderTest5, &renderTest6, &renderTest7, &renderTest8, &renderTest9, NULL
+    &renderTest1, &renderTest2, &renderTest3, &renderTest4, &renderTest5, &renderTest6, &renderTest7, NULL
 };

 /* Render test suite (global) */
--- a/test/testautomation_subsystems.c
+++ b/test/testautomation_subsystems.c
@@ -208,42 +208,6 @@ static int subsystems_dependRefCountWithExtraInit(void)
    return TEST_COMPLETED;
 }

-
-/**
- * \brief Inits and Quits timers subsystem, which cannot be explicitly initialized in SDL3
- *
- * \sa SDL_InitSubSystem
- * \sa SDL_QuitSubSystem
- *
- */
-static int subsystems_timersSubsystem(void)
-{
-    int result;
-    /* Ensure that we start with reset subsystems. */
-    SDLTest_AssertCheck(SDL_WasInit(SDL_INIT_TIMER | SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK | SDL_INIT_EVENTS) == 0,
-                        "Check result from SDL_WasInit(SDL_INIT_TIMER | SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK | SDL_INIT_EVENTS)");
-
-    SDLTest_AssertPass("About to call SDL_WasInit(0)");
-    result = SDL_WasInit(0);
-    SDLTest_AssertCheck(result == 0, "SDL_WasInit(0) should return 0, actual 0x%x", result);
-
-    SDLTest_AssertPass("About to call SDL_InitSubSystem(SDL_INIT_TIMER)");
-    result = SDL_InitSubSystem(SDL_INIT_TIMER);
-    SDLTest_AssertCheck(result == 0, "Must return 0, actually %d", result);
-    SDLTest_AssertPass("About to call SDL_WasInit(SDL_INIT_TIMER)");
-    result = SDL_WasInit(SDL_INIT_TIMER);
-    SDLTest_AssertCheck(result == SDL_INIT_TIMER, "Must return SDL_INIT_TIMER (=%d), actually %d", SDL_INIT_TIMER, result);
-    SDLTest_AssertPass("About to call SDL_WasInit(0)");
-    result = SDL_WasInit(0);
-    SDLTest_AssertCheck(result == SDL_INIT_TIMER, "SDL_WasInit(0) should return SDL_INIT_TIMER, actual 0x%x", result);
-
-    SDLTest_AssertPass("About to call SDL_QuitSubSystem(SDL_INIT_TIMER)");
-    SDL_QuitSubSystem(SDL_INIT_TIMER);
-    SDLTest_AssertPass("SDL_QuitSubSystem finished");
-
-    return TEST_COMPLETED;
-}
-
 /* ================= Test References ================== */

 /* Subsystems test cases */
@@ -263,13 +227,9 @@ static const SDLTest_TestCaseReference subsystemsTest4 = {
    (SDLTest_TestCaseFp)subsystems_dependRefCountWithExtraInit, "subsystems_dependRefCountWithExtraInit", "Check reference count of subsystem dependencies.", TEST_ENABLED
 };

-static const SDLTest_TestCaseReference subsystemsTest5 = {
-    (SDLTest_TestCaseFp)subsystems_timersSubsystem, "subsystems_timersSubsystem", "Check timer subsystem, removed in SDL3.", TEST_ENABLED
-};
-
 /* Sequence of Events test cases */
 static const SDLTest_TestCaseReference *subsystemsTests[] = {
-    &subsystemsTest1, &subsystemsTest2, &subsystemsTest3, &subsystemsTest4, &subsystemsTest5, NULL
+    &subsystemsTest1, &subsystemsTest2, &subsystemsTest3, &subsystemsTest4, NULL
 };

 /* Events test suite (global) */
--- a/test/testautomation_video.c
+++ b/test/testautomation_video.c
@@ -2251,33 +2251,6 @@ static int video_getWindowSurface(void *arg)
    return TEST_COMPLETED;
 }

-/**
- * Tests SDL_SetWindowInputFocus
- */
-static int video_setWindowInputFocus(void *arg)
-{
-    int result;
-    SDL_Window *window;
-
-    SDLTest_AssertPass("SDL_SetWindowInputFocus is not supported on dummy and SDL2 wayland driver");
-        if (SDL_strcmp(SDL_GetCurrentVideoDriver(), "dummy") == 0 || SDL_strcmp(SDL_GetCurrentVideoDriver(), "wayland") == 0) {
-        return TEST_SKIPPED;
-    }
-
-    window = _createVideoSuiteTestWindow("video_setWindowInputFocus");
-    if (!window) {
-        return TEST_ABORTED;
-    }
-
-    SDLTest_AssertPass("About to call SDL_SetWindowInputFocus(window)");
-    result = SDL_SetWindowInputFocus(window);
-    SDLTest_AssertCheck(result == 0, "Result is %d, expected 0", result);
-
-    _destroyVideoSuiteTestWindow(window);
-
-    return TEST_COMPLETED;
-}
-
 /* ================= Test References ================== */

 /* Video test cases */
@@ -2365,9 +2338,6 @@ static const SDLTest_TestCaseReference videoTest24 =
 static const SDLTest_TestCaseReference videoTest25 = {
    (SDLTest_TestCaseFp)video_getWindowSurface, "video_getWindowSurface", "Checks window surface functionality", TEST_ENABLED
 };
-static const SDLTest_TestCaseReference videoTest26 = {
-    (SDLTest_TestCaseFp)video_setWindowInputFocus, "video_setWindowInputFocus", "Checks window input focus", TEST_ENABLED
-};

 /* Sequence of Video test cases */
 static const SDLTest_TestCaseReference *videoTests[] = {
@@ -2375,7 +2345,7 @@ static const SDLTest_TestCaseReference *videoTests[] = {
    &videoTest7, &videoTest8, &videoTest9, &videoTest10, &videoTest11, &videoTest12,
    &videoTest13, &videoTest14, &videoTest15, &videoTest16, &videoTest17,
    &videoTest18, &videoTest19, &videoTest20, &videoTest21, &videoTest22,
-    &videoTest23, &videoTest24, &videoTest25, &videoTest26, NULL
+    &videoTest23, &videoTest24, &videoTest25, NULL
 };

 /* Video test suite (global) */
Author	SHA1	Message	Date
Sam Lantinga	6510d6ccbf	Updated to version 2.32.6 for release	2025-05-04 08:52:05 -07:00
Derek Schuff	b0b50da4b6	Port #12581 to SDL2 This fixes undefined behavior resulting from adding offsets to nullptr. (cherry picked from commit `a220e7c422`)	2025-05-01 21:36:53 -07:00
Sam Lantinga	8b7a088efc	Call IOHIDDeviceClose() if needed in hid_close() on macOS Unregistering the input report callback marks the device as disconnected, so IOHIDDeviceClose() would never be called if the device wasn't already disconnected when hid_close() was called. Fixes https://github.com/libsdl-org/SDL/issues/12255 (cherry picked from commit `2442c85cb8`)	2025-04-29 11:24:27 -07:00
Sam Lantinga	7fc5edab8e	Revert "Don't leak device handle in macOS 10.10 or newer" This reverts commit `5925c27efb`. Fixes https://github.com/libsdl-org/SDL/issues/12807 (cherry picked from commit `5b951141d2`)	2025-04-29 11:24:27 -07:00
Cameron Gutman	24ccde693e	events: Fix undefined behavior when disabling some event types Shifting a signed int left by 31 is UB. (cherry picked from commit `15fd3fcdc2`)	2025-04-29 00:32:43 -05:00
Sam Lantinga	f46ef5d76d	Fixed reliability of initializing Switch controllers on macOS It looks like both macOS (15.1.1) and SDL are trying to talk to the controller at the same time, which can cause interleaved replies or even locking up the controller. Waiting a bit before talking to the controller seems to take care of this. (cherry picked from commit `45b01d16b1`)	2025-04-28 20:23:37 -07:00
Petar Popovic	5696677558	SDL_BlitSurface() comment: only dstrect is modified in function (cherry picked from commit `035518d065`)	2025-04-22 10:23:02 -07:00
Boris I. Bendovsky	093307f1f4	[SDL2] Fix using of DXSDK_DIR in older CMake - Remove duplicate 'dollar' symbol in the path - Use command 'file' to normalize file paths (cherry picked from commit `40b1eac541`)	2025-04-22 10:12:55 -07:00
Ozkan Sezer	f54014e173	SDL_cpuinfo.h: only include immintrin.h for x86 targets. Reference issue: https://github.com/libsdl-org/SDL_image/issues/537 Reference issue: https://github.com/libsdl-org/SDL_mixer/issues/648 (cherry picked from commit `bfab0a968f`)	2025-04-03 19:55:04 +03:00
Sam Lantinga	64ad33884d	Updated to version 2.32.5 for development	2025-03-31 12:58:50 -07:00
Sam Lantinga	2359383fc1	Updated to version 2.32.4 for release	2025-03-31 09:12:51 -07:00
Sam Lantinga	b2a95b2482	Default SDL_HINT_ACCELEROMETER_AS_JOYSTICK to 0 on Linux The Linux joystick driver supports associating sensor devices with the related controller device, so enable that by default. Fixes https://github.com/libsdl-org/SDL/issues/12043 (cherry picked from commit `3e47181800`)	2025-03-25 09:09:59 -07:00
Carl Åstholm	2708e08f40	emscripten: Don't use legacy JS library functions for assertions (cherry picked from commit `54f5b73333`) (cherry picked from commit `a8f0eb4c33`)	2025-03-20 16:36:25 -07:00
Dragon-Baroque	3f6efbf2df	The posix4 library has been merged into the libc library Backported from commit `07e4dea693`. Reference issue: https://github.com/libsdl-org/SDL/issues/12588. (cherry picked from commit `d63b3376a4`)	2025-03-20 09:48:20 +03:00
Sam Lantinga	9b048e73a2	Fixed raw input device GUIDs changing randomly between runs On Windows 11, apparently HidD_GetManufacturerString() and HidD_GetProductString() can return TRUE without actually filling in any string data. Fixes https://github.com/libsdl-org/SDL/issues/12566 (cherry picked from commit `4fc9509ab7`) (cherry picked from commit `52146cf067`)	2025-03-17 13:57:58 -07:00
Sam Lantinga	d3bb91522f	Fixed crash if info->path is NULL (cherry picked from commit `715301cef5`) (cherry picked from commit `46a51b4298`)	2025-03-17 09:48:13 -07:00
SDL Wiki Bot	c8c4c97727	Sync SDL2 wiki -> header [ci skip] (cherry picked from commit `fc536dcb7e`)	2025-03-12 22:55:50 +03:00
Sam Lantinga	f08a5cfcab	Fixed sscanf("026", "%1x%1x%1x", &r, &g, &b) Fixes https://github.com/libsdl-org/SDL/issues/12510 (cherry picked from commit `be6ed6e9c4`) (cherry picked from commit `1caae3e9e4`)	2025-03-10 15:45:43 -07:00
SDL Wiki Bot	e9d2f60e1c	Sync SDL2 wiki -> header [ci skip] (cherry picked from commit `22a87a22ca`)	2025-03-07 22:45:02 +03:00
Neal Gompa	9e079fe9c7	pipewire: Ensure that the correct struct is used for enumeration APIs PipeWire now requires the correct struct type is used, otherwise it will fail to compile. Reference: `188d920733` Fixes: https://github.com/libsdl-org/SDL/issues/12224 (cherry picked from commit `d35bef64e9`) (cherry picked from commit `6be87ceb33`)	2025-03-06 14:37:46 -05:00
Sam Lantinga	53c022c880	Updated to version 2.32.3 for development	2025-03-01 18:13:50 -08:00
Sam Lantinga	e11183ea6c	Updated to version 2.32.2 for release	2025-03-01 18:03:11 -08:00
Sam Lantinga	024c27645a	Added support for the "%n" sscanf format specifier (cherry picked from commit `6980325310`) (cherry picked from commit `ab44451578`)	2025-02-25 08:08:55 -08:00
SDL Wiki Bot	c2047f0496	Sync SDL2 wiki -> header [ci skip] (cherry picked from commit `52ac07d327`)	2025-02-25 08:08:55 -08:00
Tomasz Pakuła	220895d4d2	[SDL2] Add SDL_HINT_JOYSTICK_HAPTIC_AXES Allows users to overwrite the number of haptic axes defined for a given joystick. Also supports a "wildcard" VID:PID of 0xFFFF/0xFFFF (cherry picked from commit `0809be4ec5`)	2025-02-25 08:08:55 -08:00
Petter Reinholdtsen	282f7a84fc	Changed PULSEAUDIO_FlushRecording() to only flush audio present when called. When the flushing is not able to keep up with the audio stream coming in, it will end up flushing forever and block API clients from getting any audio. Fixes #9706 (cherry picked from commit `24693ac285`)	2025-02-25 08:08:55 -08:00
Cameron Gutman	9be8c2a899	keyboard: Fix comment regarding implicit calls to SDL_StartTextInput() It was always done inside SDL_VideoInit(). (cherry picked from commit `92cadaf917`)	2025-02-25 08:08:55 -08:00
Anonymous Maarten	51e20f1666	ci: drop classic Intel compiler 1) The classic Intel compiler is depreated in favor of the oneapi compiler 2) SPA_FALLTHROUGH is used in pipewire's spa/utils/json.h, and causes build errors (cherry picked from commit `d2eb72fd14`)	2025-02-23 21:40:48 +01:00
Anonymous Maarten	a34c8403e7	ci: GitHub is retiring Ubuntu 20.04 support backport of `8d3db06ff2` (cherry picked from commit `b4d733619a`)	2025-02-23 21:40:48 +01:00
Anonymous Maarten	dc74448014	ci: clang32 on msys2 is EOL backport of `70f657e520` (cherry picked from commit `ed2c004c8a`)	2025-02-23 21:40:40 +01:00
Paper	155f99a4e6	thread/windows: fix stack overflow in exception naming (cherry picked from commit `1a853973ab`) (cherry picked from commit `6421f12d7f`)	2025-02-20 08:20:58 -08:00
Ozkan Sezer	63bb1a8583	dynapi: use DosScanEnv() for os/2. (cherry picked from commit `ee49025f80`)	2025-02-20 11:50:04 +03:00
Sam Lantinga	8b0c9e1dce	Don't leak device handle in macOS 10.10 or newer Merged upstream fix for macOS: `cdc473dfe4` In one of the early versions of macOS, when you try to close the device with IOHIDDeviceClose() that is being physically disconnected. Starting with some version of macOS, this crash bug was fixed, and starting with macSO 10.15 the opposite effect took place: in some environments crash happens if IOHIDDeviceClose() is _not_ called. This patch is to keep a workaround for old versions of macOS, and don't have a leak in new/tested environments. Fixes https://github.com/libsdl-org/SDL/issues/12255 (cherry picked from commit `5925c27efb`)	2025-02-19 17:00:05 -08:00
Sam Clegg	7f74c1ed63	Fix SDL_emscriptenaudio.c under wasm64 Verified locally by running `browser64.test_sdl2_mixer_wav` in emscripten. (cherry picked from commit `aa00738a21`)	2025-02-19 17:00:05 -08:00