From: Saul Wold <sgw@linux.intel.com>
To: kai.kang@windriver.com, openembedded-core@lists.openembedded.org
Subject: [PATCH 3/4] libsdl: Backport xData32 patch for x11 update
Date: Wed, 21 Aug 2013 16:14:34 -0700 [thread overview]
Message-ID: <1377126875-9856-4-git-send-email-sgw@linux.intel.com> (raw)
In-Reply-To: <1377126875-9856-1-git-send-email-sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch | 19 +++++++++++++++++++
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 3 ++-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
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 0000000..f98b927
--- /dev/null
+++ b/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
@@ -0,0 +1,19 @@
+libX11-1.5.99.901 has changed prototype of _XData32
+
+Upstream-Status: Backport
+<http://bugzilla.libsdl.org/show_bug.cgi?id=1769>
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h
+--- a/src/video/x11/SDL_x11sym.h Wed Feb 27 15:20:31 2013 -0800
++++ b/src/video/x11/SDL_x11sym.h Wed Mar 27 16:07:23 2013 +0100
+@@ -165,7 +165,7 @@
+ */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
+-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+ #endif
+
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index 1bee364..4209f37 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"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://configure_tweak.patch \
- "
+ file://libsdl-1.2.15-xdata32.patch \
+ "
S = "${WORKDIR}/SDL-${PV}"
--
1.8.3.1
next prev parent reply other threads:[~2013-08-21 23:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-21 23:14 [PATCH 0/4] libX11 Update & Valgrind patch Saul Wold
2013-08-21 23:14 ` [PATCH 1/4] libx11: upgrade to 1.6.1 Saul Wold
2013-08-21 23:23 ` Martin Jansa
2013-08-21 23:14 ` [PATCH 2/4] libx11-diet: " Saul Wold
2013-08-21 23:14 ` Saul Wold [this message]
2013-08-21 23:14 ` [PATCH 4/4] valgrind: Backport patch for eglibc 2.18 Saul Wold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1377126875-9856-4-git-send-email-sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=kai.kang@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox