Fix building with lua-5.1, ffmpeg-0.4.9_p20070330, glibc-2.5, bugs 159023, 165266. Thanks to Stephen Bridges, Nicolas Litchinko and Petri Lehtinen.

Package-Manager: portage-2.1.3

8 files changed, 171 insertions, 36 deletions

diff --git a/games-arcade/stepmania/ChangeLog b/games-arcade/stepmania/ChangeLog
index 6eaedc544a39..2e4e98e79aac 100644
--- a/games-arcade/stepmania/ChangeLog
+++ b/games-arcade/stepmania/ChangeLog
@@ -1,6 +1,14 @@
 # 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.16 2006/12/12 17:51:33 wolf31o2 Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.17 2007/08/01 16:53:05 drac Exp $
+
+  01 Aug 2007; Samuli Suominen <drac@gentoo.org>
+  +files/stepmania-3.9-crashfix.patch,
+  +files/stepmania-3.9-ffmpeg-stdint.patch,
+  +files/stepmania-3.9-gettid.patch, +files/stepmania-3.9-lua51.patch,
+  files/stepmania-3.9-vorbis.patch, stepmania-3.9.ebuild:
+  Fix building with lua-5.1, ffmpeg-0.4.9_p20070330, glibc-2.5, bugs 159023,
+  165266. Thanks to Stephen Bridges, Nicolas Litchinko and Petri Lehtinen.
 
   12 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   +files/stepmania-3.9-alias.patch, stepmania-3.9.ebuild:
diff --git a/games-arcade/stepmania/Manifest b/games-arcade/stepmania/Manifest
index 2bc50d3780fe..a3258f98adc0 100644
--- a/games-arcade/stepmania/Manifest
+++ b/games-arcade/stepmania/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX stepmania-3.9-64bits.patch 2208 RMD160 9a0a1080431504ecb2b27e3658bd341aba865a30 SHA1 b9fca52495f4c65b6f999a4949620bb33401db42 SHA256 cbbf15a9e83e4a20dd0640bb47731f0386951586c00fb5a34bac9fbf5e8b22c8
 MD5 c557de9a2d4e09419c3d4a960948e20e files/stepmania-3.9-64bits.patch 2208
 RMD160 9a0a1080431504ecb2b27e3658bd341aba865a30 files/stepmania-3.9-64bits.patch 2208
@@ -13,6 +10,14 @@ AUX stepmania-3.9-alsa.patch 356 RMD160 e1c9b0abe3e8013fbe81f9c22f67bf9ec963e467
 MD5 ce4eefeff7a193046f23b1090aff6107 files/stepmania-3.9-alsa.patch 356
 RMD160 e1c9b0abe3e8013fbe81f9c22f67bf9ec963e467 files/stepmania-3.9-alsa.patch 356
 SHA256 d08657046a074dde4206267e56fc54ae745bd3987278af55a41851373caf28eb files/stepmania-3.9-alsa.patch 356
+AUX stepmania-3.9-crashfix.patch 512 RMD160 221c66a33e12289d7356b55e9882e8026b1a927c SHA1 b7ecfdc89b30d819e522b7359c53a3774fa8eaed SHA256 24b0f48824ab977710a6f868f4509a07a1e8960e4654406cdd5974b2862d7b86
+MD5 9e440df61e6a89e2cb567339ceb7eb4f files/stepmania-3.9-crashfix.patch 512
+RMD160 221c66a33e12289d7356b55e9882e8026b1a927c files/stepmania-3.9-crashfix.patch 512
+SHA256 24b0f48824ab977710a6f868f4509a07a1e8960e4654406cdd5974b2862d7b86 files/stepmania-3.9-crashfix.patch 512
+AUX stepmania-3.9-ffmpeg-stdint.patch 811 RMD160 9b945ab9f2290bb8abcd6a936615a2320d8d976e SHA1 6e579c661d0fb2b3145f70b7a16c48f072cbd565 SHA256 80f61c7bb1073396ee91d0e295f0e51aa2d9d108fd43310193e7b68180fcca73
+MD5 3f4d37268576fe0fb73d12003d7e790b files/stepmania-3.9-ffmpeg-stdint.patch 811
+RMD160 9b945ab9f2290bb8abcd6a936615a2320d8d976e files/stepmania-3.9-ffmpeg-stdint.patch 811
+SHA256 80f61c7bb1073396ee91d0e295f0e51aa2d9d108fd43310193e7b68180fcca73 files/stepmania-3.9-ffmpeg-stdint.patch 811
 AUX stepmania-3.9-ffmpeg.patch 5075 RMD160 9241708d300551dcfd08b3b7577b61431a075dc8 SHA1 d8839b32064ed4a0f0b855a83ea6605c3e92420d SHA256 50ca9405bbb96c4b7279ac08fda9b7cfe2160151d8dae21aed7bd69ebd0b9355
 MD5 623c29b0a0dfa25000080f29fb3a91f6 files/stepmania-3.9-ffmpeg.patch 5075
 RMD160 9241708d300551dcfd08b3b7577b61431a075dc8 files/stepmania-3.9-ffmpeg.patch 5075
