[arch-commits] Commit in sdl/repos (26 files)

Jan Steffens heftig at nymeria.archlinux.org
Sat May 10 21:42:36 UTC 2014


    Date: Saturday, May 10, 2014 @ 23:42:35
  Author: heftig
Revision: 212211

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  sdl/repos/extra-i686/PKGBUILD
    (from rev 212210, sdl/trunk/PKGBUILD)
  sdl/repos/extra-i686/X11_KeyToUnicode.patch
    (from rev 212210, sdl/trunk/X11_KeyToUnicode.patch)
  sdl/repos/extra-i686/fix_joystick_misc_axes.diff
    (from rev 212210, sdl/trunk/fix_joystick_misc_axes.diff)
  sdl/repos/extra-i686/libsdl-1.2.15-resizing.patch
    (from rev 212210, sdl/trunk/libsdl-1.2.15-resizing.patch)
  sdl/repos/extra-i686/sdl-1.2.14-disable-mmx.patch
    (from rev 212210, sdl/trunk/sdl-1.2.14-disable-mmx.patch)
  sdl/repos/extra-i686/sdl-1.2.14-fix-mouse-clicking.patch
    (from rev 212210, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch)
  sdl/repos/extra-i686/sdl_x11sym.patch
    (from rev 212210, sdl/trunk/sdl_x11sym.patch)
  sdl/repos/extra-x86_64/PKGBUILD
    (from rev 212210, sdl/trunk/PKGBUILD)
  sdl/repos/extra-x86_64/X11_KeyToUnicode.patch
    (from rev 212210, sdl/trunk/X11_KeyToUnicode.patch)
  sdl/repos/extra-x86_64/fix_joystick_misc_axes.diff
    (from rev 212210, sdl/trunk/fix_joystick_misc_axes.diff)
  sdl/repos/extra-x86_64/libsdl-1.2.15-resizing.patch
    (from rev 212210, sdl/trunk/libsdl-1.2.15-resizing.patch)
  sdl/repos/extra-x86_64/sdl-1.2.14-disable-mmx.patch
    (from rev 212210, sdl/trunk/sdl-1.2.14-disable-mmx.patch)
  sdl/repos/extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch
    (from rev 212210, sdl/trunk/sdl-1.2.14-fix-mouse-clicking.patch)
  sdl/repos/extra-x86_64/sdl_x11sym.patch
    (from rev 212210, sdl/trunk/sdl_x11sym.patch)
Deleted:
  sdl/repos/extra-i686/PKGBUILD
  sdl/repos/extra-i686/fix_joystick_misc_axes.diff
  sdl/repos/extra-i686/libsdl-1.2.15-resizing.patch
  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-i686/sdl_x11sym.patch
  sdl/repos/extra-x86_64/PKGBUILD
  sdl/repos/extra-x86_64/fix_joystick_misc_axes.diff
  sdl/repos/extra-x86_64/libsdl-1.2.15-resizing.patch
  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
  sdl/repos/extra-x86_64/sdl_x11sym.patch

--------------------------------------------------+
 /PKGBUILD                                        |  106 +++++++++++++++++
 /fix_joystick_misc_axes.diff                     |   26 ++++
 /libsdl-1.2.15-resizing.patch                    |  126 +++++++++++++++++++++
 /sdl-1.2.14-disable-mmx.patch                    |   26 ++++
 /sdl-1.2.14-fix-mouse-clicking.patch             |   46 +++++++
 /sdl_x11sym.patch                                |   24 ++++
 extra-i686/PKGBUILD                              |   50 --------
 extra-i686/X11_KeyToUnicode.patch                |   52 ++++++++
 extra-i686/fix_joystick_misc_axes.diff           |   13 --
 extra-i686/libsdl-1.2.15-resizing.patch          |   63 ----------
 extra-i686/sdl-1.2.14-disable-mmx.patch          |   13 --
 extra-i686/sdl-1.2.14-fix-mouse-clicking.patch   |   23 ---
 extra-i686/sdl_x11sym.patch                      |   12 --
 extra-x86_64/PKGBUILD                            |   50 --------
 extra-x86_64/X11_KeyToUnicode.patch              |   52 ++++++++
 extra-x86_64/fix_joystick_misc_axes.diff         |   13 --
 extra-x86_64/libsdl-1.2.15-resizing.patch        |   63 ----------
 extra-x86_64/sdl-1.2.14-disable-mmx.patch        |   13 --
 extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch |   23 ---
 extra-x86_64/sdl_x11sym.patch                    |   12 --
 20 files changed, 458 insertions(+), 348 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-05-10 21:41:06 UTC (rev 212210)
