diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2006-10-24 21:51:32 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2006-10-24 21:51:32 +0000 |
| commit | fcad2bf95725aeb732b2506f3cb14343c2003c4e (patch) | |
| tree | 7047944a30d598e7d1097f410125c7de4dddf64a /games-arcade | |
| parent | Added new revision for testing which uses the brand-spankin-new games-mods.ec... (diff) | |
| download | gentoo-2-fcad2bf95725aeb732b2506f3cb14343c2003c4e.tar.gz gentoo-2-fcad2bf95725aeb732b2506f3cb14343c2003c4e.tar.bz2 gentoo-2-fcad2bf95725aeb732b2506f3cb14343c2003c4e.zip | |
Compilation on amd64 fixed. Bug #138365
(Portage version: 2.1.1)
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/stepmania/ChangeLog | 6 | ||||
| -rw-r--r-- | games-arcade/stepmania/files/stepmania-3.9-64bits.patch | 62 | ||||
| -rw-r--r-- | games-arcade/stepmania/stepmania-3.9.ebuild | 3 |
3 files changed, 69 insertions, 2 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/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 \ |