From c7b5f37b8aea4dae0c9ae3f8c1ca08f04d8d855d9df03a00fdcce877300d9923 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 19 Aug 2022 16:35:24 +0000 Subject: [PATCH] - Update to release 2.24.0 OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=129 --- SDL2-2.0.22.tar.gz | 3 -- SDL2-2.0.22.tar.gz.sig | Bin 95 -> 0 bytes SDL2-2.24.0.tar.gz | 3 ++ SDL2-2.24.0.tar.gz.sig | Bin 0 -> 95 bytes SDL2.changes | 15 +++++++++ SDL2.spec | 3 +- fix-xi2-crash.patch | 67 ----------------------------------------- sdl2-symvers.patch | 30 +++++++++++++++++- 8 files changed, 48 insertions(+), 73 deletions(-) delete mode 100644 SDL2-2.0.22.tar.gz delete mode 100644 SDL2-2.0.22.tar.gz.sig create mode 100644 SDL2-2.24.0.tar.gz create mode 100644 SDL2-2.24.0.tar.gz.sig delete mode 100644 fix-xi2-crash.patch diff --git a/SDL2-2.0.22.tar.gz b/SDL2-2.0.22.tar.gz deleted file mode 100644 index 8f0b974..0000000 --- a/SDL2-2.0.22.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e -size 7250633 diff --git a/SDL2-2.0.22.tar.gz.sig b/SDL2-2.0.22.tar.gz.sig deleted file mode 100644 index 322ab64224d5c646d9a37fe3ef0b4f8c54747e83121b8ca18349f46949edf00f..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeB(WnmCxVvrS6WD(U!j%^5DT3>$gL7TzS$>qz-te>$mC8a&hVBq2ufQjs$#IWG_ vX1CjytIP6kv2KxTj+M=tTN3`5VL^|Ym$jFD-nuBwb)N2J9gVv>iWdL?pTQ=c diff --git a/SDL2-2.24.0.tar.gz b/SDL2-2.24.0.tar.gz new file mode 100644 index 0000000..0f9d071 --- /dev/null +++ b/SDL2-2.24.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91e4c34b1768f92d399b078e171448c6af18cafda743987ed2064a28954d6d97 +size 7520541 diff --git a/SDL2-2.24.0.tar.gz.sig b/SDL2-2.24.0.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..bca8c6ca07ef8a5a7521436e7495402e07ce445e5ca5294bf3f26ca27d0e8a76 GIT binary patch literal 95 zcmeB(WnmCxVvrS6WD(U!j%^5DT3>$gL7TzS$>qz-te>$mCH>ztg@KDx045S~onf9% v2lENj`xAJqnjd;SKggkeA?#8Q!yF#1bhhugGk1J2Uofk{cKVHZ;$8;;q%J3M literal 0 HcmV?d00001 diff --git a/SDL2.changes b/SDL2.changes index dcea25d..8691bd2 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Aug 19 16:25:00 UTC 2022 - Jan Engelhardt + +- Update to release 2.24.0 + * Added a number of function relating to input devices such as + keyboard and joystick. + * Added support for the NVIDIA Shield Controller to the HIDAPI + driver, supporting rumble and battery status + * Added support for opening audio devices with 3 or 5 channels + (2.1, 4.1). All channel counts from Mono to 7.1 are now + supported. +- Drop baselibs.conf (no SDL2_ttf-dependent Tumbleweed packages + themselves have baselibs). +- Drop fix-xi2-crash.patch (merged) + ------------------------------------------------------------------- Tue Jul 5 09:16:41 UTC 2022 - Jan Engelhardt diff --git a/SDL2.spec b/SDL2.spec index 820a22c..7612b04 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -19,7 +19,7 @@ %define sle_version 0 Name: SDL2 %define lname libSDL2-2_0-0 -Version: 2.0.22 +Version: 2.24.0 Release: 0 Summary: Simple DirectMedia Layer Library License: Zlib @@ -33,7 +33,6 @@ Source3: %name.keyring Source4: baselibs.conf Patch1: sdl2-symvers.patch Patch2: sdl2-khronos.patch -Patch3: fix-xi2-crash.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: nasm diff --git a/fix-xi2-crash.patch b/fix-xi2-crash.patch deleted file mode 100644 index 6a12a2e..0000000 --- a/fix-xi2-crash.patch +++ /dev/null @@ -1,67 +0,0 @@ -From fdb86b8266947e225f058b32ebb77fa949f6ae42 Mon Sep 17 00:00:00 2001 -From: "Ryan C. Gordon" -Date: Mon, 4 Jul 2022 12:48:32 -0400 -Subject: [PATCH] x11: Don't try to use XInput2 multitouch if not supported. - -Fixes #5889. ---- - src/video/x11/SDL_x11touch.c | 4 +--- - src/video/x11/SDL_x11xinput2.c | 13 +++++++++++++ - 2 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/src/video/x11/SDL_x11touch.c b/src/video/x11/SDL_x11touch.c -index 958bee9df..c608cf24d 100644 ---- a/src/video/x11/SDL_x11touch.c -+++ b/src/video/x11/SDL_x11touch.c -@@ -31,9 +31,7 @@ - void - X11_InitTouch(_THIS) - { -- if (X11_Xinput2IsMultitouchSupported()) { -- X11_InitXinput2Multitouch(_this); -- } -+ X11_InitXinput2Multitouch(_this); - } - - void -diff --git a/src/video/x11/SDL_x11xinput2.c b/src/video/x11/SDL_x11xinput2.c -index abfbdf0e3..21d8bd6c1 100644 ---- a/src/video/x11/SDL_x11xinput2.c -+++ b/src/video/x11/SDL_x11xinput2.c -@@ -265,6 +265,11 @@ X11_InitXinput2Multitouch(_THIS) - SDL_VideoData *data = (SDL_VideoData *) _this->driverdata; - XIDeviceInfo *info; - int ndevices,i,j; -+ -+ if (!X11_Xinput2IsMultitouchSupported()) { -+ return; -+ } -+ - info = X11_XIQueryDevice(data->display, XIAllDevices, &ndevices); - - for (i = 0; i < ndevices; i++) { -@@ -354,6 +359,10 @@ X11_Xinput2GrabTouch(_THIS, SDL_Window *window) - XIGrabModifiers mods; - XIEventMask eventmask; - -+ if (!X11_Xinput2IsMultitouchSupported()) { -+ return; -+ } -+ - mods.modifiers = XIAnyModifier; - mods.status = 0; - -@@ -379,6 +388,10 @@ X11_Xinput2UngrabTouch(_THIS, SDL_Window *window) - - XIGrabModifiers mods; - -+ if (!X11_Xinput2IsMultitouchSupported()) { -+ return; -+ } -+ - mods.modifiers = XIAnyModifier; - mods.status = 0; - --- -2.36.1 - diff --git a/sdl2-symvers.patch b/sdl2-symvers.patch index a22704b..7189dc6 100644 --- a/sdl2-symvers.patch +++ b/sdl2-symvers.patch @@ -36,7 +36,7 @@ Index: SDL2-2.0.22/sdl2.sym =================================================================== --- /dev/null +++ SDL2-2.0.22/sdl2.sym -@@ -0,0 +1,278 @@ +@@ -0,0 +1,306 @@ +SUSE_2.0.5 { +global: + SDL_DequeueAudio; @@ -315,3 +315,31 @@ Index: SDL2-2.0.22/sdl2.sym + SDL_AndroidSendMessage; + SDL_GetTouchName; +} SUSE_2.0.18; ++SUSE_2.24.0 { ++ SDL_GetDefaultAudioInfo; ++ SDL_HasLSX; ++ SDL_HasLASX; ++ SDL_GameControllerPathForIndex; ++ SDL_GameControllerPath; ++ SDL_GameControllerGetFirmwareVersion; ++ SDL_GUIDToString; ++ SDL_GUIDFromString; ++ SDL_ResetHint; ++ SDL_JoystickPathForIndex; ++ SDL_JoystickAttachVirtualEx; ++ SDL_JoystickPath; ++ SDL_JoystickGetFirmwareVersion; ++ SDL_ResetKeyboard; ++ SDL_SetTextInputRect; ++ SDL_GDKRunApp; ++ SDL_GetOriginalMemoryFunctions; ++ SDL_qsort; ++ SDL_bsearch; ++ SDL_crc16; ++ SDL_utf8strnlen; ++ SDL_RenderGetD3D12Device; ++ SDL_iPhoneSetAnimationCallback; ++ SDL_GDKGetTaskQueue; ++ SDL_GetPointDisplayIndex; ++ SDL_GetRectDisplayIndex; ++} SUSE_2.0.22;