| 1 |
commit: 0831a442afc2926f4a95c7d1bbf432cd032cb6eb |
| 2 |
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 3 |
AuthorDate: Fri May 31 18:27:17 2013 +0000 |
| 4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 5 |
CommitDate: Fri May 31 18:27:17 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=0831a442 |
| 7 |
|
| 8 |
[media-libs/libsdl] compilation fix (xdata32-related) |
| 9 |
|
| 10 |
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name> |
| 11 |
|
| 12 |
--- |
| 13 |
media-libs/libsdl/files/libsdl-xdata32_fix.patch | 15 +++++++++++++++ |
| 14 |
media-libs/libsdl/libsdl-2.0.0.ebuild | 3 +++ |
| 15 |
2 files changed, 18 insertions(+) |
| 16 |
|
| 17 |
diff --git a/media-libs/libsdl/files/libsdl-xdata32_fix.patch b/media-libs/libsdl/files/libsdl-xdata32_fix.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..8590cd9 |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-libs/libsdl/files/libsdl-xdata32_fix.patch |
| 22 |
@@ -0,0 +1,15 @@ |
| 23 |
+libX11-1.5.99.901 has changed prototype of _XData32 |
| 24 |
+ |
| 25 |
+<http://bugzilla.libsdl.org/show_bug.cgi?id=1769> |
| 26 |
+ |
| 27 |
+diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h |
| 28 |
+--- a/src/video/x11/SDL_x11sym.h Wed Feb 27 15:20:31 2013 -0800 |
| 29 |
++++ b/src/video/x11/SDL_x11sym.h Wed Mar 27 16:07:23 2013 +0100 |
| 30 |
+@@ -165,7 +165,7 @@ |
| 31 |
+ */ |
| 32 |
+ #ifdef LONG64 |
| 33 |
+ SDL_X11_MODULE(IO_32BIT) |
| 34 |
+-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) |
| 35 |
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) |
| 36 |
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) |
| 37 |
+ #endif |
| 38 |
\ No newline at end of file |
| 39 |
|
| 40 |
diff --git a/media-libs/libsdl/libsdl-2.0.0.ebuild b/media-libs/libsdl/libsdl-2.0.0.ebuild |
| 41 |
index 7d92c7f..130c8ae 100644 |
| 42 |
--- a/media-libs/libsdl/libsdl-2.0.0.ebuild |
| 43 |
+++ b/media-libs/libsdl/libsdl-2.0.0.ebuild |
| 44 |
@@ -75,6 +75,9 @@ src_prepare() { |
| 45 |
epatch "${FILESDIR}/${PN}-add-libtool-export-cmake-v2.patch" |
| 46 |
# Make headers more universal for 32/64 archs. |
| 47 |
epatch "${FILESDIR}/${PN}-universal_sizeof_voidp.patch" |
| 48 |
+ |
| 49 |
+ # Build failure on 64bit systems fix: |
| 50 |
+ epatch "${FILESDIR}/${PN}-xdata32_fix.patch" |
| 51 |
} |
| 52 |
|
| 53 |
src_configure() { |
Archives