added ucode patch

(Portage version: 2.0.51.19)

4 files changed, 140 insertions, 11 deletions

diff --git a/games-emulation/mupen64-glN64/ChangeLog b/games-emulation/mupen64-glN64/ChangeLog
index 79fe9327cc8e..c3899e7bd1bb 100644
--- a/games-emulation/mupen64-glN64/ChangeLog
+++ b/games-emulation/mupen64-glN64/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/mupen64-glN64
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-glN64/ChangeLog,v 1.6 2005/01/07 22:45:22 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-glN64/ChangeLog,v 1.7 2005/04/17 17:10:26 morfic Exp $
+
+  17 Apr 2005; Daniel Goller <morfic@gentoo.org>
+  +files/mupen64-glN64-ucode.patch, mupen64-glN64-0.4.1_rc2-r1.ebuild:
+  added ucode patch, thanks to alexander.rhodes@brentwood.bc.ca, bug #80547,
+  thanks to Bret Towe for testing
 
   07 Jan 2005; Daniel Goller <morfic@gentoo.org> metadata.xml:
   Adding maintainer
diff --git a/games-emulation/mupen64-glN64/Manifest b/games-emulation/mupen64-glN64/Manifest
index 0aee15a323d9..c0cd56019084 100644
--- a/games-emulation/mupen64-glN64/Manifest
+++ b/games-emulation/mupen64-glN64/Manifest
@@ -1,9 +1,11 @@
-MD5 5da6257a8e48a5581a4ed751de2b1e43 ChangeLog 1862
-MD5 a3e62bf537d9a02609601aa9ba76da7e metadata.xml 247
+MD5 4e11eb366aa949054a2c16b3571f6c4d mupen64-glN64-0.4.1_rc2-r1.ebuild 1157
 MD5 b8f36239182a7123c9e61fad2b89fd82 mupen64-glN64-0.4.1_pre1.ebuild 751
-MD5 76dc3d0f8729049b0815d0bf4746871a mupen64-glN64-0.4.1_rc2-r1.ebuild 1051
-MD5 d2f2bca612361154241f2b899673230e files/digest-mupen64-glN64-0.4.1_pre1 64
-MD5 e0e2f9111004f21e197569c2bd419c8a files/digest-mupen64-glN64-0.4.1_rc2-r1 68
+MD5 1065afc92cec3a7d8a16a35cf2700281 ChangeLog 2060
+MD5 a3e62bf537d9a02609601aa9ba76da7e metadata.xml 247
 MD5 47f0e615c36a823f63220f4aec84d47f files/mupen64-glN64-compile.patch 1290
-MD5 7b7b92e1dd75295fa258e3f0e02d1d3c files/mupen64-glN64-gtk2.patch 808
+MD5 b16845f6a1bc038fe837a44a2bbd4568 files/mupen64-glN64-ucode.patch 3503
 MD5 9220d158fd6e0f37797eb2f7aae4c3c7 files/mupen64-glN64-noasm.patch 409
