sdl: add upstream patch to fix building for 64-bit architectures

Without the patch building fails in ARM64 and x86_64 with:

In file included from ./src/video/x11/SDL_x11dyn.c:96:0:
./src/video/x11/SDL_x11sym.h:168:92: error: conflicting types for '_XData32'
In file included from ./src/video/x11/SDL_x11dyn.h:34:0,
                 from ./src/video/x11/SDL_x11dyn.c:26:
[...]/sysroot-target/usr/include/X11/Xlibint.h:568:12: note: previous declaration of '_XData32' was here

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 70 insertions, 5 deletions

diff --git a/patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch b/patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch
index 87109359f..7233f65c0 100644
--- a/patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch
+++ b/patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch
@@ -8,11 +8,11 @@ Teach sdl-config the concept of sysroot, but disable manual prefix overwriting.
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- sdl-config.in |   14 +++++++-------
+ sdl-config.in | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/sdl-config.in b/sdl-config.in
-index e0fcc0c..0159c47 100644
+index e0fcc0ced54a..0159c474dfcb 100644
 --- a/sdl-config.in
 +++ b/sdl-config.in
 @@ -23,10 +23,10 @@ while test $# -gt 0; do
diff --git a/patches/SDL-1.2.15/0002-fix-parallel-build.patch b/patches/SDL-1.2.15/0002-fix-parallel-build.patch
index b68aaeb23..a5199e844 100644
--- a/patches/SDL-1.2.15/0002-fix-parallel-build.patch
+++ b/patches/SDL-1.2.15/0002-fix-parallel-build.patch
@@ -6,11 +6,11 @@ We have to create the objects dir before saving gcc's output into it.
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- Makefile.in |    2 +-
+ Makefile.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index ab51035..6e24672 100644
+index ab51035e0b01..6e2467275138 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -71,7 +71,7 @@ depend:
diff --git a/patches/SDL-1.2.15/0003-Fix-compilation-with-libX11-1.5.99.902.patch b/patches/SDL-1.2.15/0003-Fix-compilation-with-libX11-1.5.99.902.patch
new file mode 100644
index 000000000..07d12dbe3
--- /dev/null
+++ b/patches/SDL-1.2.15/0003-Fix-compilation-with-libX11-1.5.99.902.patch
@@ -0,0 +1,64 @@
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sun, 2 Jun 2013 20:48:53 +0600
+Subject: [PATCH] Fix compilation with libX11 >= 1.5.99.902.
+
+These changes fixes bug #1769 for SDL 1.2
+(http://bugzilla.libsdl.org/show_bug.cgi?id=1769).
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.in               | 11 +++++++++++
+ include/SDL_config.h.in    |  1 +
+ src/video/x11/SDL_x11sym.h |  4 ++++
+ 3 files changed, 16 insertions(+)
+
+diff --git a/configure.in b/configure.in
+index 08c8e1e97c67..89c526d42455 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1127,6 +1127,17 @@ AC_HELP_STRING([--enable-video-x11-xrandr], [enable X11 Xrandr extension for ful
+             if test x$definitely_enable_video_x11_xrandr = xyes; then
+                 AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR)
+             fi
++            AC_MSG_CHECKING(for const parameter to _XData32)
++            have_const_param_xdata32=no
++            AC_TRY_COMPILE([
++              #include <X11/Xlibint.h>
++              extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
++            ],[
++            ],[
++            have_const_param_xdata32=yes
++            AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
++            ])
++            AC_MSG_RESULT($have_const_param_xdata32)
+         fi
+     fi
+ }
+diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in
+index 8bb1773c0eb7..78ca747bc041 100644
+--- a/include/SDL_config.h.in
++++ b/include/SDL_config.h.in
+@@ -282,6 +282,7 @@
+ #undef SDL_VIDEO_DRIVER_WINDIB
+ #undef SDL_VIDEO_DRIVER_WSCONS
+ #undef SDL_VIDEO_DRIVER_X11
++#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
+ #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE
+ #undef SDL_VIDEO_DRIVER_X11_DYNAMIC
+ #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
+diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h
+index 4875b989c9b9..bd83f7f5c10e 100644
+--- a/src/video/x11/SDL_x11sym.h
++++ b/src/video/x11/SDL_x11sym.h
+@@ -165,7 +165,11 @@ SDL_X11_SYM(Bool,XShmQueryExtension,(Display* a),(a),return)
+  */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
++#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
++#else
+ SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
++#endif
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+ #endif
+ 
diff --git a/patches/SDL-1.2.15/series b/patches/SDL-1.2.15/series
index bc5578ec9..9cd219921 100644
--- a/patches/SDL-1.2.15/series
+++ b/patches/SDL-1.2.15/series
@@ -2,4 +2,5 @@
 #tag:base --start-number 1
 0001-SDL-1.2.10-sdl-config.in.diff.patch
 0002-fix-parallel-build.patch
-# eae8d165e3519b04806e60b441740fc3  - git-ptx-patches magic
+0003-Fix-compilation-with-libX11-1.5.99.902.patch
+# 5d22a85525900a69ee40da5d0e82fcf8  - git-ptx-patches magic