/[gentoo-x86]/media-libs/libsdl/files/libsdl-1.2.15-const-xdata32.patch
Gentoo

Contents of /media-libs/libsdl/files/libsdl-1.2.15-const-xdata32.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download) (as text)
Sun Jun 2 20:33:18 2013 UTC (6 years, 8 months ago) by chainsaw
Branch: MAIN
CVS Tags: HEAD
File MIME type: text/x-diff
Patch by Azamat H. Hackimov to address build failures against recent libX11, closes bug #471300.

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0xB5058F9A)

1 # HG changeset patch
2 # User Azamat H. Hackimov <azamat.hackimov@gmail.com>
3 # Date 1370184533 -21600
4 # Branch SDL-1.2
5 # Node ID 91ad7b43317a6387e115ecdf63a49137f47e42c8
6 # Parent f7fd5c3951b9ed922fdf696f7182e71b58a13268
7 Fix compilation with libX11 >= 1.5.99.902.
8
9 These changes fixes bug #1769 for SDL 1.2
10 (http://bugzilla.libsdl.org/show_bug.cgi?id=1769).
11
12 diff -r f7fd5c3951b9 -r 91ad7b43317a configure.in
13 --- a/configure.in Wed Apr 17 00:56:53 2013 -0700
14 +++ b/configure.in Sun Jun 02 20:48:53 2013 +0600
15 @@ -1169,6 +1169,17 @@
16 if test x$definitely_enable_video_x11_xrandr = xyes; then
17 AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR)
18 fi
19 + AC_MSG_CHECKING(for const parameter to _XData32)
20 + have_const_param_xdata32=no
21 + AC_TRY_COMPILE([
22 + #include <X11/Xlibint.h>
23 + extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
24 + ],[
25 + ],[
26 + have_const_param_xdata32=yes
27 + AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
28 + ])
29 + AC_MSG_RESULT($have_const_param_xdata32)
30 fi
31 fi
32 }
33 diff -r f7fd5c3951b9 -r 91ad7b43317a include/SDL_config.h.in
34 --- a/include/SDL_config.h.in Wed Apr 17 00:56:53 2013 -0700
35 +++ b/include/SDL_config.h.in Sun Jun 02 20:48:53 2013 +0600
36 @@ -283,6 +283,7 @@
37 #undef SDL_VIDEO_DRIVER_WINDIB
38 #undef SDL_VIDEO_DRIVER_WSCONS
39 #undef SDL_VIDEO_DRIVER_X11
40 +#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
41 #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE
42 #undef SDL_VIDEO_DRIVER_X11_DYNAMIC
43 #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
44 diff -r f7fd5c3951b9 -r 91ad7b43317a src/video/x11/SDL_x11sym.h
45 --- a/src/video/x11/SDL_x11sym.h Wed Apr 17 00:56:53 2013 -0700
46 +++ b/src/video/x11/SDL_x11sym.h Sun Jun 02 20:48:53 2013 +0600
47 @@ -165,7 +165,11 @@
48 */
49 #ifdef LONG64
50 SDL_X11_MODULE(IO_32BIT)
51 +#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
52 +SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
53 +#else
54 SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
55 +#endif
56 SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
57 #endif
58

  ViewVC Help
Powered by ViewVC 1.1.20