Add patch to fix compilation with gcc-4.1 by Karol Szumski <mareviq AT interia DOT pl>; bug #125924

(Portage version: 2.1_pre6-r2)

4 files changed, 41 insertions, 7 deletions

diff --git a/games-emulation/mupen64-riceplugin/ChangeLog b/games-emulation/mupen64-riceplugin/ChangeLog
index 822cb568ccbf..2fead070709c 100644
--- a/games-emulation/mupen64-riceplugin/ChangeLog
+++ b/games-emulation/mupen64-riceplugin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.11 2005/09/20 15:26:50 mr_bones_ Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-riceplugin/ChangeLog,v 1.12 2006/03/15 04:43:09 halcy0n Exp $
+
+  15 Mar 2006; Mark Loeser <halcy0n@gentoo.org>
+  files/mupen64-riceplugin-gcc4.patch:
+  Add patch to fix compilation with gcc-4.1 by Karol Szumski <mareviq AT
+  interia DOT pl>; bug #125924
 
   20 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
   mupen64-riceplugin-5.1.0.ebuild:
diff --git a/games-emulation/mupen64-riceplugin/Manifest b/games-emulation/mupen64-riceplugin/Manifest
index d752aaf9de5e..452ac7ef296a 100644
--- a/games-emulation/mupen64-riceplugin/Manifest
+++ b/games-emulation/mupen64-riceplugin/Manifest
@@ -1,8 +1,24 @@
-MD5 a3e62bf537d9a02609601aa9ba76da7e metadata.xml 247
 MD5 ae896353e81bd3c1c6342bab326f01d0 ChangeLog 1861
-MD5 42d4df70b03c18d41e7a289c71ee5694 mupen64-riceplugin-5.1.0.ebuild 1031
+RMD160 0549519e65051aaeb1379b33ee1d4f7bf438746b ChangeLog 1861
+SHA256 a01877ddede874fd23b462cd65758cc3be81a186f86cc1cd1f6015e4815737eb ChangeLog 1861
+MD5 374f37e72b78633b10a9c1b2b1dfabbc files/digest-mupen64-riceplugin-5.1.0 235
+RMD160 86118568913fbb756007fd27cadc4ee2a9dd9ba3 files/digest-mupen64-riceplugin-5.1.0 235
+SHA256 5556ec96723754e79925df7eca7ea45829d29b2419a555b0262819affa8b0aa1 files/digest-mupen64-riceplugin-5.1.0 235
+MD5 5818587f7353a1f0bc54a08443734016 files/mupen64-riceplugin-compile.patch 6601
+RMD160 ef7773dc9afc0f7e37850160fcfd2f7ade6133b3 files/mupen64-riceplugin-compile.patch 6601
+SHA256 ccf844428e86dfe066cc0f6c004f414694a7e7db23e71b22acef5fd515163d81 files/mupen64-riceplugin-compile.patch 6601
+MD5 4c865bc8d557b967692b1c85e54bbe77 files/mupen64-riceplugin-gcc4.patch 1036
+RMD160 95b17b5613234a5837b80ad2d7ee8ff1a0632205 files/mupen64-riceplugin-gcc4.patch 1036
+SHA256 0d8295948be78e1d25f201923a29554da47140568c961e403308c76624ec26be files/mupen64-riceplugin-gcc4.patch 1036
 MD5 c79ad1f4cdadf86d6bf4fab101ea3ae5 files/mupen64-riceplugin-gtk2.patch 631
-MD5 153ea7a83a31d4ec610c3955a910b7bc files/mupen64-riceplugin-gcc4.patch 295
+RMD160 ae52b739b6a812df27792fe1111fcadaf5809548 files/mupen64-riceplugin-gtk2.patch 631
+SHA256 eaddc1ce1cfcf2c62e4ca8e4e45bab1b5afb195783132d0785d5f33f394058dd files/mupen64-riceplugin-gtk2.patch 631
 MD5 45e5b555bb4c252b8ebe4731dd1229f8 files/mupen64-riceplugin-makefile.patch 1013
