diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-08-21 11:30:04 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-22 18:30:05 +0100 |
commit | d42920486781a0664a49789cfc796b4aef091df8 (patch) | |
tree | 17fdc0ce0e4284f000e2dec40fbf1a2966f54059 | |
parent | 0bc5f7c8f6e43d0c9b3cedebc911ab63dec236c1 (diff) | |
download | poky-d42920486781a0664a49789cfc796b4aef091df8.tar.gz |
libsdl: Backport xData32 patch for x11 update
(From OE-Core rev: afe343211c3f5d98717e7952e4d332d70a3b992a)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch | 19 | ||||
-rw-r--r-- | meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 3 |
2 files changed, 21 insertions, 1 deletions
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch new file mode 100644 index 0000000000..f98b927522 --- /dev/null +++ b/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | libX11-1.5.99.901 has changed prototype of _XData32 | ||
2 | |||
3 | Upstream-Status: Backport | ||
4 | <http://bugzilla.libsdl.org/show_bug.cgi?id=1769> | ||
5 | |||
6 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
7 | |||
8 | diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h | ||
9 | --- a/src/video/x11/SDL_x11sym.h Wed Feb 27 15:20:31 2013 -0800 | ||
10 | +++ b/src/video/x11/SDL_x11sym.h Wed Mar 27 16:07:23 2013 +0100 | ||
11 | @@ -165,7 +165,7 @@ | ||
12 | */ | ||
13 | #ifdef LONG64 | ||
14 | SDL_X11_MODULE(IO_32BIT) | ||
15 | -SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) | ||
16 | +SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) | ||
17 | SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) | ||
18 | #endif | ||
19 | |||
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb index 1bee3647be..4209f37375 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | |||
@@ -22,7 +22,8 @@ PR = "r2" | |||
22 | 22 | ||
23 | SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ | 23 | SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ |
24 | file://configure_tweak.patch \ | 24 | file://configure_tweak.patch \ |
25 | " | 25 | file://libsdl-1.2.15-xdata32.patch \ |
26 | " | ||
26 | 27 | ||
27 | S = "${WORKDIR}/SDL-${PV}" | 28 | S = "${WORKDIR}/SDL-${PV}" |
28 | 29 | ||