Fix remaining issues, building with ffmpeg and swscale, without jpeg and others. Move all patches to tarball since they are about 60 kilobytes. Thanks to Petri "Akheron" Lehtinen for making this possible.

Package-Manager: portage-2.1.3.3

15 files changed, 43 insertions, 666 deletions

diff --git a/games-arcade/stepmania/ChangeLog b/games-arcade/stepmania/ChangeLog
index 2e4e98e79aac..42e0af0fa6ff 100644
--- a/games-arcade/stepmania/ChangeLog
+++ b/games-arcade/stepmania/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for games-arcade/stepmania
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.18 2007/08/07 14:35:25 drac Exp $
+
+  07 Aug 2007; Samuli Suominen <drac@gentoo.org>
+  -files/stepmania-3.9-64bits.patch, -files/stepmania-3.9-alias.patch,
+  -files/stepmania-3.9-alsa.patch, -files/stepmania-3.9-crashfix.patch,
+  -files/stepmania-3.9-ffmpeg.patch,
+  -files/stepmania-3.9-ffmpeg-stdint.patch,
+  -files/stepmania-3.9-gcc41.patch, -files/stepmania-3.9-gettid.patch,
+  -files/stepmania-3.9-lua51.patch, -files/stepmania-3.9-sdl.patch,
+  -files/stepmania-3.9-vorbis.patch, stepmania-3.9.ebuild:
+  Fix remaining issues, building with ffmpeg and swscale, without jpeg and
+  others. Move all patches to tarball since they are about 60 kilobytes.
+  Thanks to Petri "Akheron" Lehtinen for making this possible.
 
   01 Aug 2007; Samuli Suominen <drac@gentoo.org>
   +files/stepmania-3.9-crashfix.patch,
diff --git a/games-arcade/stepmania/Manifest b/games-arcade/stepmania/Manifest
index babb039d7d80..ba5cadd2b5dd 100644
--- a/games-arcade/stepmania/Manifest
+++ b/games-arcade/stepmania/Manifest
@@ -1,75 +1,22 @@
------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
-SHA256 cbbf15a9e83e4a20dd0640bb47731f0386951586c00fb5a34bac9fbf5e8b22c8 files/stepmania-3.9-64bits.patch 2208
-AUX stepmania-3.9-alias.patch 5173 RMD160 476b47a34a8d63a9c282e04ec0a94c70e88029d9 SHA1 170134f63c18173ce42ce9c62deaf4d255c528f6 SHA256 d15ec48c0aa6ba754d419c04b2c14c5d1f756d6588180e8c82a59d1c7efb4b0b
-MD5 85457e86101ecc1e07e49e25e8b25b36 files/stepmania-3.9-alias.patch 5173
-RMD160 476b47a34a8d63a9c282e04ec0a94c70e88029d9 files/stepmania-3.9-alias.patch 5173
-SHA256 d15ec48c0aa6ba754d419c04b2c14c5d1f756d6588180e8c82a59d1c7efb4b0b files/stepmania-3.9-alias.patch 5173
-AUX stepmania-3.9-alsa.patch 356 RMD160 e1c9b0abe3e8013fbe81f9c22f67bf9ec963e467 SHA1 6ba76db3ed7a25d5136fdcada515dd98c1085a82 SHA256 d08657046a074dde4206267e56fc54ae745bd3987278af55a41851373caf28eb
-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
-SHA256 50ca9405bbb96c4b7279ac08fda9b7cfe2160151d8dae21aed7bd69ebd0b9355 files/stepmania-3.9-ffmpeg.patch 5075
-AUX stepmania-3.9-gcc41.patch 1920 RMD160 25b559544b6efa9b52d15a439e8f6c3469b04b3c SHA1 3b342919f126fd24773446ee1fca34ac97dc2ab8 SHA256 c684e69d0ea4e7e57e1d16f171f9a680e212d30fbd9723988f9a21a6ea5bbebf
-MD5 701473955ba80c360c12b17418b9748a files/stepmania-3.9-gcc41.patch 1920
-RMD160 25b559544b6efa9b52d15a439e8f6c3469b04b3c files/stepmania-3.9-gcc41.patch 1920
-SHA256 c684e69d0ea4e7e57e1d16f171f9a680e212d30fbd9723988f9a21a6ea5bbebf files/stepmania-3.9-gcc41.patch 1920
 AUX stepmania-3.9-gentoo.patch 941 RMD160 d352bf2106973e9a993293d3f1d6f14f7f125a60 SHA1 f8e9d59e85024b4847afe6b6bf164c83475e990a SHA256 eb82b01bcb17d0f09024deb1624e63682a27f49086e43c42b45f85821ba03b2d
 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 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 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
