Mercurial > mxe-octave

annotate src/sdl-1-xdata.patch @ 4026:28fa86d2cf21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ffmpeg: mods for native linux build of ffmpeg * src/ffmpeg.mk: add native build rule * src/libvpx-1-fixes.patch: update patch from mxe.cc * src/libvpx.mk: update to version 1.4.0, add native build rule * src/sdl-1-xdata.patch" new patch file * src/sdl.mk: add native build rule * src/xvidcore.mk: add native build rule
author John D
date Sat, 12 Sep 2015 20:35:11 -0400
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4026
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
1 # HG changeset patch
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
2 # User Azamat H. Hackimov <azamat.hackimov@gmail.com>
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
3 # Date 1370184533 -21600
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
4 # Branch SDL-1.2
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
5 # Node ID 91ad7b43317a6387e115ecdf63a49137f47e42c8
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
6 # Parent f7fd5c3951b9ed922fdf696f7182e71b58a13268
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
7 Fix compilation with libX11 >= 1.5.99.902.
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
8
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
9 These changes fixes bug #1769 for SDL 1.2
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
10 (http://bugzilla.libsdl.org/show_bug.cgi?id=1769).
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
11
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
12 diff -r f7fd5c3951b9 -r 91ad7b43317a configure.in
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
13 --- a/configure.in Wed Apr 17 00:56:53 2013 -0700
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
14 +++ b/configure.in Sun Jun 02 20:48:53 2013 +0600
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
15 @@ -1169,6 +1169,17 @@
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
16 if test x$definitely_enable_video_x11_xrandr = xyes; then
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
17 AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR)
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
18 fi
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
19 + AC_MSG_CHECKING(for const parameter to _XData32)
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
20 + have_const_param_xdata32=no
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
21 + AC_TRY_COMPILE([
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
22 + #include <X11/Xlibint.h>
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
23 + extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
24 + ],[
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
25 + ],[
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
26 + have_const_param_xdata32=yes
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
27 + AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
28 + ])
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
29 + AC_MSG_RESULT($have_const_param_xdata32)
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
30 fi
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
31 fi
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
32 }
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
33 diff -r f7fd5c3951b9 -r 91ad7b43317a include/SDL_config.h.in
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
34 --- a/include/SDL_config.h.in Wed Apr 17 00:56:53 2013 -0700
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
35 +++ b/include/SDL_config.h.in Sun Jun 02 20:48:53 2013 +0600
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
36 @@ -283,6 +283,7 @@
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
37 #undef SDL_VIDEO_DRIVER_WINDIB
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
38 #undef SDL_VIDEO_DRIVER_WSCONS
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
39 #undef SDL_VIDEO_DRIVER_X11
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
40 +#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
41 #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
42 #undef SDL_VIDEO_DRIVER_X11_DYNAMIC
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
43 #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
44 diff -r f7fd5c3951b9 -r 91ad7b43317a src/video/x11/SDL_x11sym.h
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
45 --- a/src/video/x11/SDL_x11sym.h Wed Apr 17 00:56:53 2013 -0700
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
46 +++ b/src/video/x11/SDL_x11sym.h Sun Jun 02 20:48:53 2013 +0600
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
47 @@ -165,7 +165,11 @@
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
48 */
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
49 #ifdef LONG64
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
50 SDL_X11_MODULE(IO_32BIT)
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
51 +#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
52 +SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
53 +#else
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
54 SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
55 +#endif
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
56 SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
57 #endif
28fa86d2cf21 ffmpeg: mods for native linux build of ffmpeg
John D
parents:
diff changeset
58