mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

libsdl 1.2.14: regenerate patch so it applies with 'patch' as well as 'git apply'

Browse Source 
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>
This commit is contained in:
Koen Kooi
2012-02-23 18:43:05 +01:00
committed by Richard Purdie
parent 26882fdd67
commit 9d6d5e37ab
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/libsdl/libsdl-1.2.14/add.XGetRequest.symbol.patch
+18 -9
View File
@@ -1,5 +1,8 @@
_XGetRequest API was backported to libx11-1.4.4 in: From e49fe9e2d75764d2d7ef79ab4252a1f6b99adcd3 Mon Sep 17 00:00:00 2001
http://git.openembedded.org/openembedded-core/commit/?id=e08604800fe1cb8f240f53c147ceb4ee08a29b91 From: Martin Jansa <martin.jansa@gmail.com>
Date: Thu, 23 Feb 2012 18:38:19 +0100
Subject: [PATCH] _XGetRequest API was backported to libx11-1.4.4 in:
http://git.openembedded.org/openembedded-core/commit/?id=e08604800fe1cb8f240f53c147ceb4ee08a29b91
This breaks e.g. libsdl-image build with: This breaks e.g. libsdl-image build with:
| /OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/libSDL.so: undefined reference to `_XGetRequest' | /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:
For details see: https://bugzilla.redhat.com/show_bug.cgi?id=782251 For details see: https://bugzilla.redhat.com/show_bug.cgi?id=782251
Upstream-Status: Accepted Upstream-Status: Accepted
---
@@ -, +, @@
added.
src/video/x11/SDL_x11dyn.c | 24 ++++++++++++++++++++++++ src/video/x11/SDL_x11dyn.c | 24 ++++++++++++++++++++++++
src/video/x11/SDL_x11sym.h | 6 ++++++ src/video/x11/SDL_x11sym.h | 6 ++++++
2 files changed, 30 insertions(+), 0 deletions(-) 2 files changed, 30 insertions(+), 0 deletions(-)
--- a/src/video/x11/SDL_x11dyn.c
+++ a/src/video/x11/SDL_x11dyn.c diff --git a/src/video/x11/SDL_x11dyn.c b/src/video/x11/SDL_x11dyn.c
index 4e549b3..a7e800e 100644
--- a/src/video/x11/SDL_x11dyn.c
+++ b/src/video/x11/SDL_x11dyn.c
@@ -109,6 +109,21 @@ char *(*pXGetICValues)(XIC, ...) = NULL; @@ -109,6 +109,21 @@ char *(*pXGetICValues)(XIC, ...) = NULL;
#undef SDL_X11_SYM #undef SDL_X11_SYM
@@ -53,8 +57,10 @@ Upstream-Status: Accepted
if (SDL_X11_HAVE_BASEXLIB) { /* all required symbols loaded. */ if (SDL_X11_HAVE_BASEXLIB) { /* all required symbols loaded. */
SDL_ClearError(); SDL_ClearError();
} else { } else {
--- a/src/video/x11/SDL_x11sym.h diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h
+++ a/src/video/x11/SDL_x11sym.h index 3dfa146..f1e7841 100644
--- a/src/video/x11/SDL_x11sym.h
+++ b/src/video/x11/SDL_x11sym.h
@@ -170,6 +170,12 @@ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data, @@ -170,6 +170,12 @@ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,
#endif #endif
@@ -68,3 +74,6 @@ Upstream-Status: Accepted
* These only show up on some variants of Unix. * These only show up on some variants of Unix.
*/ */
#if defined(__osf__) #if defined(__osf__)
--
1.7.2.5