@@ -25,24 +30,32 @@ AUX stepmania-3.9-gentoo.patch 941 RMD160 d352bf2106973e9a993293d3f1d6f14f7f125a
 MD5 4afa2bc19d2844b0744b4effbe9e8e4f files/stepmania-3.9-gentoo.patch 941
 RMD160 d352bf2106973e9a993293d3f1d6f14f7f125a60 files/stepmania-3.9-gentoo.patch 941
 SHA256 eb82b01bcb17d0f09024deb1624e63682a27f49086e43c42b45f85821ba03b2d files/stepmania-3.9-gentoo.patch 941
+AUX stepmania-3.9-gettid.patch 676 RMD160 145b1cad0c30e60e01fc21ee76f15f319c2d9695 SHA1 7701da209ad08f7cd7566166225e45b384be14b6 SHA256 03ffac5ba86e2b75ad4422955ab91b2b846ddf558688a2a67973c0463593519e
+MD5 e5c93bcd9c2d19b947ecc65838e80ae8 files/stepmania-3.9-gettid.patch 676
+RMD160 145b1cad0c30e60e01fc21ee76f15f319c2d9695 files/stepmania-3.9-gettid.patch 676
+SHA256 03ffac5ba86e2b75ad4422955ab91b2b846ddf558688a2a67973c0463593519e files/stepmania-3.9-gettid.patch 676
+AUX stepmania-3.9-lua51.patch 1728 RMD160 d070d31bdc62b75bd77e8d37691206a1595e0a61 SHA1 1850605a39e3d3ba0aeaa192c254339d20576c3a SHA256 681c447089cb728e17980273ce1dab87af1d985f9dcb67136c502bb8bacfc93d
+MD5 3b6fb9980000ec95e3923eefe5877915 files/stepmania-3.9-lua51.patch 1728
+RMD160 d070d31bdc62b75bd77e8d37691206a1595e0a61 files/stepmania-3.9-lua51.patch 1728
+SHA256 681c447089cb728e17980273ce1dab87af1d985f9dcb67136c502bb8bacfc93d files/stepmania-3.9-lua51.patch 1728
 AUX stepmania-3.9-sdl.patch 854 RMD160 5524ddf2a858d55fc6365c8381ae2be0d4a2f632 SHA1 d917041eb6e25bbb55aa529663bbaaac2c1e4b09 SHA256 4b1f3f1d5618d695c44e15bca6f20e2cfdfd92364e64513fc23abd269141b90b
 MD5 cfe612121126582cc9246a4af5dd58fe files/stepmania-3.9-sdl.patch 854
 RMD160 5524ddf2a858d55fc6365c8381ae2be0d4a2f632 files/stepmania-3.9-sdl.patch 854
 SHA256 4b1f3f1d5618d695c44e15bca6f20e2cfdfd92364e64513fc23abd269141b90b files/stepmania-3.9-sdl.patch 854
