[oe-commits] Saul Wold : libsdl: Backport xData32 patch for x11 update

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: afe343211c3f5d98717e7952e4d332d70a3b992a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=afe343211c3f5d98717e7952e4d332d70a3b992a

Author: Saul Wold <sgw at linux.intel.com>
Date:   Wed Aug 21 11:30:04 2013 -0700

libsdl: Backport xData32 patch for x11 update

Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../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 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 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 at 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}"