diff options
Diffstat (limited to 'media-libs/libsdl/files')
5 files changed, 94 insertions, 0 deletions
diff --git a/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch b/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch new file mode 100644 index 0000000..f430428 --- /dev/null +++ b/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch @@ -0,0 +1,20 @@ +Only output -L -rpath cruft if using a non-standard install location. + +Makes ABI / cross-compiling easier on the soul. + +--- sdl-config.in ++++ sdl-config.in +@@ -44,7 +44,12 @@ + echo -I@includedir@/SDL @SDL_CFLAGS@ + ;; + @ENABLE_SHARED_TRUE@ --libs) +-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ ++@ENABLE_SHARED_TRUE@ if test x"${prefix}" != x"/usr" ; then ++@ENABLE_SHARED_TRUE@ libdirs="-L@libdir@" ++@ENABLE_SHARED_TRUE@ else ++@ENABLE_SHARED_TRUE@ libdirs="" ++@ENABLE_SHARED_TRUE@ fi ++@ENABLE_SHARED_TRUE@ echo $libdirs @SDL_RLD_FLAGS@ @SDL_LIBS@ + @ENABLE_SHARED_TRUE@ ;; + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) diff --git a/media-libs/libsdl/files/libsdl-1.2.14-click.patch b/media-libs/libsdl/files/libsdl-1.2.14-click.patch new file mode 100644 index 0000000..1fe0241 --- /dev/null +++ b/media-libs/libsdl/files/libsdl-1.2.14-click.patch @@ -0,0 +1,15 @@ +--- 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, diff --git a/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch b/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch new file mode 100644 index 0000000..ab695f9 --- /dev/null +++ b/media-libs/libsdl/files/libsdl-1.2.14-glibc213.patch @@ -0,0 +1,12 @@ +diff -r 6bb01861c4c0 src/video/SDL_blit.c +--- a/src/video/SDL_blit.c Wed Feb 16 04:49:07 2011 -0800 ++++ b/src/video/SDL_blit.c Wed Feb 16 22:51:23 2011 +0100 +@@ -214,7 +214,7 @@ + dstskip = w+info->d_skip; + if ( dst < src ) { + while ( h-- ) { +- SDL_memcpy(dst, src, w); ++ SDL_memmove(dst, src, w); + src += srcskip; + dst += dstskip; + } diff --git a/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch b/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch new file mode 100644 index 0000000..7f7e7a2 --- /dev/null +++ b/media-libs/libsdl/files/libsdl-1.2.14-joystick.patch @@ -0,0 +1,37 @@ +--- SDL-1.2.14/src/joystick/linux/SDL_sysjoystick.c 2009-10-18 13:54:40.000000000 -0400 ++++ SDL-1.2.14-mod/src/joystick/linux/SDL_sysjoystick.c 2010-08-15 22:28:19.000000000 -0400 +@@ -700,26 +700,26 @@ + continue; + } + if ( test_bit(i, absbit) ) { +- int values[5]; ++ struct input_absinfo values; + +- if ( ioctl(fd, EVIOCGABS(i), values) < 0 ) ++ if ( ioctl(fd, EVIOCGABS(i), &values) < 0 ) + continue; + #ifdef DEBUG_INPUT_EVENTS + printf("Joystick has absolute axis: %x\n", i); + printf("Values = { %d, %d, %d, %d, %d }\n", +- values[0], values[1], +- values[2], values[3], values[4]); ++ values.value, values.minimum, ++ values.maximum, values.fuzz, values.flat); + #endif /* DEBUG_INPUT_EVENTS */ + joystick->hwdata->abs_map[i] = joystick->naxes; +- if ( values[1] == values[2] ) { ++ if ( values.minimum == values.maximum ) { + joystick->hwdata->abs_correct[i].used = 0; + } else { + joystick->hwdata->abs_correct[i].used = 1; + joystick->hwdata->abs_correct[i].coef[0] = +- (values[2] + values[1]) / 2 - values[4]; ++ (values.maximum + values.minimum) / 2 - values.flat; + joystick->hwdata->abs_correct[i].coef[1] = +- (values[2] + values[1]) / 2 + values[4]; +- t = ((values[2] - values[1]) / 2 - 2 * values[4]); ++ (values.maximum + values.minimum) / 2 + values.flat; ++ t = ((values.maximum - values.minimum) / 2 - 2 * values.flat); + if ( t != 0 ) { + joystick->hwdata->abs_correct[i].coef[2] = (1 << 29) / t; + } else { diff --git a/media-libs/libsdl/files/libsdl-1.2.14-raisefullscreen.patch b/media-libs/libsdl/files/libsdl-1.2.14-raisefullscreen.patch new file mode 100644 index 0000000..1407000 --- /dev/null +++ b/media-libs/libsdl/files/libsdl-1.2.14-raisefullscreen.patch @@ -0,0 +1,10 @@ +--- SDL-1.2.14/src/video/x11/SDL_x11modes.c~ 2012-01-11 17:38:21.138611142 +0100 ++++ SDL-1.2.14/src/video/x11/SDL_x11modes.c 2012-01-11 17:30:52.906622687 +0100 +@@ -968,6 +968,7 @@ + x = (real_w - window_w)/2; + y = (real_h - window_h)/2; + XReparentWindow(SDL_Display, SDL_Window, FSwindow, x, y); ++ XRaiseWindow(SDL_Display, FSwindow); + /* FIXME: move the mouse to the old relative location */ + XSync(SDL_Display, True); /* Flush spurious mode change events */ + } |