Hello community, here is the log from the commit of package SDL for openSUSE:Factory checked in at 2013-12-19 12:51:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SDL (Old) and /work/SRC/openSUSE:Factory/.SDL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SDL" Changes: -------- --- /work/SRC/openSUSE:Factory/SDL/SDL.changes 2013-08-19 11:13:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.SDL.new/SDL.changes 2013-12-19 12:51:31.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Dec 17 08:20:15 UTC 2013 - [email protected] + +- Add libsdl-1.2.15-resizing.patch: resolve an issue whereby window + frame corner resizing emitted no resize events to applications + (bnc#855639) + +------------------------------------------------------------------- New: ---- libsdl-1.2.15-resizing.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SDL.spec ++++++ --- /var/tmp/diff_new_pack.l2LWJx/_old 2013-12-19 12:51:32.000000000 +0100 +++ /var/tmp/diff_new_pack.l2LWJx/_new 2013-12-19 12:51:32.000000000 +0100 @@ -36,13 +36,18 @@ Patch0: SDL-1.2.13-x11-keytounicode.patch Patch1: SDL_sdl_endian.patch Patch2: sdl-lfs.patch +Patch3: libsdl-1.2.15-resizing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel BuildRequires: Mesa-libGL-devel BuildRequires: alsa-devel >= 0.9.0 BuildRequires: autoconf BuildRequires: esound-devel >= 0.2.8 +%if 0%{?suse_version} == 1220 +BuildRequires: Mesa-libGLU-devel +%else BuildRequires: glu-devel +%endif BuildRequires: libICE-devel BuildRequires: libXrandr-devel BuildRequires: libXrender-devel @@ -108,6 +113,7 @@ %patch0 %patch1 %patch2 +%patch -P 3 -p1 # remove the file to provide sufficient evidence that we are # not using this file during the build [bnc#508111] rm -f src/joystick/darwin/10.3.9-FIX/IOHIDLib.h ++++++ libsdl-1.2.15-resizing.patch ++++++ From: Andrew Caudwell <[email protected]> Last-Update: 2012-04-10 References: http://bugzilla.libsdl.org/show_bug.cgi?id=1430 References: http://bugs.debian.org/665779 References: http://bugs.gentoo.org/411539 References: http://bugzilla.novell.com/855639 Revert change that breaks window corner resizing (Reverts hg commit 5620:ad4ed9f0336f.) --- src/video/x11/SDL_x11events.c | 16 ---------------- src/video/x11/SDL_x11events_c.h | 5 ----- src/video/x11/SDL_x11video.c | 2 -- 3 files changed, 23 deletions(-) Index: SDL-1.2.15/src/video/x11/SDL_x11events.c =================================================================== --- SDL-1.2.15.orig/src/video/x11/SDL_x11events.c +++ SDL-1.2.15/src/video/x11/SDL_x11events.c @@ -57,12 +57,6 @@ static SDLKey ODD_keymap[256]; static SDLKey MISC_keymap[256]; SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); -/* - Pending resize target for ConfigureNotify (so outdated events don't - cause inappropriate resize events) -*/ -int X11_PendingConfigureNotifyWidth = -1; -int X11_PendingConfigureNotifyHeight = -1; #ifdef X_HAVE_UTF8_STRING Uint32 Utf8ToUcs4(const Uint8 *utf8) @@ -825,16 +819,6 @@ printf("MapNotify!\n"); #ifdef DEBUG_XEVENTS printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); #endif - if ((X11_PendingConfigureNotifyWidth != -1) && - (X11_PendingConfigureNotifyHeight != -1)) { - if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && - (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { - /* Event is from before the resize, so ignore. */ - break; - } - X11_PendingConfigureNotifyWidth = -1; - X11_PendingConfigureNotifyHeight = -1; - } if ( SDL_VideoSurface ) { if ((xevent.xconfigure.width != SDL_VideoSurface->w) || (xevent.xconfigure.height != SDL_VideoSurface->h)) { Index: SDL-1.2.15/src/video/x11/SDL_x11events_c.h =================================================================== --- SDL-1.2.15.orig/src/video/x11/SDL_x11events_c.h +++ SDL-1.2.15/src/video/x11/SDL_x11events_c.h @@ -27,8 +27,3 @@ extern void X11_InitOSKeymap(_THIS); extern void X11_PumpEvents(_THIS); extern void X11_SetKeyboardState(Display *display, const char *key_vec); - -/* Variables to be exported */ -extern int X11_PendingConfigureNotifyWidth; -extern int X11_PendingConfigureNotifyHeight; - Index: SDL-1.2.15/src/video/x11/SDL_x11video.c =================================================================== --- SDL-1.2.15.orig/src/video/x11/SDL_x11video.c +++ SDL-1.2.15/src/video/x11/SDL_x11video.c @@ -1177,8 +1177,6 @@ SDL_Surface *X11_SetVideoMode(_THIS, SDL current = NULL; goto done; } - X11_PendingConfigureNotifyWidth = width; - X11_PendingConfigureNotifyHeight = height; } else { if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { current = NULL; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
