| 1 |
commit: 67971e2499537a24b49434435a39db6010e9e719 |
| 2 |
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jun 2 15:15:33 2013 +0000 |
| 4 |
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru> |
| 5 |
CommitDate: Sun Jun 2 15:15:33 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=67971e24 |
| 7 |
|
| 8 |
[media-libs/libsdl] Downgrade to revision based tarballs. |
| 9 |
Checksums has been changed and someone, uhh, cared about it. |
| 10 |
This version also includes patch for libX11 compilation error. |
| 11 |
|
| 12 |
Package-Manager: portage-2.1.11.62 |
| 13 |
Manifest-Sign-Key: A018DE8C |
| 14 |
|
| 15 |
--- |
| 16 |
.../files/libsdl-fix-compilation-libX11.patch | 126 +++++++++++++++++++++ |
| 17 |
media-libs/libsdl/files/libsdl-xdata32_fix.patch | 15 --- |
| 18 |
...dl-2.0.0.ebuild => libsdl-2.0.0_pre7250.ebuild} | 9 +- |
| 19 |
3 files changed, 131 insertions(+), 19 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch b/media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch |
| 22 |
new file mode 100644 |
| 23 |
index 0000000..077673e |
| 24 |
--- /dev/null |
| 25 |
+++ b/media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch |
| 26 |
@@ -0,0 +1,126 @@ |
| 27 |
+# HG changeset patch |
| 28 |
+# User Azamat H. Hackimov <azamat.hackimov@×××××.com> |
| 29 |
+# Date 1370182818 -21600 |
| 30 |
+# Node ID cb19a074e0b1c3e03a4eacca149c8a6599ed9bc5 |
| 31 |
+# Parent 23a5c8f4b312d0b285667e78b9038d403d94c240 |
| 32 |
+Fix compilation with libX11 >= 1.5.99.902. |
| 33 |
+ |
| 34 |
+These changes fixes bug #1769 for SDL2 |
| 35 |
+(http://bugzilla.libsdl.org/show_bug.cgi?id=1769). |
| 36 |
+ |
| 37 |
+diff -r 23a5c8f4b312 -r cb19a074e0b1 cmake/sdlchecks.cmake |
| 38 |
+--- a/cmake/sdlchecks.cmake Sun Jun 02 14:27:54 2013 +0200 |
| 39 |
++++ b/cmake/sdlchecks.cmake Sun Jun 02 20:20:18 2013 +0600 |
| 40 |
+@@ -356,6 +356,14 @@ |
| 41 |
+ set(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1) |
| 42 |
+ endif(HAVE_XGENERICEVENT) |
| 43 |
+ |
| 44 |
++ check_c_source_compiles(" |
| 45 |
++ #include <X11/Xlibint.h> |
| 46 |
++ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); |
| 47 |
++ int main(int argc, char **argv) {}" HAVE_CONST_XDATA32) |
| 48 |
++ if(HAVE_CONST_XDATA32) |
| 49 |
++ set(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1) |
| 50 |
++ endif(HAVE_CONST_XDATA32) |
| 51 |
++ |
| 52 |
+ check_function_exists(XkbKeycodeToKeysym SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM) |
| 53 |
+ |
| 54 |
+ if(VIDEO_X11_XCURSOR AND HAVE_XCURSOR_H) |
| 55 |
+diff -r 23a5c8f4b312 -r cb19a074e0b1 configure |
| 56 |
+--- a/configure Sun Jun 02 14:27:54 2013 +0200 |
| 57 |
++++ b/configure Sun Jun 02 20:20:18 2013 +0600 |
| 58 |
+@@ -19492,6 +19492,35 @@ |
| 59 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_const_param_XextAddDisplay" >&5 |
| 60 |
+ $as_echo "$have_const_param_XextAddDisplay" >&6; } |
| 61 |
+ |
| 62 |
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for const parameter to _XData32" >&5 |
| 63 |
++$as_echo_n "checking for const parameter to _XData32... " >&6; } |
| 64 |
++ have_const_param_xdata32=no |
| 65 |
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 66 |
++/* end confdefs.h. */ |
| 67 |
++ |
| 68 |
++ #include <X11/Xlibint.h> |
| 69 |
++ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); |
| 70 |
++ |
| 71 |
++int |
| 72 |
++main () |
| 73 |
++{ |
| 74 |
++ |
| 75 |
++ |
| 76 |
++ ; |
| 77 |
++ return 0; |
| 78 |
++} |
| 79 |
++_ACEOF |
| 80 |
++if ac_fn_c_try_compile "$LINENO"; then : |
| 81 |
++ |
| 82 |
++ have_const_param_xdata32=yes |
| 83 |
++ $as_echo "#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1" >>confdefs.h |
| 84 |
++ |
| 85 |
++ |
| 86 |
++fi |
| 87 |
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 88 |
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_const_param_xdata32" >&5 |
| 89 |
++$as_echo "$have_const_param_xdata32" >&6; } |
| 90 |
++ |
| 91 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XGenericEvent" >&5 |
| 92 |
+ $as_echo_n "checking for XGenericEvent... " >&6; } |
| 93 |
+ have_XGenericEvent=no |
| 94 |
+diff -r 23a5c8f4b312 -r cb19a074e0b1 configure.in |
| 95 |
+--- a/configure.in Sun Jun 02 14:27:54 2013 +0200 |
| 96 |
++++ b/configure.in Sun Jun 02 20:20:18 2013 +0600 |
| 97 |
+@@ -1144,6 +1144,18 @@ |
| 98 |
+ ]) |
| 99 |
+ AC_MSG_RESULT($have_const_param_XextAddDisplay) |
| 100 |
+ |
| 101 |
++ AC_MSG_CHECKING(for const parameter to _XData32) |
| 102 |
++ have_const_param_xdata32=no |
| 103 |
++ AC_TRY_COMPILE([ |
| 104 |
++ #include <X11/Xlibint.h> |
| 105 |
++ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); |
| 106 |
++ ],[ |
| 107 |
++ ],[ |
| 108 |
++ have_const_param_xdata32=yes |
| 109 |
++ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32) |
| 110 |
++ ]) |
| 111 |
++ AC_MSG_RESULT($have_const_param_xdata32) |
| 112 |
++ |
| 113 |
+ dnl AC_CHECK_LIB(X11, XGetEventData, AC_DEFINE(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS, 1, [Have XGenericEvent])) |
| 114 |
+ AC_MSG_CHECKING([for XGenericEvent]) |
| 115 |
+ have_XGenericEvent=no |
| 116 |
+diff -r 23a5c8f4b312 -r cb19a074e0b1 include/SDL_config.h.cmake |
| 117 |
+--- a/include/SDL_config.h.cmake Sun Jun 02 14:27:54 2013 +0200 |
| 118 |
++++ b/include/SDL_config.h.cmake Sun Jun 02 20:20:18 2013 +0600 |
| 119 |
+@@ -266,6 +266,7 @@ |
| 120 |
+ #cmakedefine SDL_VIDEO_DRIVER_X11_XSHAPE @SDL_VIDEO_DRIVER_X11_XSHAPE@ |
| 121 |
+ #cmakedefine SDL_VIDEO_DRIVER_X11_XVIDMODE @SDL_VIDEO_DRIVER_X11_XVIDMODE@ |
| 122 |
+ #cmakedefine SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS @SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS@ |
| 123 |
++#cmakedefine SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 @SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32@ |
| 124 |
+ #cmakedefine SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY @SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY@ |
| 125 |
+ #cmakedefine SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM @SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM@ |
| 126 |
+ |
| 127 |
+diff -r 23a5c8f4b312 -r cb19a074e0b1 include/SDL_config.h.in |
| 128 |
+--- a/include/SDL_config.h.in Sun Jun 02 14:27:54 2013 +0200 |
| 129 |
++++ b/include/SDL_config.h.in Sun Jun 02 20:20:18 2013 +0600 |
| 130 |
+@@ -268,6 +268,7 @@ |
| 131 |
+ #undef SDL_VIDEO_DRIVER_X11_XSHAPE |
| 132 |
+ #undef SDL_VIDEO_DRIVER_X11_XVIDMODE |
| 133 |
+ #undef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS |
| 134 |
++#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 |
| 135 |
+ #undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY |
| 136 |
+ #undef SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM |
| 137 |
+ |
| 138 |
+diff -r 23a5c8f4b312 -r cb19a074e0b1 src/video/x11/SDL_x11sym.h |
| 139 |
+--- a/src/video/x11/SDL_x11sym.h Sun Jun 02 14:27:54 2013 +0200 |
| 140 |
++++ b/src/video/x11/SDL_x11sym.h Sun Jun 02 20:20:18 2013 +0600 |
| 141 |
+@@ -203,7 +203,11 @@ |
| 142 |
+ */ |
| 143 |
+ #ifdef LONG64 |
| 144 |
+ SDL_X11_MODULE(IO_32BIT) |
| 145 |
++#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 |
| 146 |
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) |
| 147 |
++#else |
| 148 |
+ SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) |
| 149 |
++#endif |
| 150 |
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) |
| 151 |
+ #endif |
| 152 |
+ |
| 153 |
|
| 154 |
diff --git a/media-libs/libsdl/files/libsdl-xdata32_fix.patch b/media-libs/libsdl/files/libsdl-xdata32_fix.patch |
| 155 |
deleted file mode 100644 |
| 156 |
index 8590cd9..0000000 |
| 157 |
--- a/media-libs/libsdl/files/libsdl-xdata32_fix.patch |
| 158 |
+++ /dev/null |
| 159 |
@@ -1,15 +0,0 @@ |
| 160 |
-libX11-1.5.99.901 has changed prototype of _XData32 |
| 161 |
- |
| 162 |
-<http://bugzilla.libsdl.org/show_bug.cgi?id=1769> |
| 163 |
- |
| 164 |
-diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h |
| 165 |
---- a/src/video/x11/SDL_x11sym.h Wed Feb 27 15:20:31 2013 -0800 |
| 166 |
-+++ b/src/video/x11/SDL_x11sym.h Wed Mar 27 16:07:23 2013 +0100 |
| 167 |
-@@ -165,7 +165,7 @@ |
| 168 |
- */ |
| 169 |
- #ifdef LONG64 |
| 170 |
- SDL_X11_MODULE(IO_32BIT) |
| 171 |
--SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) |
| 172 |
-+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) |
| 173 |
- SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) |
| 174 |
- #endif |
| 175 |
\ No newline at end of file |
| 176 |
|
| 177 |
diff --git a/media-libs/libsdl/libsdl-2.0.0.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild |
| 178 |
similarity index 93% |
| 179 |
rename from media-libs/libsdl/libsdl-2.0.0.ebuild |
| 180 |
rename to media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild |
| 181 |
index 130c8ae..029d8c3 100644 |
| 182 |
--- a/media-libs/libsdl/libsdl-2.0.0.ebuild |
| 183 |
+++ b/media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild |
| 184 |
@@ -10,7 +10,7 @@ MY_PV=${PV/_pre/-} |
| 185 |
|
| 186 |
DESCRIPTION="Simple Direct Media Layer" |
| 187 |
HOMEPAGE="http://www.libsdl.org/" |
| 188 |
-SRC_URI="http://www.libsdl.org/tmp/release/SDL2-${MY_PV}.tar.gz" |
| 189 |
+SRC_URI="http://www.libsdl.org/tmp/SDL-${MY_PV}.tar.gz" |
| 190 |
LICENSE="ZLIB" |
| 191 |
SLOT="2" |
| 192 |
KEYWORDS="~amd64 ~x86" |
| 193 |
@@ -63,7 +63,7 @@ DEPEND="${RDEPEND} |
| 194 |
xscreensaver? ( x11-proto/scrnsaverproto ) |
| 195 |
" |
| 196 |
|
| 197 |
-S="${WORKDIR}/SDL2-${MY_PV}" |
| 198 |
+S="${WORKDIR}/SDL-${MY_PV}" |
| 199 |
|
| 200 |
DOCS=( BUGS.txt CREDITS.txt README.txt README-hg.txt README-SDL.txt TODO.txt WhatsNew.txt ) |
| 201 |
|
| 202 |
@@ -76,8 +76,9 @@ src_prepare() { |
| 203 |
# Make headers more universal for 32/64 archs. |
| 204 |
epatch "${FILESDIR}/${PN}-universal_sizeof_voidp.patch" |
| 205 |
|
| 206 |
- # Build failure on 64bit systems fix: |
| 207 |
- epatch "${FILESDIR}/${PN}-xdata32_fix.patch" |
| 208 |
+ # libX11 1.5.99.902 compilation fix |
| 209 |
+ # See http://bugzilla.libsdl.org/show_bug.cgi?id=1769 |
| 210 |
+ epatch "${FILESDIR}/${PN}-fix-compilation-libX11.patch" |
| 211 |
} |
| 212 |
|
| 213 |
src_configure() { |
Archives