From 19e0191a14ec03abd6744e8b2701558add96c335 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Mar 27 2013 15:11:16 +0000 Subject: Adapt to libX11-1.5.99.901 --- diff --git a/SDL-1.2.15-const_XData32.patch b/SDL-1.2.15-const_XData32.patch new file mode 100644 index 0000000..0f1c07c --- /dev/null +++ b/SDL-1.2.15-const_XData32.patch @@ -0,0 +1,16 @@ +libX11-1.5.99.901 has changed prototype of _XData32 + + + +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/SDL.spec b/SDL.spec index d12f1e6..3e75c8b 100644 --- a/SDL.spec +++ b/SDL.spec @@ -18,6 +18,8 @@ Patch0: SDL-1.2.12-multilib.patch Patch1: SDL-1.2.10-GrabNotViewable.patch # Proposed to upstream as sdl1680, rh891973 Patch2: SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch +# Proposded to upstream as sdl1769 +Patch3: SDL-1.2.15-const_XData32.patch BuildRequires: alsa-lib-devel BuildRequires: audiofile-devel @@ -74,6 +76,7 @@ applications. %patch0 -p1 -b .multilib %patch1 -p0 -b .grabnotviewable %patch2 -p1 -b .gamma +%patch3 -p1 -b .XData32 for F in CREDITS; do iconv -f iso8859-1 -t utf-8 < "$F" > "${F}.utf" touch --reference "$F" "${F}.utf" @@ -135,6 +138,7 @@ rm -f %{buildroot}%{_libdir}/*.la %changelog * Wed Mar 27 2013 Petr Pisar - 1.2.15-7 - Update config.sub to support aarch64 (bug #926510) +- Adapt to libX11-1.5.99.901 * Wed Feb 13 2013 Fedora Release Engineering - 1.2.15-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild