diff options
| -rw-r--r-- | meta/recipes-graphics/libsdl/libsdl-1.2.14/add.XGetRequest.symbol.patch | 27 |
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 7bab177749..33ba8ecde9 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: | 1 | From e49fe9e2d75764d2d7ef79ab4252a1f6b99adcd3 Mon Sep 17 00:00:00 2001 |
| 2 | http://git.openembedded.org/openembedded-core/commit/?id=e08604800fe1cb8f240f53c147ceb4ee08a29b91 | 2 | From: Martin Jansa <martin.jansa@gmail.com> |
| 3 | Date: Thu, 23 Feb 2012 18:38:19 +0100 | ||
| 4 | Subject: [PATCH] _XGetRequest API was backported to libx11-1.4.4 in: | ||
| 5 | http://git.openembedded.org/openembedded-core/commit/?id=e08604800fe1cb8f240f53c147ceb4ee08a29b91 | ||
| 3 | 6 | ||
| 4 | This breaks e.g. libsdl-image build with: | 7 | This 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: | |||
| 7 | For details see: https://bugzilla.redhat.com/show_bug.cgi?id=782251 | 10 | For details see: https://bugzilla.redhat.com/show_bug.cgi?id=782251 |
| 8 | 11 | ||
| 9 | Upstream-Status: Accepted | 12 | Upstream-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 | 18 | diff --git a/src/video/x11/SDL_x11dyn.c b/src/video/x11/SDL_x11dyn.c |
| 19 | index 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 | 60 | diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h |
| 57 | +++ a/src/video/x11/SDL_x11sym.h | 61 | index 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 | -- | ||
| 78 | 1.7.2.5 | ||
| 79 | |||
