| 1 |
commit: 80791a5afde296bf4dd68aac3291ae1e32d83430 |
| 2 |
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Jun 5 15:31:48 2013 +0000 |
| 4 |
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru> |
| 5 |
CommitDate: Wed Jun 5 15:31:48 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=80791a5a |
| 7 |
|
| 8 |
[media-libs/libsdl] Fix checksum errors for ABI_X86 |
| 9 |
|
| 10 |
Package-Manager: portage-2.1.11.62 |
| 11 |
Manifest-Sign-Key: A018DE8C |
| 12 |
|
| 13 |
--- |
| 14 |
.../files/libsdl-universal_xdata32_check.patch | 49 ++++++++++++++++++++++ |
| 15 |
...e7250.ebuild => libsdl-2.0.0_pre7250-r1.ebuild} | 4 ++ |
| 16 |
2 files changed, 53 insertions(+) |
| 17 |
|
| 18 |
diff --git a/media-libs/libsdl/files/libsdl-universal_xdata32_check.patch b/media-libs/libsdl/files/libsdl-universal_xdata32_check.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..d741025 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-libs/libsdl/files/libsdl-universal_xdata32_check.patch |
| 23 |
@@ -0,0 +1,49 @@ |
| 24 |
+# HG changeset patch |
| 25 |
+# User Azamat H. Hackimov <azamat.hackimov@×××××.com> |
| 26 |
+# Date 1370413935 -21600 |
| 27 |
+# Node ID 00d5ada80b60f6e163a2ebbb5949515dd9646458 |
| 28 |
+# Parent 2a858d938e21eb4f6f4496f29557a1fa14b566b4 |
| 29 |
+Make _XData32 checking universal for 32 and 64 architectures. |
| 30 |
+_XData32 is used only for 64, so there should be no regression in 32bit |
| 31 |
+enviroment. |
| 32 |
+This commit intended for making universal SDL_config.h in mixed 32/64 |
| 33 |
+enviroment. |
| 34 |
+ |
| 35 |
+diff -r 2a858d938e21 -r 00d5ada80b60 cmake/sdlchecks.cmake |
| 36 |
+--- a/cmake/sdlchecks.cmake Wed Jun 05 12:28:53 2013 +0600 |
| 37 |
++++ b/cmake/sdlchecks.cmake Wed Jun 05 12:32:15 2013 +0600 |
| 38 |
+@@ -357,6 +357,7 @@ |
| 39 |
+ endif(HAVE_XGENERICEVENT) |
| 40 |
+ |
| 41 |
+ check_c_source_compiles(" |
| 42 |
++ #define LONG64 |
| 43 |
+ #include <X11/Xlibint.h> |
| 44 |
+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); |
| 45 |
+ int main(int argc, char **argv) {}" HAVE_CONST_XDATA32) |
| 46 |
+diff -r 2a858d938e21 -r 00d5ada80b60 configure.in |
| 47 |
+--- a/configure.in Wed Jun 05 12:28:53 2013 +0600 |
| 48 |
++++ b/configure.in Wed Jun 05 12:32:15 2013 +0600 |
| 49 |
+@@ -1147,14 +1147,15 @@ |
| 50 |
+ AC_MSG_CHECKING(for const parameter to _XData32) |
| 51 |
+ have_const_param_xdata32=no |
| 52 |
+ AC_TRY_COMPILE([ |
| 53 |
+- #include <X11/Xlibint.h> |
| 54 |
+- extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); |
| 55 |
+- ],[ |
| 56 |
+- ],[ |
| 57 |
+- have_const_param_xdata32=yes |
| 58 |
+- AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32) |
| 59 |
+- ]) |
| 60 |
+- AC_MSG_RESULT($have_const_param_xdata32) |
| 61 |
++ #define LONG64 |
| 62 |
++ #include <X11/Xlibint.h> |
| 63 |
++ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); |
| 64 |
++ ],[ |
| 65 |
++ ],[ |
| 66 |
++ have_const_param_xdata32=yes |
| 67 |
++ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32) |
| 68 |
++ ]) |
| 69 |
++ AC_MSG_RESULT($have_const_param_xdata32) |
| 70 |
+ |
| 71 |
+ dnl AC_CHECK_LIB(X11, XGetEventData, AC_DEFINE(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS, 1, [Have XGenericEvent])) |
| 72 |
+ AC_MSG_CHECKING([for XGenericEvent]) |
| 73 |
|
| 74 |
diff --git a/media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild |
| 75 |
similarity index 94% |
| 76 |
rename from media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild |
| 77 |
rename to media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild |
| 78 |
index 029d8c3..14ff260 100644 |
| 79 |
--- a/media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild |
| 80 |
+++ b/media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild |
| 81 |
@@ -74,11 +74,15 @@ src_prepare() { |
| 82 |
# See http://bugzilla.libsdl.org/show_bug.cgi?id=1743 |
| 83 |
epatch "${FILESDIR}/${PN}-add-libtool-export-cmake-v2.patch" |
| 84 |
# Make headers more universal for 32/64 archs. |
| 85 |
+ # See http://bugzilla.libsdl.org/show_bug.cgi?id=1893 |
| 86 |
epatch "${FILESDIR}/${PN}-universal_sizeof_voidp.patch" |
| 87 |
|
| 88 |
# libX11 1.5.99.902 compilation fix |
| 89 |
# See http://bugzilla.libsdl.org/show_bug.cgi?id=1769 |
| 90 |
epatch "${FILESDIR}/${PN}-fix-compilation-libX11.patch" |
| 91 |
+ # Make headers more universal for 32/64 archs. |
| 92 |
+ # http://bugzilla.libsdl.org/show_bug.cgi?id=1893 |
| 93 |
+ epatch "${FILESDIR}/${PN}-universal_xdata32_check.patch" |
| 94 |
} |
| 95 |
|
| 96 |
src_configure() { |
Archives