-MD5 5818587f7353a1f0bc54a08443734016 files/mupen64-riceplugin-compile.patch 6601
-MD5 b3400316b9d64a4bda1c9d80e9e87717 files/digest-mupen64-riceplugin-5.1.0 63
+RMD160 98e0dbd8d4912c91e2aa6fe15ef5dfe09d830459 files/mupen64-riceplugin-makefile.patch 1013
+SHA256 e1672b5c1cc8a8e93698f1e20b55842062a63efed48442125f5405b6ccaadafc files/mupen64-riceplugin-makefile.patch 1013
+MD5 a3e62bf537d9a02609601aa9ba76da7e metadata.xml 247
+RMD160 d6446b6a361938735e710a73c98f86b437cc16cf metadata.xml 247
+SHA256 ff809a9b645ca993316fed51f8ef6d918d1ad9bc1118a775efc7fa37716e8ad8 metadata.xml 247
+MD5 42d4df70b03c18d41e7a289c71ee5694 mupen64-riceplugin-5.1.0.ebuild 1031
+RMD160 19c006abc05ae64c0697a081d7c1b8c3ac81a8c9 mupen64-riceplugin-5.1.0.ebuild 1031
+SHA256 7a8cd5080035a1680ff41bb8646db8afe659ceabbeca27879ee450f4fc3cc4ac mupen64-riceplugin-5.1.0.ebuild 1031
diff --git a/games-emulation/mupen64-riceplugin/files/digest-mupen64-riceplugin-5.1.0 b/games-emulation/mupen64-riceplugin/files/digest-mupen64-riceplugin-5.1.0
index 959bea1f6753..1124b13422b5 100644
--- a/games-emulation/mupen64-riceplugin/files/digest-mupen64-riceplugin-5.1.0
+++ b/games-emulation/mupen64-riceplugin/files/digest-mupen64-riceplugin-5.1.0
@@ -1 +1,3 @@
 MD5 f6f42d31cee3fce0ea92176f42ef73ba riceplugin.tar.bz2 287672
+RMD160 312d57354818b55550a5c74e2b62332a41016eeb riceplugin.tar.bz2 287672
+SHA256 3fa3065d70a697f3b6afb17bceb505fd5e117a1503a345ef9a819f63943de210 riceplugin.tar.bz2 287672
diff --git a/games-emulation/mupen64-riceplugin/files/mupen64-riceplugin-gcc4.patch b/games-emulation/mupen64-riceplugin/files/mupen64-riceplugin-gcc4.patch
index 23368c50fca2..659179ee347b 100644
--- a/games-emulation/mupen64-riceplugin/files/mupen64-riceplugin-gcc4.patch
+++ b/games-emulation/mupen64-riceplugin/files/mupen64-riceplugin-gcc4.patch
@@ -9,3 +9,14 @@
  {

  	_ASSERTE(m_pInstance == NULL);

  	

+--- riceplugin/DaedalusRender.h.old	2006-03-12 14:38:00.000000000 +0100
++++ riceplugin/DaedalusRender.h	2006-03-12 14:39:06.000000000 +0100
+@@ -60,7 +60,7 @@
+ 	

+ 	inline bool IsTexel0Enable() {return m_pColorCombiner->m_bTex0Enabled;}

+ 	inline bool IsTexel1Enable() {return m_pColorCombiner->m_bTex1Enabled;}

+-	inline bool CDaedalusRender::IsTextureEnabled() { return (m_pColorCombiner->m_bTex0Enabled||m_pColorCombiner->m_bTex1Enabled); }

++	inline bool IsTextureEnabled() { return (m_pColorCombiner->m_bTex0Enabled||m_pColorCombiner->m_bTex1Enabled); }

+ 

+ 	inline DaedalusRenderTexture& GetCurrentTexture() { return g_textures[gRSP.curTile]; }

+ 	inline DaedalusRenderTexture& GetTexture(DWORD dwTile) { return g_textures[dwTile]; }