Updated to version 2.28.4 for release

snd_pcm_plugin_flush was removed in QNX 7.1 and later
Co-authored-by: elahav <elahav@users.noreply.github.com>
2023-10-01 12:05:05 -07:00 · 2023-09-30 16:53:53 +02:00 · 2023-09-30 16:53:53 +02:00 · 2023-09-30 16:53:53 +02:00 · 2023-09-29 06:57:07 -07:00 · 2023-09-24 17:28:23 -07:00
54 changed files with 678 additions and 375 deletions
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.0...3.5)
 project(ci_utils C CXX)
 set(txt "CC=${CMAKE_C_COMPILER}
@@ -9,7 +9,7 @@ jobs:
      - uses: actions/checkout@v3
      - uses: mymindstorm/setup-emsdk@v12
        with:
-          version: 2.0.32
+          version: 3.1.35
      - name: Install ninja
        run: |
          sudo apt-get -y update
@@ -107,7 +107,7 @@ jobs:
        ${{ matrix.platform.source_cmd }}
        set -eu
        export SDL_TESTS_QUICK=1
-        ctest -VV --test-dir build/
+        ctest -VV --test-dir build/ -j2
        if test "${{ runner.os }}" = "Linux"; then
          # This should show us the SDL_REVISION
          strings build/libSDL2-2.0.so.0 | grep SDL-
@@ -34,7 +34,7 @@ jobs:
        os.makedirs(builddir)
        with open(f"{ builddir }/CMakeLists.txt", "w") as f:
          f.write(textwrap.dedent(f"""\
-            cmake_minimum_required(VERSION 3.0)
+            cmake_minimum_required(VERSION 3.0...3.5)
            project(sdl_user)
            add_subdirectory("{ srcdir }" SDL)
          """))
@@ -53,7 +53,7 @@ jobs:
      if: "! contains(matrix.platform.name, 'ARM')"
      run: |
        $env:SDL_TESTS_QUICK=1
-        ctest -VV --test-dir build/ -C Release
+        ctest -VV --test-dir build/ -C Release -j2
    - name: Install (CMake)
      run: |
        echo "SDL2_DIR=$Env:GITHUB_WORKSPACE/prefix" >> $Env:GITHUB_ENV
@@ -2,6 +2,9 @@ if(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR})
  message(FATAL_ERROR "Prevented in-tree build. Please create a build directory outside of the SDL source code and run \"cmake -S ${CMAKE_SOURCE_DIR} -B .\" from there")
 endif()
 # MSVC runtime library flags are selected by an abstraction.
 set(CMAKE_POLICY_DEFAULT_CMP0091 NEW)
 cmake_minimum_required(VERSION 3.0.0...3.5)
 project(SDL2 C CXX)
@@ -84,7 +87,7 @@ endif()
 # See docs/release_checklist.md
 set(SDL_MAJOR_VERSION 2)
 set(SDL_MINOR_VERSION 28)
-set(SDL_MICRO_VERSION 2)
+set(SDL_MICRO_VERSION 4)
 set(SDL_VERSION "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}.${SDL_MICRO_VERSION}")
 # Set defaults preventing destination file conflicts
@@ -224,11 +227,13 @@ elseif(MSVC_VERSION GREATER 1400) # VisualStudio 8.0+
 elseif(CMAKE_C_COMPILER_ID MATCHES "^Intel$")
  set(OPT_DEF_ASM TRUE)
  set(USE_INTELCC TRUE)
 elseif(CMAKE_C_COMPILER_ID MATCHES "QCC")
  set(USE_QCC TRUE)
 else()
  set(OPT_DEF_ASM FALSE)
 endif()
-if(USE_GCC OR USE_CLANG OR USE_INTELCC)
+if(USE_GCC OR USE_CLANG OR USE_INTELCC OR USE_QCC)
  set(OPT_DEF_GCC_ATOMICS ON)
 endif()
@@ -253,6 +258,9 @@ endif()
 if(MSVC)
  option(SDL_FORCE_STATIC_VCRT "Force /MT for static VC runtimes" OFF)
  if(SDL_FORCE_STATIC_VCRT)
    if(NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
      set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
    endif()
    foreach(flag_var
        CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
        CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
@@ -563,7 +571,7 @@ if(NOT SDL_FOREGROUNDING_SIGNAL STREQUAL "OFF")
 endif()
 # Compiler option evaluation
-if(USE_GCC OR USE_CLANG OR USE_INTELCC)
+if(USE_GCC OR USE_CLANG OR USE_INTELCC OR USE_QCC)
  # Check for -Wall first, so later things can override pieces of it.
  # Note: clang-cl treats -Wall as -Weverything (which is very loud),
  #       /W3 as -Wall, and /W4 as -Wall -Wextra.  So: /W3 is enough.
@@ -1422,6 +1430,12 @@ elseif(UNIX AND NOT APPLE AND NOT RISCOS AND NOT HAIKU)
        file(GLOB AIX_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/paudio/*.c)
        list(APPEND SOURCE_FILES ${AIX_AUDIO_SOURCES})
        set(HAVE_SDL_AUDIO TRUE)
    elseif(QNX)
        set(SDL_AUDIO_DRIVER_QSA 1)
        file(GLOB QSA_AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/qsa/*.c)
        list(APPEND SOURCE_FILES ${QSA_AUDIO_SOURCES})
        list(APPEND EXTRA_LIBS asound)
        set(HAVE_SDL_AUDIO TRUE)
    endif()
    CheckOSS()
    CheckALSA()
@@ -1453,6 +1467,7 @@ elseif(UNIX AND NOT APPLE AND NOT RISCOS AND NOT HAIKU)
      set(SDL_VIDEO_VULKAN 1)
      set(HAVE_VULKAN TRUE)
    endif()
    CheckQNXScreen()
  endif()
  if(UNIX)
@@ -1703,6 +1718,13 @@ elseif(UNIX AND NOT APPLE AND NOT RISCOS AND NOT HAIKU)
    set(HAVE_RPATH TRUE)
  endif()
  if(QNX)
    # QNX's *printf() family generates a SIGSEGV if NULL is passed for a string
    # specifier (on purpose), but SDL expects "(null)". Use the built-in
    # implementation.
    set(HAVE_VSNPRINTF 0)
    set(USE_POSIX_SPAWN 1)
  endif()
 elseif(WINDOWS)
  find_program(WINDRES windres)
@@ -3182,7 +3204,7 @@ if (SDL_ASAN)
 endif()
 if(SDL_CCACHE AND NOT CMAKE_VERSION VERSION_LESS 3.4)
-  cmake_minimum_required(VERSION 3.4)
+  cmake_minimum_required(VERSION 3.4...3.5)
  find_program(CCACHE_BINARY ccache)
  if(CCACHE_BINARY)
    set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_BINARY})
@@ -15,7 +15,7 @@
 LIBNAME = SDL2
 MAJOR_VERSION = 2
 MINOR_VERSION = 28
-MICRO_VERSION = 2
+MICRO_VERSION = 4
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
 DESCRIPTION = Simple DirectMedia Layer 2
@@ -6,7 +6,7 @@
 LIBNAME = SDL2
 MAJOR_VERSION = 2
 MINOR_VERSION = 28
-MICRO_VERSION = 2
+MICRO_VERSION = 4
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
 LIBHOME = .
@@ -1,7 +1,7 @@
 # SDL2 CMake configuration file:
 # This file is meant to be placed in a cmake subfolder of SDL2-devel-2.x.y-VC
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.0...3.5)
 include(FeatureSummary)
 set_package_properties(SDL2 PROPERTIES
@@ -19,10 +19,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.28.2</string>
+	<string>2.28.4</string>
 	<key>CFBundleSignature</key>
 	<string>SDLX</string>
 	<key>CFBundleVersion</key>
-	<string>2.28.2</string>
+	<string>2.28.4</string>
 </dict>
 </plist>
@@ -9529,7 +9529,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEPLOYMENT_POSTPROCESSING = YES;
 				DYLIB_COMPATIBILITY_VERSION = 2801.0.0;
-				DYLIB_CURRENT_VERSION = 2801.2.0;
+				DYLIB_CURRENT_VERSION = 2801.4.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_ALTIVEC_EXTENSIONS = YES;
@@ -9570,7 +9570,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_LINK_OBJC_RUNTIME = NO;
-				MARKETING_VERSION = 2.28.2;
+				MARKETING_VERSION = 2.28.4;
 				OTHER_LDFLAGS = "-liconv";
 			};
 			name = Release;
@@ -9614,7 +9614,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 2801.0.0;
-				DYLIB_CURRENT_VERSION = 2801.2.0;
+				DYLIB_CURRENT_VERSION = 2801.4.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -9656,7 +9656,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_LINK_OBJC_RUNTIME = NO;
-				MARKETING_VERSION = 2.28.2;
+				MARKETING_VERSION = 2.28.4;
 				OTHER_LDFLAGS = "-liconv";
 			};
 			name = Debug;
@@ -9863,7 +9863,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 2801.0.0;
-				DYLIB_CURRENT_VERSION = 2801.2.0;
+				DYLIB_CURRENT_VERSION = 2801.4.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -9915,7 +9915,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 2801.0.0;
-				DYLIB_CURRENT_VERSION = 2801.2.0;
+				DYLIB_CURRENT_VERSION = 2801.4.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1,4 +1,4 @@
-Title SDL 2.28.2
+Title SDL 2.28.4
 Version 1
 Description SDL Library for Mac OS X (http://www.libsdl.org)
 DefaultLocation /Library/Frameworks
@@ -8,22 +8,22 @@ else {
 }
 android {
    compileSdkVersion 31
    defaultConfig {
    if (buildAsApplication) {
-            applicationId "org.libsdl.app"
+        namespace "org.libsdl.app"
    }
-        minSdkVersion 16
+    compileSdkVersion 34
-        targetSdkVersion 31
+    defaultConfig {
        minSdkVersion 19
        targetSdkVersion 34
        versionCode 1
        versionName "1.0"
        externalNativeBuild {
            ndkBuild {
-                arguments "APP_PLATFORM=android-16"
+                arguments "APP_PLATFORM=android-19"
                abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
            }
            // cmake {
-            //     arguments "-DANDROID_APP_PLATFORM=android-16", "-DANDROID_STL=c++_static"
+            //     arguments "-DANDROID_APP_PLATFORM=android-19", "-DANDROID_STL=c++_static"
            //     // abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
            //     abiFilters 'arm64-v8a'
            // }
@@ -53,7 +53,7 @@ android {
        }
    }
-    lintOptions {
+    lint {
        abortOnError false
    }
@@ -3,7 +3,6 @@
     com.gamemaker.game
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="org.libsdl.app"
    android:versionCode="1"
    android:versionName="1.0"
    android:installLocation="auto">
@@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
    private static final String TAG = "SDL";
    private static final int SDL_MAJOR_VERSION = 2;
    private static final int SDL_MINOR_VERSION = 28;
-    private static final int SDL_MICRO_VERSION = 2;
+    private static final int SDL_MICRO_VERSION = 4;
 /*
    // Display InputType.SOURCE/CLASS of events and devices
    //
@@ -1345,7 +1345,20 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
            }
        }
-        if ((source & InputDevice.SOURCE_KEYBOARD) == InputDevice.SOURCE_KEYBOARD) {
+        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
            // on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses
            // they are ignored here because sending them as mouse input to SDL is messy
            if ((keyCode == KeyEvent.KEYCODE_BACK) || (keyCode == KeyEvent.KEYCODE_FORWARD)) {
                switch (event.getAction()) {
                case KeyEvent.ACTION_DOWN:
                case KeyEvent.ACTION_UP:
                    // mark the event as handled or it will be handled by system
                    // handling KEYCODE_BACK by system will call onBackPressed()
                    return true;
                }
            }
        }
        if (event.getAction() == KeyEvent.ACTION_DOWN) {
            if (isTextInputEvent(event)) {
                if (ic != null) {
@@ -1360,21 +1373,6 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
            onNativeKeyUp(keyCode);
            return true;
        }
        }
        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
            // on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses
            // they are ignored here because sending them as mouse input to SDL is messy
            if ((keyCode == KeyEvent.KEYCODE_BACK) || (keyCode == KeyEvent.KEYCODE_FORWARD)) {
                switch (event.getAction()) {
                case KeyEvent.ACTION_DOWN:
                case KeyEvent.ACTION_UP:
                    // mark the event as handled or it will be handled by system
                    // handling KEYCODE_BACK by system will call onBackPressed()
                    return true;
                }
            }
        }
        return false;
    }
@@ -6,7 +6,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:8.1.1'
        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
@@ -1,6 +1,6 @@
 #Thu Nov 11 18:20:34 PST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2022 Free Software Foundation, Inc.
+#   Copyright 1992-2023 Free Software Foundation, Inc.
 # shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2022-05-25'
+timestamp='2023-08-22'
 # 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
@@ -47,7 +47,7 @@ me=`echo "$0" | sed -e 's,.*/,,'`
 usage="\
 Usage: $0 [OPTION]
-Output the configuration name of the system \`$me' is run on.
+Output the configuration name of the system '$me' is run on.
 Options:
  -h, --help         print this help, then exit
@@ -60,13 +60,13 @@ version="\
 GNU config.guess ($timestamp)
 Originally written by Per Bothner.
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2023 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."
 help="
-Try \`$me --help' for more information."
+Try '$me --help' for more information."
 # Parse command line
 while test $# -gt 0 ; do
@@ -102,8 +102,8 @@ GUESS=
 # temporary files to be created and, as you can see below, it is a
 # headache to deal with in a portable fashion.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
+# use 'HOST_CC' if defined, but it is deprecated.
 # Portable tmp directory creation inspired by the Autoconf team.
@@ -155,6 +155,9 @@ Linux|GNU|GNU/*)
 	set_cc_for_build
 	cat <<-EOF > "$dummy.c"
 	#if defined(__ANDROID__)
 	LIBC=android
 	#else
 	#include <features.h>
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
@@ -169,6 +172,7 @@ Linux|GNU|GNU/*)
 	LIBC=musl
 	#endif
 	#endif
 	#endif
 	EOF
 	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 	eval "$cc_set_libc"
@@ -459,7 +463,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
 		UNAME_RELEASE=`uname -v`
 		;;
 	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
+	# Japanese Language versions have a version number like '4.1.3-JL'.
 	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
 	GUESS=sparc-sun-sunos$SUN_REL
 	;;
@@ -904,7 +908,7 @@ EOF
 	fi
 	;;
    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	UNAME_PROCESSOR=`uname -p`
 	case $UNAME_PROCESSOR in
 	    amd64)
 		UNAME_PROCESSOR=x86_64 ;;
@@ -966,11 +970,37 @@ EOF
 	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
 	GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
 	;;
    x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*)
 	GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
 	;;
    *:[Mm]anagarm:*:*)
 	GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
 	;;
    *:Minix:*:*)
 	GUESS=$UNAME_MACHINE-unknown-minix
 	;;
    aarch64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	set_cc_for_build
 	CPU=$UNAME_MACHINE
 	LIBCABI=$LIBC
 	if test "$CC_FOR_BUILD" != no_compiler_found; then
 	    ABI=64
 	    sed 's/^	    //' << EOF > "$dummy.c"
 	    #ifdef __ARM_EABI__
 	    #ifdef __ARM_PCS_VFP
 	    ABI=eabihf
 	    #else
 	    ABI=eabi
 	    #endif
 	    #endif
 EOF
 	    cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
 	    eval "$cc_set_abi"
 	    case $ABI in
 		eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
 	    esac
 	fi
 	GUESS=$CPU-unknown-linux-$LIBCABI
 	;;
    aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
@@ -1036,7 +1066,16 @@ EOF
    k1om:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
-    loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+    kvx:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
    kvx:cos:*:*)
 	GUESS=$UNAME_MACHINE-unknown-cos
 	;;
    kvx:mbr:*:*)
 	GUESS=$UNAME_MACHINE-unknown-mbr
 	;;
    loongarch32:Linux:*:* | loongarch64:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
    m32r*:Linux:*:*)
@@ -1191,7 +1230,7 @@ EOF
 	GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
 	;;
    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
+	# If we were able to find 'uname', then EMX Unix compatibility
 	# is probably installed.
 	GUESS=$UNAME_MACHINE-pc-os2-emx
 	;;
@@ -1332,7 +1371,7 @@ EOF
 		GUESS=ns32k-sni-sysv
 	fi
 	;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+    PENTIUM:*:4.0*:*)	# Unisys 'ClearPath HMP IX 4000' SVR4/MP effort
 			# says <Richard.M.Bartel@ccMail.Census.GOV>
 	GUESS=i586-unisys-sysv4
 	;;
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2022 Free Software Foundation, Inc.
+#   Copyright 1992-2023 Free Software Foundation, Inc.
 # shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2022-01-03'
+timestamp='2023-09-19'
 # 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,13 +76,13 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2023 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."
 help="
-Try \`$me --help' for more information."
+Try '$me --help' for more information."
 # Parse command line
 while test $# -gt 0 ; do
@@ -130,7 +130,7 @@ IFS=$saved_IFS
 # Separate into logical components for further validation
 case $1 in
 	*-*-*-*-*)
-		echo Invalid configuration \`"$1"\': more than four components >&2
+		echo "Invalid configuration '$1': more than four components" >&2
 		exit 1
 		;;
 	*-*-*-*)
@@ -145,7 +145,8 @@ case $1 in
 			nto-qnx* | linux-* | uclinux-uclibc* \
 			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
 			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
-			| storm-chaos* | os2-emx* | rtmk-nova*)
+			| storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \
 			| windows-* )
 				basic_machine=$field1
 				basic_os=$maybe_os
 				;;
@@ -943,7 +944,7 @@ $basic_machine
 EOF
 		IFS=$saved_IFS
 		;;
-	# We use `pc' rather than `unknown'
+	# We use 'pc' rather than 'unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
 	i*86 | x86_64)
@@ -1180,7 +1181,7 @@ case $cpu-$vendor in
 		case $cpu in
 			1750a | 580 \
 			| a29k \
-			| aarch64 | aarch64_be \
+			| aarch64 | aarch64_be | aarch64c | arm64ec \
 			| abacus \
 			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
 			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
@@ -1199,45 +1200,23 @@ case $cpu-$vendor in
 			| d10v | d30v | dlx | dsp16xx \
 			| e2k | elxsi | epiphany \
 			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
 			| javascript \
 			| h8300 | h8500 \
 			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 			| hexagon \
 			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
 			| ip2k | iq2000 \
 			| k1om \
 			| kvx \
 			| le32 | le64 \
 			| lm32 \
-			| loongarch32 | loongarch64 | loongarchx32 \
+			| loongarch32 | loongarch64 \
 			| m32c | m32r | m32rle \
 			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
 			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
 			| m88110 | m88k | maxq | mb | mcore | mep | metag \
 			| microblaze | microblazeel \
-			| mips | mipsbe | mipseb | mipsel | mipsle \
+			| mips* \
 			| mips16 \
 			| mips64 | mips64eb | mips64el \
 			| mips64octeon | mips64octeonel \
 			| mips64orion | mips64orionel \
 			| mips64r5900 | mips64r5900el \
 			| mips64vr | mips64vrel \
 			| mips64vr4100 | mips64vr4100el \
 			| mips64vr4300 | mips64vr4300el \
 			| mips64vr5000 | mips64vr5000el \
 			| mips64vr5900 | mips64vr5900el \
 			| mipsisa32 | mipsisa32el \
 			| mipsisa32r2 | mipsisa32r2el \
 			| mipsisa32r3 | mipsisa32r3el \
 			| mipsisa32r5 | mipsisa32r5el \
 			| mipsisa32r6 | mipsisa32r6el \
 			| mipsisa64 | mipsisa64el \
 			| mipsisa64r2 | mipsisa64r2el \
 			| mipsisa64r3 | mipsisa64r3el \
 			| mipsisa64r5 | mipsisa64r5el \
 			| mipsisa64r6 | mipsisa64r6el \
 			| mipsisa64sb1 | mipsisa64sb1el \
 			| mipsisa64sr71k | mipsisa64sr71kel \
 			| mipsr5900 | mipsr5900el \
 			| mipstx39 | mipstx39el \
 			| mmix \
 			| mn10200 | mn10300 \
 			| moxie \
@@ -1285,7 +1264,7 @@ case $cpu-$vendor in
 				;;
 			*)
-				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2
 				exit 1
 				;;
 		esac
@@ -1306,11 +1285,12 @@ esac
 # Decode manufacturer-specific aliases for certain operating systems.
-if test x$basic_os != x
+if test x"$basic_os" != x
 then
 # First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
 # set os.
 obj=
 case $basic_os in
 	gnu/linux*)
 		kernel=linux
