From 33528f4a124b276577cd9d8c9799e4bc7d6edf8e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 9 Jan 2005 21:03:31 +0000 Subject: [PATCH] Add patch from upstream to fix variable clashing with linux headers #74608. --- media-libs/libsdl/ChangeLog | 6 +++- media-libs/libsdl/Manifest | 37 +++++++++++++-------- media-libs/libsdl/files/1.2.8-linux26.patch | 37 +++++++++++++++++++++ media-libs/libsdl/libsdl-1.2.8.ebuild | 3 +- 4 files changed, 68 insertions(+), 15 deletions(-) create mode 100644 media-libs/libsdl/files/1.2.8-linux26.patch diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog index 7a8d947f83a2..db1d623f825a 100644 --- a/media-libs/libsdl/ChangeLog +++ b/media-libs/libsdl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libsdl # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.72 2005/01/04 09:53:42 hardave Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.73 2005/01/09 21:03:31 vapier Exp $ + + 09 Jan 2005; Mike Frysinger + +files/1.2.8-linux26.patch, libsdl-1.2.8.ebuild: + Add patch from upstream to fix variable clashing with linux headers #74608. 04 Jan 2005; Hardave Riar libsdl-1.2.6-r3.ebuild: Stable on mips, dep of bug #74475. diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest index 070c74253a8f..508632ddea6f 100644 --- a/media-libs/libsdl/Manifest +++ b/media-libs/libsdl/Manifest @@ -1,22 +1,33 @@ -MD5 605910702f91c98f16eb8e447fbc080a libsdl-1.2.8.ebuild 3981 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 ba9543364078a4cc2e887cec1eeaf81d ChangeLog 10936 MD5 114ce0cde41698cd48fe7f21f8c95c7c libsdl-1.2.6-r3.ebuild 2897 -MD5 670f67bc1f7e776800a5cc7e54cd83e7 ChangeLog 10757 -MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974 MD5 d1354ee11e24509f444f75566c12a58b libsdl-1.2.7-r3.ebuild 3846 -MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196 -MD5 22c541533c3c588f430b62440053071f files/1.2.8-gcc2-asm.patch 10160 -MD5 4f1ce33c931d461bed06277f60341085 files/1.2.8-nobuggy-X.patch 568 +MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974 +MD5 d91b8e5b54c9e4739f1f5cc7d7d66bf9 libsdl-1.2.8.ebuild 4030 MD5 0c2020ec3ce37ea0612064c52d1014b1 files/1.2.6-alsa-1.0.0.patch 557 MD5 60ecfde6cc7b734ef03b93357c537674 files/1.2.8-keyrepeat.patch 598 MD5 803844293dc7df2bb7d2323c03977b71 files/1.2.7-libcaca.patch 23266 +MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r3 62 +MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196 MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094 -MD5 4f1ce33c931d461bed06277f60341085 files/1.2.6-nobuggy-X.patch 568 MD5 e71ab5ce20cb7c70631a59f9d209cce1 files/1.2.7-joystick.patch 1317 -MD5 71a857d2bbcc34c4807638eb5d710f2e files/1.2.7-26headers.patch 1017 -MD5 4ce5ec18eafcf0b1c6caf31c9f67cb1d files/digest-libsdl-1.2.8 62 -MD5 88437c556d9b4571f08de4a4e2d9323a files/1.2.8-libcaca.patch 23278 -MD5 abf0c6fe9d93e5b0cc9a4dbb6d93ad87 files/1.2.7-joystick2.patch 16196 +MD5 4f1ce33c931d461bed06277f60341085 files/1.2.6-nobuggy-X.patch 568 MD5 4f1ce33c931d461bed06277f60341085 files/1.2.7-nobuggy-X.patch 568 -MD5 b66ce90b8939cef871c1c9b065fc0658 files/digest-libsdl-1.2.6-r3 62 -MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r3 62 +MD5 e0c6c6ffc15475282fc864b8f52f0abf files/1.2.8-linux26.patch 1268 +MD5 abf0c6fe9d93e5b0cc9a4dbb6d93ad87 files/1.2.7-joystick2.patch 16196 +MD5 71a857d2bbcc34c4807638eb5d710f2e files/1.2.7-26headers.patch 1017 MD5 323ad5b1e83521630dd4d54819c5efbd files/1.2.8-gcc2.patch 743 +MD5 2e9d99f7ab858b5a64d124abea4565b9 files/digest-libsdl-1.2.7-r3 62 +MD5 88437c556d9b4571f08de4a4e2d9323a files/1.2.8-libcaca.patch 23278 +MD5 4f1ce33c931d461bed06277f60341085 files/1.2.8-nobuggy-X.patch 568 +MD5 4ce5ec18eafcf0b1c6caf31c9f67cb1d files/digest-libsdl-1.2.8 62 +MD5 22c541533c3c588f430b62440053071f files/1.2.8-gcc2-asm.patch 10160 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.9.14 (GNU/Linux) + +iD8DBQFB4Zw3roRuSHgZdywRAmVbAJsFOA4esNkWYPhderAu/svqCEzSPQCfez+q +e5dDkRY3RQ0VAu1k8JYMbBE= +=sJMg +-----END PGP SIGNATURE----- diff --git a/media-libs/libsdl/files/1.2.8-linux26.patch b/media-libs/libsdl/files/1.2.8-linux26.patch new file mode 100644 index 000000000000..d0d009b7543c --- /dev/null +++ b/media-libs/libsdl/files/1.2.8-linux26.patch @@ -0,0 +1,37 @@ +http://bugs.gentoo.org/show_bug.cgi?id=74608 + +Index: SDL_fbevents.c +=================================================================== +RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/video/fbcon/SDL_fbevents.c,v +retrieving revision 1.13 +retrieving revision 1.14 +diff -u -r1.13 -r1.14 +--- src/video/fbcon/SDL_fbevents.c 4 Jan 2004 16:49:25 -0000 1.13 ++++ src/video/fbcon/SDL_fbevents.c 4 Jan 2005 19:04:14 -0000 1.14 +@@ -835,7 +835,7 @@ + static void switch_vt(_THIS, unsigned short which) + { + struct vt_stat vtstate; +- unsigned short current; ++ unsigned short v_active; + SDL_Surface *screen; + __u16 saved_pal[3*256]; + Uint32 screen_arealen; +@@ -846,7 +846,7 @@ + (which == vtstate.v_active) ) { + return; + } +- current = vtstate.v_active; ++ v_active = vtstate.v_active; + + /* Save the contents of the screen, and go to text mode */ + SDL_mutexP(hw_lock); +@@ -864,7 +864,7 @@ + if ( ioctl(keyboard_fd, VT_ACTIVATE, which) == 0 ) { + /* Wait for our console to be activated again */ + ioctl(keyboard_fd, VT_WAITACTIVE, which); +- while ( ioctl(keyboard_fd, VT_WAITACTIVE, current) < 0 ) { ++ while ( ioctl(keyboard_fd, VT_WAITACTIVE, v_active) < 0 ) { + if ( (errno != EINTR) && (errno != EAGAIN) ) { + /* Unknown VT error - cancel this */ + break; diff --git a/media-libs/libsdl/libsdl-1.2.8.ebuild b/media-libs/libsdl/libsdl-1.2.8.ebuild index 2dcea920f6a9..9208128734f0 100644 --- a/media-libs/libsdl/libsdl-1.2.8.ebuild +++ b/media-libs/libsdl/libsdl-1.2.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8.ebuild,v 1.8 2005/01/03 02:19:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8.ebuild,v 1.9 2005/01/09 21:03:31 vapier Exp $ inherit flag-o-matic toolchain-funcs eutils gnuconfig @@ -50,6 +50,7 @@ src_unpack() { epatch "${FILESDIR}"/${PV}-libcaca.patch #40224 epatch "${FILESDIR}"/${PV}-gcc2.patch #75392 epatch "${FILESDIR}"/${PV}-keyrepeat.patch #76448 + epatch "${FILESDIR}"/${PV}-linux26.patch #74608 [[ $(gcc-major-version) -eq 2 ]] && \ epatch "${FILESDIR}"/${PV}-gcc2-asm.patch #75392 -- 2.26.2