diff options
author | Azamat H. Hackimov <azamat.hackimov@gmail.com> | 2013-06-02 21:15:33 +0600 |
---|---|---|
committer | Azamat H. Hackimov <azamat.hackimov@gmail.com> | 2013-06-02 21:15:33 +0600 |
commit | 67971e2499537a24b49434435a39db6010e9e719 (patch) | |
tree | 53dac3ea3ee4772b6b33c8c235ce2b9940e95ba1 /media-libs | |
parent | [games-util/steam-*] removed ebuilds that are not required with the steam run... (diff) | |
download | gamerlay-67971e2499537a24b49434435a39db6010e9e719.tar.gz gamerlay-67971e2499537a24b49434435a39db6010e9e719.tar.bz2 gamerlay-67971e2499537a24b49434435a39db6010e9e719.zip |
[media-libs/libsdl] Downgrade to revision based tarballs.
Checksums has been changed and someone, uhh, cared about it.
This version also includes patch for libX11 compilation error.
Package-Manager: portage-2.1.11.62
Manifest-Sign-Key: A018DE8C
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/libsdl/Manifest | 8 | ||||
-rw-r--r-- | media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch | 126 | ||||
-rw-r--r-- | media-libs/libsdl/files/libsdl-xdata32_fix.patch | 15 | ||||
-rw-r--r-- | media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild (renamed from media-libs/libsdl/libsdl-2.0.0.ebuild) | 9 |
4 files changed, 135 insertions, 23 deletions
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest index 016a007..624a91d 100644 --- a/media-libs/libsdl/Manifest +++ b/media-libs/libsdl/Manifest @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST SDL2-2.0.0.tar.gz 4262663 SHA256 6ff331d0e8ce0cc5eefba9504d2f1da05bc2bbf00027d73a3f4c2ee6d7d06d50 SHA512 07eb67e9280712eaf5565e9540a449e49fa3fe41bcd1a095010d9c73395e920a52b41683d473bc5a4d365f5ea122beabc45d90ca42a6b1a50580fe175304ca8e WHIRLPOOL 73ee0dcfca4a25f3cd4f0c7007344859fcb71b99360890338c390822fbdc39b382fb48b915a100bf1a0a72c19461c75a9729dfb671caad6e8ef72e7b078eca6b +DIST SDL-2.0.0-7250.tar.gz 4400644 SHA256 d2e6093808f7e862e7736597184f54cdf4b7454081b1e4675ffdd40bd9bdb422 SHA512 14af31d2f0cde1d38b4e5e2df2c0c0e542b2e412f5b4adbffda700eb7c8b9424519cccafaf53fbd96725ec668b7a849dc1ad30478be2234fee7d9134083286dc WHIRLPOOL 4d1e2e322a65db1ada3a1b5dbde00794b3f787cfe07e258bcf2d72840adc157b9403ceb84ed405d4eab5ad089dbbb4e35727d309816c59a4ad688533f8487a1f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlGmFYcACgkQz+A7F6AY3owrTAEAoukS7MkbxoPjLYs+7ZvxqSDF -1DEUcA6VP8fIF4AICl8BANBLWZm4/SJ01xwQkt0Rf/FiDc3sqabzinhJ6yeasDK1 -=rwaa +iF4EAREIAAYFAlGrYZUACgkQz+A7F6AY3oxZeAD/cOxJApu65ueGHaTbzDSxjUGv +7XhnYsTPj4ldvzg7PKoBAJ0qYjjwrnNUMSNQjcDjoOAcfbJKc74J91He9bfGCL75 +=ryfv -----END PGP SIGNATURE----- diff --git a/media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch b/media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch new file mode 100644 index 0000000..077673e --- /dev/null +++ b/media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch @@ -0,0 +1,126 @@ +# HG changeset patch +# User Azamat H. Hackimov <azamat.hackimov@gmail.com> +# Date 1370182818 -21600 +# Node ID cb19a074e0b1c3e03a4eacca149c8a6599ed9bc5 +# Parent 23a5c8f4b312d0b285667e78b9038d403d94c240 +Fix compilation with libX11 >= 1.5.99.902. + +These changes fixes bug #1769 for SDL2 +(http://bugzilla.libsdl.org/show_bug.cgi?id=1769). + +diff -r 23a5c8f4b312 -r cb19a074e0b1 cmake/sdlchecks.cmake +--- a/cmake/sdlchecks.cmake Sun Jun 02 14:27:54 2013 +0200 ++++ b/cmake/sdlchecks.cmake Sun Jun 02 20:20:18 2013 +0600 +@@ -356,6 +356,14 @@ + set(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1) + endif(HAVE_XGENERICEVENT) + ++ check_c_source_compiles(" ++ #include <X11/Xlibint.h> ++ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); ++ int main(int argc, char **argv) {}" HAVE_CONST_XDATA32) ++ if(HAVE_CONST_XDATA32) ++ set(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1) ++ endif(HAVE_CONST_XDATA32) ++ + check_function_exists(XkbKeycodeToKeysym SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM) + + if(VIDEO_X11_XCURSOR AND HAVE_XCURSOR_H) +diff -r 23a5c8f4b312 -r cb19a074e0b1 configure +--- a/configure Sun Jun 02 14:27:54 2013 +0200 ++++ b/configure Sun Jun 02 20:20:18 2013 +0600 +@@ -19492,6 +19492,35 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_const_param_XextAddDisplay" >&5 + $as_echo "$have_const_param_XextAddDisplay" >&6; } + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for const parameter to _XData32" >&5 ++$as_echo_n "checking for const parameter to _XData32... " >&6; } ++ have_const_param_xdata32=no ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++ #include <X11/Xlibint.h> ++ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); ++ ++int ++main () ++{ ++ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++ have_const_param_xdata32=yes ++ $as_echo "#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1" >>confdefs.h ++ ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_const_param_xdata32" >&5 ++$as_echo "$have_const_param_xdata32" >&6; } ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XGenericEvent" >&5 + $as_echo_n "checking for XGenericEvent... " >&6; } + have_XGenericEvent=no +diff -r 23a5c8f4b312 -r cb19a074e0b1 configure.in +--- a/configure.in Sun Jun 02 14:27:54 2013 +0200 ++++ b/configure.in Sun Jun 02 20:20:18 2013 +0600 +@@ -1144,6 +1144,18 @@ + ]) + AC_MSG_RESULT($have_const_param_XextAddDisplay) + ++ 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) ++ + dnl AC_CHECK_LIB(X11, XGetEventData, AC_DEFINE(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS, 1, [Have XGenericEvent])) + AC_MSG_CHECKING([for XGenericEvent]) + have_XGenericEvent=no +diff -r 23a5c8f4b312 -r cb19a074e0b1 include/SDL_config.h.cmake +--- a/include/SDL_config.h.cmake Sun Jun 02 14:27:54 2013 +0200 ++++ b/include/SDL_config.h.cmake Sun Jun 02 20:20:18 2013 +0600 +@@ -266,6 +266,7 @@ + #cmakedefine SDL_VIDEO_DRIVER_X11_XSHAPE @SDL_VIDEO_DRIVER_X11_XSHAPE@ + #cmakedefine SDL_VIDEO_DRIVER_X11_XVIDMODE @SDL_VIDEO_DRIVER_X11_XVIDMODE@ + #cmakedefine SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS @SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS@ ++#cmakedefine SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 @SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32@ + #cmakedefine SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY @SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY@ + #cmakedefine SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM @SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM@ + +diff -r 23a5c8f4b312 -r cb19a074e0b1 include/SDL_config.h.in +--- a/include/SDL_config.h.in Sun Jun 02 14:27:54 2013 +0200 ++++ b/include/SDL_config.h.in Sun Jun 02 20:20:18 2013 +0600 +@@ -268,6 +268,7 @@ + #undef SDL_VIDEO_DRIVER_X11_XSHAPE + #undef SDL_VIDEO_DRIVER_X11_XVIDMODE + #undef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS ++#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 + #undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY + #undef SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM + +diff -r 23a5c8f4b312 -r cb19a074e0b1 src/video/x11/SDL_x11sym.h +--- a/src/video/x11/SDL_x11sym.h Sun Jun 02 14:27:54 2013 +0200 ++++ b/src/video/x11/SDL_x11sym.h Sun Jun 02 20:20:18 2013 +0600 +@@ -203,7 +203,11 @@ + */ + #ifdef LONG64 + SDL_X11_MODULE(IO_32BIT) ++#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 ++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) ++#else + SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) ++#endif + SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) + #endif + diff --git a/media-libs/libsdl/files/libsdl-xdata32_fix.patch b/media-libs/libsdl/files/libsdl-xdata32_fix.patch deleted file mode 100644 index 8590cd9..0000000 --- a/media-libs/libsdl/files/libsdl-xdata32_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -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_pre7250.ebuild index 130c8ae..029d8c3 100644 --- a/media-libs/libsdl/libsdl-2.0.0.ebuild +++ b/media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild @@ -10,7 +10,7 @@ MY_PV=${PV/_pre/-} DESCRIPTION="Simple Direct Media Layer" HOMEPAGE="http://www.libsdl.org/" -SRC_URI="http://www.libsdl.org/tmp/release/SDL2-${MY_PV}.tar.gz" +SRC_URI="http://www.libsdl.org/tmp/SDL-${MY_PV}.tar.gz" LICENSE="ZLIB" SLOT="2" KEYWORDS="~amd64 ~x86" @@ -63,7 +63,7 @@ DEPEND="${RDEPEND} xscreensaver? ( x11-proto/scrnsaverproto ) " -S="${WORKDIR}/SDL2-${MY_PV}" +S="${WORKDIR}/SDL-${MY_PV}" DOCS=( BUGS.txt CREDITS.txt README.txt README-hg.txt README-SDL.txt TODO.txt WhatsNew.txt ) @@ -76,8 +76,9 @@ src_prepare() { # 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" + # libX11 1.5.99.902 compilation fix + # See http://bugzilla.libsdl.org/show_bug.cgi?id=1769 + epatch "${FILESDIR}/${PN}-fix-compilation-libX11.patch" } src_configure() { |