[packages/SDL] - fix building with libX11 1.6+ - rel 5

baggins baggins at pld-linux.org
Sat Nov 30 12:23:33 CET 2013


commit ea1acc43ab296712649baaee801695ba4992c45f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Nov 30 12:23:16 2013 +0100

    - fix building with libX11 1.6+
    - rel 5

 SDL-const_XData32.patch | 16 ++++++++++++++++
 SDL.spec                |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/SDL.spec b/SDL.spec
index 31a2ffb..2b70b9d 100644
--- a/SDL.spec
+++ b/SDL.spec
@@ -27,7 +27,7 @@ Summary(pl.UTF-8):	SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimedi
 Summary(zh_CN.UTF-8):	SDL (Simple DirectMedia Layer) Generic APIs - 游戏/多媒体库
 Name:		SDL
 Version:	1.2.15
-Release:	4
+Release:	5
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://www.libsdl.org/release/%{name}-%{version}.tar.gz
@@ -36,6 +36,7 @@ Patch0:		%{name}-acfix.patch
 Patch1:		%{name}-new_gamma_ramp_support.patch
 Patch2:		fix-mouse-click.patch
 Patch3:		%{name}-config.patch
+Patch4:		%{name}-const_XData32.patch
 URL:		http://www.libsdl.org/
 %{?with_directfb:BuildRequires:	DirectFB-devel >= 0.9.15}
 BuildRequires:	OpenGL-GLU-devel
@@ -173,6 +174,7 @@ SDL - przykładowe programy.
 %{?with_new_gamma_ramp:%patch1 -p1}
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 : > acinclude.m4
 %{!?with_alsa:echo 'AC_DEFUN([AM_PATH_ALSA],[$3])' >> acinclude.m4}
diff --git a/SDL-const_XData32.patch b/SDL-const_XData32.patch
new file mode 100644
index 0000000..0f1c07c
--- /dev/null
+++ b/SDL-const_XData32.patch
@@ -0,0 +1,16 @@
+libX11-1.5.99.901 has changed prototype of _XData32
+
+<http://bugzilla.libsdl.org/show_bug.cgi?id=1769>
+
+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
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/SDL.git/commitdiff/ea1acc43ab296712649baaee801695ba4992c45f



More information about the pld-cvs-commit mailing list