-AUX stepmania-3.9-vorbis.patch 616 RMD160 fdac52f93d738ecdb9f91aeb2ea23ec509c213eb SHA1 eba497fc044e3896afe1cd0e0444147dd173f732 SHA256 ea8992e76c5240f96257e7b78594709b222274df9c58a4f4082ae462d51030ba
-MD5 fd098945d9c4f34760cfcbd9a6a548ae files/stepmania-3.9-vorbis.patch 616
-RMD160 fdac52f93d738ecdb9f91aeb2ea23ec509c213eb files/stepmania-3.9-vorbis.patch 616
-SHA256 ea8992e76c5240f96257e7b78594709b222274df9c58a4f4082ae462d51030ba files/stepmania-3.9-vorbis.patch 616
+AUX stepmania-3.9-vorbis.patch 769 RMD160 ee62cb8ece3d85f2b49ca6ae88004117736997fe SHA1 ce9c67deb9ed0191804bede923f0ce5b12348ef0 SHA256 58e583f44ca6651083ae2ac5b90cfebd91525286e8f2320f028af326d797fbc3
+MD5 d0c843cbdc1421a9703a9f8839756811 files/stepmania-3.9-vorbis.patch 769
+RMD160 ee62cb8ece3d85f2b49ca6ae88004117736997fe files/stepmania-3.9-vorbis.patch 769
+SHA256 58e583f44ca6651083ae2ac5b90cfebd91525286e8f2320f028af326d797fbc3 files/stepmania-3.9-vorbis.patch 769
 DIST StepMania-3.9-linux.tar.gz 10174400 RMD160 426b11d652669be85753161f2cd03f2fe81df860 SHA1 100b1a2771fec1d208798ef03ba164259a589bf2 SHA256 ccb6e549e8d026e79de7d6bbfadc7f1ac7f7c05242a90edf56cf652f5ddeaae0
 DIST StepMania-3.9-src.tar.gz 3090223 RMD160 e7451192fe67f53a7a93baf99bf9a20bc3d1f7cf SHA1 b2d2c3a50c23506844ba7e22289e59d270bb8b2e SHA256 31082d388fa64b9764aee4d7628f377bc0fe47b8f157b8bcc66d9e3678479c85
-EBUILD stepmania-3.9.ebuild 2374 RMD160 0ffd56865661f035840377f0ea05210a66cc6f87 SHA1 1f4693f4daa311cab32c26f8e61af50652c25377 SHA256 eb0fee23daf8e66e94250c32311453eb2b0feef9e73f86f45464ba98f5769b7f
-MD5 f610bafd87619887a6e5ac94da54d7e6 stepmania-3.9.ebuild 2374
-RMD160 0ffd56865661f035840377f0ea05210a66cc6f87 stepmania-3.9.ebuild 2374
-SHA256 eb0fee23daf8e66e94250c32311453eb2b0feef9e73f86f45464ba98f5769b7f stepmania-3.9.ebuild 2374
-MISC ChangeLog 2903 RMD160 ed6b22f60a4a87fc447de92fb4c7fdb71f01cc94 SHA1 d90e00be2db75ea20f9732d29f601da5c0886c95 SHA256 c072dde9fa66e52cbd4504b7951d27f1445167c3bc5706e5220974a5b2bc7667
-MD5 6b96bfaab013f89303d43f7521b040ef ChangeLog 2903
-RMD160 ed6b22f60a4a87fc447de92fb4c7fdb71f01cc94 ChangeLog 2903
-SHA256 c072dde9fa66e52cbd4504b7951d27f1445167c3bc5706e5220974a5b2bc7667 ChangeLog 2903
+EBUILD stepmania-3.9.ebuild 2565 RMD160 d5c6759b8a81c41d3d84f1e2e97f7fc0934e3393 SHA1 e66c3f51fda34b311e846255782cb7065048ed96 SHA256 4bb17c9fdc0c85e195578b1047edd9b670ca2ca9e5fe6b1f6d76ce543ad975df
+MD5 61fac020ad686a7245a4f8c3d2284ecf stepmania-3.9.ebuild 2565
+RMD160 d5c6759b8a81c41d3d84f1e2e97f7fc0934e3393 stepmania-3.9.ebuild 2565
+SHA256 4bb17c9fdc0c85e195578b1047edd9b670ca2ca9e5fe6b1f6d76ce543ad975df stepmania-3.9.ebuild 2565
+MISC ChangeLog 3313 RMD160 ea1ece8c170fbfdad833908d5f1c0d531987cddc SHA1 91ecd457a42fe75b718d792beb78195eb5acc7bd SHA256 b37dfc74f10cb7df2f9714daa4eef817047a14879d68f89db04d8dea204e87de
+MD5 e7a1eed77f903554a97c82f331f52d27 ChangeLog 3313
+RMD160 ea1ece8c170fbfdad833908d5f1c0d531987cddc ChangeLog 3313
+SHA256 b37dfc74f10cb7df2f9714daa4eef817047a14879d68f89db04d8dea204e87de ChangeLog 3313
 MISC metadata.xml 220 RMD160 9644806f89f8b8d272e5ece60b993df5cd41a900 SHA1 97c2910ccf82c9a3600a4bb822777a7bf342a17a SHA256 2482823056583dedefb8c75afb2d017147227f6d93f81655e2f7b0721d178178
 MD5 441e3a625f4d1889a960a7f9adefe87b metadata.xml 220
 RMD160 9644806f89f8b8d272e5ece60b993df5cd41a900 metadata.xml 220
