Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package SDL2 for openSUSE:Factory checked in
at 2022-07-06 15:41:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/SDL2 (Old)
and /work/SRC/openSUSE:Factory/.SDL2.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SDL2"
Wed Jul 6 15:41:36 2022 rev:41 rq:986808 version:2.0.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/SDL2/SDL2.changes 2022-05-05
23:05:55.669522428 +0200
+++ /work/SRC/openSUSE:Factory/.SDL2.new.1548/SDL2.changes 2022-07-06
15:41:38.694485876 +0200
@@ -1,0 +2,5 @@
+Tue Jul 5 09:16:41 UTC 2022 - Jan Engelhardt <jeng...@inai.de>
+
+- Add fix-xi2-crash.patch
+
+-------------------------------------------------------------------
New:
----
fix-xi2-crash.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ SDL2.spec ++++++
--- /var/tmp/diff_new_pack.3FRFcb/_old 2022-07-06 15:41:40.250488168 +0200
+++ /var/tmp/diff_new_pack.3FRFcb/_new 2022-07-06 15:41:40.258488180 +0200
@@ -33,6 +33,7 @@
Source4: baselibs.conf
Patch1: sdl2-symvers.patch
Patch2: sdl2-khronos.patch
+Patch3: fix-xi2-crash.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: nasm
@@ -87,6 +88,9 @@
API for access to audio, keyboard, mouse, and display framebuffer
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
Summary: SDL2 Library Developer Files
Group: Development/Libraries/X11
@@ -120,8 +124,7 @@
%ifarch ix86
--enable-sse2=no \
%endif
- --enable-sse3=no --disable-rpath --disable-3dnow \
- CFLAGS="%optflags -fcommon"
+ --enable-sse3=no --disable-rpath --disable-3dnow
%make_build
%install
++++++ fix-xi2-crash.patch ++++++
>From fdb86b8266947e225f058b32ebb77fa949f6ae42 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <iccu...@icculus.org>
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
