diff --git a/thirdparty/README.md b/thirdparty/README.md index 02445011c5b..47af47e19eb 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -1018,6 +1018,8 @@ Patches: - `0005-fix-libudev-dbus.patch` ([GH-108373](https://github.com/godotengine/godot/pull/108373)) - `0006-fix-cs-environ.patch` ([GH-109283](https://github.com/godotengine/godot/pull/109283)) - `0007-shield-duplicate-macos.patch` ([GH-115510](https://github.com/godotengine/godot/pull/115510)) +- `0008-fix-linux-joycon-serial-num.patch` ([GH-113873](https://github.com/godotengine/godot/pull/113873)) +- `0009-update-device-blocklist.patch` ([GH-119403](https://github.com/godotengine/godot/pull/119403)) ## spirv-cross diff --git a/thirdparty/sdl/joystick/SDL_joystick.c b/thirdparty/sdl/joystick/SDL_joystick.c index 090dc07303a..768f8f9025b 100644 --- a/thirdparty/sdl/joystick/SDL_joystick.c +++ b/thirdparty/sdl/joystick/SDL_joystick.c @@ -273,14 +273,20 @@ static Uint32 initial_blacklist_devices[] = { MAKE_VIDPID(0x04d9, 0x8009), // OBINLB USB-HID Keyboard (Anne Pro II) MAKE_VIDPID(0x04d9, 0xa292), // OBINLB USB-HID Keyboard (Anne Pro II) MAKE_VIDPID(0x04d9, 0xa293), // OBINLB USB-HID Keyboard (Anne Pro II) + MAKE_VIDPID(0x04f2, 0xa13c), // HP Deluxe Webcam KQ246AA + MAKE_VIDPID(0x0e6f, 0x018a), // PDP REALMz Wireless Controller for Switch, USB charging MAKE_VIDPID(0x1532, 0x0266), // Razer Huntsman V2 Analog, non-functional DInput device MAKE_VIDPID(0x1532, 0x0282), // Razer Huntsman Mini Analog, non-functional DInput device - MAKE_VIDPID(0x26ce, 0x01a2), // ASRock LED Controller MAKE_VIDPID(0x20d6, 0x0002), // PowerA Enhanced Wireless Controller for Nintendo Switch (charging port only) + MAKE_VIDPID(0x256c, 0x006d), // Huion Tablet_GS1331, Huion Tablet_GS1331 Touch Strip + MAKE_VIDPID(0x26ce, 0x01a2), // ASRock LED Controller MAKE_VIDPID(0x31e3, 0x1310), // Wooting 60HE (ARM) MAKE_VIDPID(0x3297, 0x1969), // Moonlander MK1 Keyboard + MAKE_VIDPID(0x3434, 0x0121), // Keychron Q3 System Control MAKE_VIDPID(0x3434, 0x0211), // Keychron K1 Pro System Control - MAKE_VIDPID(0x04f2, 0xa13c), // HP Deluxe Webcam KQ246AA + MAKE_VIDPID(0x3434, 0x02a0), // Keychron K10 Pro System Control + MAKE_VIDPID(0x3434, 0x0353), // Keychron V5 System Control + MAKE_VIDPID(0x3434, 0xd030), // Keychron Link }; static SDL_vidpid_list blacklist_devices = { SDL_HINT_JOYSTICK_BLACKLIST_DEVICES, 0, 0, NULL, diff --git a/thirdparty/sdl/patches/0009-update-device-blocklist.patch b/thirdparty/sdl/patches/0009-update-device-blocklist.patch new file mode 100644 index 00000000000..6edc2ec8f92 --- /dev/null +++ b/thirdparty/sdl/patches/0009-update-device-blocklist.patch @@ -0,0 +1,27 @@ +diff --git a/thirdparty/sdl/joystick/SDL_joystick.c b/thirdparty/sdl/joystick/SDL_joystick.c +index 090dc07303..768f8f9025 100644 +--- a/thirdparty/sdl/joystick/SDL_joystick.c ++++ b/thirdparty/sdl/joystick/SDL_joystick.c +@@ -273,14 +273,20 @@ static Uint32 initial_blacklist_devices[] = { + MAKE_VIDPID(0x04d9, 0x8009), // OBINLB USB-HID Keyboard (Anne Pro II) + MAKE_VIDPID(0x04d9, 0xa292), // OBINLB USB-HID Keyboard (Anne Pro II) + MAKE_VIDPID(0x04d9, 0xa293), // OBINLB USB-HID Keyboard (Anne Pro II) ++ MAKE_VIDPID(0x04f2, 0xa13c), // HP Deluxe Webcam KQ246AA ++ MAKE_VIDPID(0x0e6f, 0x018a), // PDP REALMz Wireless Controller for Switch, USB charging + MAKE_VIDPID(0x1532, 0x0266), // Razer Huntsman V2 Analog, non-functional DInput device + MAKE_VIDPID(0x1532, 0x0282), // Razer Huntsman Mini Analog, non-functional DInput device +- MAKE_VIDPID(0x26ce, 0x01a2), // ASRock LED Controller + MAKE_VIDPID(0x20d6, 0x0002), // PowerA Enhanced Wireless Controller for Nintendo Switch (charging port only) ++ MAKE_VIDPID(0x256c, 0x006d), // Huion Tablet_GS1331, Huion Tablet_GS1331 Touch Strip ++ MAKE_VIDPID(0x26ce, 0x01a2), // ASRock LED Controller + MAKE_VIDPID(0x31e3, 0x1310), // Wooting 60HE (ARM) + MAKE_VIDPID(0x3297, 0x1969), // Moonlander MK1 Keyboard ++ MAKE_VIDPID(0x3434, 0x0121), // Keychron Q3 System Control + MAKE_VIDPID(0x3434, 0x0211), // Keychron K1 Pro System Control +- MAKE_VIDPID(0x04f2, 0xa13c), // HP Deluxe Webcam KQ246AA ++ MAKE_VIDPID(0x3434, 0x02a0), // Keychron K10 Pro System Control ++ MAKE_VIDPID(0x3434, 0x0353), // Keychron V5 System Control ++ MAKE_VIDPID(0x3434, 0xd030), // Keychron Link + }; + static SDL_vidpid_list blacklist_devices = { + SDL_HINT_JOYSTICK_BLACKLIST_DEVICES, 0, 0, NULL,