summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/libsdl
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-02-23 17:43:05 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-23 23:50:52 (GMT)
commit9d6d5e37abae5e88ac6cd06fe1c3d7fb36801fac (patch)
tree56e11db187908635b39ccdd3517f8c381ac7b2bb /meta/recipes-graphics/libsdl
parent26882fdd6718b4f5ceb970dd9e1e7ee8c9273f17 (diff)
downloadpoky-9d6d5e37abae5e88ac6cd06fe1c3d7fb36801fac.tar.gz
libsdl 1.2.14: regenerate patch so it applies with 'patch' as well as 'git apply'
The '@@ -, +, @@' part upsets plain 'patch' (From OE-Core rev: 949f4dc6f2bd59aa3e2c782fee87f07438aebd21) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/libsdl')
-rw-r--r--meta/recipes-graphics/libsdl/libsdl-1.2.14/add.XGetRequest.symbol.patch27
1 files changed, 18 insertions, 9 deletions
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.14/add.XGetRequest.symbol.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.14/add.XGetRequest.symbol.patch
index 7bab177..33ba8ec 100644
--- a/meta/recipes-graphics/libsdl/libsdl-1.2.14/add.XGetRequest.symbol.patch
+++ b/meta/recipes-graphics/libsdl/libsdl-1.2.14/add.XGetRequest.symbol.patch
@@ -1,5 +1,8 @@
1_XGetRequest API was backported to libx11-1.4.4 in: 1From e49fe9e2d75764d2d7ef79ab4252a1f6b99adcd3 Mon Sep 17 00:00:00 2001
2http://git.openembedded.org/openembedded-core/commit/?id=e08604800fe1cb8f240f53c147ceb4ee08a29b91 2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Thu, 23 Feb 2012 18:38:19 +0100
4Subject: [PATCH] _XGetRequest API was backported to libx11-1.4.4 in:
5 http://git.openembedded.org/openembedded-core/commit/?id=e08604800fe1cb8f240f53c147ceb4ee08a29b91
3 6
4This breaks e.g. libsdl-image build with: 7This breaks e.g. libsdl-image build with:
5| /OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/libSDL.so: undefined reference to `_XGetRequest' 8| /OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/libSDL.so: undefined reference to `_XGetRequest'
@@ -7,14 +10,15 @@ This breaks e.g. libsdl-image build with:
7For details see: https://bugzilla.redhat.com/show_bug.cgi?id=782251 10For details see: https://bugzilla.redhat.com/show_bug.cgi?id=782251
8 11
9Upstream-Status: Accepted 12Upstream-Status: Accepted
10 13---
11@@ -, +, @@
12 added.
13 src/video/x11/SDL_x11dyn.c | 24 ++++++++++++++++++++++++ 14 src/video/x11/SDL_x11dyn.c | 24 ++++++++++++++++++++++++
14 src/video/x11/SDL_x11sym.h | 6 ++++++ 15 src/video/x11/SDL_x11sym.h | 6 ++++++
15 2 files changed, 30 insertions(+), 0 deletions(-) 16 2 files changed, 30 insertions(+), 0 deletions(-)
16--- a/src/video/x11/SDL_x11dyn.c 17
17+++ a/src/video/x11/SDL_x11dyn.c 18diff --git a/src/video/x11/SDL_x11dyn.c b/src/video/x11/SDL_x11dyn.c
19index 4e549b3..a7e800e 100644
20--- a/src/video/x11/SDL_x11dyn.c
21+++ b/src/video/x11/SDL_x11dyn.c
18@@ -109,6 +109,21 @@ char *(*pXGetICValues)(XIC, ...) = NULL; 22@@ -109,6 +109,21 @@ char *(*pXGetICValues)(XIC, ...) = NULL;
19 #undef SDL_X11_SYM 23 #undef SDL_X11_SYM
20 24
@@ -53,8 +57,10 @@ Upstream-Status: Accepted
53 if (SDL_X11_HAVE_BASEXLIB) { /* all required symbols loaded. */ 57 if (SDL_X11_HAVE_BASEXLIB) { /* all required symbols loaded. */
54 SDL_ClearError(); 58 SDL_ClearError();
55 } else { 59 } else {
56--- a/src/video/x11/SDL_x11sym.h 60diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h
57+++ a/src/video/x11/SDL_x11sym.h 61index 3dfa146..f1e7841 100644
62--- a/src/video/x11/SDL_x11sym.h
63+++ b/src/video/x11/SDL_x11sym.h
58@@ -170,6 +170,12 @@ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data, 64@@ -170,6 +170,12 @@ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,
59 #endif 65 #endif
60 66
@@ -68,3 +74,6 @@ Upstream-Status: Accepted
68 * These only show up on some variants of Unix. 74 * These only show up on some variants of Unix.
69 */ 75 */
70 #if defined(__osf__) 76 #if defined(__osf__)
77--
781.7.2.5
79