diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2005-03-10 01:38:13 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2005-03-10 01:38:13 +0000 |
| commit | 7c84a7d68320ac3b0044d4c6c5a97243cad0004a (patch) | |
| tree | afc467f8b36e91c44dd97d57c4a5d2c8e6b0cda6 /games-emulation/mupen64-riceplugin | |
| parent | Marked stable on amd64. (diff) | |
| download | historical-7c84a7d68320ac3b0044d4c6c5a97243cad0004a.tar.gz historical-7c84a7d68320ac3b0044d4c6c5a97243cad0004a.tar.bz2 historical-7c84a7d68320ac3b0044d4c6c5a97243cad0004a.zip | |
GCC4 compile patch from Bret Towe
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'games-emulation/mupen64-riceplugin')
4 files changed, 25 insertions, 8 deletions
diff --git a/games-emulation/mupen64-riceplugin/ChangeLog b/games-emulation/mupen64-riceplugin/ChangeLog index 42a99a7890e4..0e5d374bfe94 100644 --- a/games-emulation/mupen64-riceplugin/ChangeLog +++ b/games-emulation/mupen64-riceplugin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-emulation/mupen64-riceplugin # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-riceplugin/ChangeLog,v 1.7 2005/03/09 07:08:37 morfic Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-riceplugin/ChangeLog,v 1.8 2005/03/10 01:38:13 halcy0n Exp $ + + 09 Mar 2005; Mark Loeser <halcy0n@gentoo.org> + +files/mupen64-riceplugin-gcc4.patch, mupen64-riceplugin-5.1.0.ebuild: + Patch to fix compilation on GCC4, patch from Bret Towe from bug #84236 08 Mar 2005; Daniel Goller <morfic@gentoo.org> mupen64-riceplugin-5.1.0.ebuild: diff --git a/games-emulation/mupen64-riceplugin/Manifest b/games-emulation/mupen64-riceplugin/Manifest index 8f7f536ada4c..7f00455815a2 100644 --- a/games-emulation/mupen64-riceplugin/Manifest +++ b/games-emulation/mupen64-riceplugin/Manifest @@ -1,17 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 5a4e471a45eaf94e52c6e98a7a37407b mupen64-riceplugin-5.1.0.ebuild 1373 -MD5 24915484bf901ae2ee622a81446c39fe ChangeLog 1317 +MD5 2c73b6d224c6c535fef2edd6083c0e0b ChangeLog 1513 MD5 a3e62bf537d9a02609601aa9ba76da7e metadata.xml 247 -MD5 c79ad1f4cdadf86d6bf4fab101ea3ae5 files/mupen64-riceplugin-gtk2.patch 631 +MD5 d7f5634d50699b703ce718533701f73c mupen64-riceplugin-5.1.0.ebuild 1433 MD5 b3400316b9d64a4bda1c9d80e9e87717 files/digest-mupen64-riceplugin-5.1.0 63 MD5 5818587f7353a1f0bc54a08443734016 files/mupen64-riceplugin-compile.patch 6601 +MD5 c79ad1f4cdadf86d6bf4fab101ea3ae5 files/mupen64-riceplugin-gtk2.patch 631 MD5 45e5b555bb4c252b8ebe4731dd1229f8 files/mupen64-riceplugin-makefile.patch 1013 +MD5 153ea7a83a31d4ec610c3955a910b7bc files/mupen64-riceplugin-gcc4.patch 295 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFCLpA7UpKYMelfdYERAhUHAJ9NtnIzzu0X183zBlLW6Q4mHchEzwCfb3jP -9pmMK+MgsYle/oDcNE5y/TA= -=de9y +iD8DBQFCL6UNCRZPokWLroQRAkDNAJ9kdgEafZUY24u5KjXGo68StK7GqwCgu4Ar +mx08i6W0cJSIEBAumZp77rw= +=TGRQ -----END PGP SIGNATURE----- diff --git a/games-emulation/mupen64-riceplugin/files/mupen64-riceplugin-gcc4.patch b/games-emulation/mupen64-riceplugin/files/mupen64-riceplugin-gcc4.patch new file mode 100644 index 000000000000..23368c50fca2 --- /dev/null +++ b/games-emulation/mupen64-riceplugin/files/mupen64-riceplugin-gcc4.patch @@ -0,0 +1,11 @@ +--- riceplugin/Profiler.cpp.old 2005-02-05 12:38:52.721617392 -0800 ++++ riceplugin/Profiler.cpp 2005-02-05 12:39:16.467082794 -0800 +@@ -14,7 +14,7 @@ +
+
+
+-HRESULT CUnique< CProfiler >::Create()
++template <> HRESULT CUnique< CProfiler >::Create()
+ {
+ _ASSERTE(m_pInstance == NULL);
+
diff --git a/games-emulation/mupen64-riceplugin/mupen64-riceplugin-5.1.0.ebuild b/games-emulation/mupen64-riceplugin/mupen64-riceplugin-5.1.0.ebuild index f60162729ac5..f8e5f0d8ce4d 100644 --- a/games-emulation/mupen64-riceplugin/mupen64-riceplugin-5.1.0.ebuild +++ b/games-emulation/mupen64-riceplugin/mupen64-riceplugin-5.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-riceplugin/mupen64-riceplugin-5.1.0.ebuild,v 1.5 2005/03/09 07:08:37 morfic Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-riceplugin/mupen64-riceplugin-5.1.0.ebuild,v 1.6 2005/03/10 01:38:13 halcy0n Exp $ inherit games gcc eutils libtool @@ -41,6 +41,7 @@ src_unpack() { fi epatch ${FILESDIR}/${PN}-compile.patch || die "patch failed" + epatch ${FILESDIR}/${PN}-gcc4.patch || die "patch failed" # the riceplugin requires sse support #echo "#include <xmmintrin.h>" > ${T}/test.c |