diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/libsdl/05-x11-xdata32.patch | 43 | ||||
| -rw-r--r-- | tools/depends/target/libsdl/Makefile | 3 |
2 files changed, 1 insertions, 45 deletions
diff --git a/tools/depends/target/libsdl/05-x11-xdata32.patch b/tools/depends/target/libsdl/05-x11-xdata32.patch deleted file mode 100644 index c619929533..0000000000 --- a/tools/depends/target/libsdl/05-x11-xdata32.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/configure.in Wed Apr 17 00:56:53 2013 -0700 -+++ a/configure.in Sun Jun 02 20:48:53 2013 +0600 -@@ -1169,6 +1169,17 @@ - if test x$definitely_enable_video_x11_xrandr = xyes; then - AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR) - fi -+ AC_MSG_CHECKING(for const parameter to _XData32) -+ have_const_param_xdata32=no -+ AC_TRY_COMPILE([ -+ #include <X11/Xlibint.h> -+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); -+ ],[ -+ ],[ -+ have_const_param_xdata32=yes -+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32) -+ ]) -+ AC_MSG_RESULT($have_const_param_xdata32) - fi - fi - } ---- a/include/SDL_config.h.in Wed Apr 17 00:56:53 2013 -0700 -+++ a/include/SDL_config.h.in Sun Jun 02 20:48:53 2013 +0600 -@@ -283,6 +283,7 @@ - #undef SDL_VIDEO_DRIVER_WINDIB - #undef SDL_VIDEO_DRIVER_WSCONS - #undef SDL_VIDEO_DRIVER_X11 -+#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 - #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE - #undef SDL_VIDEO_DRIVER_X11_DYNAMIC - #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT ---- a/src/video/x11/SDL_x11sym.h Wed Apr 17 00:56:53 2013 -0700 -+++ a/src/video/x11/SDL_x11sym.h Sun Jun 02 20:48:53 2013 +0600 -@@ -165,7 +165,11 @@ - */ - #ifdef LONG64 - SDL_X11_MODULE(IO_32BIT) -+#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 -+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) -+#else - SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) -+#endif - SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) - #endif diff --git a/tools/depends/target/libsdl/Makefile b/tools/depends/target/libsdl/Makefile index 530a10c5a9..e539915650 100644 --- a/tools/depends/target/libsdl/Makefile +++ b/tools/depends/target/libsdl/Makefile @@ -1,5 +1,5 @@ include ../../Makefile.include -DEPS= ../../Makefile.include Makefile 01-SDL_SetWidthHeight.patch 02-OSX_interpretKeyEvents.patch 03-mavericks-compile.patch 04-fix_external_screen_crash.patch 05-x11-xdata32.patch +DEPS= ../../Makefile.include Makefile 01-SDL_SetWidthHeight.patch 02-OSX_interpretKeyEvents.patch 03-mavericks-compile.patch 04-fix_external_screen_crash.patch # lib name, version LIBNAME=SDL @@ -27,7 +27,6 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) cd $(PLATFORM); patch -p0 < ../02-OSX_interpretKeyEvents.patch cd $(PLATFORM); patch -p0 < ../03-mavericks-compile.patch cd $(PLATFORM); patch -p0 < ../04-fix_external_screen_crash.patch - cd $(PLATFORM); patch -p1 < ../05-x11-xdata32.patch cd $(PLATFORM); ./autogen.sh cd $(PLATFORM); $(CONFIGURE) |