diff options
| author | Robin Cook | 2012-01-27 18:47:25 -0600 |
|---|---|---|
| committer | Robin Cook | 2012-01-27 18:47:25 -0600 |
| commit | e0b09612a0e6344810db64edb857882a81e63910 (patch) | |
| tree | e34fe6d36e97c4e20aa68967f4dbd2130eba4d68 | |
| parent | 3bcc6ef36b37386fdd8a5f7df4b1c76442e3c8af (diff) | |
sdl: updated to 1.2.15
| -rw-r--r-- | libs/sdl/HISTORY | 4 | ||||
| -rwxr-xr-x | libs/sdl/PRE_BUILD | 1 | ||||
| -rw-r--r-- | libs/sdl/mouse-fix.patch | 15 |
3 files changed, 4 insertions, 16 deletions
diff --git a/libs/sdl/HISTORY b/libs/sdl/HISTORY index f44827af69..3d7e860d45 100644 --- a/libs/sdl/HISTORY +++ b/libs/sdl/HISTORY @@ -1,3 +1,7 @@ +2012-01-27 Robin Cook <rcook@wyrms.net> + * DETAILS: updated to 1.2.15 + * PRE_BUILD: removed mouse fix patch as no longer needed + 2011-10-12 Bor Kraljič <pyrobor@ver.si> * DEPENDS: removed optional dependency on arts diff --git a/libs/sdl/PRE_BUILD b/libs/sdl/PRE_BUILD index 04554fb972..74b2580ae8 100755 --- a/libs/sdl/PRE_BUILD +++ b/libs/sdl/PRE_BUILD @@ -1,6 +1,5 @@ default_pre_build && cd $SOURCE_DIRECTORY && -patch -p1 < $SCRIPT_DIRECTORY/mouse-fix.patch && mkdir -p smgl && cp $SCRIPT_DIRECTORY/sdl smgl/ && cp $SCRIPT_DIRECTORY/sdl.sh smgl/ diff --git a/libs/sdl/mouse-fix.patch b/libs/sdl/mouse-fix.patch deleted file mode 100644 index 1fe0241e93..0000000000 --- a/libs/sdl/mouse-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- SDL-1.2.14/src/video/x11/SDL_x11events.c 2009-10-12 16:07:15.000000000 -0700 -+++ SDL-1.2/src/video/x11/SDL_x11events.c 2010-07-19 23:57:48.365397095 -0700 -@@ -441,8 +441,10 @@ - if ( xevent.xcrossing.mode == NotifyUngrab ) - printf("Mode: NotifyUngrab\n"); - #endif -- if ( xevent.xcrossing.detail != NotifyInferior ) { -- if ( this->input_grab == SDL_GRAB_OFF ) { -+ if ( (xevent.xcrossing.mode != NotifyGrab) && -+ (xevent.xcrossing.mode != NotifyUngrab) && -+ (xevent.xcrossing.detail != NotifyInferior) ) { -+ if ( this->input_grab == SDL_GRAB_OFF ) { - posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); - } else { - posted = SDL_PrivateMouseMotion(0, 0, |