Mercurial > mxe-octave

changeset 950:2e58d1df6906

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
include a bugfix for package sdl (by Gregory Smith)
author Volker Grabsch <vog@notjusthosting.com>
date Wed, 12 May 2010 15:09:00 +0200
parents 3dcb4ece2c80
children 1a84ed8b1d95
files src/sdl-1-remove-nonamelessunion.patch src/sdl-2-fix-dinput.patch src/sdl-remove-nonamelessunion.patch
diffstat 3 files changed, 46 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sdl-1-remove-nonamelessunion.patch	Wed May 12 15:09:00 2010 +0200
@@ -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>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/sdl-2-fix-dinput.patch	Wed May 12 15:09:00 2010 +0200
@@ -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;
+
--- a/src/sdl-remove-nonamelessunion.patch	Tue May 11 01:54:55 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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>