+MD5 e0e2f9111004f21e197569c2bd419c8a files/digest-mupen64-glN64-0.4.1_rc2-r1 68
+MD5 b16845f6a1bc038fe837a44a2bbd4568 files/ucode.patch 3503
+MD5 d2f2bca612361154241f2b899673230e files/digest-mupen64-glN64-0.4.1_pre1 64
+MD5 7b7b92e1dd75295fa258e3f0e02d1d3c files/mupen64-glN64-gtk2.patch 808
diff --git a/games-emulation/mupen64-glN64/files/mupen64-glN64-ucode.patch b/games-emulation/mupen64-glN64/files/mupen64-glN64-ucode.patch
new file mode 100644
index 000000000000..b83fbd471785
--- /dev/null
+++ b/games-emulation/mupen64-glN64/files/mupen64-glN64-ucode.patch
@@ -0,0 +1,121 @@
+diff -g glN64-0.4.1-rc2-old/GBI.cpp glN64-0.4.1-rc2/GBI.cpp
+*** glN64-0.4.1-rc2-old/GBI.cpp	2003-10-15 16:01:07.000000000 -0700
+--- glN64-0.4.1-rc2/GBI.cpp	2005-02-02 23:42:30.000000000 -0800
+***************
+*** 37,43 ****
+  	{ F3DDKR,	FALSE,	0x8d91244f, "Diddy Kong Racing" },
+  	{ F3DDKR,	FALSE,	0x6e6fc893, "Diddy Kong Racing" },
+  	{ F3DDKR,	FALSE,	0xbde9d1fb, "Jet Force Gemini" },
+! 	{ F3DPD,	FALSE,	0x1c4f7869, "Perfect Dark" }
+  };
+  
+  u32 G_RDPHALF_1, G_RDPHALF_2, G_RDPHALF_CONT;
+--- 37,44 ----
+  	{ F3DDKR,	FALSE,	0x8d91244f, "Diddy Kong Racing" },
+  	{ F3DDKR,	FALSE,	0x6e6fc893, "Diddy Kong Racing" },
+  	{ F3DDKR,	FALSE,	0xbde9d1fb, "Jet Force Gemini" },
+! 	{ F3DPD,	FALSE,	0x1c4f7869, "Perfect Dark" },
+! 	{ F3DEX,	FALSE,	0x0ace4c3f, "Mario Kart" }
+  };
+  
+  u32 G_RDPHALF_1, G_RDPHALF_2, G_RDPHALF_CONT;
+***************
+*** 264,274 ****
+  
+  	while (selectedMicrocode == -1)
+  	{
+! //		if( gtk_main_iteration() )
+! //			break;
+  		usleep( 10000 );
+  	}
+  	gdk_threads_leave();
+  	return selectedMicrocode;
+  }
+  #endif // __LINUX__
+--- 265,276 ----
+  
+  	while (selectedMicrocode == -1)
+  	{
+! 		if( gtk_main_iteration() )
+! 			break;
+  		usleep( 10000 );
+  	}
+  	gdk_threads_leave();
++ 
+  	return selectedMicrocode;
+  }
+  #endif // __LINUX__
+***************
+*** 435,441 ****
+  	current->type = DialogBox( hInstance, MAKEINTRESOURCE( IDD_MICROCODEDLG ), hWnd, MicrocodeDlgProc );
+  #else // !__LINUX__
+  	printf( "glN64: Warning - unknown ucode!!!\n" );
+! 	current->type = MicrocodeDialog();
+  #endif // __LINUX__
+  	return current;
+  }
+--- 437,447 ----
+  	current->type = DialogBox( hInstance, MAKEINTRESOURCE( IDD_MICROCODEDLG ), hWnd, MicrocodeDlgProc );
+  #else // !__LINUX__
+  	printf( "glN64: Warning - unknown ucode!!!\n" );
+! 	if(last_good_ucode != -1) {
+! 		current->type=last_good_ucode;
+! 	} else {
+! 		current->type = MicrocodeDialog();
+! 	}
+  #endif // __LINUX__
+  	return current;
+  }
+diff -g glN64-0.4.1-rc2-old/GBI.h glN64-0.4.1-rc2/GBI.h
+*** glN64-0.4.1-rc2-old/GBI.h	2003-10-15 16:01:07.000000000 -0700
+--- glN64-0.4.1-rc2/GBI.h	2005-02-02 23:37:36.000000000 -0800
+***************
+*** 736,741 ****
+--- 736,742 ----
+  
+  void GBI_MakeCurrent( MicrocodeInfo *current );
+  MicrocodeInfo *GBI_DetectMicrocode( u32 uc_start, u32 uc_dstart, u16 uc_dsize );
++ extern u32 last_good_ucode;
+  void GBI_Init();
+  void GBI_Destroy();
+  
+diff -g glN64-0.4.1-rc2-old/glN64.cpp glN64-0.4.1-rc2/glN64.cpp
+*** glN64-0.4.1-rc2-old/glN64.cpp	2003-10-15 16:09:00.000000000 -0700
+--- glN64-0.4.1-rc2/glN64.cpp	2005-02-02 23:36:47.000000000 -0800
+***************
+*** 29,35 ****
+  
+  char		pluginName[] = "glN64 v0.4.1-rc2";
+  char		*screenDirectory;
+! 
+  void (*CheckInterrupts)( void );
+  
+  #ifndef __LINUX__
+--- 29,35 ----
+  
+  char		pluginName[] = "glN64 v0.4.1-rc2";
+  char		*screenDirectory;
+! u32 last_good_ucode = -1;
+  void (*CheckInterrupts)( void );
+  
+  #ifndef __LINUX__
+diff -g glN64-0.4.1-rc2-old/gSP.cpp glN64-0.4.1-rc2/gSP.cpp
+*** glN64-0.4.1-rc2-old/gSP.cpp	2003-10-15 16:01:07.000000000 -0700
+--- glN64-0.4.1-rc2/gSP.cpp	2005-02-02 23:41:58.000000000 -0800
+***************
+*** 60,66 ****
+  	}
+  
+  	MicrocodeInfo *ucode = GBI_DetectMicrocode( uc_start, uc_dstart, uc_dsize );
+! 
+  	if (ucode->type != NONE)
+  		GBI_MakeCurrent( ucode );
+  	else
+--- 60,66 ----
+  	}
+  
+  	MicrocodeInfo *ucode = GBI_DetectMicrocode( uc_start, uc_dstart, uc_dsize );
+! 	if (ucode->type != -1) last_good_ucode = ucode->type;
+  	if (ucode->type != NONE)
+  		GBI_MakeCurrent( ucode );
+  	else
diff --git a/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild b/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild
index 424942bd55b7..0bcb956e7017 100644
--- a/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild
+++ b/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.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-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild,v 1.2 2005/01/31 03:26:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild,v 1.3 2005/04/17 17:10:26 morfic Exp $
 
 inherit eutils games
 
@@ -13,13 +13,14 @@ HOMEPAGE="http://deltaanime.ath.cx/~blight/n64/"
 KEYWORDS="x86"
 LICENSE="as-is"
 SLOT="0"
-IUSE=""
+IUSE="asm"
 
 RDEPEND="media-libs/libsdl"
 
 src_compile () {
-	epatch ${FILESDIR}/${PN}-compile.patch || die "patch failed"
-	epatch ${FILESDIR}/${PN}-gtk2.patch
+	epatch ${FILESDIR}/${PN}-compile.patch || die "icompile patch failed"
+	epatch ${FILESDIR}/${PN}-gtk2.patch || die "gtk2 patch failed"
+	epatch ${FILESDIR}/${PN}-ucode.patch || die "ucode patch failed"
 	if use x86; then
 		if use asm; then
 			einfo "using x86 asm where available"