[SDL] Restore compatibility with libX11-1.4.99.1

[Petr Pisar]

commit 70c4cf486584d6aff8f21513790fc0d068722418
Author: Petr Písař <ppisar at redhat.com>
Date:   Tue Jan 17 15:03:51 2012 +0100

    Restore compatibility with libX11-1.4.99.1

 SDL-1.2.14-Define__XGetRequest.patch |   14 ++++++++++++++
 SDL.spec                             |    8 +++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/SDL-1.2.14-Define__XGetRequest.patch b/SDL-1.2.14-Define__XGetRequest.patch
new file mode 100644
index 0000000..aa126e2
--- /dev/null
+++ b/SDL-1.2.14-Define__XGetRequest.patch
@@ -0,0 +1,14 @@
+libX11 declares extern _XGetRequest() since 1.4.99.1. SDL needs to define it
+to hide it from run-time linker.
+
+diff -r 6f013dd0add1 src/video/x11/SDL_x11sym.h
+--- a/src/video/x11/SDL_x11sym.h	Mon Jan 16 14:27:47 2012 -0500
++++ b/src/video/x11/SDL_x11sym.h	Tue Jan 17 14:40:44 2012 +0100
+@@ -118,6 +118,7 @@
+ SDL_X11_SYM(void,_XEatData,(Display* a,unsigned long b),(a,b),)
+ SDL_X11_SYM(void,_XFlush,(Display* a),(a),)
+ SDL_X11_SYM(void,_XFlushGCCache,(Display* a,GC b),(a,b),)
++SDL_X11_SYM(void *,_XGetRequest,(Display* a,CARD8 b,size_t c),(a,b,c),)
+ SDL_X11_SYM(int,_XRead,(Display* a,char* b,long c),(a,b,c),return)
+ SDL_X11_SYM(void,_XReadPad,(Display* a,char* b,long c),(a,b,c),)
+ SDL_X11_SYM(void,_XSend,(Display* a,_Xconst char* b,long c),(a,b,c),)
diff --git a/SDL.spec b/SDL.spec
index 47b0b8c..93fb05f 100644
--- a/SDL.spec
+++ b/SDL.spec
@@ -1,7 +1,7 @@
 Summary: A cross-platform multimedia library
 Name: SDL
 Version: 1.2.14
-Release: 14%{?dist}
+Release: 15%{?dist}
 # Source: http://www.libsdl.org/release/%%{name}-%%{version}.tar.gz
 # To create the repackaged archive use ./repackage.sh %%{version}
 Source0: %{name}-%{version}_repackaged.tar.gz
@@ -26,6 +26,8 @@ Patch7: SDL-1.2.14-SDL_BlitCopyOverlap_memcpy.patch
 Patch8: SDL-1.2.14-nasm-2.09-compat.patch
 # Rejected by upstream as sdl1155, rh480065
 Patch9: SDL-1.2.10-GrabNotViewable.patch
+# Restore compatibility with libX11-1.4.99.1, submitted as sdl1376, rh782251
+Patch10: SDL-1.2.14-Define__XGetRequest.patch
 
 URL: http://www.libsdl.org/
 License: LGPLv2+
@@ -89,6 +91,7 @@ static SDL applications.
 %patch7 -p1 -b .SDL_BlitCopyOverlap_memcpy
 %patch8 -p1 -b .nasm209
 %patch9 -p0 -b .grabnotviewable
+%patch10 -p1 -b .define__xGetRequest
 for F in CREDITS; do 
     iconv -f iso8859-1 -t utf-8 < "$F" > "${F}.utf"
     touch --reference "$F" "${F}.utf"
@@ -151,6 +154,9 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Jan 17 2012 Petr Pisar <ppisar at redhat.com> - 1.2.14-15
+- Restore compatibility with libX11-1.4.99.1 (bug #782251)
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.14-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild