Update to 0.4:

  0.4   - better interrupt handling and dsp emulation
        - input should work in more games now
        - improved gx emulation (with new engine at its early stage)
        - savestates can be created without the debugger
        - simple thp video player included (thpview)

  0.3   - should now work on mac os x (thanks to Adam Green)
        - basic hle system
        - function mapper
        - fixed a few problems with pad emulation
        - further debugger improvements
        - killed some ugly cpu bugs
        - fixes here and there

This project is currently dead, so we might consider removing this package
in the future.

5 files changed, 59 insertions, 31 deletions

diff --git a/emulators/gcube/Makefile b/emulators/gcube/Makefile
index d374168ff80..d55ef9d09e7 100644
--- a/emulators/gcube/Makefile
+++ b/emulators/gcube/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/12/11 09:40:39 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/10 14:33:26 jmmv Exp $
 #
 
-DISTNAME=		gcube-v0.2-src
-PKGNAME=		gcube-0.2
-PKGREVISION=		3
+DISTNAME=		gcube-0.4-src
+PKGNAME=		${DISTNAME:S/-src//}
 CATEGORIES=		emulators
 MASTER_SITES=		http://gcube.exemu.net/downloads/
 EXTRACT_SUFX=		.tar.bz2
@@ -15,7 +14,7 @@ COMMENT=		Opensource Nintendo GameCube(TM) emulator
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_TOOLS+=		gmake
-WRKSRC=			${WRKDIR}
+WRKSRC=			${WRKDIR}/0.4
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -36,4 +35,5 @@ do-install:
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/gcube/distinfo b/emulators/gcube/distinfo
index e88f27732c3..63ef63c173a 100644
--- a/emulators/gcube/distinfo
+++ b/emulators/gcube/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:18 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/01/10 14:33:26 jmmv Exp $
 
-SHA1 (gcube-v0.2-src.tar.bz2) = 0681f1bf3f64208616984a5352d9ebeaff5ed8c6
-RMD160 (gcube-v0.2-src.tar.bz2) = 92e7c7a4f985413951ca5d4e60674282a3bb43ff
-Size (gcube-v0.2-src.tar.bz2) = 297817 bytes
-SHA1 (patch-aa) = 1bb0e7b6429bc0df0694bf9cbd7b41975f727f73
-SHA1 (patch-ab) = 119d81c03a38bfc76a9fe063e6cb347b8fddd60d
+SHA1 (gcube-0.4-src.tar.bz2) = dae967f8aedfc2115c3720dfe2c523128fddc8b6
+RMD160 (gcube-0.4-src.tar.bz2) = 9a7c13ed611da22705f960686eea225e30b61dc6
+Size (gcube-0.4-src.tar.bz2) = 803503 bytes
+SHA1 (patch-aa) = 285ae801f3e000420713e4e9b22d20fb55b12e3c
+SHA1 (patch-ab) = 8907f650214bec5cdbf032464a1be39cccea5d81
+SHA1 (patch-ac) = 24e52c1b863d858863317de1c34fe9a917f83599
diff --git a/emulators/gcube/patches/patch-aa b/emulators/gcube/patches/patch-aa
index f0187f659aa..0e3e484ae7c 100644
--- a/emulators/gcube/patches/patch-aa
+++ b/emulators/gcube/patches/patch-aa
@@ -1,19 +1,30 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/16 14:25:34 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/10 14:33:26 jmmv Exp $
 
---- Makefile.rules.orig	2004-07-16 14:47:19.000000000 +0200
-+++ Makefile.rules	2004-07-16 14:48:09.000000000 +0200
-@@ -1,10 +1,10 @@
- 
+--- Makefile.rules.orig	2005-01-12 14:34:18.000000000 +0100
++++ Makefile.rules
+@@ -2,9 +2,9 @@
  SDL_CONFIG=sdl-config
--LIBS=-lSDL -lz -l$(OPENGL)
-+LIBS=-lSDL -lz -l$(OPENGL) $(LDFLAGS)
+ LIBS=`$(SDL_CONFIG) --libs` -mno-windows -mcygwin -lz -l$(OPENGL)
  
--CFLAGS=-g -Wall
+-CFLAGS=-g -Wall -I/usr/include -I/usr/local/include
 -PROFLAGS=-g -Wall -pg -fprofile-arcs -ftest-coverage
 -OPTFLAGS=-O3 -fno-strict-aliasing -fomit-frame-pointer -ffast-math -march=$(CPU) $(OPTIMIZE)
-+#CFLAGS=-g -Wall
++#CFLAGS=-g -Wall -I/usr/include -I/usr/local/include
 +#PROFLAGS=-g -Wall -pg -fprofile-arcs -ftest-coverage
-+OPTFLAGS=-fno-strict-aliasing -fomit-frame-pointer -ffast-math
++#OPTFLAGS=-O3 -fno-strict-aliasing -fomit-frame-pointer -ffast-math -march=$(CPU) $(OPTIMIZE)
  
  OBJECTS=\
  	 ppc_disasm.o\
+@@ -89,10 +89,10 @@ release: default
+ profiler:	default
+ 
+ gcube:  $(OBJECTS) gcube.o
+-	$(CC) $(CFLAGS) $^ -o $@ $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ gcubedbg:  $(OBJECTS) gcubedbg.o cpu_dbg.o
+-	$(CC) $(CFLAGS) $^ -o $@ $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ bin2dol:	bin2dol.c general.o
+ 	$(CC) $(CFLAGS) $^ -o $@
diff --git a/emulators/gcube/patches/patch-ab b/emulators/gcube/patches/patch-ab
index 68f1761a2bf..63f0273b2b0 100644
--- a/emulators/gcube/patches/patch-ab
+++ b/emulators/gcube/patches/patch-ab
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/07/16 14:25:34 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2006/01/10 14:33:26 jmmv Exp $
 
---- Makefile.orig	2004-07-16 14:57:16.000000000 +0200
-+++ Makefile	2004-07-16 14:57:30.000000000 +0200
+--- Makefile.orig	2005-01-12 03:11:22.000000000 +0100
++++ Makefile
 @@ -1,8 +1,8 @@
  # use assembler optimizations
--ASM_X86=1
-+#ASM_X86=1
+-ASM_X86=0
++#ASM_X86=0
  
  # use debugger: 1 - by default, 2 - compile in but don't use by default
--GDEBUG=2
-+#GDEBUG=2
+-GDEBUG=0
++#GDEBUG=0
  
  # by default, no window will open until fb address is set
  # or video mode is specified. some programs might not reach that stage.
-@@ -18,7 +18,7 @@
+@@ -18,7 +18,7 @@ DEFAULT_BUFFER_SIZE=512
  MEMHACK=0
  
  # specify the cpu used (for -march, check gcc manual)
@@ -22,7 +22,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/07/16 14:25:34 xtraeme Exp $
  #CPU=athlon-xp
  
  # add here optimization flags
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ CPU=i686
  OPENGL=GL
  
  # compilator
@@ -30,4 +30,4 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/07/16 14:25:34 xtraeme Exp $
 +#CC=gcc
  
  # if byteswap.h is present
- USE_BYTESWAP_H=1
+ USE_BYTESWAP_H=0
diff --git a/emulators/gcube/patches/patch-ac b/emulators/gcube/patches/patch-ac
new file mode 100644
index 00000000000..6590fdca1d4
--- /dev/null
+++ b/emulators/gcube/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2006/01/10 14:33:26 jmmv Exp $
+
+--- cpu.c.orig	2005-01-12 02:10:42.000000000 +0100
++++ cpu.c
+@@ -45,10 +45,10 @@ __u32 mask[32][32];
+ int RESERVE = 0;
+ __u32 RESERVE_ADDR = 0;
+ 
++#if 0
+ double (*fp_round[]) (double) = { round, trunc, ceil, floor };
+ #define FP_ROUND(D)		(fp_round[FPSCR_RN] (D))
+ 
+-#if 0
+ # include <fenv.h>
+ int fp_round_mode[] = { FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD, FE_DOWNWARD };
+ # define SET_ROUNDING_MODE				(fesetround (fp_round_mode[FPSCR_RN]))