+++ extra-i686/PKGBUILD	2014-05-10 21:42:35 UTC (rev 212211)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=sdl
-pkgver=1.2.15
-pkgrel=5
-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' 'glu')
-optdepends=('alsa-lib: ALSA audio driver'
-            'libpulse: PulseAudio audio driver')
-options=('staticlibs')
-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
-        sdl_x11sym.patch)
-md5sums=('9d96df8417572a2afb781a7c4c811a85'
-         '04d8c179f125e04bcd4c9d60e013c2d7'
-         'e5c16b7611f62c7cb25f0534eff68852'
-         '687586a108b597a2a6b73070c1d37e51'
-         '3dd50347d8856160a9cbd7f80383a1f8'
-         '148b285bccee9d21bb96db807363b962')
-
-prepare() {
-  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
-  patch -Np0 -i ../sdl_x11sym.patch
-}
-
-build() {
-  cd SDL-$pkgver
-  ./configure --prefix=/usr --disable-nasm --enable-alsa \
-              --with-x --disable-rpath --disable-static
-  make
-}
-
-package() {
-  cd SDL-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: sdl/repos/extra-i686/PKGBUILD (from rev 212210, sdl/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-05-10 21:42:35 UTC (rev 212211)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=sdl
+pkgver=1.2.15
+pkgrel=6
+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' 'glu')
+optdepends=('alsa-lib: ALSA audio driver'
+            'libpulse: PulseAudio audio driver')
+options=('staticlibs')
+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
+        sdl_x11sym.patch
+        X11_KeyToUnicode.patch)
+md5sums=('9d96df8417572a2afb781a7c4c811a85'
+         '04d8c179f125e04bcd4c9d60e013c2d7'
+         'e5c16b7611f62c7cb25f0534eff68852'
+         '687586a108b597a2a6b73070c1d37e51'
+         '3dd50347d8856160a9cbd7f80383a1f8'
+         '148b285bccee9d21bb96db807363b962'
+         'edea272dff4698470877c016d818918d')
+
+prepare() {
+  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
+  patch -Np0 -i ../sdl_x11sym.patch
+  patch -Np1 -i ../X11_KeyToUnicode.patch
+}
+
+build() {
+  cd SDL-$pkgver
+  ./configure --prefix=/usr --disable-nasm --enable-alsa \
+              --with-x --disable-rpath --disable-static
+  make
+}
+
+package() {
+  cd SDL-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Copied: sdl/repos/extra-i686/X11_KeyToUnicode.patch (from rev 212210, sdl/trunk/X11_KeyToUnicode.patch)
===================================================================
--- extra-i686/X11_KeyToUnicode.patch	                        (rev 0)
+++ extra-i686/X11_KeyToUnicode.patch	2014-05-10 21:42:35 UTC (rev 212211)
@@ -0,0 +1,52 @@
+
+# HG changeset patch
+# User Sam Lantinga <slouken at libsdl.org>
+# Date 1327258041 18000
+# Node ID 900a0fae90ca65cff55a70a17b9ec39d2ddccbcf
+# Parent  5273dfd19a5e8c5736a0d417bd441f704c5355f8
+Fixed bug 1390 - X11_KeyToUnicode
+
+manuel.montezelo 2012-01-22 08:56:18 PST
+
+We had the following bug report at Debian:
+http://bugs.debian.org/376560
+
+Same one in Ubuntu:
+https://bugs.launchpad.net/ubuntu/+source/libsdl1.2/+bug/66217
+
+We've been including a patch since then (attached) to actually export the
+symbol, since 2006.  In the last release the function seems to be there, alive
+and kicking.
+
+It's affecting other people too:
+http://www.garagegames.com/community/forums/viewthread/52287
+
+diff -r 5273dfd19a5e -r 900a0fae90ca src/video/x11/SDL_x11events.c
+--- a/src/video/x11/SDL_x11events.c	Sat Jan 21 12:06:51 2012 -0500
++++ b/src/video/x11/SDL_x11events.c	Sun Jan 22 13:47:21 2012 -0500
+@@ -1246,8 +1246,11 @@
+  * sequences (dead accents, compose key sequences) will not work since the
+  * state has been irrevocably lost.
+  */
++extern DECLSPEC Uint16 SDLCALL X11_KeyToUnicode(SDLKey, SDLMod);
++
+ Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers)
+ {
++	static int warning = 0;
+ 	struct SDL_VideoDevice *this = current_video;
+ 	char keybuf[32];
+ 	int i;
+@@ -1255,6 +1258,12 @@
+ 	XKeyEvent xkey;
+ 	Uint16 unicode;
+ 
++	if ( warning ) {
++		warning = 0;
++		fprintf(stderr, "WARNING: Application is using X11_KeyToUnicode().\n");
++		fprintf(stderr, "This is not an official SDL function, please report this as a bug.\n");
++	}
++
+ 	if ( !this || !SDL_Display ) {
+ 		return 0;
+ 	}
+

Deleted: extra-i686/fix_joystick_misc_axes.diff
===================================================================
--- extra-i686/fix_joystick_misc_axes.diff	2014-05-10 21:41:06 UTC (rev 212210)
+++ extra-i686/fix_joystick_misc_axes.diff	2014-05-10 21:42:35 UTC (rev 212211)
@@ -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 212210, sdl/trunk/fix_joystick_misc_axes.diff)
===================================================================
--- extra-i686/fix_joystick_misc_axes.diff	                        (rev 0)
+++ extra-i686/fix_joystick_misc_axes.diff	2014-05-10 21:42:35 UTC (rev 212211)
@@ -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;

Deleted: extra-i686/libsdl-1.2.15-resizing.patch
===================================================================
--- extra-i686/libsdl-1.2.15-resizing.patch	2014-05-10 21:41:06 UTC (rev 212210)
+++ extra-i686/libsdl-1.2.15-resizing.patch	2014-05-10 21:42:35 UTC (rev 212211)
@@ -1,63 +0,0 @@
-Description: Revert change that breaks window corner resizing
- http://bugzilla.libsdl.org/show_bug.cgi?id=1430
-Author: Andrew Caudwell <acaudwell at 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;

Copied: sdl/repos/extra-i686/libsdl-1.2.15-resizing.patch (from rev 212210, 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	2014-05-10 21:42:35 UTC (rev 212211)
@@ -0,0 +1,63 @@
+Description: Revert change that breaks window corner resizing
+ http://bugzilla.libsdl.org/show_bug.cgi?id=1430
+Author: Andrew Caudwell <acaudwell at 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	2014-05-10 21:41:06 UTC (rev 212210)
+++ extra-i686/sdl-1.2.14-disable-mmx.patch	2014-05-10 21:42:35 UTC (rev 212211)
@@ -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 212210, 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	2014-05-10 21:42:35 UTC (rev 212211)
@@ -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	2014-05-10 21:41:06 UTC (rev 212210)
+++ extra-i686/sdl-1.2.14-fix-mouse-clicking.patch	2014-05-10 21:42:35 UTC (rev 212211)
@@ -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 212210, 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	2014-05-10 21:42:35 UTC (rev 212211)
@@ -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-i686/sdl_x11sym.patch
===================================================================
--- extra-i686/sdl_x11sym.patch	2014-05-10 21:41:06 UTC (rev 212210)
+++ extra-i686/sdl_x11sym.patch	2014-05-10 21:42:35 UTC (rev 212211)
@@ -1,12 +0,0 @@
---- src/video/x11/SDL_x11sym.h-orig	2013-07-16 23:56:46.718523385 -0600
-+++ src/video/x11/SDL_x11sym.h	2013-07-16 23:58:27.025186485 -0600
-@@ -165,7 +165,8 @@
-  */
- #ifdef LONG64
- SDL_X11_MODULE(IO_32BIT)
--SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
-+
-+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
- SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
- #endif
- 

Copied: sdl/repos/extra-i686/sdl_x11sym.patch (from rev 212210, sdl/trunk/sdl_x11sym.patch)
===================================================================
--- extra-i686/sdl_x11sym.patch	                        (rev 0)
+++ extra-i686/sdl_x11sym.patch	2014-05-10 21:42:35 UTC (rev 212211)
@@ -0,0 +1,12 @@
+--- src/video/x11/SDL_x11sym.h-orig	2013-07-16 23:56:46.718523385 -0600
++++ src/video/x11/SDL_x11sym.h	2013-07-16 23:58:27.025186485 -0600
+@@ -165,7 +165,8 @@
+  */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
+-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
++
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+ #endif
+ 

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-05-10 21:41:06 UTC (rev 212210)
+++ extra-x86_64/PKGBUILD	2014-05-10 21:42:35 UTC (rev 212211)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=sdl
-pkgver=1.2.15
-pkgrel=5
-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' 'glu')
-optdepends=('alsa-lib: ALSA audio driver'
-            'libpulse: PulseAudio audio driver')
-options=('staticlibs')
-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
-        sdl_x11sym.patch)
-md5sums=('9d96df8417572a2afb781a7c4c811a85'
-         '04d8c179f125e04bcd4c9d60e013c2d7'
-         'e5c16b7611f62c7cb25f0534eff68852'
-         '687586a108b597a2a6b73070c1d37e51'
-         '3dd50347d8856160a9cbd7f80383a1f8'
-         '148b285bccee9d21bb96db807363b962')
-
-prepare() {
-  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
-  patch -Np0 -i ../sdl_x11sym.patch
-}
-
-build() {
-  cd SDL-$pkgver
-  ./configure --prefix=/usr --disable-nasm --enable-alsa \
-              --with-x --disable-rpath --disable-static
-  make
-}
-
-package() {
-  cd SDL-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: sdl/repos/extra-x86_64/PKGBUILD (from rev 212210, sdl/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-05-10 21:42:35 UTC (rev 212211)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=sdl
+pkgver=1.2.15
+pkgrel=6
+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' 'glu')
+optdepends=('alsa-lib: ALSA audio driver'
+            'libpulse: PulseAudio audio driver')
+options=('staticlibs')
+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
+        sdl_x11sym.patch
+        X11_KeyToUnicode.patch)
+md5sums=('9d96df8417572a2afb781a7c4c811a85'
+         '04d8c179f125e04bcd4c9d60e013c2d7'
+         'e5c16b7611f62c7cb25f0534eff68852'
+         '687586a108b597a2a6b73070c1d37e51'
+         '3dd50347d8856160a9cbd7f80383a1f8'
+         '148b285bccee9d21bb96db807363b962'
+         'edea272dff4698470877c016d818918d')
+
+prepare() {
+  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
+  patch -Np0 -i ../sdl_x11sym.patch
+  patch -Np1 -i ../X11_KeyToUnicode.patch
+}
+
+build() {
+  cd SDL-$pkgver
+  ./configure --prefix=/usr --disable-nasm --enable-alsa \
+              --with-x --disable-rpath --disable-static
+  make
+}
+
+package() {
+  cd SDL-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Copied: sdl/repos/extra-x86_64/X11_KeyToUnicode.patch (from rev 212210, sdl/trunk/X11_KeyToUnicode.patch)
===================================================================
--- extra-x86_64/X11_KeyToUnicode.patch	                        (rev 0)
+++ extra-x86_64/X11_KeyToUnicode.patch	2014-05-10 21:42:35 UTC (rev 212211)
@@ -0,0 +1,52 @@
+
+# HG changeset patch
+# User Sam Lantinga <slouken at libsdl.org>
+# Date 1327258041 18000
+# Node ID 900a0fae90ca65cff55a70a17b9ec39d2ddccbcf
+# Parent  5273dfd19a5e8c5736a0d417bd441f704c5355f8
+Fixed bug 1390 - X11_KeyToUnicode
+
+manuel.montezelo 2012-01-22 08:56:18 PST
+
+We had the following bug report at Debian:
+http://bugs.debian.org/376560
+
+Same one in Ubuntu:
+https://bugs.launchpad.net/ubuntu/+source/libsdl1.2/+bug/66217
+
+We've been including a patch since then (attached) to actually export the
+symbol, since 2006.  In the last release the function seems to be there, alive
+and kicking.
+
+It's affecting other people too:
+http://www.garagegames.com/community/forums/viewthread/52287
+
+diff -r 5273dfd19a5e -r 900a0fae90ca src/video/x11/SDL_x11events.c
+--- a/src/video/x11/SDL_x11events.c	Sat Jan 21 12:06:51 2012 -0500
++++ b/src/video/x11/SDL_x11events.c	Sun Jan 22 13:47:21 2012 -0500
+@@ -1246,8 +1246,11 @@
+  * sequences (dead accents, compose key sequences) will not work since the
+  * state has been irrevocably lost.
+  */
++extern DECLSPEC Uint16 SDLCALL X11_KeyToUnicode(SDLKey, SDLMod);
++
+ Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers)
+ {
++	static int warning = 0;
+ 	struct SDL_VideoDevice *this = current_video;
+ 	char keybuf[32];
+ 	int i;
+@@ -1255,6 +1258,12 @@
+ 	XKeyEvent xkey;
+ 	Uint16 unicode;
+ 
++	if ( warning ) {
++		warning = 0;
++		fprintf(stderr, "WARNING: Application is using X11_KeyToUnicode().\n");
++		fprintf(stderr, "This is not an official SDL function, please report this as a bug.\n");
++	}
++
+ 	if ( !this || !SDL_Display ) {
+ 		return 0;
+ 	}
+

Deleted: extra-x86_64/fix_joystick_misc_axes.diff
===================================================================
--- extra-x86_64/fix_joystick_misc_axes.diff	2014-05-10 21:41:06 UTC (rev 212210)
+++ extra-x86_64/fix_joystick_misc_axes.diff	2014-05-10 21:42:35 UTC (rev 212211)
@@ -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 212210, 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	2014-05-10 21:42:35 UTC (rev 212211)
@@ -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;

Deleted: extra-x86_64/libsdl-1.2.15-resizing.patch
===================================================================
--- extra-x86_64/libsdl-1.2.15-resizing.patch	2014-05-10 21:41:06 UTC (rev 212210)
+++ extra-x86_64/libsdl-1.2.15-resizing.patch	2014-05-10 21:42:35 UTC (rev 212211)
@@ -1,63 +0,0 @@
-Description: Revert change that breaks window corner resizing
- http://bugzilla.libsdl.org/show_bug.cgi?id=1430
-Author: Andrew Caudwell <acaudwell at 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;

Copied: sdl/repos/extra-x86_64/libsdl-1.2.15-resizing.patch (from rev 212210, 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	2014-05-10 21:42:35 UTC (rev 212211)
@@ -0,0 +1,63 @@
+Description: Revert change that breaks window corner resizing
+ http://bugzilla.libsdl.org/show_bug.cgi?id=1430
+Author: Andrew Caudwell <acaudwell at 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	2014-05-10 21:41:06 UTC (rev 212210)
+++ extra-x86_64/sdl-1.2.14-disable-mmx.patch	2014-05-10 21:42:35 UTC (rev 212211)
@@ -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 212210, 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	2014-05-10 21:42:35 UTC (rev 212211)
@@ -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	2014-05-10 21:41:06 UTC (rev 212210)
+++ extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch	2014-05-10 21:42:35 UTC (rev 212211)
@@ -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 212210, 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	2014-05-10 21:42:35 UTC (rev 212211)
@@ -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/sdl_x11sym.patch
===================================================================
--- extra-x86_64/sdl_x11sym.patch	2014-05-10 21:41:06 UTC (rev 212210)
+++ extra-x86_64/sdl_x11sym.patch	2014-05-10 21:42:35 UTC (rev 212211)
@@ -1,12 +0,0 @@
---- src/video/x11/SDL_x11sym.h-orig	2013-07-16 23:56:46.718523385 -0600
-+++ src/video/x11/SDL_x11sym.h	2013-07-16 23:58:27.025186485 -0600
-@@ -165,7 +165,8 @@
-  */
- #ifdef LONG64
- SDL_X11_MODULE(IO_32BIT)
--SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
-+
-+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
- SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
- #endif
- 

Copied: sdl/repos/extra-x86_64/sdl_x11sym.patch (from rev 212210, sdl/trunk/sdl_x11sym.patch)
===================================================================
--- extra-x86_64/sdl_x11sym.patch	                        (rev 0)
+++ extra-x86_64/sdl_x11sym.patch	2014-05-10 21:42:35 UTC (rev 212211)
@@ -0,0 +1,12 @@
+--- src/video/x11/SDL_x11sym.h-orig	2013-07-16 23:56:46.718523385 -0600
++++ src/video/x11/SDL_x11sym.h	2013-07-16 23:58:27.025186485 -0600
+@@ -165,7 +165,8 @@
+  */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
+-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
++
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+ #endif
+ 




More information about the arch-commits mailing list