+DIST stepmania-patches-1.tar.bz2 8083 RMD160 cc588e460ae2a75dd2eedd431af6f55732ed5c9e SHA1 a304befe2050a8425122bb02e4e033cbd58c49e3 SHA256 abd19df61913f6545e8a9195a4dc8d34403183c1d6c5eb963c01dbcde96ac99d
+EBUILD stepmania-3.9.ebuild 2251 RMD160 633ee64d217a20d7750d8777592aea1ccaaf272e SHA1 3c5e2a60e8b57b4b0aec110d70ec33e340885d29 SHA256 ba0cd0b41967e32ca53a9a23971e1df0f0b3e3a7a8df3bf525b7a22525d98a60
+MD5 63cab9386c0cb3271112eeb0827de363 stepmania-3.9.ebuild 2251
+RMD160 633ee64d217a20d7750d8777592aea1ccaaf272e stepmania-3.9.ebuild 2251
+SHA256 ba0cd0b41967e32ca53a9a23971e1df0f0b3e3a7a8df3bf525b7a22525d98a60 stepmania-3.9.ebuild 2251
+MISC ChangeLog 3996 RMD160 1dbcaa44709ec03debc9a5678bd20adbd85107bb SHA1 a9dd099199ab50ee83436d9850cd3c9bffc6d6ec SHA256 ac69e5d0b35074cccce8c2b3a5f29423854ef44c62ce5bcf92250f1600dfe8d0
+MD5 e92e96025290267bffeb90887c9d844a ChangeLog 3996
+RMD160 1dbcaa44709ec03debc9a5678bd20adbd85107bb ChangeLog 3996
+SHA256 ac69e5d0b35074cccce8c2b3a5f29423854ef44c62ce5bcf92250f1600dfe8d0 ChangeLog 3996
 MISC metadata.xml 252 RMD160 e411517dfb6780a014783443250bcc27b2f2ab55 SHA1 2b0c462d2a8f8ef492eec0126df154578d704c2d SHA256 9d0e4b5866a81feafc2114ba80b39a45e341eb905734f978cbabc588bcabcd85
 MD5 a172766747cdfaca321b89e4771291a7 metadata.xml 252
 RMD160 e411517dfb6780a014783443250bcc27b2f2ab55 metadata.xml 252
 SHA256 9d0e4b5866a81feafc2114ba80b39a45e341eb905734f978cbabc588bcabcd85 metadata.xml 252
-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 v2.0.5 (GNU/Linux)
-
-iD8DBQFGs2+sdz7hIScOURERAurOAJ9wz8J90mH6zTdh9Otuw3NqFoLXwgCbBr8u
-VFH4KWaR9JgJRZDgXQ8SnC0=
-=Td3A
------END PGP SIGNATURE-----
+MD5 23ba60a35e04519bf5ab552981b880d2 files/digest-stepmania-3.9 777
+RMD160 d0792175a02f12a213e180e6d5f0b04ac2ce7ceb files/digest-stepmania-3.9 777
+SHA256 739366b6ec5e071d94ad77d2e7953fdedb26b24d9ed5ecbef3c1565ebd379ef3 files/digest-stepmania-3.9 777
diff --git a/games-arcade/stepmania/files/digest-stepmania-3.9 b/games-arcade/stepmania/files/digest-stepmania-3.9
index 078b4653e004..031fdf4d1aa5 100644
--- a/games-arcade/stepmania/files/digest-stepmania-3.9
+++ b/games-arcade/stepmania/files/digest-stepmania-3.9
@@ -4,3 +4,6 @@ SHA256 ccb6e549e8d026e79de7d6bbfadc7f1ac7f7c05242a90edf56cf652f5ddeaae0 StepMani
 MD5 28bbbc985788bc990fa7042e2d7320b8 StepMania-3.9-src.tar.gz 3090223
 RMD160 e7451192fe67f53a7a93baf99bf9a20bc3d1f7cf StepMania-3.9-src.tar.gz 3090223
 SHA256 31082d388fa64b9764aee4d7628f377bc0fe47b8f157b8bcc66d9e3678479c85 StepMania-3.9-src.tar.gz 3090223
