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 322ab64..0000000 Binary files a/SDL2-2.0.22.tar.gz.sig and /dev/null differ 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 0000000..bca8c6c Binary files /dev/null and b/SDL2-2.24.0.tar.gz.sig differ diff --git a/SDL2.changes b/SDL2.changes index dcea25d..40be46f 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +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) +- Rename devel package to just %name-devel, which is what most + our packages do. + ------------------------------------------------------------------- Tue Jul 5 09:16:41 UTC 2022 - Jan Engelhardt diff --git a/SDL2.spec b/SDL2.spec index 820a22c..c7ebc7e 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 @@ -91,10 +90,10 @@ across multiple platforms. SDL2 uses dlopen, so if you experience problems under X11, check again that libXrandr2 and libXi6 are in fact installed. -%package -n libSDL2-devel +%package devel Summary: SDL2 Library Developer Files Group: Development/Libraries/X11 -Requires: %lname = %version +Requires: %lname = %version-%release Requires: c_compiler Requires: pkgconfig Requires: pkgconfig(gl) @@ -103,9 +102,10 @@ Requires: pkgconfig(glesv2) Requires: pkgconfig(glu) Requires: pkgconfig(x11) Requires: pkgconfig(xproto) -Provides: SDL2-devel = %version-%release +Obsoletes: libSDL2-devel < %version-%release +Provides: libSDL2-devel = %version-%release -%description -n libSDL2-devel +%description devel This package contains files needed for development with the SDL2 library. @@ -130,7 +130,7 @@ perl -i -pe 's{\r\n}{\n}g' *.txt README.md %install %make_install rm -f "%buildroot/%_libdir"/*.la -rm -fv "%buildroot/%_libdir/libSDL2.a" "%buildroot/%_libdir/libSDL2_test.a" +rm -fv "%buildroot/%_libdir/libSDL2.a" # Need to keep libSDL2main.a (empty lib), because it is referenced by # sdl2-config.cmake, and it seems like that .cmake file cannot be edited to # make SDL2::SDL2main a phony target with no file (just leads to more Makefile @@ -144,7 +144,7 @@ rm -fv "%buildroot/%_libdir/libSDL2.a" "%buildroot/%_libdir/libSDL2_test.a" %doc README.md README-SDL.txt %_libdir/libSDL2-2*.so.* -%files -n libSDL2-devel +%files devel %doc WhatsNew.txt %_bindir/sdl2-config %_libdir/libSDL2.so @@ -153,5 +153,6 @@ rm -fv "%buildroot/%_libdir/libSDL2.a" "%buildroot/%_libdir/libSDL2_test.a" %_libdir/pkgconfig/sdl2.pc %_libdir/cmake/SDL2/ %_libdir/libSDL2main.a +%_libdir/libSDL2_test.a %changelog diff --git a/baselibs.conf b/baselibs.conf index d1dd351..564454e 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,7 @@ libSDL2-2_0-0 provides "SDL2- = " -libSDL2-devel - provides "SDL2-devel- = " +SDL2-devel + obsoletes "libSDL2-devel-" + provides "libSDL2-devel- = " requires -libSDL2- requires "libSDL2-2_0-0- = " 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;