Date: Saturday, September 15, 2012 @ 05:41:06 Author: heftig Revision: 166673
archrelease: copy trunk to extra-i686, extra-x86_64 Added: sdl/repos/extra-i686/PKGBUILD (from rev 166672, sdl/trunk/PKGBUILD) sdl/repos/extra-i686/fix_joystick_misc_axes.diff (from rev 166672, sdl/trunk/fix_joystick_misc_axes.diff) sdl/repos/extra-i686/libsdl-1.2.15-resizing.patch (from rev 166672, sdl/trunk/libsdl-1.2.15-resizing.patch) sdl/repos/extra-i686/sdl-1.2.14-disable-mmx.patch (from rev 166672, sdl/trunk/sdl-1.2.14-disable-mmx.patch) sdl/repos/extra-i686/sdl-1.2.14-fix-mouse-clicking.patch (from rev 166672, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch) sdl/repos/extra-x86_64/PKGBUILD (from rev 166672, sdl/trunk/PKGBUILD) sdl/repos/extra-x86_64/fix_joystick_misc_axes.diff (from rev 166672, sdl/trunk/fix_joystick_misc_axes.diff) sdl/repos/extra-x86_64/libsdl-1.2.15-resizing.patch (from rev 166672, sdl/trunk/libsdl-1.2.15-resizing.patch) sdl/repos/extra-x86_64/sdl-1.2.14-disable-mmx.patch (from rev 166672, sdl/trunk/sdl-1.2.14-disable-mmx.patch) sdl/repos/extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch (from rev 166672, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch) Deleted: sdl/repos/extra-i686/PKGBUILD sdl/repos/extra-i686/fix_joystick_misc_axes.diff sdl/repos/extra-i686/sdl-1.2.14-disable-mmx.patch sdl/repos/extra-i686/sdl-1.2.14-fix-mouse-clicking.patch sdl/repos/extra-x86_64/PKGBUILD sdl/repos/extra-x86_64/fix_joystick_misc_axes.diff sdl/repos/extra-x86_64/sdl-1.2.14-disable-mmx.patch sdl/repos/extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch --------------------------------------------------+ extra-i686/PKGBUILD | 81 +++++++++++---------- extra-i686/fix_joystick_misc_axes.diff | 26 +++--- extra-i686/libsdl-1.2.15-resizing.patch | 63 ++++++++++++++++ extra-i686/sdl-1.2.14-disable-mmx.patch | 26 +++--- extra-i686/sdl-1.2.14-fix-mouse-clicking.patch | 46 +++++------ extra-x86_64/PKGBUILD | 81 +++++++++++---------- extra-x86_64/fix_joystick_misc_axes.diff | 26 +++--- extra-x86_64/libsdl-1.2.15-resizing.patch | 63 ++++++++++++++++ extra-x86_64/sdl-1.2.14-disable-mmx.patch | 26 +++--- extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch | 46 +++++------ 10 files changed, 310 insertions(+), 174 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-09-15 09:39:11 UTC (rev 166672) +++ extra-i686/PKGBUILD 2012-09-15 09:41:06 UTC (rev 166673) @@ -1,38 +0,0 @@ -# $Id$ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Contributor: Allan McRae <al...@archlinux.org> -# Contributor: dorphell <dorph...@archlinux.org> - -pkgname=sdl -pkgver=1.2.15 -pkgrel=2 -pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" -arch=('i686' 'x86_64') -url="http://www.libsdl.org" -license=('LGPL') -depends=('glibc' 'libxext' 'libxrender' 'libx11') -makedepends=('alsa-lib' 'mesa' 'libpulse') -options=('!libtool') -source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz - sdl-1.2.14-fix-mouse-clicking.patch - sdl-1.2.14-disable-mmx.patch - fix_joystick_misc_axes.diff) -md5sums=('9d96df8417572a2afb781a7c4c811a85' - '04d8c179f125e04bcd4c9d60e013c2d7' - 'e5c16b7611f62c7cb25f0534eff68852' - '687586a108b597a2a6b73070c1d37e51') - -build() { - cd SDL-$pkgver - patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch - patch -Np1 -i ../fix_joystick_misc_axes.diff - ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \ - --with-x --disable-rpath --disable-static - make -} - -package() { - cd SDL-$pkgver - make DESTDIR="$pkgdir" install -} Copied: sdl/repos/extra-i686/PKGBUILD (from rev 166672, sdl/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-09-15 09:41:06 UTC (rev 166673) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: dorphell <dorph...@archlinux.org> + +pkgname=sdl +pkgver=1.2.15 +pkgrel=3 +pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" +arch=('i686' 'x86_64') +url="http://www.libsdl.org" +license=('LGPL') +depends=('glibc' 'libxext' 'libxrender' 'libx11') +makedepends=('alsa-lib' 'mesa' 'libpulse') +optdepends=('alsa-lib: ALSA audio driver' + 'libpulse: PulseAudio audio driver') +options=('!libtool') +source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz + sdl-1.2.14-fix-mouse-clicking.patch + sdl-1.2.14-disable-mmx.patch + fix_joystick_misc_axes.diff + libsdl-1.2.15-resizing.patch) +md5sums=('9d96df8417572a2afb781a7c4c811a85' + '04d8c179f125e04bcd4c9d60e013c2d7' + 'e5c16b7611f62c7cb25f0534eff68852' + '687586a108b597a2a6b73070c1d37e51' + '3dd50347d8856160a9cbd7f80383a1f8') + +build() { + cd SDL-$pkgver + patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch + patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch + patch -Np1 -i ../fix_joystick_misc_axes.diff + patch -Np1 -i ../libsdl-1.2.15-resizing.patch + ./configure --prefix=/usr --disable-nasm --enable-alsa \ + --with-x --disable-rpath --disable-static + make +} + +package() { + cd SDL-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: extra-i686/fix_joystick_misc_axes.diff =================================================================== --- extra-i686/fix_joystick_misc_axes.diff 2012-09-15 09:39:11 UTC (rev 166672) +++ extra-i686/fix_joystick_misc_axes.diff 2012-09-15 09:41:06 UTC (rev 166673) @@ -1,13 +0,0 @@ -diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c -index ee43974..80e46e4 100644 ---- a/src/joystick/linux/SDL_sysjoystick.c -+++ b/src/joystick/linux/SDL_sysjoystick.c -@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd) - ++joystick->nbuttons; - } - } -- for ( i=0; i<ABS_MISC; ++i ) { -+ for ( i=0; i<ABS_MAX; ++i ) { - /* Skip hats */ - if ( i == ABS_HAT0X ) { - i = ABS_HAT3Y; Copied: sdl/repos/extra-i686/fix_joystick_misc_axes.diff (from rev 166672, sdl/trunk/fix_joystick_misc_axes.diff) =================================================================== --- extra-i686/fix_joystick_misc_axes.diff (rev 0) +++ extra-i686/fix_joystick_misc_axes.diff 2012-09-15 09:41:06 UTC (rev 166673) @@ -0,0 +1,13 @@ +diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c +index ee43974..80e46e4 100644 +--- a/src/joystick/linux/SDL_sysjoystick.c ++++ b/src/joystick/linux/SDL_sysjoystick.c +@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd) + ++joystick->nbuttons; + } + } +- for ( i=0; i<ABS_MISC; ++i ) { ++ for ( i=0; i<ABS_MAX; ++i ) { + /* Skip hats */ + if ( i == ABS_HAT0X ) { + i = ABS_HAT3Y; Copied: sdl/repos/extra-i686/libsdl-1.2.15-resizing.patch (from rev 166672, sdl/trunk/libsdl-1.2.15-resizing.patch) =================================================================== --- extra-i686/libsdl-1.2.15-resizing.patch (rev 0) +++ extra-i686/libsdl-1.2.15-resizing.patch 2012-09-15 09:41:06 UTC (rev 166673) @@ -0,0 +1,63 @@ +Description: Revert change that breaks window corner resizing + http://bugzilla.libsdl.org/show_bug.cgi?id=1430 +Author: Andrew Caudwell <acaudw...@gmail.com> +Last-Update: 2012-04-10 +Bug-Debian: http://bugs.debian.org/665779 + +diff -r c787fb1b5699 src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300 +@@ -57,12 +57,6 @@ + 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 @@ + #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)) { +diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h +--- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300 +@@ -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; +- +diff -r c787fb1b5699 src/video/x11/SDL_x11video.c +--- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300 +@@ -1182,8 +1182,6 @@ + current = NULL; + goto done; + } +- X11_PendingConfigureNotifyWidth = width; +- X11_PendingConfigureNotifyHeight = height; + } else { + if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { + current = NULL; Deleted: extra-i686/sdl-1.2.14-disable-mmx.patch =================================================================== --- extra-i686/sdl-1.2.14-disable-mmx.patch 2012-09-15 09:39:11 UTC (rev 166672) +++ extra-i686/sdl-1.2.14-disable-mmx.patch 2012-09-15 09:41:06 UTC (rev 166673) @@ -1,13 +0,0 @@ -# and another one from FS#26020 - ---- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700 -+++ b/src/video/SDL_yuv_sw.c 2011-09-20 19:26:30.247742620 +0700 -@@ -89,6 +89,8 @@ - #include "SDL_yuvfuncs.h" - #include "SDL_yuv_sw_c.h" - -+#undef __OPTIMIZE__ -+ - /* The functions used to manipulate software video overlays */ - static struct private_yuvhwfuncs sw_yuvfuncs = { - SDL_LockYUV_SW, Copied: sdl/repos/extra-i686/sdl-1.2.14-disable-mmx.patch (from rev 166672, sdl/trunk/sdl-1.2.14-disable-mmx.patch) =================================================================== --- extra-i686/sdl-1.2.14-disable-mmx.patch (rev 0) +++ extra-i686/sdl-1.2.14-disable-mmx.patch 2012-09-15 09:41:06 UTC (rev 166673) @@ -0,0 +1,13 @@ +# and another one from FS#26020 + +--- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700 ++++ b/src/video/SDL_yuv_sw.c 2011-09-20 19:26:30.247742620 +0700 +@@ -89,6 +89,8 @@ + #include "SDL_yuvfuncs.h" + #include "SDL_yuv_sw_c.h" + ++#undef __OPTIMIZE__ ++ + /* The functions used to manipulate software video overlays */ + static struct private_yuvhwfuncs sw_yuvfuncs = { + SDL_LockYUV_SW, Deleted: extra-i686/sdl-1.2.14-fix-mouse-clicking.patch =================================================================== --- extra-i686/sdl-1.2.14-fix-mouse-clicking.patch 2012-09-15 09:39:11 UTC (rev 166672) +++ extra-i686/sdl-1.2.14-fix-mouse-clicking.patch 2012-09-15 09:41:06 UTC (rev 166673) @@ -1,23 +0,0 @@ ---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700 -+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700 -@@ -423,12 +423,15 @@ - if ( xevent.xcrossing.mode == NotifyUngrab ) - printf("Mode: NotifyUngrab\n"); - #endif -- if ( this->input_grab == SDL_GRAB_OFF ) { -- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ if ( (xevent.xcrossing.mode != NotifyGrab) && -+ (xevent.xcrossing.mode != NotifyUngrab) ) { -+ if ( this->input_grab == SDL_GRAB_OFF ) { -+ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ } -+ posted = SDL_PrivateMouseMotion(0, 0, -+ xevent.xcrossing.x, -+ xevent.xcrossing.y); - } -- posted = SDL_PrivateMouseMotion(0, 0, -- xevent.xcrossing.x, -- xevent.xcrossing.y); - } - break; - Copied: sdl/repos/extra-i686/sdl-1.2.14-fix-mouse-clicking.patch (from rev 166672, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch) =================================================================== --- extra-i686/sdl-1.2.14-fix-mouse-clicking.patch (rev 0) +++ extra-i686/sdl-1.2.14-fix-mouse-clicking.patch 2012-09-15 09:41:06 UTC (rev 166673) @@ -0,0 +1,23 @@ +--- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700 ++++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700 +@@ -423,12 +423,15 @@ + if ( xevent.xcrossing.mode == NotifyUngrab ) + printf("Mode: NotifyUngrab\n"); + #endif +- if ( this->input_grab == SDL_GRAB_OFF ) { +- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ if ( (xevent.xcrossing.mode != NotifyGrab) && ++ (xevent.xcrossing.mode != NotifyUngrab) ) { ++ if ( this->input_grab == SDL_GRAB_OFF ) { ++ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ } ++ posted = SDL_PrivateMouseMotion(0, 0, ++ xevent.xcrossing.x, ++ xevent.xcrossing.y); + } +- posted = SDL_PrivateMouseMotion(0, 0, +- xevent.xcrossing.x, +- xevent.xcrossing.y); + } + break; + Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-09-15 09:39:11 UTC (rev 166672) +++ extra-x86_64/PKGBUILD 2012-09-15 09:41:06 UTC (rev 166673) @@ -1,38 +0,0 @@ -# $Id$ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Contributor: Allan McRae <al...@archlinux.org> -# Contributor: dorphell <dorph...@archlinux.org> - -pkgname=sdl -pkgver=1.2.15 -pkgrel=2 -pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" -arch=('i686' 'x86_64') -url="http://www.libsdl.org" -license=('LGPL') -depends=('glibc' 'libxext' 'libxrender' 'libx11') -makedepends=('alsa-lib' 'mesa' 'libpulse') -options=('!libtool') -source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz - sdl-1.2.14-fix-mouse-clicking.patch - sdl-1.2.14-disable-mmx.patch - fix_joystick_misc_axes.diff) -md5sums=('9d96df8417572a2afb781a7c4c811a85' - '04d8c179f125e04bcd4c9d60e013c2d7' - 'e5c16b7611f62c7cb25f0534eff68852' - '687586a108b597a2a6b73070c1d37e51') - -build() { - cd SDL-$pkgver - patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch - patch -Np1 -i ../fix_joystick_misc_axes.diff - ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \ - --with-x --disable-rpath --disable-static - make -} - -package() { - cd SDL-$pkgver - make DESTDIR="$pkgdir" install -} Copied: sdl/repos/extra-x86_64/PKGBUILD (from rev 166672, sdl/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-09-15 09:41:06 UTC (rev 166673) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: dorphell <dorph...@archlinux.org> + +pkgname=sdl +pkgver=1.2.15 +pkgrel=3 +pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" +arch=('i686' 'x86_64') +url="http://www.libsdl.org" +license=('LGPL') +depends=('glibc' 'libxext' 'libxrender' 'libx11') +makedepends=('alsa-lib' 'mesa' 'libpulse') +optdepends=('alsa-lib: ALSA audio driver' + 'libpulse: PulseAudio audio driver') +options=('!libtool') +source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz + sdl-1.2.14-fix-mouse-clicking.patch + sdl-1.2.14-disable-mmx.patch + fix_joystick_misc_axes.diff + libsdl-1.2.15-resizing.patch) +md5sums=('9d96df8417572a2afb781a7c4c811a85' + '04d8c179f125e04bcd4c9d60e013c2d7' + 'e5c16b7611f62c7cb25f0534eff68852' + '687586a108b597a2a6b73070c1d37e51' + '3dd50347d8856160a9cbd7f80383a1f8') + +build() { + cd SDL-$pkgver + patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch + patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch + patch -Np1 -i ../fix_joystick_misc_axes.diff + patch -Np1 -i ../libsdl-1.2.15-resizing.patch + ./configure --prefix=/usr --disable-nasm --enable-alsa \ + --with-x --disable-rpath --disable-static + make +} + +package() { + cd SDL-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: extra-x86_64/fix_joystick_misc_axes.diff =================================================================== --- extra-x86_64/fix_joystick_misc_axes.diff 2012-09-15 09:39:11 UTC (rev 166672) +++ extra-x86_64/fix_joystick_misc_axes.diff 2012-09-15 09:41:06 UTC (rev 166673) @@ -1,13 +0,0 @@ -diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c -index ee43974..80e46e4 100644 ---- a/src/joystick/linux/SDL_sysjoystick.c -+++ b/src/joystick/linux/SDL_sysjoystick.c -@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd) - ++joystick->nbuttons; - } - } -- for ( i=0; i<ABS_MISC; ++i ) { -+ for ( i=0; i<ABS_MAX; ++i ) { - /* Skip hats */ - if ( i == ABS_HAT0X ) { - i = ABS_HAT3Y; Copied: sdl/repos/extra-x86_64/fix_joystick_misc_axes.diff (from rev 166672, sdl/trunk/fix_joystick_misc_axes.diff) =================================================================== --- extra-x86_64/fix_joystick_misc_axes.diff (rev 0) +++ extra-x86_64/fix_joystick_misc_axes.diff 2012-09-15 09:41:06 UTC (rev 166673) @@ -0,0 +1,13 @@ +diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c +index ee43974..80e46e4 100644 +--- a/src/joystick/linux/SDL_sysjoystick.c ++++ b/src/joystick/linux/SDL_sysjoystick.c +@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd) + ++joystick->nbuttons; + } + } +- for ( i=0; i<ABS_MISC; ++i ) { ++ for ( i=0; i<ABS_MAX; ++i ) { + /* Skip hats */ + if ( i == ABS_HAT0X ) { + i = ABS_HAT3Y; Copied: sdl/repos/extra-x86_64/libsdl-1.2.15-resizing.patch (from rev 166672, sdl/trunk/libsdl-1.2.15-resizing.patch) =================================================================== --- extra-x86_64/libsdl-1.2.15-resizing.patch (rev 0) +++ extra-x86_64/libsdl-1.2.15-resizing.patch 2012-09-15 09:41:06 UTC (rev 166673) @@ -0,0 +1,63 @@ +Description: Revert change that breaks window corner resizing + http://bugzilla.libsdl.org/show_bug.cgi?id=1430 +Author: Andrew Caudwell <acaudw...@gmail.com> +Last-Update: 2012-04-10 +Bug-Debian: http://bugs.debian.org/665779 + +diff -r c787fb1b5699 src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300 +@@ -57,12 +57,6 @@ + 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 @@ + #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)) { +diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h +--- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300 +@@ -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; +- +diff -r c787fb1b5699 src/video/x11/SDL_x11video.c +--- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300 +@@ -1182,8 +1182,6 @@ + current = NULL; + goto done; + } +- X11_PendingConfigureNotifyWidth = width; +- X11_PendingConfigureNotifyHeight = height; + } else { + if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { + current = NULL; Deleted: extra-x86_64/sdl-1.2.14-disable-mmx.patch =================================================================== --- extra-x86_64/sdl-1.2.14-disable-mmx.patch 2012-09-15 09:39:11 UTC (rev 166672) +++ extra-x86_64/sdl-1.2.14-disable-mmx.patch 2012-09-15 09:41:06 UTC (rev 166673) @@ -1,13 +0,0 @@ -# and another one from FS#26020 - ---- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700 -+++ b/src/video/SDL_yuv_sw.c 2011-09-20 19:26:30.247742620 +0700 -@@ -89,6 +89,8 @@ - #include "SDL_yuvfuncs.h" - #include "SDL_yuv_sw_c.h" - -+#undef __OPTIMIZE__ -+ - /* The functions used to manipulate software video overlays */ - static struct private_yuvhwfuncs sw_yuvfuncs = { - SDL_LockYUV_SW, Copied: sdl/repos/extra-x86_64/sdl-1.2.14-disable-mmx.patch (from rev 166672, sdl/trunk/sdl-1.2.14-disable-mmx.patch) =================================================================== --- extra-x86_64/sdl-1.2.14-disable-mmx.patch (rev 0) +++ extra-x86_64/sdl-1.2.14-disable-mmx.patch 2012-09-15 09:41:06 UTC (rev 166673) @@ -0,0 +1,13 @@ +# and another one from FS#26020 + +--- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700 ++++ b/src/video/SDL_yuv_sw.c 2011-09-20 19:26:30.247742620 +0700 +@@ -89,6 +89,8 @@ + #include "SDL_yuvfuncs.h" + #include "SDL_yuv_sw_c.h" + ++#undef __OPTIMIZE__ ++ + /* The functions used to manipulate software video overlays */ + static struct private_yuvhwfuncs sw_yuvfuncs = { + SDL_LockYUV_SW, Deleted: extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch =================================================================== --- extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch 2012-09-15 09:39:11 UTC (rev 166672) +++ extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch 2012-09-15 09:41:06 UTC (rev 166673) @@ -1,23 +0,0 @@ ---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700 -+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700 -@@ -423,12 +423,15 @@ - if ( xevent.xcrossing.mode == NotifyUngrab ) - printf("Mode: NotifyUngrab\n"); - #endif -- if ( this->input_grab == SDL_GRAB_OFF ) { -- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ if ( (xevent.xcrossing.mode != NotifyGrab) && -+ (xevent.xcrossing.mode != NotifyUngrab) ) { -+ if ( this->input_grab == SDL_GRAB_OFF ) { -+ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ } -+ posted = SDL_PrivateMouseMotion(0, 0, -+ xevent.xcrossing.x, -+ xevent.xcrossing.y); - } -- posted = SDL_PrivateMouseMotion(0, 0, -- xevent.xcrossing.x, -- xevent.xcrossing.y); - } - break; - Copied: sdl/repos/extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch (from rev 166672, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch) =================================================================== --- extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch (rev 0) +++ extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch 2012-09-15 09:41:06 UTC (rev 166673) @@ -0,0 +1,23 @@ +--- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700 ++++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700 +@@ -423,12 +423,15 @@ + if ( xevent.xcrossing.mode == NotifyUngrab ) + printf("Mode: NotifyUngrab\n"); + #endif +- if ( this->input_grab == SDL_GRAB_OFF ) { +- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ if ( (xevent.xcrossing.mode != NotifyGrab) && ++ (xevent.xcrossing.mode != NotifyUngrab) ) { ++ if ( this->input_grab == SDL_GRAB_OFF ) { ++ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ } ++ posted = SDL_PrivateMouseMotion(0, 0, ++ xevent.xcrossing.x, ++ xevent.xcrossing.y); + } +- posted = SDL_PrivateMouseMotion(0, 0, +- xevent.xcrossing.x, +- xevent.xcrossing.y); + } + break; +