@@ -50,10 +63,3 @@ SHA256 2482823056583dedefb8c75afb2d017147227f6d93f81655e2f7b0721d178178 metadata
 MD5 c1e3bef52068916fd35ad333c8bc9729 files/digest-stepmania-3.9 521
 RMD160 8de9c7da4cd2c2689dc0da18f83213b514f507e1 files/digest-stepmania-3.9 521
 SHA256 d808db368491b77f5196ebef8f35817eead695add6514ed9337dbc24bc2a1f0c files/digest-stepmania-3.9 521
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFfuwwkT4lNIS36YERAizxAKCD00Y230OuuXlTIC7rVHthP96wQQCfaxry
-aBPu5l/YniV8WWDzFulF04I=
-=ev3P
------END PGP SIGNATURE-----
diff --git a/games-arcade/stepmania/files/stepmania-3.9-crashfix.patch b/games-arcade/stepmania/files/stepmania-3.9-crashfix.patch
new file mode 100644
index 000000000000..bba60e0f4f5a
--- /dev/null
+++ b/games-arcade/stepmania/files/stepmania-3.9-crashfix.patch
@@ -0,0 +1,21 @@
+diff -ur StepMania-3.9-src.orig/src/arch/Sound/ALSA9Helpers.cpp StepMania-3.9-src/src/arch/Sound/ALSA9Helpers.cpp
+--- StepMania-3.9-src.orig/src/arch/Sound/ALSA9Helpers.cpp	2007-07-31 00:17:55.000000000 +0300
++++ StepMania-3.9-src/src/arch/Sound/ALSA9Helpers.cpp	2007-07-31 00:20:55.000000000 +0300
+@@ -256,6 +256,7 @@
+ 	{
+ 		CHECKPOINT;
+ 		dsnd_pcm_close(pcm);
++		pcm = 0;
+ 		CHECKPOINT;
+ 	}
+ 	else
+@@ -264,7 +265,8 @@
+ 
+ Alsa9Buf::~Alsa9Buf()
+ {
+-	dsnd_pcm_close(pcm);
++	if(pcm)
++		dsnd_pcm_close(pcm);
+ }
+ 
+ 
diff --git a/games-arcade/stepmania/files/stepmania-3.9-ffmpeg-stdint.patch b/games-arcade/stepmania/files/stepmania-3.9-ffmpeg-stdint.patch
new file mode 100644
index 000000000000..e42fe5dc6410
--- /dev/null
+++ b/games-arcade/stepmania/files/stepmania-3.9-ffmpeg-stdint.patch
@@ -0,0 +1,18 @@
+diff -ur StepMania-3.9-src.orig/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp StepMania-3.9-src/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+--- StepMania-3.9-src.orig/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp	2007-08-01 11:54:50.000000000 +0300
++++ StepMania-3.9-src/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp	2007-08-01 11:55:17.000000000 +0300
+@@ -1,3 +1,6 @@
++#define __STDC_CONSTANT_MACROS
++#include <stdint.h>
++
+ #include "global.h"
+ #include "MovieTexture_FFMpeg.h"
+ 
+@@ -515,7 +518,6 @@
+ 	case AVERROR_INVALIDDATA:	Error = "invalid data found"; break;
+ 	case AVERROR_NOMEM:			Error = "not enough memory"; break;
+ 	case AVERROR_NOFMT:			Error = "unknown format"; break;
+-	case AVERROR_UNKNOWN:		Error = "unknown error"; break;
+ 	default: Error = ssprintf( "unknown error %i", err ); break;
+ 	}
+ 
diff --git a/games-arcade/stepmania/files/stepmania-3.9-gettid.patch b/games-arcade/stepmania/files/stepmania-3.9-gettid.patch
new file mode 100644
index 000000000000..6327d9faa932
--- /dev/null
+++ b/games-arcade/stepmania/files/stepmania-3.9-gettid.patch
@@ -0,0 +1,20 @@
+--- StepMania-3.9-src-orig/src/archutils/Unix/LinuxThreadHelpers.cpp	2004-10-22 17:23:38.000000000 -0500
++++ StepMania-3.9-src/src/archutils/Unix/LinuxThreadHelpers.cpp	2006-11-18 13:36:18.000000000 -0600
+@@ -15,7 +15,7 @@
+ #include <sys/wait.h>
+ #include <sys/ptrace.h>
+ #include <sys/stat.h>
+-#include <linux/unistd.h>
++#include <sys/syscall.h>
+ #define _LINUX_PTRACE_H // hack to prevent broken linux/ptrace.h from conflicting with sys/ptrace.h
+ #include <sys/user.h>
+ 
+@@ -29,7 +29,7 @@
+ 
+ static bool g_bUsingNPTL = false;
+ 
+-static _syscall0(pid_t,gettid)
++#define gettid() syscall(SYS_gettid)
+ 
+ #ifndef _CS_GNU_LIBPTHREAD_VERSION
+ #define _CS_GNU_LIBPTHREAD_VERSION 3
diff --git a/games-arcade/stepmania/files/stepmania-3.9-lua51.patch b/games-arcade/stepmania/files/stepmania-3.9-lua51.patch
new file mode 100644
index 000000000000..f3cfce47bf10
--- /dev/null
+++ b/games-arcade/stepmania/files/stepmania-3.9-lua51.patch
@@ -0,0 +1,54 @@
+diff -ur StepMania-3.9-src.orig/autoconf/m4/lua.m4 StepMania-3.9-src/autoconf/m4/lua.m4
+--- StepMania-3.9-src.orig/autoconf/m4/lua.m4	2007-08-01 12:57:59.000000000 +0300
++++ StepMania-3.9-src/autoconf/m4/lua.m4	2007-08-01 12:58:06.000000000 +0300
+@@ -44,16 +44,24 @@
+ 	LUA_LIBS="$LIB_LUA $LIB_LUA_LIB"
+ fi
+ if test "$LUA_MISSING" = "yes"; then
+-	echo
+-	echo "*** liblua is required to build StepMania; please make sure that"
+-	echo "*** it is installed to continue the installation process."
+-	exit 1;
+-fi
+-if test "$LUA_LIB_MISSING" = "yes"; then
++	LUA_CFLAGS=
++	LUA_LIBS=
++	PKG_PROG_PKG_CONFIG
++	PKG_CHECK_MODULES(LUA, lua >= 5.1, [LUA_MISSING=no])
++
++	if test "$LUA_MISSING" = "yes"; then
++		echo
++		echo "*** liblua is required to build StepMania; please make sure that"
++		echo "*** it is installed to continue the installation process."
++		exit 1
++	else
++		AC_DEFINE([HAVE_LUA51], [1], [The system has Lua 5.1 instead of Lua 5.0])
++	fi
++elif test "$LUA_LIB_MISSING" = "yes"; then
+ 	echo
+ 	echo "*** liblualib is required to build StepMania; please make sure that"
+ 	echo "*** it is installed to continue the installation process."
+-	exit 1;
++	exit 1
+ fi
+ 
+ AC_SUBST(LUA_CFLAGS)
+diff -ur StepMania-3.9-src.orig/src/LuaFunctions.h StepMania-3.9-src/src/LuaFunctions.h
+--- StepMania-3.9-src.orig/src/LuaFunctions.h	2007-08-01 12:57:59.000000000 +0300
++++ StepMania-3.9-src/src/LuaFunctions.h	2007-08-01 12:58:12.000000000 +0300
+@@ -4,11 +4,15 @@
+ #include "LuaHelpers.h"
+ #include "RageUtil.h" /* for ssprintf */
+ 
++#ifdef HAVE_LUA51
++#include <lua.hpp>
++#else
+ extern "C"
+ {
+ #include <lua.h>
+ #include <lualib.h>
+ }
++#endif
+ 
+ /* Argument helpers: */
+ #define LUA_ASSERT( expr, err ) if( !(expr) ) { Lua::Fail( L, err ); }
diff --git a/games-arcade/stepmania/files/stepmania-3.9-vorbis.patch b/games-arcade/stepmania/files/stepmania-3.9-vorbis.patch
index a149c629925f..68a77cc27314 100644
--- a/games-arcade/stepmania/files/stepmania-3.9-vorbis.patch
+++ b/games-arcade/stepmania/files/stepmania-3.9-vorbis.patch
@@ -1,5 +1,6 @@
---- aclocal.m4.orig	2006-05-05 19:12:10.412237750 -0600
-+++ aclocal.m4	2006-05-05 19:12:22.568997500 -0600
+diff -ur StepMania-3.9-src.orig/autoconf/m4/audio.m4 StepMania-3.9-src/autoconf/m4/audio.m4
+--- StepMania-3.9-src.orig/autoconf/m4/audio.m4 2007-07-30 23:19:43.000000000 +0300
++++ StepMania-3.9-src/autoconf/m4/audio.m4      2007-07-30 23:17:41.000000000 +0300
 @@ -1,6 +1,6 @@
  AC_DEFUN(SM_AUDIO, [
  
diff --git a/games-arcade/stepmania/stepmania-3.9.ebuild b/games-arcade/stepmania/stepmania-3.9.ebuild
index 5f989bc85b64..858357cd4cf2 100644
--- a/games-arcade/stepmania/stepmania-3.9.ebuild
+++ b/games-arcade/stepmania/stepmania-3.9.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.8 2006/12/12 17:51:33 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9.ebuild,v 1.9 2007/08/01 16:53:05 drac Exp $
 
-WANT_AUTOCONF=latest
 inherit eutils autotools games
 
 MY_PV="${PV/_/-}"
@@ -13,20 +12,22 @@ SRC_URI="mirror://sourceforge/stepmania/StepMania-${MY_PV}-src.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug gtk jpeg mp3 mpeg vorbis force-oss"
+
 RESTRICT="test"
 
-DEPEND="gtk? ( >=x11-libs/gtk+-2.0 )
+RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
 	mp3? ( media-libs/libmad )
-	>=dev-lang/lua-5.0
+	>=dev-lang/lua-5
 	media-libs/libsdl
 	jpeg? ( media-libs/jpeg )
 	media-libs/libpng
-	mpeg? ( media-video/ffmpeg )
+	mpeg? ( ~media-video/ffmpeg-0.4.9_p20070330 )
 	vorbis? ( media-libs/libvorbis )
 	virtual/opengl
 	virtual/glu"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/StepMania-${MY_PV}-src
 
@@ -50,8 +51,14 @@ src_unpack() {
 		"${FILESDIR}/${P}"-vorbis.patch \
 		"${FILESDIR}/${P}"-sdl.patch \
 		"${FILESDIR}/${P}"-alsa.patch \
-		"${FILESDIR}/${P}"-alias.patch
-	eautoconf
+		"${FILESDIR}/${P}"-alias.patch \
+		"${FILESDIR}/${P}"-gettid.patch \
+		"${FILESDIR}/${P}"-lua51.patch \
+		"${FILESDIR}/${P}"-ffmpeg-stdint.patch \
+		"${FILESDIR}/${P}"-crashfix.patch
+
+	AT_M4DIR="autoconf/m4"
+	eautoreconf
 }
 
 src_compile() {
@@ -64,7 +71,7 @@ src_compile() {
 		$(use_enable gtk gtk2) \
 		$(use_enable force-oss) \
 		|| die
-	emake || die "emake failed"
+	emake || die "emake failed."
 }
 
 src_install() {