[gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/

["Azamat H. Hackimov" <winterheart@gentoo.ru>]

commit:     80791a5afde296bf4dd68aac3291ae1e32d83430
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Wed Jun  5 15:31:48 2013 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Wed Jun  5 15:31:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=80791a5a

[media-libs/libsdl] Fix checksum errors for ABI_X86

Package-Manager: portage-2.1.11.62
Manifest-Sign-Key: A018DE8C

---
 .../files/libsdl-universal_xdata32_check.patch     | 49 ++++++++++++++++++++++
 ...e7250.ebuild => libsdl-2.0.0_pre7250-r1.ebuild} |  4 ++
 2 files changed, 53 insertions(+)

diff --git a/media-libs/libsdl/files/libsdl-universal_xdata32_check.patch b/media-libs/libsdl/files/libsdl-universal_xdata32_check.patch
new file mode 100644
index 0000000..d741025
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-universal_xdata32_check.patch
@@ -0,0 +1,49 @@
+# HG changeset patch
+# User Azamat H. Hackimov <azamat.hackimov@gmail.com>
+# Date 1370413935 -21600
+# Node ID 00d5ada80b60f6e163a2ebbb5949515dd9646458
+# Parent  2a858d938e21eb4f6f4496f29557a1fa14b566b4
+Make _XData32 checking universal for 32 and 64 architectures.
+_XData32 is used only for 64, so there should be no regression in 32bit
+enviroment.
+This commit intended for making universal SDL_config.h in mixed 32/64
+enviroment.
+
+diff -r 2a858d938e21 -r 00d5ada80b60 cmake/sdlchecks.cmake
+--- a/cmake/sdlchecks.cmake	Wed Jun 05 12:28:53 2013 +0600
++++ b/cmake/sdlchecks.cmake	Wed Jun 05 12:32:15 2013 +0600
+@@ -357,6 +357,7 @@
+       endif(HAVE_XGENERICEVENT)
+ 
+       check_c_source_compiles("
++          #define LONG64
+           #include <X11/Xlibint.h>
+           extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
+           int main(int argc, char **argv) {}" HAVE_CONST_XDATA32)
+diff -r 2a858d938e21 -r 00d5ada80b60 configure.in
+--- a/configure.in	Wed Jun 05 12:28:53 2013 +0600
++++ b/configure.in	Wed Jun 05 12:32:15 2013 +0600
+@@ -1147,14 +1147,15 @@
+             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)
++              #define LONG64
++              #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)
+ 
+             dnl AC_CHECK_LIB(X11, XGetEventData, AC_DEFINE(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS, 1, [Have XGenericEvent]))
+             AC_MSG_CHECKING([for XGenericEvent])

diff --git a/media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild
similarity index 94%
rename from media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild
rename to media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild
index 029d8c3..14ff260 100644
--- a/media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild
+++ b/media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild
@@ -74,11 +74,15 @@ src_prepare() {
 	# See http://bugzilla.libsdl.org/show_bug.cgi?id=1743
 	epatch "${FILESDIR}/${PN}-add-libtool-export-cmake-v2.patch"
 	# Make headers more universal for 32/64 archs.
+	# See http://bugzilla.libsdl.org/show_bug.cgi?id=1893
 	epatch "${FILESDIR}/${PN}-universal_sizeof_voidp.patch"
 
 	# libX11 1.5.99.902 compilation fix
 	# See http://bugzilla.libsdl.org/show_bug.cgi?id=1769
 	epatch "${FILESDIR}/${PN}-fix-compilation-libX11.patch"
+	# Make headers more universal for 32/64 archs.
+	# http://bugzilla.libsdl.org/show_bug.cgi?id=1893
+	epatch "${FILESDIR}/${PN}-universal_xdata32_check.patch"
 }
 
 src_configure() {