+MD5 f1307bf7149951090a4fbbc94fdfa3df stepmania-patches-1.tar.bz2 8083
+RMD160 cc588e460ae2a75dd2eedd431af6f55732ed5c9e stepmania-patches-1.tar.bz2 8083
+SHA256 abd19df61913f6545e8a9195a4dc8d34403183c1d6c5eb963c01dbcde96ac99d stepmania-patches-1.tar.bz2 8083
diff --git a/games-arcade/stepmania/files/stepmania-3.9-64bits.patch b/games-arcade/stepmania/files/stepmania-3.9-64bits.patch
deleted file mode 100644
index 91c33193fe74..000000000000
--- a/games-arcade/stepmania/files/stepmania-3.9-64bits.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/arch/Threads/Threads_Pthreads.cpp.old	2006-10-24 22:01:54.000000000 +0200
-+++ src/arch/Threads/Threads_Pthreads.cpp	2006-10-24 22:08:35.000000000 +0200
-@@ -39,12 +39,14 @@
- 
- int ThreadImpl_Pthreads::Wait()
- {
--	void *val;
--	int ret = pthread_join( thread, &val );
-+	int *val;
-+	int ret = pthread_join( thread, (void **)&val );
- 	if( ret )
--		RageException::Throw( "pthread_join: %s", strerror(errno) );
-+		RageException::Throw( "pthread_join: %s", strerror(ret) );
- 
--	return (int) val;
-+	int iRet = *val;
-+	delete val;
-+	return iRet;
- }
- 
- ThreadImpl *MakeThisThread()
-@@ -67,7 +69,8 @@
- 	/* Tell MakeThread that we've set m_piThreadID, so it's safe to return. */
- 	pThis->m_StartFinishedSem->Post();
- 
--	return (void *) pThis->m_pFunc( pThis->m_pData );
-+	int iRet = pThis->m_pFunc( pThis->m_pData );
-+	return new int(iRet);
- }
- 
- ThreadImpl *MakeThread( int (*pFunc)(void *pData), void *pData, uint64_t *piThreadID )
---- src/crypto51/misc.h.old	2006-10-24 22:17:51.000000000 +0200
-+++ src/crypto51/misc.h	2006-10-24 23:13:30.000000000 +0200
-@@ -142,7 +142,7 @@
- 
- inline bool IsAlignedOn(const void *p, unsigned int alignment)
- {
--	return IsPowerOf2(alignment) ? ModPowerOf2((unsigned int)p, alignment) == 0 : (unsigned int)p % alignment == 0;
-+	return IsPowerOf2(alignment) ? ModPowerOf2((uintptr_t)p, alignment) == 0 : (uintptr_t)p % alignment == 0;
- }
- 
- template <class T>
---- src/crypto51/misc.cpp.old	2006-10-24 23:28:55.000000000 +0200
-+++ src/crypto51/misc.cpp	2006-10-24 23:30:19.000000000 +0200
-@@ -16,7 +16,7 @@
- 
- void xorbuf(byte *buf, const byte *mask, unsigned int count)
- {
--	if (((unsigned int)buf | (unsigned int)mask | count) % WORD_SIZE == 0)
-+	if (((uintptr_t)buf | (uintptr_t)mask | count) % WORD_SIZE == 0)
- 		XorWords((word *)buf, (const word *)mask, count/WORD_SIZE);
- 	else
- 	{
-@@ -27,7 +27,7 @@
- 
- void xorbuf(byte *output, const byte *input, const byte *mask, unsigned int count)
- {
--	if (((unsigned int)output | (unsigned int)input | (unsigned int)mask | count) % WORD_SIZE == 0)
-+	if (((uintptr_t)output | (uintptr_t)input | (uintptr_t)mask | count) % WORD_SIZE == 0)
- 		XorWords((word *)output, (const word *)input, (const word *)mask, count/WORD_SIZE);
- 	else
- 	{
diff --git a/games-arcade/stepmania/files/stepmania-3.9-alias.patch b/games-arcade/stepmania/files/stepmania-3.9-alias.patch
deleted file mode 100644
index 17ca00467983..000000000000
--- a/games-arcade/stepmania/files/stepmania-3.9-alias.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -u StepMania-3.9-src-orig/src/Difficulty.cpp StepMania-3.9-src/src/Difficulty.cpp
---- StepMania-3.9-src-orig/src/Difficulty.cpp	2004-07-11 09:21:29.000000000 +0200
-+++ StepMania-3.9-src/src/Difficulty.cpp	2006-11-27 00:15:25.000000000 +0100
-@@ -57,7 +57,7 @@
- 
- CourseDifficulty GetNextShownCourseDifficulty( CourseDifficulty cd )
- {
--	for( CourseDifficulty d=(CourseDifficulty)(cd+1); d<NUM_DIFFICULTIES; ((int&)d)++ )
-+	for( CourseDifficulty d=(CourseDifficulty)(cd+1); d<NUM_DIFFICULTIES; enum_add(d, 1) )
- 	{
- 		if( GAMESTATE->IsCourseDifficultyShown(d) )
- 			return d;
-diff -u StepMania-3.9-src-orig/src/PlayerNumber.cpp StepMania-3.9-src/src/PlayerNumber.cpp
---- StepMania-3.9-src-orig/src/PlayerNumber.cpp	2004-07-18 00:15:39.000000000 +0200
-+++ StepMania-3.9-src/src/PlayerNumber.cpp	2006-11-27 00:15:25.000000000 +0100
-@@ -22,41 +22,33 @@
- 
- PlayerNumber GetNextHumanPlayer( PlayerNumber pn )
- {
--	for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ )
--	{
--		if( GAMESTATE->IsHumanPlayer(p) )
--			return p;
--	}
-+	for( enum_add(pn, 1); pn < NUM_PLAYERS; enum_add(pn, 1) )
-+		if( GAMESTATE->IsHumanPlayer(pn) )
-+			return pn;
- 	return PLAYER_INVALID;
- }
- 
- PlayerNumber GetNextEnabledPlayer( PlayerNumber pn )
- {
--	for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ )
--	{
--		if( GAMESTATE->IsPlayerEnabled(p) )
--			return p;
--	}
-+	for( enum_add(pn, 1); pn < NUM_PLAYERS; enum_add(pn, 1) )
-+		if( GAMESTATE->IsPlayerEnabled(pn) )
-+			return pn;
- 	return PLAYER_INVALID;
- }
- 
- PlayerNumber GetNextCpuPlayer( PlayerNumber pn )
- {
--	for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ )
--	{
--		if( GAMESTATE->IsCpuPlayer(p) )
--			return p;
--	}
-+	for( enum_add(pn, 1); pn < NUM_PLAYERS; enum_add(pn, 1) )
-+		if( GAMESTATE->IsCpuPlayer(pn) )
-+			return pn;
- 	return PLAYER_INVALID;
- }
- 
- PlayerNumber GetNextPotentialCpuPlayer( PlayerNumber pn )
- {
--	for( PlayerNumber p=(PlayerNumber)(pn+1); p<NUM_PLAYERS; ((int&)p)++ )
--	{
--		if( !GAMESTATE->IsHumanPlayer(p) )
--			return p;
--	}
-+	for( enum_add(pn, 1); pn < NUM_PLAYERS; enum_add(pn, 1) )
-+		if( !GAMESTATE->IsHumanPlayer(pn) )
-+			return pn;
- 	return PLAYER_INVALID;
- }
- 
-diff -u StepMania-3.9-src-orig/src/RageUtil.h StepMania-3.9-src/src/RageUtil.h
---- StepMania-3.9-src-orig/src/RageUtil.h	2004-10-07 19:56:16.000000000 +0200
-+++ StepMania-3.9-src/src/RageUtil.h	2006-11-27 00:15:25.000000000 +0100
-@@ -53,6 +53,14 @@
- 	return false;
- }
- 
-+template<class T>
-+inline bool ENUM_CLAMP( T &x, T l, T h )
-+{
-+	if (x > h)	{ x = h; return true; }
-+	else if (x < l) { x = l; return true; }
-+	return false;
-+}
-+
- inline void wrap( int &x, int n)
- {
- 	if (x<0)
-diff -u StepMania-3.9-src-orig/src/ScreenBookkeeping.cpp StepMania-3.9-src/src/ScreenBookkeeping.cpp
---- StepMania-3.9-src-orig/src/ScreenBookkeeping.cpp	2004-08-22 18:28:19.000000000 +0200
-+++ StepMania-3.9-src/src/ScreenBookkeeping.cpp	2006-11-27 00:15:25.000000000 +0100
-@@ -74,14 +74,14 @@
- void ScreenBookkeeping::MenuLeft( PlayerNumber pn )
- {
- 	m_View = (View)(m_View-1);
--	CLAMP( (int&)m_View, 0, NUM_VIEWS-1 );
-+	ENUM_CLAMP( m_View, View(0), View(NUM_VIEWS-1) );
- 	ChangeView( m_View );
- }
- 
- void ScreenBookkeeping::MenuRight( PlayerNumber pn )
- {
- 	m_View = (View)(m_View+1);
--	CLAMP( (int&)m_View, 0, NUM_VIEWS-1 );
-+	ENUM_CLAMP( m_View, View(0), View(NUM_VIEWS-1) );
- 	ChangeView( m_View );
- }
- 
-diff -u StepMania-3.9-src-orig/src/ScreenSetTime.cpp StepMania-3.9-src/src/ScreenSetTime.cpp
---- StepMania-3.9-src-orig/src/ScreenSetTime.cpp	2004-08-31 10:29:34.000000000 +0200
-+++ StepMania-3.9-src/src/ScreenSetTime.cpp	2006-11-27 00:15:25.000000000 +0100
-@@ -160,7 +160,7 @@
- 	SetTimeSelection OldSelection = m_Selection;
- 	enum_add<SetTimeSelection>( m_Selection, iDirection );
- 
--	CLAMP( (int&)m_Selection, 0, NUM_SET_TIME_SELECTIONS-1 );
-+	ENUM_CLAMP( m_Selection, SetTimeSelection(0), SetTimeSelection(NUM_SET_TIME_SELECTIONS-1) );
- 	if( iDirection != 0 && m_Selection == OldSelection )
- 		return; // can't move any more
- 
-diff -u StepMania-3.9-src-orig/src/Song.cpp StepMania-3.9-src/src/Song.cpp
---- StepMania-3.9-src-orig/src/Song.cpp	2004-12-20 23:25:12.000000000 +0100
-+++ StepMania-3.9-src/src/Song.cpp	2006-11-27 00:15:25.000000000 +0100
-@@ -916,22 +916,22 @@
- 	if( pSteps )
- 		return pSteps;
- 	newDC = (Difficulty)(dc-1);
--	CLAMP( (int&)newDC, 0, NUM_DIFFICULTIES-1 );
-+	ENUM_CLAMP( newDC, Difficulty(0), Difficulty(NUM_DIFFICULTIES-1) );
- 	pSteps = GetStepsByDifficulty( st, newDC );
- 	if( pSteps )
- 		return pSteps;
- 	newDC = (Difficulty)(dc+1);
--	CLAMP( (int&)newDC, 0, NUM_DIFFICULTIES-1 );
-+	ENUM_CLAMP( newDC, Difficulty(0), Difficulty(NUM_DIFFICULTIES-1) );
- 	pSteps = GetStepsByDifficulty( st, newDC );
- 	if( pSteps )
- 		return pSteps;
- 	newDC = (Difficulty)(dc-2);
--	CLAMP( (int&)newDC, 0, NUM_DIFFICULTIES-1 );
-+	ENUM_CLAMP( newDC, Difficulty(0), Difficulty(NUM_DIFFICULTIES-1) );
- 	pSteps = GetStepsByDifficulty( st, newDC );
- 	if( pSteps )
- 		return pSteps;
- 	newDC = (Difficulty)(dc+2);
--	CLAMP( (int&)newDC, 0, NUM_DIFFICULTIES-1 );
-+	ENUM_CLAMP( newDC, Difficulty(0), Difficulty(NUM_DIFFICULTIES-1) );
- 	pSteps = GetStepsByDifficulty( st, newDC );
- 	return pSteps;
- }
diff --git a/games-arcade/stepmania/files/stepmania-3.9-alsa.patch b/games-arcade/stepmania/files/stepmania-3.9-alsa.patch
deleted file mode 100644
index 3fde6e6fe27b..000000000000
--- a/games-arcade/stepmania/files/stepmania-3.9-alsa.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/arch/Sound/ALSA9Helpers.cpp.ori	2005-12-29 17:14:29.172002500 +0100
-+++ src/arch/Sound/ALSA9Helpers.cpp	2005-12-29 17:49:07.609896750 +0100
-@@ -257,10 +257,9 @@
- 		CHECKPOINT;
- 		dsnd_pcm_close(pcm);
- 		CHECKPOINT;
--		RageException::ThrowNonfatal( "SetHWParams failed" );
- 	}
--
--	SetSWParams();
-+	else
-+		SetSWParams();
- }
- 
- Alsa9Buf::~Alsa9Buf()
diff --git a/games-arcade/stepmania/files/stepmania-3.9-crashfix.patch b/games-arcade/stepmania/files/stepmania-3.9-crashfix.patch
deleted file mode 100644
index bba60e0f4f5a..000000000000
--- a/games-arcade/stepmania/files/stepmania-3.9-crashfix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index e42fe5dc6410..000000000000
--- a/games-arcade/stepmania/files/stepmania-3.9-ffmpeg-stdint.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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-ffmpeg.patch b/games-arcade/stepmania/files/stepmania-3.9-ffmpeg.patch
deleted file mode 100644
index 01c6eaad3f2f..000000000000
--- a/games-arcade/stepmania/files/stepmania-3.9-ffmpeg.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- src/arch/MovieTexture/MovieTexture_FFMpeg.cpp.ori	2005-12-29 16:54:24.744730500 +0100
-+++ src/arch/MovieTexture/MovieTexture_FFMpeg.cpp	2005-12-29 16:56:23.100127250 +0100
-@@ -307,7 +307,11 @@
- 		if ( GetNextTimestamp )
- 		{
- 			if (pkt.dts != int64_t(AV_NOPTS_VALUE))
-+#if (LIBAVCODEC_BUILD >= 4754)
-+				pts = (float)pkt.dts * m_stream->time_base.num / m_stream->time_base.den;
-+#else
-				pts = (float)pkt.dts / AV_TIME_BASE;
-+#endif
- 			else
- 				pts = -1;
- 			GetNextTimestamp = false;
-@@ -326,7 +326,11 @@
- 		 * to give it a buffer to read from since it tries to read anyway. */
- 		static uint8_t dummy[FF_INPUT_BUFFER_PADDING_SIZE] = { 0 };
- 		int len = avcodec::avcodec_decode_video(
-+#if (LIBAVCODEC_BUILD >= 4754)
-+				m_stream->codec, 
-+#else
- 				&m_stream->codec, 
-+#endif
- 				&frame, &got_frame,
- 				pkt.size? pkt.data:dummy, pkt.size );
- 		CHECKPOINT;
-@@ -360,7 +364,11 @@
- 		}
- 
- 		/* Length of this frame: */
-+#if (LIBAVCODEC_BUILD >= 4754)
-+		LastFrameDelay = (float)m_stream->codec->time_base.num / m_stream->codec->time_base.den;
-+#else
- 		LastFrameDelay = (float)m_stream->codec.frame_rate_base / m_stream->codec.frame_rate;
-+#endif
- 		LastFrameDelay += frame.repeat_pict * (LastFrameDelay * 0.5f);
- 
- 		return 1;
-@@ -377,9 +385,15 @@
- 	pict.data[0] = (unsigned char *)m_img->pixels;
- 	pict.linesize[0] = m_img->pitch;
- 
-+#if (LIBAVCODEC_BUILD >= 4754)
-+	avcodec::img_convert(&pict, AVPixelFormats[m_AVTexfmt].pf,
-+			(avcodec::AVPicture *) &decoder->frame, decoder->m_stream->codec->pix_fmt, 
-+			decoder->m_stream->codec->width, decoder->m_stream->codec->height);
-+#else
- 	avcodec::img_convert(&pict, AVPixelFormats[m_AVTexfmt].pf,
- 			(avcodec::AVPicture *) &decoder->frame, decoder->m_stream->codec.pix_fmt, 
- 			decoder->m_stream->codec.width, decoder->m_stream->codec.height);
-+#endif
- 
- 	m_ImageWaiting = FRAME_WAITING;
- }
-@@ -389,8 +403,13 @@
-     for( int stream = 0; stream < m_fctx->nb_streams; ++stream )
- 	{
- 		avcodec::AVStream *enc = m_fctx->streams[stream];
-+#if (LIBAVCODEC_BUILD >= 4754)
-+        if( enc->codec->codec_type == avcodec::CODEC_TYPE_VIDEO )
-+			return enc;
-+#else
-         if( enc->codec.codec_type == avcodec::CODEC_TYPE_VIDEO )
- 			return enc;
-+#endif
- 	}
- 	return NULL;
- }
-@@ -418,8 +437,13 @@
- 	m_bThreaded = PREFSMAN->m_bThreadedMovieDecode;
- 
- 	CreateDecoder();
-+#if (LIBAVCODEC_BUILD >= 4754)
-+	LOG->Trace("Bitrate: %i", decoder->m_stream->codec->bit_rate );
-+	LOG->Trace("Codec pixel format: %s", avcodec::avcodec_get_pix_fmt_name(decoder->m_stream->codec->pix_fmt) );
-+#else
- 	LOG->Trace("Bitrate: %i", decoder->m_stream->codec.bit_rate );
- 	LOG->Trace("Codec pixel format: %s", avcodec::avcodec_get_pix_fmt_name(decoder->m_stream->codec.pix_fmt) );
-+#endif
- 
- 	/* Decode one frame, to guarantee that the texture is drawn when this function returns. */
- 	int ret = decoder->GetFrame();
-@@ -573,6 +597,17 @@
- 	if ( stream == NULL )
- 		RageException::Throw( "AVCodec (%s): Couldn't find any video streams", GetID().filename.c_str() );
- 
-+#if (LIBAVCODEC_BUILD >= 4754)
-+	if( stream->codec->codec_id == avcodec::CODEC_ID_NONE )
-+		RageException::ThrowNonfatal( "AVCodec (%s): Unsupported codec %08x", GetID().filename.c_str(), stream->codec->codec_tag );
-+
-+	avcodec::AVCodec *codec = avcodec::avcodec_find_decoder( stream->codec->codec_id );
-+	if( codec == NULL )
-+		RageException::Throw( "AVCodec (%s): Couldn't find decoder %i", GetID().filename.c_str(), stream->codec->codec_id );
-+
-+	LOG->Trace("Opening codec %s", codec->name );
-+	ret = avcodec::avcodec_open( stream->codec, codec );
-+#else
- 	if( stream->codec.codec_id == avcodec::CODEC_ID_NONE )
- 		RageException::ThrowNonfatal( "AVCodec (%s): Unsupported codec %08x", GetID().filename.c_str(), stream->codec.codec_tag );
- 
-@@ -582,6 +617,7 @@
- 
- 	LOG->Trace("Opening codec %s", codec->name );
- 	ret = avcodec::avcodec_open( &stream->codec, codec );
-+#endif
- 	if ( ret < 0 )
- 		RageException::Throw( averr_ssprintf(ret, "AVCodec (%s): Couldn't open codec \"%s\"", GetID().filename.c_str(), codec->name) );
- 
-@@ -596,7 +632,11 @@
- {
- 	if( decoder->m_stream )
- 	{
-+#if (LIBAVCODEC_BUILD >= 4754)
-+		avcodec::avcodec_close( decoder->m_stream->codec );
-+#else
- 		avcodec::avcodec_close( &decoder->m_stream->codec );
-+#endif
- 		decoder->m_stream = NULL;
- 	}
- 
-@@ -637,8 +677,13 @@
- 	/* Cap the max texture size to the hardware max. */
- 	actualID.iMaxSize = min( actualID.iMaxSize, DISPLAY->GetMaxTextureSize() );
- 
-+#if (LIBAVCODEC_BUILD >= 4754)
-+	m_iSourceWidth  = decoder->m_stream->codec->width;
-+	m_iSourceHeight = decoder->m_stream->codec->height;
-+#else
- 	m_iSourceWidth  = decoder->m_stream->codec.width;
- 	m_iSourceHeight = decoder->m_stream->codec.height;
-+#endif
- 
- 	/* image size cannot exceed max size */
- 	m_iImageWidth = min( m_iSourceWidth, actualID.iMaxSize );
-@@ -818,7 +863,11 @@
- 		m_FrameSkipMode = true;
- 	}
- 
-+#if (LIBAVCODEC_BUILD >= 4754)
-+	if( m_FrameSkipMode && decoder->m_stream->codec->frame_number % 2 )
-+#else
- 	if( m_FrameSkipMode && decoder->m_stream->codec.frame_number % 2 )
-+#endif
- 		return -1; /* skip */
- 	
- 	return 0;
diff --git a/games-arcade/stepmania/files/stepmania-3.9-gcc41.patch b/games-arcade/stepmania/files/stepmania-3.9-gcc41.patch
deleted file mode 100644
index 2b00414834d8..000000000000
--- a/games-arcade/stepmania/files/stepmania-3.9-gcc41.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/GameState.h.orig	2006-04-23 18:31:04.000000000 +0200
-+++ src/GameState.h	2006-04-23 18:31:23.000000000 +0200
-@@ -85,8 +85,8 @@
- 	bool AnyPlayersAreCpu() const;
- 
- 	void GetCharacters( vector<Character*> &apCharactersOut );
--	Character* GameState::GetRandomCharacter();
--	Character* GameState::GetDefaultCharacter();
-+	Character* GetRandomCharacter();
-+	Character* GetDefaultCharacter();
- 
- 	PlayerController	m_PlayerController[NUM_PLAYERS];
- 	
---- src/StdString.h.orig	2006-04-23 18:40:14.000000000 +0200
-+++ src/StdString.h	2006-04-23 19:22:10.000000000 +0200
-@@ -1087,7 +1087,7 @@
- 
- 		while ( (nIdx=this->find(szOld, nIdx)) != MYBASE::npos )
- 		{
--			replace(this->begin()+nIdx, this->begin()+nIdx+nOldLen, szRealNew);
-+			MYBASE::replace(this->begin()+nIdx, this->begin()+nIdx+nOldLen, szRealNew);
- 			nReplaced++;
- 			nIdx += nNewLen;
- 		}
---- src/NetworkSyncServer.h.orig	2006-04-23 19:28:07.000000000 +0200
-+++ src/NetworkSyncServer.h	2006-04-23 19:28:20.000000000 +0200
-@@ -117,7 +117,7 @@
- 	void GameOver(PacketFunctions& Packet, const unsigned int clientNum);
- 	void ScreenNetMusicSelectStatus(PacketFunctions& Packet, const unsigned int clientNum);
- 	void AnalizeChat(PacketFunctions &Packet, const unsigned int clientNum);
--	CString StepManiaLanServer::ListPlayers();
-+	CString ListPlayers();
- 	void Kick(CString &name);
- 	void Ban(CString &name);
- 	bool IsBanned(CString &ip);
---- src/RageUtil_FileDB.h.orig	2006-04-23 19:35:11.000000000 +0200
-+++ src/RageUtil_FileDB.h	2006-04-23 19:35:34.000000000 +0200
-@@ -86,9 +86,9 @@
- 	virtual void PopulateFileSet( FileSet &fs, const CString &sPath ) { }
- 
- public:
--	FilenameDB::FilenameDB():
-+	FilenameDB():
- 		ExpireSeconds( -1 ) { }
--	virtual FilenameDB::~FilenameDB() { FlushDirCache(); }
-+	virtual ~FilenameDB() { FlushDirCache(); }
- 
- 	void AddFile( const CString &sPath, int size, int hash, void *priv=NULL );
- 	void DelFile( const CString &sPath );
diff --git a/games-arcade/stepmania/files/stepmania-3.9-gettid.patch b/games-arcade/stepmania/files/stepmania-3.9-gettid.patch
deleted file mode 100644
index 6327d9faa932..000000000000
--- a/games-arcade/stepmania/files/stepmania-3.9-gettid.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index f3cfce47bf10..000000000000
--- a/games-arcade/stepmania/files/stepmania-3.9-lua51.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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-sdl.patch b/games-arcade/stepmania/files/stepmania-3.9-sdl.patch
deleted file mode 100644
index 0c97ce0d1b11..000000000000
--- a/games-arcade/stepmania/files/stepmania-3.9-sdl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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/files/stepmania-3.9-vorbis.patch b/games-arcade/stepmania/files/stepmania-3.9-vorbis.patch
deleted file mode 100644
index 68a77cc27314..000000000000
--- a/games-arcade/stepmania/files/stepmania-3.9-vorbis.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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, [
- 
--AC_ARG_WITH(vorbis, AC_HELP_STRING([--without-vorbis], [Disable Vorbis support]), with_vorbis=$enableval, with_vorbis=yes)
-+AC_ARG_WITH(vorbis, AC_HELP_STRING([--without-vorbis], [Disable Vorbis support]), with_vorbis=$withval, with_vorbis=yes)
- 
- # This is used to force the integer decoder, on systems that prefer it.
- AC_ARG_WITH(integer-vorbis, AC_HELP_STRING([--with-integer-vorbis], [Integer vorbis decoding only]), with_int_vorbis=$withval, with_int_vorbis=no)
diff --git a/games-arcade/stepmania/stepmania-3.9.ebuild b/games-arcade/stepmania/stepmania-3.9.ebuild
index 858357cd4cf2..d5dcda48b202 100644
--- a/games-arcade/stepmania/stepmania-3.9.ebuild
+++ b/games-arcade/stepmania/stepmania-3.9.ebuild
@@ -1,29 +1,30 @@
 # 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.9 2007/08/01 16:53:05 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9.ebuild,v 1.10 2007/08/07 14:35:25 drac Exp $
 
-inherit eutils autotools games
+inherit autotools eutils games
 
 MY_PV="${PV/_/-}"
 DESCRIPTION="An advanced DDR simulator"
 HOMEPAGE="http://www.stepmania.com/stepmania/"
 SRC_URI="mirror://sourceforge/stepmania/StepMania-${MY_PV}-src.tar.gz
-	mirror://sourceforge/stepmania/StepMania-${MY_PV}-linux.tar.gz"
+	mirror://sourceforge/stepmania/StepMania-${MY_PV}-linux.tar.gz
+	http://dev.gentoo.org/~drac/distfiles/${PN}-patches-1.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug gtk jpeg mp3 mpeg vorbis force-oss"
+IUSE="debug gtk jpeg mad ffmpeg vorbis force-oss"
 
 RESTRICT="test"
 
 RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
-	mp3? ( media-libs/libmad )
+	mad? ( media-libs/libmad )
 	>=dev-lang/lua-5
 	media-libs/libsdl
 	jpeg? ( media-libs/jpeg )
 	media-libs/libpng
-	mpeg? ( ~media-video/ffmpeg-0.4.9_p20070330 )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070330 )
 	vorbis? ( media-libs/libvorbis )
 	virtual/opengl
 	virtual/glu"
