Gentoo Archives: gentoo-commits

From: "Vadim A. Misbakh-Soloviov" <mva@×××.name>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/
Date: Fri, 31 May 2013 21:28:20
Message-Id: 1370024837.0831a442afc2926f4a95c7d1bbf432cd032cb6eb.mva@gentoo
commit:     0831a442afc2926f4a95c7d1bbf432cd032cb6eb
Author:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Fri May 31 18:27:17 2013 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Fri May 31 18:27:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=0831a442

[media-libs/libsdl] compilation fix (xdata32-related)

Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>

---
 media-libs/libsdl/files/libsdl-xdata32_fix.patch | 15 +++++++++++++++
 media-libs/libsdl/libsdl-2.0.0.ebuild            |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/media-libs/libsdl/files/libsdl-xdata32_fix.patch b/media-libs/libsdl/files/libsdl-xdata32_fix.patch
new file mode 100644
index 0000000..8590cd9
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-xdata32_fix.patch
@@ -0,0 +1,15 @@
+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
\ No newline at end of file

diff --git a/media-libs/libsdl/libsdl-2.0.0.ebuild b/media-libs/libsdl/libsdl-2.0.0.ebuild
index 7d92c7f..130c8ae 100644
--- a/media-libs/libsdl/libsdl-2.0.0.ebuild
+++ b/media-libs/libsdl/libsdl-2.0.0.ebuild
@@ -75,6 +75,9 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-add-libtool-export-cmake-v2.patch"
 	# Make headers more universal for 32/64 archs.
 	epatch "${FILESDIR}/${PN}-universal_sizeof_voidp.patch"
+
+	# Build failure on 64bit systems fix:
+	epatch "${FILESDIR}/${PN}-xdata32_fix.patch"
 }
 
 src_configure() {