diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-07-25 19:04:41 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-07-25 19:04:41 +0000 |
| commit | 4639ab98c9cffdbe5269b4eaee7e92a14495694a (patch) | |
| tree | 1665d4bff505aa52708677d3c337a0d0ce9d9748 /media-libs/libsdl | |
| parent | x11-plugins/wmbatppc 2.4 stable for ppc. Wipe out old ebuilds... (Manifest re... (diff) | |
| download | gentoo-2-4639ab98c9cffdbe5269b4eaee7e92a14495694a.tar.gz gentoo-2-4639ab98c9cffdbe5269b4eaee7e92a14495694a.tar.bz2 gentoo-2-4639ab98c9cffdbe5269b4eaee7e92a14495694a.zip | |
Fix for bug #58192.
Diffstat (limited to 'media-libs/libsdl')
| -rw-r--r-- | media-libs/libsdl/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libsdl/files/1.2.7-26headers.patch | 29 | ||||
| -rw-r--r-- | media-libs/libsdl/libsdl-1.2.7-r2.ebuild | 3 |
3 files changed, 36 insertions, 2 deletions
diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog index 233dfed549f7..81fad7b24cc8 100644 --- a/media-libs/libsdl/ChangeLog +++ b/media-libs/libsdl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libsdl # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.53 2004/07/14 00:17:25 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.54 2004/07/25 19:04:41 plasmaroo Exp $ + + 25 Jul 2004; <plasmaroo@gentoo.org> libsdl-1.2.7-r2.ebuild, + +files/1.2.7-26headers.patch: + Fix for bug #58192. *libsdl-1.2.7-r2 (13 Jul 2004) diff --git a/media-libs/libsdl/files/1.2.7-26headers.patch b/media-libs/libsdl/files/1.2.7-26headers.patch new file mode 100644 index 000000000000..d145d90e4761 --- /dev/null +++ b/media-libs/libsdl/files/1.2.7-26headers.patch @@ -0,0 +1,29 @@ +--- SDL-1.2.7/src/video/fbcon/SDL_fbevents.c.old 2004-02-18 17:22:06.000000000 +0000 ++++ SDL-1.2.7/src/video/fbcon/SDL_fbevents.c 2004-07-25 13:44:16.654181264 +0100 +@@ -835,7 +835,7 @@ + static void switch_vt(_THIS, unsigned short which) + { + struct vt_stat vtstate; +- unsigned short current; ++ unsigned short current_; + SDL_Surface *screen; + __u16 saved_pal[3*256]; + Uint32 screen_arealen; +@@ -846,7 +846,7 @@ + (which == vtstate.v_active) ) { + return; + } +- current = vtstate.v_active; ++ current_ = 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, current_) < 0 ) { + if ( (errno != EINTR) && (errno != EAGAIN) ) { + /* Unknown VT error - cancel this */ + break; diff --git a/media-libs/libsdl/libsdl-1.2.7-r2.ebuild b/media-libs/libsdl/libsdl-1.2.7-r2.ebuild index ef1b7572e665..cfbab37fb05c 100644 --- a/media-libs/libsdl/libsdl-1.2.7-r2.ebuild +++ b/media-libs/libsdl/libsdl-1.2.7-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.7-r2.ebuild,v 1.1 2004/07/14 00:17:25 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.7-r2.ebuild,v 1.2 2004/07/25 19:04:41 plasmaroo Exp $ inherit fixheadtails eutils @@ -39,6 +39,7 @@ src_unpack() { epatch ${FILESDIR}/${PV}-libcaca.patch #40224 epatch ${FILESDIR}/${PV}-gcc34.patch #48947 epatch ${FILESDIR}/${PV}-joystick2.patch #52833 + epatch ${FILESDIR}/${PV}-26headers.patch #58192 ht_fix_file configure.in |