@@ -40,37 +41,25 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	sed "s:/usr/share/games/${PN}:${GAMES_DATADIR}/${PN}:" \
-		"${FILESDIR}"/${P}-gentoo.patch > "${T}"/gentoo.patch \
-		|| die "sed failed"
-	epatch \
-		"${T}"/gentoo.patch \
-		"${FILESDIR}/${P}"-gcc41.patch \
-		"${FILESDIR}/${P}"-64bits.patch \
-		"${FILESDIR}/${P}"-ffmpeg.patch \
-		"${FILESDIR}/${P}"-vorbis.patch \
-		"${FILESDIR}/${P}"-sdl.patch \
-		"${FILESDIR}/${P}"-alsa.patch \
-		"${FILESDIR}/${P}"-alias.patch \
-		"${FILESDIR}/${P}"-gettid.patch \
-		"${FILESDIR}/${P}"-lua51.patch \
-		"${FILESDIR}/${P}"-ffmpeg-stdint.patch \
-		"${FILESDIR}/${P}"-crashfix.patch
+		"${FILESDIR}"/${P}-gentoo.patch > "${T}"/gentoo.patch
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches
+	epatch "${T}"/gentoo.patch
 
 	AT_M4DIR="autoconf/m4"
 	eautoreconf
 }
 
 src_compile() {
-	econf \
-		--disable-dependency-tracking \
+	econf --disable-dependency-tracking \
 		$(use_with debug) \
 		$(use_with jpeg) \
 		$(use_with vorbis) \
-		$(use_with mp3) \
+		$(use_with mad mp3) \
 		$(use_enable gtk gtk2) \
-		$(use_enable force-oss) \
-		|| die
+		$(use_enable force-oss)
 	emake || die "emake failed."
 }