From e88c227f3062f861de12dfb6902d93afba990396 Mon Sep 17 00:00:00 2001
From: Volker Grabsch <vog@notjusthosting.com>
Date: Wed, 12 May 2010 15:09:00 +0200
Subject: include a bugfix for package sdl  (by Gregory Smith)

---
 src/sdl-1-remove-nonamelessunion.patch | 16 ++++++++++++++++
 src/sdl-2-fix-dinput.patch             | 30 ++++++++++++++++++++++++++++++
 src/sdl-remove-nonamelessunion.patch   | 16 ----------------
 3 files changed, 46 insertions(+), 16 deletions(-)
 create mode 100644 src/sdl-1-remove-nonamelessunion.patch
 create mode 100644 src/sdl-2-fix-dinput.patch
 delete mode 100644 src/sdl-remove-nonamelessunion.patch

diff --git a/src/sdl-1-remove-nonamelessunion.patch b/src/sdl-1-remove-nonamelessunion.patch
new file mode 100644
index 0000000..a2444bb
--- /dev/null
+++ b/src/sdl-1-remove-nonamelessunion.patch
@@ -0,0 +1,16 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+diff -r be6033c09175 src/video/windx5/directx.h
+--- a/src/video/windx5/directx.h	Fri Apr 23 18:34:51 2010 +0200
++++ b/src/video/windx5/directx.h	Fri Apr 23 18:42:08 2010 +0200
+@@ -74,9 +74,6 @@
+ #define DIRECTSOUND_VERSION 0x0500
+ #define DIRECTINPUT_VERSION 0x0700
+ 
+-#ifdef __GNUC__
+-#define NONAMELESSUNION
+-#endif
+ #include <ddraw.h>
+ #include <dsound.h>
+ #include <dinput.h>
diff --git a/src/sdl-2-fix-dinput.patch b/src/sdl-2-fix-dinput.patch
new file mode 100644
index 0000000..7eeb335
--- /dev/null
+++ b/src/sdl-2-fix-dinput.patch
@@ -0,0 +1,30 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+This patch has been taken from:
+http://hg.libsdl.org/SDL/rev/daf9e6037596
+
+diff --git a/src/video/windx5/SDL_dx5events.c b/src/video/windx5/SDL_dx5events.c
+--- a/src/video/windx5/SDL_dx5events.c
++++ b/src/video/windx5/SDL_dx5events.c
+@@ -559,13 +559,15 @@
+ 
+ 			active = (wParam && (GetForegroundWindow() == hwnd));
+ 			if ( active ) {
+-				for ( i=0; SDL_DIdev[i]; ++i ) {
+-					IDirectInputDevice2_Acquire(
++				for ( i=0; i<MAX_INPUTS; ++i ) {
++					if (SDL_DIdev[i] != NULL)
++						IDirectInputDevice2_Acquire(
+ 								SDL_DIdev[i]);
+ 				}
+ 			} else {
+-				for ( i=0; SDL_DIdev[i]; ++i ) {
+-					IDirectInputDevice2_Unacquire(
++				for ( i=0; i<MAX_INPUTS; ++i ) {
++					if (SDL_DIdev[i] != NULL) 
++						IDirectInputDevice2_Unacquire(
+ 								SDL_DIdev[i]);
+ 				}
+ 				mouse_lost = 1;
+
diff --git a/src/sdl-remove-nonamelessunion.patch b/src/sdl-remove-nonamelessunion.patch
deleted file mode 100644
index a2444bb..0000000
--- a/src/sdl-remove-nonamelessunion.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-diff -r be6033c09175 src/video/windx5/directx.h
---- a/src/video/windx5/directx.h	Fri Apr 23 18:34:51 2010 +0200
-+++ b/src/video/windx5/directx.h	Fri Apr 23 18:42:08 2010 +0200
-@@ -74,9 +74,6 @@
- #define DIRECTSOUND_VERSION 0x0500
- #define DIRECTINPUT_VERSION 0x0700
- 
--#ifdef __GNUC__
--#define NONAMELESSUNION
--#endif
- #include <ddraw.h>
- #include <dsound.h>
- #include <dinput.h>
-- 
cgit v0.12