Compilation on amd64 fixed. Bug #138365

Package-Manager: portage-2.1.1

4 files changed, 84 insertions, 13 deletions

diff --git a/games-arcade/stepmania/ChangeLog b/games-arcade/stepmania/ChangeLog
index 5cb8b1ea516d..36e025adebb3 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.11 2006/09/10 22:01:38 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.12 2006/10/24 21:51:32 tupone Exp $
+
+  24 Oct 2006; <tupone@gentoo.org> +files/stepmania-3.9-64bits.patch,
+  stepmania-3.9.ebuild:
+  Compilation on amd64 fixed. Bug #138365 by Bryan Jacobs
 
   10 Sep 2006; <tupone@gentoo.org> +files/stepmania-3.9-sdl.patch,
   stepmania-3.9.ebuild:
diff --git a/games-arcade/stepmania/Manifest b/games-arcade/stepmania/Manifest
index fdc063c029a5..aa44baf439e3 100644
--- a/games-arcade/stepmania/Manifest
+++ b/games-arcade/stepmania/Manifest
@@ -1,6 +1,10 @@
 -----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-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
@@ -39,10 +43,10 @@ DIST StepMania-3.9-rc2a-src.tar.gz 3083935
 DIST StepMania-3.9-rc3-linux.tar.gz 9515927 RMD160 ae6cb869d7c8cfa3a240e6adcfd1b61890add589 SHA1 fa276f67f5bd354d5df3330c79429b8fb511df60 SHA256 8faf4f1220a6c0797773c50b8c9b3bbd51f99dff691b161dc246a06a4ba5e8b3
 DIST StepMania-3.9-rc3-src.tar.gz 3035711 RMD160 f6bbfd9fd46bf980c59b3fca14289b269b094888 SHA1 6d1f9fae8344843906286e67cbf86cb2d5b8440f SHA256 ead8de29a6970cbf22b41a81801bc2dc20ea12af6be957a3bda18a86e906dd67
 DIST StepMania-3.9-src.tar.gz 3090223 RMD160 e7451192fe67f53a7a93baf99bf9a20bc3d1f7cf SHA1 b2d2c3a50c23506844ba7e22289e59d270bb8b2e SHA256 31082d388fa64b9764aee4d7628f377bc0fe47b8f157b8bcc66d9e3678479c85
-EBUILD stepmania-3.9.ebuild 2072 RMD160 e112f0bbc0be0c7cc24415e04691e4077c46f1f6 SHA1 a0b74f59aefbfdbe4b6652afff3c5f62c7c46003 SHA256 c36677de8d917679b9bdd90e8febaed8b858d4b3493d9d5e9830b33a5b76a2fe
-MD5 043114e55aec22ffd329c3c262411f03 stepmania-3.9.ebuild 2072
-RMD160 e112f0bbc0be0c7cc24415e04691e4077c46f1f6 stepmania-3.9.ebuild 2072
-SHA256 c36677de8d917679b9bdd90e8febaed8b858d4b3493d9d5e9830b33a5b76a2fe stepmania-3.9.ebuild 2072
+EBUILD stepmania-3.9.ebuild 2108 RMD160 be643ac3a67701fe58165b9449422ad0806c9fd2 SHA1 75c9e5647c17d666a0981199ff5aac0006a3446c SHA256 78c4214402311470a3dd35aa4dd549d6f02783cc2a9dbf4d033c6eb1fc030293
+MD5 c9d1d8342269afabf6ee72b3bd4b6677 stepmania-3.9.ebuild 2108
+RMD160 be643ac3a67701fe58165b9449422ad0806c9fd2 stepmania-3.9.ebuild 2108
+SHA256 78c4214402311470a3dd35aa4dd549d6f02783cc2a9dbf4d033c6eb1fc030293 stepmania-3.9.ebuild 2108
 EBUILD stepmania-3.9_rc2.ebuild 1864 RMD160 c2cc4725b255a47864f4f07aa9215c21816e3bc1 SHA1 37502a892a7430f3e1ea53456faf4c2962f36d16 SHA256 2351b3e68514e030e3d68a80497cb438347c29e97b5bbf6c517f4170fcdecd21
 MD5 e09ed95b0c39e0acca28b224b7db983f stepmania-3.9_rc2.ebuild 1864
 RMD160 c2cc4725b255a47864f4f07aa9215c21816e3bc1 stepmania-3.9_rc2.ebuild 1864