@@ -1341,6 +1321,10 @@ EOF
 		kernel=linux
 		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
 		;;
 	managarm*)
 		kernel=managarm
 		os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'`
 		;;
 	*)
 		kernel=
 		os=$basic_os
@@ -1506,10 +1490,16 @@ case $os in
 			os=eabi
 			;;
 		    *)
-			os=elf
+			os=
 			obj=elf
 			;;
 		esac
 		;;
 	aout* | coff* | elf* | pe*)
 		# These are machine code file formats, not OSes
 		obj=$os
 		os=
 		;;
 	*)
 		# No normalization, but not necessarily accepted, that comes below.
 		;;
@@ -1528,12 +1518,15 @@ else
 # system, and we'll never get to this point.
 kernel=
 obj=
 case $cpu-$vendor in
 	score-*)
-		os=elf
+		os=
 		obj=elf
 		;;
 	spu-*)
-		os=elf
+		os=
 		obj=elf
 		;;
 	*-acorn)
 		os=riscix1.2
@@ -1543,28 +1536,35 @@ case $cpu-$vendor in
 		os=gnu
 		;;
 	arm*-semi)
-		os=aout
+		os=
 		obj=aout
 		;;
 	c4x-* | tic4x-*)
-		os=coff
+		os=
 		obj=coff
 		;;
 	c8051-*)
-		os=elf
+		os=
 		obj=elf
 		;;
 	clipper-intergraph)
 		os=clix
 		;;
 	hexagon-*)
-		os=elf
+		os=
 		obj=elf
 		;;
 	tic54x-*)
-		os=coff
+		os=
 		obj=coff
 		;;
 	tic55x-*)
-		os=coff
+		os=
 		obj=coff
 		;;
 	tic6x-*)
-		os=coff
+		os=
 		obj=coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1586,19 +1586,24 @@ case $cpu-$vendor in
 		os=sunos3
 		;;
 	m68*-cisco)
-		os=aout
+		os=
 		obj=aout
 		;;
 	mep-*)
-		os=elf
+		os=
 		obj=elf
 		;;
 	mips*-cisco)
-		os=elf
+		os=
 		obj=elf
 		;;
 	mips*-*)
-		os=elf
+		os=
 		obj=elf
 		;;
 	or32-*)
-		os=coff
+		os=
 		obj=coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=sysv3
@@ -1607,7 +1612,8 @@ case $cpu-$vendor in
 		os=sunos4.1.1
 		;;
 	pru-*)
-		os=elf
+		os=
 		obj=elf
 		;;
 	*-be)
 		os=beos
@@ -1688,10 +1694,12 @@ case $cpu-$vendor in
 		os=uxpv
 		;;
 	*-rom68k)
-		os=coff
+		os=
 		obj=coff
 		;;
 	*-*bug)
-		os=coff
+		os=
 		obj=coff
 		;;
 	*-apple)
 		os=macos
@@ -1709,7 +1717,8 @@ esac
 fi
-# Now, validate our (potentially fixed-up) OS.
+# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ).
 case $os in
 	# Sometimes we do "kernel-libc", so those need to count as OSes.
 	musl* | newlib* | relibc* | uclibc*)
@@ -1720,6 +1729,9 @@ case $os in
 	# VxWorks passes extra cpu info in the 4th filed.
 	simlinux | simwindows | spe)
 		;;
 	# See `case $cpu-$os` validation below
 	ghcjs)
 		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST end in a * to match a version number.
@@ -1728,7 +1740,7 @@ case $os in
 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
 	     | hiux* | abug | nacl* | netware* | windows* \
-	     | os9* | macos* | osx* | ios* \
+	     | os9* | macos* | osx* | ios* | tvos* | watchos* \
 	     | mpw* | magic* | mmixware* | mon960* | lnews* \
 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
 	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
@@ -1737,11 +1749,11 @@ case $os in
 	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
 	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
 	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
-	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+	     | bosx* | nextstep* | cxux* | oabi* \
-	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	     | ptx* | ecoff* | winnt* | domain* | vsta* \
 	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
 	     | chorusrdb* | cegcc* | glidix* | serenity* \
-	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	     | cygwin* | msys* | moss* | proelf* | rtems* \
 	     | midipix* | mingw32* | mingw64* | mint* \
 	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
 	     | interix* | uwin* | mks* | rhapsody* | darwin* \
@@ -1754,7 +1766,7 @@ case $os in
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-	     | fiwix* )
+	     | fiwix* | mlibc* | cos* | mbr* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
@@ -1762,41 +1774,99 @@ case $os in
 		;;
 	none)
 		;;
 	kernel* | msvc* )
 		# Restricted further below
 		;;
 	'')
 		if test x"$obj" = x
 		then
 			echo "Invalid configuration '$1': Blank OS only allowed with explicit machine code file format" 1>&2
 		fi
 		;;
 	*)
-		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+		echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2
 		exit 1
 		;;
 esac
 case $obj in
 	aout* | coff* | elf* | pe*)
 		;;
 	'')
 		# empty is fine
 		;;
 	*)
 		echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2
 		exit 1
 		;;
 esac
 # Here we handle the constraint that a (synthetic) cpu and os are
 # valid only in combination with each other and nowhere else.
 case $cpu-$os in
 	# The "javascript-unknown-ghcjs" triple is used by GHC; we
 	# accept it here in order to tolerate that, but reject any
 	# variations.
 	javascript-ghcjs)
 		;;
 	javascript-* | *-ghcjs)
 		echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2
 		exit 1
 		;;
 esac
 # As a final step for OS-related things, validate the OS-kernel combination
 # (given a valid OS), if there is a kernel.
-case $kernel-$os in
+case $kernel-$os-$obj in
-	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
+	linux-gnu*- | linux-dietlibc*- | linux-android*- | linux-newlib*- \
-		   | linux-musl* | linux-relibc* | linux-uclibc* )
+		   | linux-musl*- | linux-relibc*- | linux-uclibc*- | linux-mlibc*- )
 		;;
-	uclinux-uclibc* )
+	uclinux-uclibc*- )
 		;;
