summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2006-09-10 22:01:38 +0000
committerAlfredo Tupone <tupone@gentoo.org>2006-09-10 22:01:38 +0000
commit666149a84983b3f94988efd0b03b2c9e787c08c9 (patch)
treebe1a23f7c3effac26264baa502342041740501ee /games-arcade/stepmania
parentRemoved unnecessary -lib parameter to eant test. (diff)
downloadgentoo-2-666149a84983b3f94988efd0b03b2c9e787c08c9.tar.gz
gentoo-2-666149a84983b3f94988efd0b03b2c9e787c08c9.tar.bz2
gentoo-2-666149a84983b3f94988efd0b03b2c9e787c08c9.zip
Fixing stepmania SDL error. Bug #135440
(Portage version: 2.1.1)
Diffstat (limited to 'games-arcade/stepmania')
-rw-r--r--games-arcade/stepmania/ChangeLog6
-rw-r--r--games-arcade/stepmania/files/stepmania-3.9-sdl.patch29
-rw-r--r--games-arcade/stepmania/stepmania-3.9.ebuild3
3 files changed, 36 insertions, 2 deletions
diff --git a/games-arcade/stepmania/ChangeLog b/games-arcade/stepmania/ChangeLog
index ec9da6d7a3f0..5cb8b1ea516d 100644
--- a/games-arcade/stepmania/ChangeLog
+++ b/games-arcade/stepmania/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-arcade/stepmania
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.10 2006/06/01 20:09:07 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.11 2006/09/10 22:01:38 tupone Exp $
+
+ 10 Sep 2006; <tupone@gentoo.org> +files/stepmania-3.9-sdl.patch,
+ stepmania-3.9.ebuild:
+ Fixing stepmania SDL error. Bug #135440 by Damien THEBAULT
01 Jun 2006; <Tupone@gentoo.org> +files/stepmania-3.9-vorbis.patch,
stepmania-3.9.ebuild:
diff --git a/games-arcade/stepmania/files/stepmania-3.9-sdl.patch b/games-arcade/stepmania/files/stepmania-3.9-sdl.patch
new file mode 100644
index 000000000000..0c97ce0d1b11
--- /dev/null
+++ b/games-arcade/stepmania/files/stepmania-3.9-sdl.patch
@@ -0,0 +1,29 @@
+--- src/arch/InputHandler/InputHandler_SDL.cpp.old 2006-09-10 23:31:24.000000000 +0200
++++ src/arch/InputHandler/InputHandler_SDL.cpp 2006-09-10 23:32:09.000000000 +0200
+@@ -123,7 +123,7 @@
+ SDL_KEYDOWN, SDL_KEYUP, SDL_JOYBUTTONDOWN, SDL_JOYBUTTONUP,
+ SDL_JOYAXISMOTION, SDL_JOYHATMOTION, -1
+ };
+-static int SDL_EventMask;
++static int SDLEventMask;
+
+ InputHandler_SDL::InputHandler_SDL()
+ {
+@@ -173,7 +173,7 @@
+ for(i = 0; Handled_SDL_Events[i] != -1; ++i)
+ {
+ mySDL_EventState(Handled_SDL_Events[i], SDL_ENABLE);
+- SDL_EventMask |= SDL_EVENTMASK(Handled_SDL_Events[i]);
++ SDLEventMask |= SDL_EVENTMASK(Handled_SDL_Events[i]);
+ }
+ }
+
+@@ -192,7 +192,7 @@
+ void InputHandler_SDL::Update(float fDeltaTime)
+ {
+ SDL_Event event;
+- while(SDL_GetEvent(event, SDL_EventMask))
++ while(SDL_GetEvent(event, SDLEventMask))
+ {
+ switch(event.type)
+ {
diff --git a/games-arcade/stepmania/stepmania-3.9.ebuild b/games-arcade/stepmania/stepmania-3.9.ebuild
index d77e508912bd..3632b6a5eda6 100644
--- a/games-arcade/stepmania/stepmania-3.9.ebuild
+++ b/games-arcade/stepmania/stepmania-3.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9.ebuild,v 1.2 2006/06/01 20:09:07 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9.ebuild,v 1.3 2006/09/10 22:01:38 tupone Exp $
inherit eutils autotools games
@@ -36,6 +36,7 @@ src_unpack() {
"${FILESDIR}/${P}"-gcc41.patch \
"${FILESDIR}/${P}"-ffmpeg.patch \
"${FILESDIR}/${P}"-vorbis.patch \
+ "${FILESDIR}"/${P}-sdl.patch \
"${FILESDIR}/${P}"-alsa.patch
eautoconf
}