@@ -51,10 +55,10 @@ EBUILD stepmania-3.9_rc3.ebuild 1870 RMD160 dfb41cd45ebc5bd72fb27a599e2d2ce2ccd5
 MD5 46f831eb7a7c9fd4f204046c15610ed8 stepmania-3.9_rc3.ebuild 1870
 RMD160 dfb41cd45ebc5bd72fb27a599e2d2ce2ccd5fec6 stepmania-3.9_rc3.ebuild 1870
 SHA256 13d4911dc92ee1367680c35a21159cf7a46c9431e506c4ecc2dfb1ead94b3e37 stepmania-3.9_rc3.ebuild 1870
-MISC ChangeLog 2225 RMD160 8184fd9e003847608ab1c13f5a3eadc2f1975f4d SHA1 a793a2dd4bfd7ab6fd498d8a8ec656291c0db7ac SHA256 4e69445b40934b53104b12ce73171469c99d7d3715958387109ce6523c319de2
-MD5 2470ecbcfb36f07755226ff7a00b2d4f ChangeLog 2225
-RMD160 8184fd9e003847608ab1c13f5a3eadc2f1975f4d ChangeLog 2225
-SHA256 4e69445b40934b53104b12ce73171469c99d7d3715958387109ce6523c319de2 ChangeLog 2225
+MISC ChangeLog 2378 RMD160 bb429e982e1255e9c56992f74f0d02b622aa9ea6 SHA1 5d2141f49fb4f4fae4ecb7a866d2f12bbcf14a13 SHA256 f8937f57d5e6b480eac131581d0ec2b5e5976a52ffc33f2fcadd8bded0c601bf
+MD5 415a06c1c8a324c3b947b5e697bab714 ChangeLog 2378
+RMD160 bb429e982e1255e9c56992f74f0d02b622aa9ea6 ChangeLog 2378
+SHA256 f8937f57d5e6b480eac131581d0ec2b5e5976a52ffc33f2fcadd8bded0c601bf ChangeLog 2378
 MISC metadata.xml 220 RMD160 9644806f89f8b8d272e5ece60b993df5cd41a900 SHA1 97c2910ccf82c9a3600a4bb822777a7bf342a17a SHA256 2482823056583dedefb8c75afb2d017147227f6d93f81655e2f7b0721d178178
 MD5 441e3a625f4d1889a960a7f9adefe87b metadata.xml 220
 RMD160 9644806f89f8b8d272e5ece60b993df5cd41a900 metadata.xml 220
@@ -71,7 +75,7 @@ SHA256 9b5c338295a554a1603d6955a47a6dae9d46805312ccf083babe6bb9efe392f9 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFBItQ2CTtIKiFlQIRAoKFAJ0bF48Yu0VL5m9xrZbNCZ2H/iF8RgCcChW2
-oRUAoqlHRGg6KKOtCFwPw2A=
-=foXt
+iD8DBQFFPorybfN2jvlVAhwRAp4vAJ9mWhoGYZg7NX/kvwGDVciixwd3ggCgml3W
+z+29OPbxNmvqJ8CkV9OgoZw=
+=zxyJ
 -----END PGP SIGNATURE-----
diff --git a/games-arcade/stepmania/files/stepmania-3.9-64bits.patch b/games-arcade/stepmania/files/stepmania-3.9-64bits.patch
new file mode 100644
index 000000000000..91c33193fe74
--- /dev/null
+++ b/games-arcade/stepmania/files/stepmania-3.9-64bits.patch
@@ -0,0 +1,62 @@
+--- 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/stepmania-3.9.ebuild b/games-arcade/stepmania/stepmania-3.9.ebuild
index 3632b6a5eda6..f7545cc2f570 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.3 2006/09/10 22:01:38 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9.ebuild,v 1.4 2006/10/24 21:51:32 tupone Exp $
 
 inherit eutils autotools games
 
@@ -34,6 +34,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${P}"-gentoo.patch \
 		"${FILESDIR}/${P}"-gcc41.patch \
+		"${FILESDIR}/${P}"-64bits.patch \
 		"${FILESDIR}/${P}"-ffmpeg.patch \
 		"${FILESDIR}/${P}"-vorbis.patch \
 		"${FILESDIR}"/${P}-sdl.patch \