-	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
+	managarm-mlibc*- | managarm-kernel*- )
 		;;
 	windows*-msvc*-)
 		;;
 	-dietlibc*- | -newlib*- | -musl*- | -relibc*- | -uclibc*- | -mlibc*- )
 		# These are just libc implementations, not actual OSes, and thus
 		# require a kernel.
-		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+		echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2
 		exit 1
 		;;
-	kfreebsd*-gnu* | kopensolaris*-gnu*)
+	-kernel*- )
 		echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2
 		exit 1
 		;;
-	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+	*-kernel*- )
 		echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2
 		exit 1
 		;;
-	nto-qnx*)
+	*-msvc*- )
 		echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
 		exit 1
 		;;
-	os2-emx)
+	kfreebsd*-gnu*- | kopensolaris*-gnu*-)
 		;;
-	*-eabi* | *-gnueabi*)
+	vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
 		;;
-	-*)
+	nto-qnx*-)
 		;;
 	os2-emx-)
 		;;
 	*-eabi*- | *-gnueabi*-)
 		;;
 	none--*)
 		# None (no kernel, i.e. freestanding / bare metal),
 		# can be paired with an machine code file format
 		;;
 	-*-)
 		# Blank kernel with real OS is always fine.
 		;;
-	*-*)
+	--*)
-		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+		# Blank kernel and OS with real machine code file format is always fine.
 		;;
 	*-*-*)
 		echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2
 		exit 1
 		;;
 esac
@@ -1879,7 +1949,7 @@ case $vendor in
 		;;
 esac
-echo "$cpu-$vendor-${kernel:+$kernel-}$os"
+echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}"
 exit
 # Local variables:
@@ -905,6 +905,22 @@ macro(CheckOpenGLES)
  endif()
 endmacro()
 # Requires:
 # - EGL
 macro(CheckQNXScreen)
  if(QNX AND HAVE_OPENGL_EGL)
    check_c_source_compiles("
        #include <screen/screen.h>
        int main (int argc, char** argv) { return 0; }" HAVE_QNX_SCREEN)
    if(HAVE_QNX_SCREEN)
      set(SDL_VIDEO_DRIVER_QNX 1)
      file(GLOB QNX_VIDEO_SOURCES ${SDL2_SOURCE_DIR}/src/video/qnx/*.c)
      list(APPEND SOURCE_FILES ${QNX_VIDEO_SOURCES})
      list(APPEND EXTRA_LIBS screen EGL)
    endif()
  endif()
 endmacro()
 # Requires:
 # - nada
 # Optional:
@@ -955,6 +971,8 @@ macro(CheckPTHREAD)
    elseif(EMSCRIPTEN)
      set(PTHREAD_CFLAGS "-D_REENTRANT -pthread")
      set(PTHREAD_LDFLAGS "-pthread")
    elseif(QNX)
      # pthread support is baked in
    else()
      set(PTHREAD_CFLAGS "-D_REENTRANT")
      set(PTHREAD_LDFLAGS "-lpthread")
@@ -28,6 +28,8 @@ macro(SDL_DetectCMakePlatform)
      set(SDL_CMAKE_PLATFORM AIX)
    elseif(CMAKE_SYSTEM_NAME MATCHES "Minix.*")
      set(SDL_CMAKE_PLATFORM MINIX)
    elseif(CMAKE_SYSTEM_NAME MATCHES "QNX")
      set(SDL_CMAKE_PLATFORM QNX)
    endif()
  elseif(APPLE)
    if(CMAKE_SYSTEM_NAME MATCHES ".*Darwin.*")
@@ -3507,7 +3507,7 @@ orig_CFLAGS="$CFLAGS"
 # See docs/release_checklist.md
 SDL_MAJOR_VERSION=2
 SDL_MINOR_VERSION=28
-SDL_MICRO_VERSION=2
+SDL_MICRO_VERSION=4
 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
 SDL_BINARY_AGE=`expr $SDL_MINOR_VERSION \* 100 + $SDL_MICRO_VERSION`
@@ -13,7 +13,7 @@ dnl Set various version strings - taken gratefully from the GTk sources
 # See docs/release_checklist.md
 SDL_MAJOR_VERSION=2
 SDL_MINOR_VERSION=28
-SDL_MICRO_VERSION=2
+SDL_MICRO_VERSION=4
 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
 SDL_BINARY_AGE=`expr $SDL_MINOR_VERSION \* 100 + $SDL_MICRO_VERSION`
@@ -13,13 +13,13 @@ supported, but you can use the "android-project-ant" directory as a template.
 Requirements
 ================================================================================
-Android SDK (version 31 or later)
+Android SDK (version 34 or later)
 https://developer.android.com/sdk/index.html
 Android NDK r15c or later
 https://developer.android.com/tools/sdk/ndk/index.html
-Minimum API level supported by SDL: 16 (Android 4.1)
+Minimum API level supported by SDL: 19 (Android 4.4)
 How the port works
@@ -431,13 +431,13 @@ The Tegra Graphics Debugger is available from NVidia here:
 https://developer.nvidia.com/tegra-graphics-debugger
-Why is API level 16 the minimum required?
+Why is API level 19 the minimum required?
 ================================================================================
-The latest NDK toolchain doesn't support targeting earlier than API level 16.
+The latest NDK toolchain doesn't support targeting earlier than API level 19.
-As of this writing, according to https://developer.android.com/about/dashboards/index.html
+As of this writing, according to https://www.composables.com/tools/distribution-chart
-about 99% of the Android devices accessing Google Play support API level 16 or
+about 99.7% of the Android devices accessing Google Play support API level 19 or
-higher (January 2018).
+higher (August 2023).
 A note regarding the use of the "dirty rectangles" rendering technique
@@ -48,7 +48,7 @@ SDL can be included in your project in 2 major ways:
 The following CMake script supports both, depending on the value of `MYGAME_VENDORED`.
 ```cmake
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)
 project(mygame)
 # Create an option to switch between a system sdl library and a vendored sdl library
@@ -38,7 +38,7 @@ for some Javascript code to steal for this approach.
 ## Building SDL/emscripten
-SDL currently requires at least Emscripten 2.0.32 to build. Newer versions
+SDL currently requires at least Emscripten 3.1.35 to build. Newer versions
 are likely to work, as well.
@@ -55,6 +55,8 @@ assert can have unique static variables associated with it.
    #define SDL_TriggerBreakpoint() __builtin_debugtrap()
 #elif ( (!defined(__NACL__)) && ((defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))) )
    #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" )
 #elif (defined(__GNUC__) || defined(__clang__)) && defined(__riscv)
    #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "ebreak\n\t" )
 #elif ( defined(__APPLE__) && (defined(__arm64__) || defined(__aarch64__)) )  /* this might work on other ARM targets, but this is a known quantity... */
    #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "brk #22\n\t" )
 #elif defined(__APPLE__) && defined(__arm__)
@@ -262,6 +262,8 @@
 #cmakedefine HAVE_XINPUT_GAMEPAD_EX @HAVE_XINPUT_GAMEPAD_EX@
 #cmakedefine HAVE_XINPUT_STATE_EX @HAVE_XINPUT_STATE_EX@
 #cmakedefine USE_POSIX_SPAWN @USE_POSIX_SPAWN@
 /* SDL internal assertion support */
 #if @SDL_DEFAULT_ASSERT_LEVEL_CONFIGURED@
 #cmakedefine SDL_DEFAULT_ASSERT_LEVEL @SDL_DEFAULT_ASSERT_LEVEL@
@@ -1474,6 +1474,17 @@ extern "C" {
 */
 #define SDL_HINT_RENDER_VSYNC               "SDL_RENDER_VSYNC"
 /**
 *  \brief  A variable controlling whether the Metal render driver select low power device over default one
 *
 *  This variable can be set to the following values:
 *    "0"       - Use the prefered OS device
 *    "1"       - Select a low power one
 *
 *  By default the prefered OS device is used.
 */
 #define SDL_HINT_RENDER_METAL_PREFER_LOW_POWER_DEVICE "SDL_RENDER_METAL_PREFER_LOW_POWER_DEVICE"
 /**
 *  \brief  A variable controlling if VSYNC is automatically disable if doesn't reach the enough FPS
 *
@@ -1890,7 +1890,7 @@ extern DECLSPEC void *SDLCALL SDL_RenderGetMetalLayer(SDL_Renderer * renderer);
 * Note that as of SDL 2.0.18, this will return NULL if Metal refuses to give
 * SDL a drawable to render to, which might happen if the window is
 * hidden/minimized/offscreen. This doesn't apply to command encoders for
- * render targets, just the window's backbacker. Check your return values!
+ * render targets, just the window's backbuffer. Check your return values!
 *
 * \param renderer The renderer to query
 * \returns an `id<MTLRenderCommandEncoder>` on success, or NULL if the
@@ -59,7 +59,7 @@ typedef struct SDL_version
 */
 #define SDL_MAJOR_VERSION   2
 #define SDL_MINOR_VERSION   28
-#define SDL_PATCHLEVEL      2
+#define SDL_PATCHLEVEL      4
 /**
 * Macro to determine SDL version program was compiled against.
@@ -42,7 +42,15 @@
 #endif
 #if defined(__EMSCRIPTEN__)
-#include <emscripten.h>
+    #include <emscripten.h>
    /* older Emscriptens don't have this, but we need to for wasm64 compatibility. */
    #ifndef MAIN_THREAD_EM_ASM_PTR
        #ifdef __wasm64__
            #error You need to upgrade your Emscripten compiler to support wasm64
        #else
            #define MAIN_THREAD_EM_ASM_PTR MAIN_THREAD_EM_ASM_INT
        #endif
    #endif
 #endif
 /* The size of the stack buffer to use for rendering assert messages. */
@@ -251,7 +259,7 @@ static SDL_assert_state SDLCALL SDL_PromptAssertion(const SDL_assert_data *data,
        for (;;) {
            SDL_bool okay = SDL_TRUE;
            /* *INDENT-OFF* */ /* clang-format off */
-            char *buf = (char *) EM_ASM_INT({
+            char *buf = (char *) MAIN_THREAD_EM_ASM_PTR({
                var str =
                    UTF8ToString($0) + '\n\n' +
                    'Abort/Retry/Ignore/AlwaysIgnore? [ariA] :';
@@ -197,6 +197,8 @@ static void EMSCRIPTENAUDIO_CloseDevice(_THIS)
 #endif
 }
 EM_JS_DEPS(sdlaudio, "$autoResumeAudioContext,$dynCall");
 static int EMSCRIPTENAUDIO_OpenDevice(_THIS, const char *devname)
 {
    SDL_AudioFormat test_format;
@@ -233,6 +233,7 @@ static Uint8 *QSA_GetDeviceBuf(_THIS)
 static void QSA_CloseDevice(_THIS)
 {
    if (this->hidden->audio_handle != NULL) {
 #if _NTO_VERSION < 710
        if (!this->iscapture) {
            /* Finish playing available samples */
            snd_pcm_plugin_flush(this->hidden->audio_handle,
@@ -242,6 +243,7 @@ static void QSA_CloseDevice(_THIS)
            snd_pcm_plugin_flush(this->hidden->audio_handle,
                                 SND_PCM_CHANNEL_CAPTURE);
        }
 #endif
        snd_pcm_close(this->hidden->audio_handle);
    }
@@ -884,9 +884,9 @@ int HID_API_EXPORT hid_get_feature_report(hid_device *dev, unsigned char *data,
 	unsigned char report = data[0];
 	res = ioctl(dev->device_handle, HIDIOCGFEATURE(length), data);
-	if (res < 0)
+	if (res < 0) {
-		perror("ioctl (GFEATURE)");
+		/* perror("ioctl (GFEATURE)"); */
-	else if (dev->needs_ble_hack) {
+	} else if (dev->needs_ble_hack) {
 		/* Versions of BlueZ before 5.56 don't include the report in the data,
 		 * and versions of BlueZ >= 5.56 include 2 copies of the report.
 		 * We'll fix it so that there is a single copy of the report in both cases
@@ -134,9 +134,7 @@ static const char *s_ControllerMappings[] = {
    "03000000b80500000610000000000000,Elecom Gamepad,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,",
    "03000000852100000201000000000000,FF-GP1,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,",
    "030000000d0f00002700000000000000,FIGHTING STICK V3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,",
-    "03000000151900004000000000000000,Flydigi Vader 2,a:b27,b:b26,back:b19,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b23,leftstick:b17,lefttrigger:b21,leftx:a0,lefty:a1,misc1:b15,paddle1:b11,paddle2:b10,paddle3:b13,paddle4:b12,rightshoulder:b22,rightstick:b16,righttrigger:b20,rightx:a3,righty:a4,start:b18,x:b25,y:b24,", /* Bluetooth */
+    "03000000790000000600000000000000,G-Shark GS-GP702,crc:8e4f,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,",
    "03000000b40400001124000000000000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:b8,leftx:a0,lefty:a1,misc1:b14,paddle1:b4,paddle2:b5,paddle3:b16,paddle4:b17,rightshoulder:b7,rightstick:b13,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b2,y:b3,", /* Dongle */
    "03000000b40400001224000000000000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:b8,leftx:a0,lefty:a1,misc1:b2,paddle1:b16,paddle2:b17,paddle3:b14,paddle4:b15,rightshoulder:b7,rightstick:b13,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,", /* Wired */
    "030000008f0e00000d31000000000000,GAMEPAD 3 TURBO,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,",
    "03000000300f00000b01000000000000,GGE909 Recoil Pad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,",
    "03000000790000002201000000000000,Game Controller for PC,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,",
@@ -416,9 +414,6 @@ static const char *s_ControllerMappings[] = {
    "03000000a306000022f6000001030000,Cyborg V.3 Rumble Pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:-a3,rightx:a2,righty:a4,start:b9,x:b0,y:b3,",
    "030000000d0f00008400000000010000,Fighting Commander,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
    "030000000d0f00008500000000010000,Fighting Commander,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,",
    "03000000151900004000000001000000,Flydigi Vader 2,a:b14,b:b15,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b21,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b2,paddle2:b5,paddle3:b16,paddle4:b17,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b0,y:b1,", /* Bluetooth */
    "03000000b40400001124000001040000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b14,paddle1:b2,paddle2:b5,paddle3:b16,paddle4:b17,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,", /* Dongle */
    "03000000b40400001224000003030000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b2,paddle1:b16,paddle2:b17,paddle3:b14,paddle4:b15,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,", /* Wired */
    "03000000ac0500001a06000002020000,GameSir-T3 2.02,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,",
    "0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,",
    "03000000c01100000140000000010000,GameStop PS4 Fun Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
@@ -610,9 +605,6 @@ static const char *s_ControllerMappings[] = {
    "050000004c050000f20d000000010000,DualSense Edge Wireless Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
    "030000006f0e00003001000001010000,EA Sports PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,",
    "03000000790000001100000010010000,Elecom Gamepad,crc:e86c,a:b2,b:b3,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b0,y:b1,",
    "03000000b40400001124000011010000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b14,paddle1:b2,paddle2:b5,paddle3:b16,paddle4:b17,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,", /* Dongle */
    "03000000b40400001224000011010000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b2,paddle1:b16,paddle2:b17,paddle3:b14,paddle4:b15,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,", /* Wired */
    "05000000151900004000000001000000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b21,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b14,paddle1:b2,paddle2:b5,paddle3:b16,paddle4:b17,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,", /* Bluetooth */
    "0300000079000000d418000000010000,GPD Win 2 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
    "0500000047532067616d657061640000,GS Gamepad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,",
    "03000000341a000005f7000010010000,GameCube {HuiJia USB box},a:b1,b:b2,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b0,y:b3,",
@@ -910,7 +902,6 @@ static const char *s_ControllerMappings[] = {
    "05000000c82d000018900000ffff0f00,8BitDo Zero 2,a:b1,b:b0,back:b4,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,start:b6,x:b3,y:b2,hint:!SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,",
    "05000000c82d000030320000ffff0f00,8BitDo Zero 2,a:b0,b:b1,back:b4,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,start:b6,x:b2,y:b3,hint:SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,",
    "05000000c82d000030320000ffff0f00,8BitDo Zero 2,a:b1,b:b0,back:b4,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,start:b6,x:b3,y:b2,hint:!SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1,",
    "05000000b404000011240000dfff3f00,Flydigi Vader 2,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,paddle1:b17,paddle2:b18,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,",
    "05000000d6020000e5890000dfff3f80,GPD XD Plus,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a3,rightx:a4,righty:a5,start:b6,x:b2,y:b3,",
    "0500000031366332860c44aadfff0f00,GS Gamepad,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b15,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b16,rightx:a2,righty:a3,start:b6,x:b2,y:b3,",
    "05000000bc20000000550000ffff3f00,GameSir G3w,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,",
@@ -2479,8 +2479,11 @@ static SDL_bool SDL_IsJoystickProductWheel(Uint32 vidpid)
        MAKE_VIDPID(0x046d, 0xc262), /* Logitech G920 (active mode) */
        MAKE_VIDPID(0x046d, 0xc268), /* Logitech PRO Racing Wheel (PC mode) */
        MAKE_VIDPID(0x046d, 0xc269), /* Logitech PRO Racing Wheel (PS4/PS5 mode) */
        MAKE_VIDPID(0x046d, 0xc272), /* Logitech PRO Racing Wheel for Xbox (PC mode) */
        MAKE_VIDPID(0x046d, 0xc26d), /* Logitech G923 (Xbox) */
        MAKE_VIDPID(0x046d, 0xc26e), /* Logitech G923 */
        MAKE_VIDPID(0x046d, 0xc266), /* Logitech G923 for Playstation 4 and PC (PC mode) */
        MAKE_VIDPID(0x046d, 0xc267), /* Logitech G923 for Playstation 4 and PC (PS4 mode)*/
        MAKE_VIDPID(0x046d, 0xca03), /* Logitech Momo Racing */
        MAKE_VIDPID(0x044f, 0xb65d), /* Thrustmaster Wheel FFB */
        MAKE_VIDPID(0x044f, 0xb66d), /* Thrustmaster Wheel FFB */
@@ -2492,6 +2495,17 @@ static SDL_bool SDL_IsJoystickProductWheel(Uint32 vidpid)
        MAKE_VIDPID(0x044f, 0xb65e), /* Thrustmaster T500RS */
        MAKE_VIDPID(0x044f, 0xb664), /* Thrustmaster TX (initial mode) */
        MAKE_VIDPID(0x044f, 0xb669), /* Thrustmaster TX (active mode) */
        MAKE_VIDPID(0x0483, 0x0522), /* Simagic Wheelbase (including M10, Alpha Mini, Alpha, Alpha U) */
        MAKE_VIDPID(0x0eb7, 0x0001), /* Fanatec ClubSport Wheel Base V2 */
        MAKE_VIDPID(0x0eb7, 0x0004), /* Fanatec ClubSport Wheel Base V2.5 */
        MAKE_VIDPID(0x0eb7, 0x0005), /* Fanatec CSL Elite Wheel Base+ (PS4) */
        MAKE_VIDPID(0x0eb7, 0x0006), /* Fanatec Podium Wheel Base DD1 */
        MAKE_VIDPID(0x0eb7, 0x0007), /* Fanatec Podium Wheel Base DD2 */
        MAKE_VIDPID(0x0eb7, 0x0011), /* Fanatec Forza Motorsport (CSR Wheel / CSR Elite Wheel) */
        MAKE_VIDPID(0x0eb7, 0x0020), /* Fanatec generic wheel / CSL DD / GT DD Pro */
        MAKE_VIDPID(0x0eb7, 0x0197), /* Fanatec Porsche Wheel (Turbo / GT3 RS / Turbo S / GT3 V2 / GT2) */
        MAKE_VIDPID(0x0eb7, 0x038e), /* Fanatec ClubSport Wheel Base V1 */
        MAKE_VIDPID(0x0eb7, 0x0e03), /* Fanatec CSL Elite Wheel Base */
        MAKE_VIDPID(0x11ff, 0x0511), /* DragonRise Inc. Wired Wheel (initial mode) (also known as PXN V900 (PS3), Superdrive SV-750, or a Genesis Seaborg 400) */
    };
    int i;
@@ -102,7 +102,7 @@ typedef struct
    Uint8 rgucAccelX[2];          /* 21 */
    Uint8 rgucAccelY[2];          /* 23 */
    Uint8 rgucAccelZ[2];          /* 25 */
-    Uint8 rgucSensorTimestamp[4]; /* 27 - 32 bit little endian */
+    Uint8 rgucSensorTimestamp[4]; /* 27 - 16/32 bit little endian */
 } PS5StatePacketCommon_t;
@@ -154,7 +154,9 @@ typedef struct
    Uint8 rgucAccelX[2];          /* 21 */
    Uint8 rgucAccelY[2];          /* 23 */
    Uint8 rgucAccelZ[2];          /* 25 */
-    Uint8 rgucSensorTimestamp[4]; /* 27 - 32 bit little endian */
+    Uint8 rgucSensorTimestamp[2]; /* 27 - 16 bit little endian */
    Uint8 ucBatteryLevel;         /* 29 */
    Uint8 ucUnknown;              /* 30 */
    Uint8 ucTouchpadCounter1;     /* 31 - high bit clear + counter */
    Uint8 rgucTouchpadData1[3];   /* 32 - X/Y, 12 bits per axis */
    Uint8 ucTouchpadCounter2;     /* 35 - high bit clear + counter */
@@ -486,6 +488,7 @@ static SDL_bool HIDAPI_DriverPS5_InitDevice(SDL_HIDAPI_Device *device)
            /* The Razer Wolverine V2 Pro doesn't respond to the detection protocol, but has a touchpad and sensors, but no vibration */
            ctx->sensors_supported = SDL_TRUE;
            ctx->touchpad_supported = SDL_TRUE;
            ctx->use_alternate_report = SDL_TRUE;
        }
    }
    ctx->effects_supported = (ctx->lightbar_supported || ctx->vibration_supported || ctx->playerled_supported);
@@ -720,7 +723,7 @@ static void HIDAPI_DriverPS5_CheckPendingLEDReset(SDL_HIDAPI_Device *device)
    SDL_DriverPS5_Context *ctx = (SDL_DriverPS5_Context *)device->context;
    SDL_bool led_reset_complete = SDL_FALSE;
-    if (ctx->sensors_supported) {
+    if (ctx->enhanced_mode && ctx->sensors_supported && !ctx->use_alternate_report) {
        const PS5StatePacketCommon_t *packet = &ctx->last_state.state;
        /* Check the timer to make sure the Bluetooth connection LED animation is complete */
@@ -1228,9 +1231,34 @@ static void HIDAPI_DriverPS5_HandleStatePacketCommon(SDL_Joystick *joystick, SDL
    SDL_PrivateJoystickAxis(joystick, SDL_CONTROLLER_AXIS_RIGHTY, axis);
    if (ctx->report_sensors) {
        Uint32 timestamp;
        Uint64 timestamp_us;
        float data[3];
        Uint64 timestamp_us;
        if (ctx->use_alternate_report) {
            /* 16-bit timestamp */
            Uint16 timestamp;
            timestamp = LOAD16(packet->rgucSensorTimestamp[0],
                               packet->rgucSensorTimestamp[1]);
            if (ctx->timestamp) {
                Uint16 delta;
                if (ctx->last_timestamp > timestamp) {
                    delta = (SDL_MAX_UINT16 - ctx->last_timestamp + timestamp + 1);
                } else {
                    delta = (timestamp - ctx->last_timestamp);
                }
                ctx->timestamp += delta;
            } else {
                ctx->timestamp = timestamp;
            }
            ctx->last_timestamp = timestamp;
            /* Sensor timestamp is in 1us units */
            timestamp_us = ctx->timestamp;
        } else {
            /* 32-bit timestamp */
            Uint32 timestamp;
            timestamp = LOAD32(packet->rgucSensorTimestamp[0],
                               packet->rgucSensorTimestamp[1],
@@ -1252,6 +1280,7 @@ static void HIDAPI_DriverPS5_HandleStatePacketCommon(SDL_Joystick *joystick, SDL
            /* Sensor timestamp is in 0.33us units */
            timestamp_us = ctx->timestamp / 3;
        }
        data[0] = HIDAPI_DriverPS5_ApplyCalibrationData(ctx, 0, LOAD16(packet->rgucGyroX[0], packet->rgucGyroX[1]));
        data[1] = HIDAPI_DriverPS5_ApplyCalibrationData(ctx, 1, LOAD16(packet->rgucGyroY[0], packet->rgucGyroY[1]));
@@ -1041,7 +1041,7 @@ static void ConfigJoystick(SDL_Joystick *joystick, int fd)
        }
        for (i = 0; i < ABS_MAX; ++i) {
            /* Skip digital hats */
-            if (joystick->hwdata->has_hat[(i - ABS_HAT0X) / 2]) {
+            if (i >= ABS_HAT0X && i <= ABS_HAT3Y && joystick->hwdata->has_hat[(i - ABS_HAT0X) / 2]) {
                continue;
            }
            if (test_bit(i, absbit)) {
@@ -1752,11 +1752,11 @@ static SDL_bool LINUX_JoystickGetGamepadMapping(int device_index, SDL_GamepadMap
    /* We temporarily open the device to check how it's configured. Make
       a fake SDL_Joystick object to do so. */
    joystick = (SDL_Joystick *)SDL_calloc(sizeof(*joystick), 1);
    joystick->magic = &SDL_joystick_magic;
    if (joystick == NULL) {
        SDL_OutOfMemory();
        return SDL_FALSE;
    }
    joystick->magic = &SDL_joystick_magic;
    SDL_memcpy(&joystick->guid, &item->guid, sizeof(item->guid));
    joystick->hwdata = (struct joystick_hwdata *)
@@ -174,27 +174,33 @@ static int OS2_JoystickInit(void)
    struct _joycfg joycfg;    /* Joy Configuration from envvar */
    /* Open GAME$ port */
-	if (joyPortOpen(&hJoyPort) < 0) return 0;	/* Cannot open... report no joystick */
+    if (joyPortOpen(&hJoyPort) < 0) {
        return 0; /* Cannot open... report no joystick */
    }
    /* Get Max Number of Devices */
    ulDataLen = sizeof(stGameParms);
    rc = DosDevIOCtl(hJoyPort, IOCTL_CAT_USER, GAME_GET_PARMS,
                      NULL, 0, NULL, &stGameParms, ulDataLen, &ulDataLen); /* Ask device info */
-	if (rc != 0)
+    if (rc != 0) {
 	{
        joyPortClose(&hJoyPort);
        return SDL_SetError("Could not read joystick port.");
    }
    maxdevs = 0;
-	if (stGameParms.useA != 0) maxdevs++;
+    if (stGameParms.useA != 0) {
-	if (stGameParms.useB != 0) maxdevs++;
+        maxdevs++;
-	if (maxdevs > MAX_JOYSTICKS) maxdevs = MAX_JOYSTICKS;
+    }
    if (stGameParms.useB != 0) {
        maxdevs++;
    }
    if (maxdevs > MAX_JOYSTICKS) {
        maxdevs = MAX_JOYSTICKS;
    }
    /* Defines min/max axes values (callibration) */
    ulDataLen = sizeof(stGameCalib);
    rc = DosDevIOCtl(hJoyPort, IOCTL_CAT_USER, GAME_GET_CALIB,
                     NULL, 0, NULL, &stGameCalib, ulDataLen, &ulDataLen);
-	if (rc != 0)
+    if (rc != 0) {
 	{
        joyPortClose(&hJoyPort);
        return SDL_SetError("Could not read callibration data.");
    }
@@ -205,34 +211,35 @@ static int OS2_JoystickInit(void)
    ulDataLen = sizeof(ucNewJoystickMask);
    rc = DosDevIOCtl(hJoyPort, IOCTL_CAT_USER, GAME_PORT_RESET,
                     &ucNewJoystickMask, ulDataLen, &ulDataLen, NULL, 0, NULL);
-	if (rc == 0)
+    if (rc == 0) {
 	{
        ulDataLen = sizeof(stJoyStatus);
        rc = DosDevIOCtl(hJoyPort, IOCTL_CAT_USER, GAME_PORT_GET,
                         NULL, 0, NULL, &stJoyStatus, ulDataLen, &ulDataLen);
-		if (rc != 0)
+        if (rc != 0) {
 		{
            joyPortClose(&hJoyPort);
            return SDL_SetError("Could not call joystick port.");
        }
        ulLastTick = stJoyStatus.ulJs_Ticks;
-		while (stJoyStatus.ulJs_Ticks == ulLastTick)
+        while (stJoyStatus.ulJs_Ticks == ulLastTick) {
 		{
               rc = DosDevIOCtl(hJoyPort, IOCTL_CAT_USER, GAME_PORT_GET,
                                NULL, 0, NULL, &stJoyStatus, ulDataLen, &ulDataLen);
        }
-		if ((stJoyStatus.ucJs_JoyStickMask & 0x03) > 0) numdevs++;
+        if ((stJoyStatus.ucJs_JoyStickMask & 0x03) > 0) {
-		if (((stJoyStatus.ucJs_JoyStickMask >> 2) & 0x03) > 0) numdevs++;
+            numdevs++;
        }
        if (((stJoyStatus.ucJs_JoyStickMask >> 2) & 0x03) > 0) {
            numdevs++;
        }
    }
-	if (numdevs > maxdevs) numdevs = maxdevs;
+    if (numdevs > maxdevs) {
        numdevs = maxdevs;
    }
    /* If *any* joystick was detected... Let's configure SDL for them */
-	if (numdevs > 0)
+    if (numdevs > 0) {
 	{
        /* Verify if it is a "user defined" joystick */
-		if (joyGetEnv(&joycfg))
+        if (joyGetEnv(&joycfg)) {
 		{
            GAME_3POS_STRUCT * axis[4];
            axis[0] = &stGameCalib.Ax;
            axis[1] = &stGameCalib.Ay;
@@ -246,46 +253,61 @@ static int OS2_JoystickInit(void)
            SYS_JoyData[0].id = 0;
            /* Define Number of Axes... up to 4 */
-			if (joycfg.axes>MAX_AXES) joycfg.axes = MAX_AXES;
+            if (joycfg.axes>MAX_AXES) {
                joycfg.axes = MAX_AXES;
            }
            SYS_JoyData[0].axes = joycfg.axes;
            /* Define number of buttons... 8 if 2 axes, 6 if 3 axes and 4 if 4 axes */
            maxbut = MAX_BUTTONS;
-			if (joycfg.axes>2) maxbut -= ((joycfg.axes - 2)<<1); /* MAX_BUTTONS - 2*(axes-2) */
+            if (joycfg.axes > 2) {
-			if (joycfg.buttons > maxbut) joycfg.buttons = maxbut;
+                maxbut -= ((joycfg.axes - 2) << 1);     /* MAX_BUTTONS - 2*(axes-2) */
            }
            if (joycfg.buttons > maxbut) {
                joycfg.buttons = maxbut;
            }
            SYS_JoyData[0].buttons = joycfg.buttons;
            /* Define number of hats */
-			if (joycfg.hats > MAX_HATS) joycfg.hats = MAX_HATS;
+            if (joycfg.hats > MAX_HATS) {
                joycfg.hats = MAX_HATS;
            }
            SYS_JoyData[0].hats = joycfg.hats;
            /* Define number of balls */
-			if (joycfg.balls > MAX_BALLS) joycfg.balls = MAX_BALLS;
+            if (joycfg.balls > MAX_BALLS) {
                joycfg.balls = MAX_BALLS;
            }
            SYS_JoyData[0].balls = joycfg.balls;
            /* Initialize Axes Callibration Values */
-			for (i=0; i<joycfg.axes; i++)
+            for (i = 0; i < joycfg.axes; i++) {
 			{
                 SYS_JoyData[0].axes_min[i] = axis[i]->lower;
                 SYS_JoyData[0].axes_med[i] = axis[i]->centre;
                 SYS_JoyData[0].axes_max[i] = axis[i]->upper;
            }
            /* Initialize Buttons 5 to 8 structures */
-			if (joycfg.buttons>=5) SYS_JoyData[0].buttoncalc[0] = ((axis[2]->lower+axis[3]->centre)>>1);
+            if (joycfg.buttons >=5 ) {
-			if (joycfg.buttons>=6) SYS_JoyData[0].buttoncalc[1] = ((axis[3]->lower+axis[3]->centre)>>1);
+                SYS_JoyData[0].buttoncalc[0] = ((axis[2]->lower + axis[3]->centre) >> 1);
-			if (joycfg.buttons>=7) SYS_JoyData[0].buttoncalc[2] = ((axis[2]->upper+axis[3]->centre)>>1);
+            }
-			if (joycfg.buttons>=8) SYS_JoyData[0].buttoncalc[3] = ((axis[3]->upper+axis[3]->centre)>>1);
+            if (joycfg.buttons >=6 ) {
                SYS_JoyData[0].buttoncalc[1] = ((axis[3]->lower + axis[3]->centre) >> 1);
            }
            if (joycfg.buttons >=7 ) {
                SYS_JoyData[0].buttoncalc[2] = ((axis[2]->upper + axis[3]->centre) >> 1);
            }
            if (joycfg.buttons >=8 ) {
                SYS_JoyData[0].buttoncalc[3] = ((axis[3]->upper + axis[3]->centre) >> 1);
            }
            /* Intialize Joystick Name */
            SDL_strlcpy (SYS_JoyData[0].szDeviceName,joycfg.name, SDL_arraysize(SYS_JoyData[0].szDeviceName));
        }
        /* Default Init ... autoconfig */
-		else
+        else {
 		{
            /* if two devices were detected... configure as Joy1 4 axis and Joy2 2 axis */
-			if (numdevs == 2)
+            if (numdevs == 2) {
 			{
                /* Define Device 0 as 4 axes, 4 buttons */
-				SYS_JoyData[0].id=0;
+                SYS_JoyData[0].id = 0;
                SYS_JoyData[0].axes = 4;
                SYS_JoyData[0].buttons = 4;
                SYS_JoyData[0].hats = 0;
@@ -303,7 +325,7 @@ static int OS2_JoystickInit(void)
                SYS_JoyData[0].axes_med[3] = stGameCalib.By.centre;
                SYS_JoyData[0].axes_max[3] = stGameCalib.By.upper;
                /* Define Device 1 as 2 axes, 2 buttons */
-				SYS_JoyData[1].id=1;
+                SYS_JoyData[1].id = 1;
                SYS_JoyData[1].axes = 2;
                SYS_JoyData[1].buttons = 2;
                SYS_JoyData[1].hats = 0;
@@ -316,13 +338,11 @@ static int OS2_JoystickInit(void)
                SYS_JoyData[1].axes_max[1] = stGameCalib.By.upper;
            }
            /* One joystick only? */
-			else
+            else {
 			{
                /* If it is joystick A... */
-				if ((stJoyStatus.ucJs_JoyStickMask & 0x03) > 0)
+                if ((stJoyStatus.ucJs_JoyStickMask & 0x03) > 0) {
 				{
                    /* Define Device 0 as 2 axes, 4 buttons */
-					SYS_JoyData[0].id=0;
+                    SYS_JoyData[0].id = 0;
                    SYS_JoyData[0].axes = 2;
                    SYS_JoyData[0].buttons = 4;
                    SYS_JoyData[0].hats = 0;
@@ -335,10 +355,9 @@ static int OS2_JoystickInit(void)
                    SYS_JoyData[0].axes_max[1] = stGameCalib.Ay.upper;
                }
                /* If not, it is joystick B */
-				else
+                else {
 				{
                    /* Define Device 1 as 2 axes, 2 buttons */
-					SYS_JoyData[0].id=1;
+                    SYS_JoyData[0].id = 1;
                    SYS_JoyData[0].axes = 2;
                    SYS_JoyData[0].buttons = 2;
                    SYS_JoyData[0].hats = 0;
@@ -353,16 +372,17 @@ static int OS2_JoystickInit(void)
            }
            /* Hack to define Joystick Port Names */
-			if (numdevs > maxdevs) numdevs = maxdevs;
+            if (numdevs > maxdevs) {
                numdevs = maxdevs;
            }
-			for (i = 0; i < numdevs; i++)
+            for (i = 0; i < numdevs; i++) {
-			{
+                SDL_snprintf(SYS_JoyData[i].szDeviceName, SDL_arraysize(SYS_JoyData[i].szDeviceName),
 				SDL_snprintf(SYS_JoyData[i].szDeviceName,
 						SDL_arraysize(SYS_JoyData[i].szDeviceName),
                            "Default Joystick %c", 'A'+SYS_JoyData[i].id);
            }
        }
    }
    /* Return the number of devices found */
    numjoysticks = numdevs;
    return numdevs;
@@ -422,8 +442,7 @@ static int OS2_JoystickOpen(SDL_Joystick *joystick, int device_index)
    /* allocate memory for system specific hardware data */
    joystick->hwdata = (struct joystick_hwdata *) SDL_calloc(1, sizeof(*joystick->hwdata));
-	if (!joystick->hwdata)
+    if (!joystick->hwdata) {
 	{
        return SDL_OutOfMemory();
    }
@@ -433,16 +452,12 @@ static int OS2_JoystickOpen(SDL_Joystick *joystick, int device_index)
    /* Define offsets and scales for all axes */
    joystick->hwdata->id = SYS_JoyData[index].id;
-	for (i = 0; i < MAX_AXES; ++i)
+    for (i = 0; i < MAX_AXES; ++i) {
-	{
+        if ((i < 2) || i < SYS_JoyData[index].axes) {
 		if ((i < 2) || i < SYS_JoyData[index].axes)
 		{
            joystick->hwdata->transaxes[i].offset = ((SDL_JOYSTICK_AXIS_MAX + SDL_JOYSTICK_AXIS_MIN)>>1) - SYS_JoyData[index].axes_med[i];
            joystick->hwdata->transaxes[i].scale1 = (float)SDL_abs((SDL_JOYSTICK_AXIS_MIN/SYS_JoyData[index].axes_min[i]));
            joystick->hwdata->transaxes[i].scale2 = (float)SDL_abs((SDL_JOYSTICK_AXIS_MAX/SYS_JoyData[index].axes_max[i]));
-		}
+        } else {
 		else
 		{
            joystick->hwdata->transaxes[i].offset = 0;
            joystick->hwdata->transaxes[i].scale1 = 1.0f; /* Just in case */
            joystick->hwdata->transaxes[i].scale2 = 1.0f; /* Just in case */
@@ -514,8 +529,7 @@ static void OS2_JoystickUpdate(SDL_Joystick *joystick)
    ulDataLen = sizeof(stGameStatus);
    rc = DosDevIOCtl(hJoyPort, IOCTL_CAT_USER, GAME_GET_STATUS,
                      NULL, 0, NULL, &stGameStatus, ulDataLen, &ulDataLen);
-	if (rc != 0)
+    if (rc != 0) {
 	{
        SDL_SetError("Could not read joystick status.");
        return; /* Could not read data */
    }
@@ -525,18 +539,22 @@ static void OS2_JoystickUpdate(SDL_Joystick *joystick)
    /* joystick motion events */
-	if (SYS_JoyData[index].id == 0)
+    if (SYS_JoyData[index].id == 0) {
 	{
        pos[0] = stGameStatus.curdata.A.x;
        pos[1] = stGameStatus.curdata.A.y;
-		if (SYS_JoyData[index].axes >= 3) pos[2] = stGameStatus.curdata.B.x;
+        if (SYS_JoyData[index].axes >= 3) {
-		else pos[2] = 0;
+            pos[2] = stGameStatus.curdata.B.x;
-		if (SYS_JoyData[index].axes >= 4) pos[3] = stGameStatus.curdata.B.y;
+        } else {
-		else pos[3] = 0;
+            pos[2] = 0;
        }
        if (SYS_JoyData[index].axes >= 4) {
            pos[3] = stGameStatus.curdata.B.y;
        } else {
            pos[3] = 0;
        }
        /* OS/2 basic drivers do not support more than 4 axes joysticks */
    }
-	else if (SYS_JoyData[index].id == 1)
+    else if (SYS_JoyData[index].id == 1) {
 	{
        pos[0] = stGameStatus.curdata.B.x;
        pos[1] = stGameStatus.curdata.B.y;
        pos[2] = 0;
@@ -545,41 +563,42 @@ static void OS2_JoystickUpdate(SDL_Joystick *joystick)
    /* Corrects the movements using the callibration */
    transaxes = joystick->hwdata->transaxes;
-	for (i = 0; i < joystick->naxes; i++)
+    for (i = 0; i < joystick->naxes; i++) {
 	{
        value = pos[i] + transaxes[i].offset;
-		if (value < 0)
+        if (value < 0) {
 		{
            value *= transaxes[i].scale1;
-			if (value > 0) value = SDL_JOYSTICK_AXIS_MIN;
+            if (value > 0) {
                value = SDL_JOYSTICK_AXIS_MIN;
            }
-		else
+        } else {
 		{
            value *= transaxes[i].scale2;
-			if (value < 0) value = SDL_JOYSTICK_AXIS_MAX;
+            if (value < 0) {
                value = SDL_JOYSTICK_AXIS_MAX;
            }
        }
        SDL_PrivateJoystickAxis(joystick, (Uint8)i, (Sint16)value);
    }
    /* joystick button A to D events */
-	if (SYS_JoyData[index].id == 1) corr = 2;
+    if (SYS_JoyData[index].id == 1) {
-	else corr = 0;
+        corr = 2;
    } else {
        corr = 0;
    }
    normbut = 4;    /* Number of normal buttons */
-	if (joystick->nbuttons < normbut) normbut = joystick->nbuttons;
+    if (joystick->nbuttons < normbut) {
-	for (i = corr; (i-corr) < normbut; ++i)
+        normbut = joystick->nbuttons;
-	{
+    }
    for (i = corr; (i-corr) < normbut; ++i) {
        /*
        Button A: 1110 0000
        Button B: 1101 0000
        Button C: 1011 0000
        Button D: 0111 0000
        */
-		if ((~stGameStatus.curdata.butMask)>>4 & JOY_BUTTON_FLAG(i))
+        if ((~stGameStatus.curdata.butMask)>>4 & JOY_BUTTON_FLAG(i)) {
 		{
            SDL_PrivateJoystickButton(joystick, (Uint8)(i-corr), SDL_PRESSED);
-		}
+        } else {
 		else
 		{
            SDL_PrivateJoystickButton(joystick, (Uint8)(i-corr), SDL_RELEASED);
        }
    }
@@ -591,25 +610,33 @@ static void OS2_JoystickUpdate(SDL_Joystick *joystick)
    Button G: Axis 2 X Right
    Button H: Axis 2 Y Down
    */
-	if (joystick->nbuttons >= 5)
+    if (joystick->nbuttons >= 5) {
-	{
+        if (stGameStatus.curdata.B.x < SYS_JoyData[index].buttoncalc[0]) {
-		if (stGameStatus.curdata.B.x < SYS_JoyData[index].buttoncalc[0]) SDL_PrivateJoystickButton(joystick, (Uint8)4, SDL_PRESSED);
+            SDL_PrivateJoystickButton(joystick, (Uint8)4, SDL_PRESSED);
-		else SDL_PrivateJoystickButton(joystick, (Uint8)4, SDL_RELEASED);
+        } else {
            SDL_PrivateJoystickButton(joystick, (Uint8)4, SDL_RELEASED);
        }
 	if (joystick->nbuttons >= 6)
 	{
 		if (stGameStatus.curdata.B.y < SYS_JoyData[index].buttoncalc[1]) SDL_PrivateJoystickButton(joystick, (Uint8)5, SDL_PRESSED);
 		else SDL_PrivateJoystickButton(joystick, (Uint8)5, SDL_RELEASED);
    }
-	if (joystick->nbuttons >= 7)
+    if (joystick->nbuttons >= 6) {
-	{
+        if (stGameStatus.curdata.B.y < SYS_JoyData[index].buttoncalc[1]) {
-		if (stGameStatus.curdata.B.x > SYS_JoyData[index].buttoncalc[2]) SDL_PrivateJoystickButton(joystick, (Uint8)6, SDL_PRESSED);
+            SDL_PrivateJoystickButton(joystick, (Uint8)5, SDL_PRESSED);
-		else SDL_PrivateJoystickButton(joystick, (Uint8)6, SDL_RELEASED);
+        } else {
            SDL_PrivateJoystickButton(joystick, (Uint8)5, SDL_RELEASED);
        }
    }
    if (joystick->nbuttons >= 7) {
        if (stGameStatus.curdata.B.x > SYS_JoyData[index].buttoncalc[2]) {
            SDL_PrivateJoystickButton(joystick, (Uint8)6, SDL_PRESSED);
        } else {
            SDL_PrivateJoystickButton(joystick, (Uint8)6, SDL_RELEASED);
        }
    }
    if (joystick->nbuttons >= 8) {
        if (stGameStatus.curdata.B.y > SYS_JoyData[index].buttoncalc[3]) {
            SDL_PrivateJoystickButton(joystick, (Uint8)7, SDL_PRESSED);
        } else {
           SDL_PrivateJoystickButton(joystick, (Uint8)7, SDL_RELEASED);
        }
 	if (joystick->nbuttons >= 8)
 	{
 		if (stGameStatus.curdata.B.y > SYS_JoyData[index].buttoncalc[3]) SDL_PrivateJoystickButton(joystick, (Uint8)7, SDL_PRESSED);
 		else SDL_PrivateJoystickButton(joystick, (Uint8)7, SDL_RELEASED);
    }
    /* joystick hat events */
@@ -656,13 +683,14 @@ static int joyPortOpen(HFILE * hGame)
    ULONG ulDataLen;  /* Size of version data */
    /* Verifies if joyport is not already open... */
-	if (*hGame != NULLHANDLE) return 0;
+    if (*hGame != NULLHANDLE) {
        return 0;
    }
    /* Open GAME$ for read */
    rc = DosOpen("GAME$   ", hGame, &ulAction, 0, FILE_READONLY,
                 FILE_OPEN, OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE, NULL);
-	if (rc != 0)
+    if (rc != 0) {
 	{
        return SDL_SetError("Could not open Joystick Port.");
    }
@@ -671,16 +699,15 @@ static int joyPortOpen(HFILE * hGame)
    ulDataLen = sizeof(ulVersion);
    rc = DosDevIOCtl(*hGame, IOCTL_CAT_USER, GAME_GET_VERSION,
                     NULL, 0, NULL, &ulVersion, ulDataLen, &ulDataLen);
-	if (rc != 0)
+    if (rc != 0) {
 	{
        joyPortClose(hGame);
        return SDL_SetError("Could not get Joystick Driver version.");
    }
-	if (ulVersion < 0x20)
+    if (ulVersion < 0x20) {
 	{
        joyPortClose(hGame);
        return SDL_SetError("Driver too old. At least IBM driver version 2.0 required.");
    }
    return 0;
 }
@@ -689,7 +716,9 @@ static int joyPortOpen(HFILE * hGame)
 /****************************/
 static void joyPortClose(HFILE * hGame)
 {
-	if (*hGame != NULLHANDLE) DosClose(*hGame);
+    if (*hGame != NULLHANDLE) {
        DosClose(*hGame);
    }
    *hGame = NULLHANDLE;
 }
@@ -726,24 +755,33 @@ static int joyGetEnv(struct _joycfg * joydata)
    }
    /* Now get the number of axes */
-	while (*joyenv == ' ' && *joyenv != 0) joyenv++; /* jump spaces... */
+    while (*joyenv == ' ' && *joyenv != 0) {
        joyenv++; /* jump spaces... */
    }
    joyenv += joyGetData(joyenv,tempnumber,' ',sizeof(tempnumber));
    joydata->axes = SDL_atoi(tempnumber);
    /* Now get the number of buttons */
-	while (*joyenv == ' ' && *joyenv != 0) joyenv++; /* jump spaces... */
+    while (*joyenv == ' ' && *joyenv != 0) {
        joyenv++; /* jump spaces... */
    }
    joyenv += joyGetData(joyenv,tempnumber,' ',sizeof(tempnumber));
    joydata->buttons = SDL_atoi(tempnumber);
    /* Now get the number of hats */
-	while (*joyenv == ' ' && *joyenv != 0) joyenv++; /* jump spaces... */
+    while (*joyenv == ' ' && *joyenv != 0) {
        joyenv++; /* jump spaces... */
    }
    joyenv += joyGetData(joyenv,tempnumber,' ',sizeof(tempnumber));
    joydata->hats = SDL_atoi(tempnumber);
    /* Now get the number of balls */
-	while (*joyenv==' ' && *joyenv != 0) joyenv++; /* jump spaces... */
+    while (*joyenv==' ' && *joyenv != 0) {
        joyenv++; /* jump spaces... */
    }
    joyenv += joyGetData(joyenv,tempnumber,' ',sizeof(tempnumber));
    joydata->balls = SDL_atoi(tempnumber);
    return 1;
 }
@@ -757,18 +795,15 @@ static int joyGetData(const char *joyenv, char *name, char stopchar, size_t maxc
    int chcnt = 0;  /* Count how many characters where copied */
    nameptr = name;
-	while (*joyenv!=stopchar && *joyenv!=0)
+    while (*joyenv!=stopchar && *joyenv != 0) {
-	{
+        if (nameptr < (name + (maxchars-1))) {
 		if (nameptr < (name + (maxchars-1)))
 		{
            *nameptr = *joyenv; /* Only copy if smaller than maximum */
            nameptr++;
        }
        chcnt++;
        joyenv++;
    }
-	if (*joyenv == stopchar)
+    if (*joyenv == stopchar) {
 	{
        joyenv++; /* Jump stopchar */
        chcnt++;
    }
@@ -776,8 +811,7 @@ static int joyGetData(const char *joyenv, char *name, char stopchar, size_t maxc
    return chcnt;
 }
-SDL_JoystickDriver SDL_OS2_JoystickDriver =
+SDL_JoystickDriver SDL_OS2_JoystickDriver = {
 {
    OS2_JoystickInit,
    OS2_NumJoysticks,
    OS2_JoystickDetect,
@@ -22,6 +22,7 @@ standard_guid_pattern = re.compile(r'^([0-9a-fA-F]{4})([0-9a-fA-F]{2})([0-9a-fA-
 invalid_controllers = (
    ('0079', '0006', '0000'), # DragonRise Inc. Generic USB Joystick
    ('0079', '0006', '6120'), # DragonRise Inc. Generic USB Joystick
    ('04b4', '2412', 'c529'), # Flydigi Vader 2, Vader 2 Pro, Apex 2, Apex 3
    ('16c0', '05e1', '0000'), # Xinmotek Controller
 )
@@ -9,8 +9,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,28,2,0
+ FILEVERSION 2,28,4,0
- PRODUCTVERSION 2,28,2,0
+ PRODUCTVERSION 2,28,4,0
 FILEFLAGSMASK 0x3fL
 FILEFLAGS 0x0L
 FILEOS 0x40004L
@@ -23,12 +23,12 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "\0"
            VALUE "FileDescription", "SDL\0"
-            VALUE "FileVersion", "2, 28, 2, 0\0"
+            VALUE "FileVersion", "2, 28, 4, 0\0"
            VALUE "InternalName", "SDL\0"
            VALUE "LegalCopyright", "Copyright (C) 2023 Sam Lantinga\0"
            VALUE "OriginalFilename", "SDL2.dll\0"
            VALUE "ProductName", "Simple DirectMedia Layer\0"
-            VALUE "ProductVersion", "2, 28, 2, 0\0"
+            VALUE "ProductVersion", "2, 28, 4, 0\0"
        END
    END
    BLOCK "VarFileInfo"
@@ -23,13 +23,11 @@
 #include <emscripten/emscripten.h>
 EM_JS_DEPS(sdlsysurl, "$UTF8ToString");
 int SDL_SYS_OpenURL(const char *url)
 {
-    EM_ASM({
+    EM_ASM(window.open(UTF8ToString($0), "_blank"), url);
        window.open(UTF8ToString($0), "_blank");
    },
           url);
    return 0;
 }
@@ -32,6 +32,18 @@ int SDL_SYS_OpenURL(const char *url)
 {
    const pid_t pid1 = fork();
    if (pid1 == 0) { /* child process */
 #ifdef USE_POSIX_SPAWN
        pid_t pid2;
        const char *args[] = { "xdg-open", url, NULL };
        /* Clear LD_PRELOAD so Chrome opens correctly when this application is launched by Steam */
        unsetenv("LD_PRELOAD");
        if (posix_spawnp(&pid2, args[0], NULL, NULL, (char **)args, environ) == 0) {
            /* Child process doesn't wait for possibly-blocking grandchild. */
            _exit(EXIT_SUCCESS);
        } else {
            _exit(EXIT_FAILURE);
        }
 #else
        pid_t pid2;
        /* Clear LD_PRELOAD so Chrome opens correctly when this application is launched by Steam */
        unsetenv("LD_PRELOAD");
@@ -46,6 +58,7 @@ int SDL_SYS_OpenURL(const char *url)
            /* Child process doesn't wait for possibly-blocking grandchild. */
            _exit(EXIT_SUCCESS);
        }
 #endif /* USE_POSIX_SPAWN */
    } else if (pid1 < 0) {
        return SDL_SetError("fork() failed: %s", strerror(errno));
    } else {
@@ -2481,7 +2481,7 @@ int SDL_RenderSetClipRect(SDL_Renderer *renderer, const SDL_Rect *rect)
    int retval;
    CHECK_RENDERER_MAGIC(renderer, -1)
-    if (rect && rect->w > 0 && rect->h > 0) {
+    if (rect && rect->w >= 0 && rect->h >= 0) {
        renderer->clipping_enabled = SDL_TRUE;
        renderer->clip_rect.x = (double)rect->x * renderer->scale.x;
        renderer->clip_rect.y = (double)rect->y * renderer->scale.y;
@@ -1654,8 +1654,22 @@ static SDL_Renderer *METAL_CreateRenderer(SDL_Window * window, Uint32 flags)
        return NULL;
    }
-    // !!! FIXME: MTLCopyAllDevices() can find other GPUs on macOS...
+#ifdef __MACOSX__
    if (SDL_GetHintBoolean(SDL_HINT_RENDER_METAL_PREFER_LOW_POWER_DEVICE, SDL_TRUE)) {
        NSArray<id<MTLDevice>> *devices = MTLCopyAllDevices();
        for (id<MTLDevice> device in devices) {
            if (device.isLowPower) {
                mtldevice = device;
                break;
            }
        }
    }
 #endif
    if (mtldevice == nil) {
        mtldevice = MTLCreateSystemDefaultDevice();
    }
    if (mtldevice == nil) {
        SDL_free(renderer);
@@ -795,9 +795,6 @@ char *SDL_iconv_string(const char *tocode, const char *fromcode, const char *inb
    size_t outbytesleft;
    size_t retCode = 0;
    cd = SDL_iconv_open(tocode, fromcode);
    if (cd == (SDL_iconv_t)-1) {
        /* See if we can recover here (fixes iconv on Solaris 11) */
    if (tocode == NULL || !*tocode) {
        tocode = "UTF-8";
    }
@@ -805,7 +802,6 @@ char *SDL_iconv_string(const char *tocode, const char *fromcode, const char *inb
        fromcode = "UTF-8";
    }
    cd = SDL_iconv_open(tocode, fromcode);
    }
    if (cd == (SDL_iconv_t)-1) {
        return NULL;
    }
@@ -1190,7 +1190,9 @@ int SDL_vsscanf(const char *text, const char *fmt, va_list ap)
                    suppress = SDL_TRUE;
                    break;
                case 'h':
-                    if (inttype > DO_SHORT) {
+                    if (inttype == DO_INT) {
                        inttype = DO_SHORT;
                    } else if (inttype > DO_SHORT) {
                        ++inttype;
                    }
                    break;
@@ -36,6 +36,25 @@
 /* Counter for _CompareSurface calls; used for filename creation when comparisons fail */
 static int _CompareSurfaceCount = 0;
 static Uint32
 GetPixel(Uint8 *p, size_t bytes_per_pixel)
 {
    Uint32 ret = 0;
    SDL_assert(bytes_per_pixel <= sizeof(ret));
    /* Fill the appropriate number of least-significant bytes of ret,
     * leaving the most-significant bytes set to zero, so that ret can
     * be decoded with SDL_GetRGBA afterwards. */
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
    SDL_memcpy(((Uint8 *) &ret) + (sizeof(ret) - bytes_per_pixel), p, bytes_per_pixel);
 #else
    SDL_memcpy(&ret, p, bytes_per_pixel);
 #endif
    return ret;
 }
 /* Compare surfaces */
 int SDLTest_CompareSurfaces(SDL_Surface *surface, SDL_Surface *referenceSurface, int allowable_error)
 {
@@ -74,11 +93,14 @@ int SDLTest_CompareSurfaces(SDL_Surface *surface, SDL_Surface *referenceSurface,
    /* Compare image - should be same format. */
    for (j = 0; j < surface->h; j++) {
        for (i = 0; i < surface->w; i++) {
            Uint32 pixel;
            p = (Uint8 *)surface->pixels + j * surface->pitch + i * bpp;
            p_reference = (Uint8 *)referenceSurface->pixels + j * referenceSurface->pitch + i * bpp_reference;
-            SDL_GetRGBA(*(Uint32 *)p, surface->format, &R, &G, &B, &A);
+            pixel = GetPixel(p, bpp);
-            SDL_GetRGBA(*(Uint32 *)p_reference, referenceSurface->format, &Rd, &Gd, &Bd, &Ad);
+            SDL_GetRGBA(pixel, surface->format, &R, &G, &B, &A);
            pixel = GetPixel(p_reference, bpp_reference);
            SDL_GetRGBA(pixel, referenceSurface->format, &Rd, &Gd, &Bd, &Ad);
            dist = 0;
            dist += (R - Rd) * (R - Rd);
@@ -31,6 +31,15 @@
 #include "../../events/SDL_mouse_c.h"
 /* older Emscriptens don't have this, but we need to for wasm64 compatibility. */
 #ifndef MAIN_THREAD_EM_ASM_PTR
    #ifdef __wasm64__
        #error You need to upgrade your Emscripten compiler to support wasm64
    #else
        #define MAIN_THREAD_EM_ASM_PTR MAIN_THREAD_EM_ASM_INT
    #endif
 #endif
 static SDL_Cursor *Emscripten_CreateCursorFromString(const char *cursor_str, SDL_bool is_custom)
 {
    SDL_Cursor *cursor;
@@ -60,6 +69,8 @@ static SDL_Cursor *Emscripten_CreateDefaultCursor()
    return Emscripten_CreateCursorFromString("default", SDL_FALSE);
 }
 EM_JS_DEPS(sdlmouse, "$stringToUTF8,$UTF8ToString");
 static SDL_Cursor *Emscripten_CreateCursor(SDL_Surface *surface, int hot_x, int hot_y)
 {
    const char *cursor_url = NULL;
@@ -72,7 +83,7 @@ static SDL_Cursor *Emscripten_CreateCursor(SDL_Surface *surface, int hot_x, int
    }
    /* *INDENT-OFF* */ /* clang-format off */
-    cursor_url = (const char *)MAIN_THREAD_EM_ASM_INT({
+    cursor_url = (const char *)MAIN_THREAD_EM_ASM_PTR({
        var w = $0;
        var h = $1;
        var hot_x = $2;
@@ -37,34 +37,30 @@ typedef struct
    const char *libname;
 } waylanddynlib;
 #ifndef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL
 #define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL NULL
 #endif
 #ifndef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR
 #define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR NULL
 #endif
 #ifndef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON
 #define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON NULL
 #endif
 #ifndef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR
 #define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR NULL
 #endif
 static waylanddynlib waylandlibs[] = {
    { NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC },
 #ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL
    { NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL },
 #endif
 #ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR
    { NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR },
 #endif
 #ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON
    { NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON },
-    { NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR }
+#endif
 #ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR
    { NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR },
 #endif
    { NULL, NULL }
 };
 static void *WAYLAND_GetSym(const char *fnname, int *pHasModule, SDL_bool required)
 {
    int i;
    void *fn = NULL;
-    for (i = 0; i < SDL_TABLESIZE(waylandlibs); i++) {
+    waylanddynlib *dynlib;
-        if (waylandlibs[i].lib != NULL) {
+    for (dynlib = waylandlibs; dynlib->libname; dynlib++) {
-            fn = SDL_LoadFunction(waylandlibs[i].lib, fnname);
+        if (dynlib->lib != NULL) {
            fn = SDL_LoadFunction(dynlib->lib, fnname);
            if (fn != NULL) {
                break;
            }
@@ -72,10 +68,11 @@ static void *WAYLAND_GetSym(const char *fnname, int *pHasModule, SDL_bool requir
    }
 #if DEBUG_DYNAMIC_WAYLAND
-    if (fn != NULL)
+    if (fn != NULL) {
-        SDL_Log("WAYLAND: Found '%s' in %s (%p)\n", fnname, waylandlibs[i].libname, fn);
+        SDL_Log("WAYLAND: Found '%s' in %s (%p)\n", fnname, dynlib->libname, fn);
-    else
+    } else {
        SDL_Log("WAYLAND: Symbol '%s' NOT FOUND!\n", fnname);
    }
 #endif
    if (fn == NULL && required) {
@@ -132,10 +132,7 @@ static int SetSelectionText(_THIS, const char *text, Atom selection_type)
                        X11_GetSDLCutBufferClipboardInternalFormat(display, SDL_X11_CLIPBOARD_MIME_TYPE_STRING), 8, PropModeReplace,
                        (const unsigned char *)text, SDL_strlen(text));
    if (X11_XGetSelectionOwner(display, selection_type) != window) {
    X11_XSetSelectionOwner(display, selection_type, window, CurrentTime);
    }
    return 0;
 }
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.0...3.5)
 project(SDL2_test)
 include(CheckCCompilerFlag)
@@ -168,6 +168,9 @@ add_sdl_test_executable(testoverlay2 NEEDS_RESOURCES testoverlay2.c testyuv_cvt.
 add_sdl_test_executable(testplatform NONINTERACTIVE testplatform.c)
 add_sdl_test_executable(testpower NONINTERACTIVE testpower.c)
 add_sdl_test_executable(testfilesystem NONINTERACTIVE testfilesystem.c)
 if(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
    add_sdl_test_executable(testfilesystem_pre NONINTERACTIVE testfilesystem_pre.c)
 endif()
 add_sdl_test_executable(testrendertarget NEEDS_RESOURCES testrendertarget.c testutils.c)
 add_sdl_test_executable(testscale NEEDS_RESOURCES testscale.c testutils.c)
 add_sdl_test_executable(testsem testsem.c)
@@ -426,6 +429,10 @@ endforeach()
 set_tests_properties(testthread PROPERTIES TIMEOUT 40)
 set_tests_properties(testtimer PROPERTIES TIMEOUT 60)
 if(TARGET testfilesystem_pre)
    set_property(TEST testfilesystem_pre PROPERTY TIMEOUT 60)
    set_property(TEST testfilesystem APPEND PROPERTY DEPENDS testfilesystem_pre)
 endif()
 if(SDL_INSTALL_TESTS)
    if(RISCOS)
@@ -102,8 +102,8 @@ const char *_nonRGBPixelFormatsVerbose[] = {
 /* Definition of some invalid formats for negative tests */
 const int _numInvalidPixelFormats = 2;
 Uint32 _invalidPixelFormats[] = {
-    0xfffffffe,
+    SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ABGR, SDL_PACKEDLAYOUT_1010102 + 1, 32, 4),
-    0xffffffff
+    SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ABGR, SDL_PACKEDLAYOUT_1010102 + 2, 32, 4)
 };
 const char *_invalidPixelFormatsVerbose[] = {
    "SDL_PIXELFORMAT_UNKNOWN",
@@ -121,7 +121,6 @@ const char *_invalidPixelFormatsVerbose[] = {
 int pixels_allocFreeFormat(void *arg)
 {
    const char *unknownFormat = "SDL_PIXELFORMAT_UNKNOWN";
    const char *expectedError = "Parameter 'format' is invalid";
    const char *error;
    int i;
    Uint32 format;
@@ -172,6 +171,7 @@ int pixels_allocFreeFormat(void *arg)
        }
    }
 #if 0 /* This succeeds for SDL3, but we don't expect SDL2 applications to call SDL_AllocFormat() for FOURCC formats directly */
    /* Non-RGB formats */
    for (i = 0; i < _numNonRGBPixelFormats; i++) {
        format = _nonRGBPixelFormats[i];
@@ -182,6 +182,7 @@ int pixels_allocFreeFormat(void *arg)
        SDLTest_AssertPass("Call to SDL_AllocFormat()");
        SDLTest_AssertCheck(result == NULL, "Verify result is NULL");
    }
 #endif
    /* Negative cases */
@@ -196,23 +197,6 @@ int pixels_allocFreeFormat(void *arg)
        error = SDL_GetError();
        SDLTest_AssertPass("Call to SDL_GetError()");
        SDLTest_AssertCheck(error != NULL, "Validate that error message was not NULL");
        if (error != NULL) {
            SDLTest_AssertCheck(SDL_strcmp(error, expectedError) == 0,
                                "Validate error message, expected: '%s', got: '%s'", expectedError, error);
        }
    }
    /* Invalid free pointer */
    SDL_ClearError();
    SDLTest_AssertPass("Call to SDL_ClearError()");
    SDL_FreeFormat(NULL);
    SDLTest_AssertPass("Call to SDL_FreeFormat(NULL)");
    error = SDL_GetError();
    SDLTest_AssertPass("Call to SDL_GetError()");
    SDLTest_AssertCheck(error != NULL, "Validate that error message was not NULL");
    if (error != NULL) {
        SDLTest_AssertCheck(SDL_strcmp(error, expectedError) == 0,
                            "Validate error message, expected: '%s', got: '%s'", expectedError, error);
    }
    return TEST_COMPLETED;
@@ -310,7 +294,6 @@ int pixels_getPixelFormatName(void *arg)
 int pixels_allocFreePalette(void *arg)
 {
    const char *expectedError1 = "Parameter 'ncolors' is invalid";
    const char *expectedError2 = "Parameter 'palette' is invalid";
    const char *error;
    int variation;
    int i;
@@ -375,19 +358,6 @@ int pixels_allocFreePalette(void *arg)
        }
    }
    /* Invalid free pointer */
    SDL_ClearError();
    SDLTest_AssertPass("Call to SDL_ClearError()");
    SDL_FreePalette(NULL);
    SDLTest_AssertPass("Call to SDL_FreePalette(NULL)");
    error = SDL_GetError();
    SDLTest_AssertPass("Call to SDL_GetError()");
    SDLTest_AssertCheck(error != NULL, "Validate that error message was not NULL");
    if (error != NULL) {
        SDLTest_AssertCheck(SDL_strcmp(error, expectedError2) == 0,
                            "Validate error message, expected: '%s', got: '%s'", expectedError2, error);
    }
    return TEST_COMPLETED;
 }
@@ -0,0 +1,32 @@
 /*
  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
  arising from the use of this software.
  Permission is granted to anyone to use this software for any purpose,
  including commercial applications, and to alter it and redistribute it
  freely.
 */
 /* Call SDL_GetPrefPath to warm the SHGetFolderPathW cache */
 /**
 * We noticed frequent ci timeouts running testfilesystem on 32-bit Windows.
 * Internally, this functions calls Shell32.SHGetFolderPathW.
 */
 #include "SDL.h"
 int main(int argc, char *argv[])
 {
    Uint64 start;
    (void)argc;
    (void)argv;
    SDL_Init(0);
    start = SDL_GetTicks();
    SDL_GetPrefPath("libsdl", "test_filesystem");
    SDL_Log("SDL_GetPrefPath took %" SDL_PRIu64 "ms", SDL_GetTicks() - start);
    SDL_Quit();
    return 0;
 }
Author	SHA1	Message	Date
Sam Lantinga	cc016b0046	Updated to version 2.28.4 for release	2023-10-01 12:05:05 -07:00
Anonymous Maartenandelahav	8c3fd5aec2	snd_pcm_plugin_flush was removed in QNX 7.1 and later Co-authored-by: elahav <elahav@users.noreply.github.com>	2023-09-30 16:53:53 +02:00
Anonymous Maartenandelahav	24d145f4b6	cmake: add qnx support Co-authored-by: elahav <elahav@users.noreply.github.com>	2023-09-30 16:53:53 +02:00
Anonymous Maartenandelahav	145ad48c0e	Allow the use of posix_spawn() instead of vfork/execlp() Backport of #7041 Co-authored-by: elahav <elahav@users.noreply.github.com>	2023-09-30 16:53:53 +02:00
Simon McVittie	fd495bb57c	SDLTest_CompareSurfaces: Decode pixels correctly on big-endian platforms Previously, if acting on a surface with less than 32 bits per pixel, this code was placing the pixel value from the surface in the first few bytes of the Uint32 to be decoded, and unrelated data from a subsequent pixel in the remaining bytes. Because SDL_GetRGBA takes the bits to be decoded from the least-significant bits of the given value, ignoring the higher-order bits if any, this happened to be correct on little-endian platforms, where the first few bytes store the least-significant bits of an integer. However, it was incorrect on big-endian, where the first few bytes are the most-significant bits of an integer. The previous implementation also assumed that unaligned access to a 32-bit quantity is possible, which is not the case on all CPUs (but happens to be true on x86). These issues were not discovered until now because SDLTest_CompareSurfaces() is only used in testautomation, which until recently was not being run routinely at build-time, because it contained other assumptions that can fail in an autobuilder or CI environment. Resolves: https://github.com/libsdl-org/SDL/issues/8315 Signed-off-by: Simon McVittie <smcv@collabora.com> (cherry picked from commit `d95d2d7051`) (cherry picked from commit `6b5eadb10f`)	2023-09-29 06:57:07 -07:00
Sam Lantinga	d58fa94ee9	SDL_iconv_string() defaults to UTF-8 Fixes https://github.com/libsdl-org/SDL/issues/8287 (cherry picked from commit `1375d2049d`) (cherry picked from commit `9772d0512c`)	2023-09-24 17:28:23 -07:00
Sam Lantinga	d691010686	Check for NULL before dereferencing newly allocated memory Fixes https://github.com/libsdl-org/SDL/issues/8289 (cherry picked from commit `70a1bc6973`) (cherry picked from commit `27f2df2292`)	2023-09-24 17:19:03 -07:00
Ryan C. Gordon	b93a8a86ab	emscripten: Restore compatibility with existing emsdk releases. (cherry picked from commit `5008521538`)	2023-09-20 14:37:56 -04:00
Jaswant Panchumarti	536f625bde	Use EM_ASM_PTR when the return value is a pointer - closes https://github.com/libsdl-org/SDL/issues/8241 (cherry picked from commit `953b55dd6d`)	2023-09-20 14:37:24 -04:00
Ozkan Sezer	1e18dc594e	update config.guess and config.sub from mainstream	2023-09-20 14:50:56 +03:00
Sam Lantinga	cc4973ea45	Fixed sensor timestamp units for third-party PS5 controllers (cherry picked from commit `a72dfa6a5f`) (cherry picked from commit `37dee79b74`)	2023-09-18 13:00:50 -07:00
Sam Lantinga	8114bd9108	Fixed error: array subscript 2 is above array bounds of ‘const Uint8[2]’ Smart compilers don't like dereferencing off the end of arrays (cherry picked from commit `f6756047a4`) (cherry picked from commit `62e7049a4f`)	2023-09-18 12:20:36 -07:00
Sam Lantinga	495fca1517	Fixed sensor timestamp calculation for third-party PS5 controllers (cherry picked from commit `7059a55ccc`) (cherry picked from commit `fff3c2573a`)	2023-09-18 11:59:00 -07:00
Sam Clegg	7d80e20883	emscripten: Add JS library dependencies using EM_JS_DEPS macro See https://github.com/emscripten-core/emscripten/pull/19780 (cherry picked from commit `042243471f`)	2023-09-15 15:29:47 -07:00
Guldoman	f3847c157a	x11: Always update clipboard owner This allows utilities like clipboard managers to keep track of the changes. (cherry picked from commit `65aaf3a9ab`) (cherry picked from commit `70a2ac2f1c`)	2023-09-15 05:23:21 -07:00
Max Bachmann	b576e29d9b	detect fanatec steering wheels (cherry picked from commit `fd1c54a004`) (cherry picked from commit `a8b9414697`)	2023-09-12 15:36:41 -07:00
Anonymous Maarten	c7ad8e5431	cmake: make sure SDL_GetPrefPath is run before testfilesystem 60 seconds timeout ought to be sufficient.	2023-09-10 15:34:29 +02:00
Anonymous Maarten	9c8ee3a154	ci: run tests in parallel	2023-09-10 15:34:29 +02:00
Simon McVittie	d710e0be27	render: Enable clipping for zero-sized rectangles Battle for Wesnoth apparently relies on being able to disable rendering of UI elements by setting the clip rectangle to be empty. Resolves: https://github.com/libsdl-org/SDL/issues/6896 Fixes: `00f05dcf` "render: only enable clipping when the rectangle is valid" Signed-off-by: Simon McVittie <smcv@collabora.com> (cherry picked from commit `8ad043fc38`)	2023-09-09 11:14:25 -07:00
Anonymous Maarten	b8d1f852db	cmake: use MSVC_RUNTIME_LIBRARY to force MT	2023-09-09 19:17:36 +02:00
Makarenko Oleg	e9ab663c43	Detect Simagic wheel bases as wheels (#8198 ) Simagic DirectDrive wheel bases have the same vendor + product id's (cherry picked from commit `a2c1984d37`) (cherry picked from commit `1d495351a0`)	2023-09-04 12:12:37 -07:00
Oleg	c8d1de1a9b	Detect Logitech G923 Playstation as wheel G923 have two different versions - Xbox version is already present in the wheel list, but not the PS version. (cherry picked from commit `266b91d2fd`) (cherry picked from commit `365a36386a`)	2023-09-04 11:06:06 -07:00
Oleg	bf8c9cd6bf	Detect Logitech PRO Racing Wheel for Xbox (PC mode) as wheel Logitech PRO Racing Wheel have two different versions - for Playstation and Xbox. Vendor + Product ID for Playstation version already present in SDL sources, but not an Xbox version (cherry picked from commit `cde67ea49a`) (cherry picked from commit `242b25aba4`)	2023-09-04 11:02:09 -07:00
Sam Lantinga	8a5ba43d00	Updated to version 2.28.3 for release	2023-09-01 11:22:07 -07:00
Jeremy Demeule	c25a49c406	metal: Add hint to select low power device instead of the default one (#8182 ) On some system like MacBook Pro Intel with AMD card, asking for the default device will always return the AMD GPU. This is not an issue for 99% of the case when the renderer context is here to provide the maximum performance level like for game. However, for video application using GPU for 1 quad and 1 texture, using the discrete GPU for that lead to an important power consumption (4 to 8W), heat increase, and fan noise. With this patch, I successfully amend ffplay to only use the integrated GPU (i.e. the Intel one), instead of the discrete GPU (i.e. the AMD one). (cherry picked from commit `aa7ba62978`)	2023-08-31 01:55:40 -07:00
Anonymous Maarten	d46fdfa3ee	wayland: add SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL	2023-08-30 23:03:29 +02:00
Anonymous Maarten	787d339282	wayland: don't define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_* macro's They mess with #ifdef conditional in headers.	2023-08-30 22:46:53 +02:00
Sam Lantinga	874f6feab4	Fixed the report format for the Razer Wolverine V2 Pro (cherry picked from commit `69aec8c915`) (cherry picked from commit `6ff48dddcb`)	2023-08-24 11:39:15 -07:00
Sam Lantinga	1df4dce78f	Accept key events from any source This allows TV remotes to navigate SDL applications (with source HDMI) Fixes https://github.com/libsdl-org/SDL/issues/8137	2023-08-24 10:12:04 -07:00
Sam Lantinga	cc58a09c09	Updated to Android minSdkVersion 19 and targetSdkVersion 34 This is updated to meet the latest requirements for apps on the Google Play store (cherry picked from commit `8e27a69370`)	2023-08-24 08:33:04 -07:00
Sam Lantinga	ae72cd57b5	Quiet spurious warning Fixes https://github.com/libsdl-org/SDL/issues/8112 (cherry picked from commit `0b9d8e679a`)	2023-08-13 13:54:45 -07:00
David CARLIER	8f858d7908	SDL_TriggerBreakppoint for riscv arch (both 32/64) version. `ebreak` acts like int3 for x86, giving control of running process to debuggers. (cherry picked from commit `723bcd0a8b`)	2023-08-13 23:02:20 +03:00
Anonymous Maarten	5bfdb6e02f	Fix overflow when doing SDL_sscanf("%hd", ...) An overflow occured in the stdlib_sscanf test, when using msys2 clang32 toolchain. (cherry picked from commit `342ec51131`) (cherry picked from commit `10135b2d7b`)	2023-08-10 15:07:11 -07:00
Mathieu Eyraud	739d3ec189	Fix out of bound read of 'has_hat' array (cherry picked from commit `94b3f78c44`) (cherry picked from commit `f348370e1b`)	2023-08-10 08:27:11 -07:00
Sam Lantinga	2319b2635b	Fixed testautomation --filter pixels_allocFreePalette Error messages are not part of the ABI, so we can't validate those. Hand-picked from https://github.com/libsdl-org/sdl2-compat/commit/c9323f8face982983668fca216a2eef12dc8b1f7	2023-08-08 11:50:00 +03:00
Sam Lantinga	bda161d22b	Fixed testautomation --filter pixels_allocFreeFormat Error messages are not part of the ABI, so we can't validate those. Technically SDL_AllocFormat() on a FOURCC format in SDL2 should fail, but SDL3 supports it and we don't expect SDL2 applications to actually do this, so skip that test. Hand-picked from https://github.com/libsdl-org/sdl2-compat/commit/5cf9438f8870bb1f517935febf9d07b4f910a308	2023-08-08 11:50:00 +03:00
Anonymous Maarten	dbfd47e77d	cmake: update cmake_minimum_required to avoid deprecated warning	2023-08-07 19:03:18 +02:00
Ryan C. Gordon	dbb6cd02aa	include: fixed a typo in SDL_RenderGetMetalCommandEncoder docs. (cherry picked from commit `8087c0a5d2`)	2023-08-06 10:45:34 -04:00
Ozkan Sezer	841263c9d6	updated config.guess and config.sub from mainstream	2023-08-05 14:03:02 +03:00
Sam Lantinga	2ccb311cb7	Added a gamepad mapping for the G-Shark GS-GP702 Fixes https://github.com/libsdl-org/SDL/issues/8068 (cherry picked from commit `06bea1eb55`) (cherry picked from commit `2304b4e86a`)	2023-08-02 14:39:09 -07:00
Sam Lantinga	e0a345702d	The Flydigi Vader and Apex series controllers all have the same VID, PID, and name (cherry picked from commit `58e3084477`) (cherry picked from commit `0f753d9794`)	2023-08-02 14:39:09 -07:00
Sam Lantinga	9fba36511f	Removed Flydigi Vader 2 mappings Many of the Flydigi controllers use the same VID/PID and have different mappings, so let's revisit this once we have more data. (cherry picked from commit `5388edd549`) (cherry picked from commit `805fc29ae8`)	2023-08-02 14:39:09 -07:00
Ozkan Sezer	45fb778fe5	adjusted coding style in SDL_os2_joystick.c to match rest of SDL better (cherry picked from commit `57f3c41b97`)	2023-08-02 20:40:24 +03:00