Update to 1.32. Changes are mainly bugfixes (see the installed CHANGES.TXT).

Package change: DGA detection, instead of hardcoding on i386.

7 files changed, 65 insertions, 57 deletions

diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index f284818489a..b64e807cb09 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2000/11/09 17:25:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2000/11/16 02:27:04 wiz Exp $
 
-DISTNAME=		s9xs129
-PKGNAME=		snes9x-1.29
+DISTNAME=		s9xs132
+PKGNAME=		snes9x-1.32
 WRKSRC=			${WRKDIR}/release
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.snes9x.com/zips/
@@ -15,9 +15,12 @@ BUILD_DEPENDS+=		nasm:../../devel/nasm
 USE_X11=		yes
 USE_GMAKE=		yes
 
+.if exists(/usr/X11R6/lib/libXxf86dga.a)
+MAKE_ENV+=	NETBSD_USE_DGA=1
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/s9xserver ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/offsets ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snes9x
 	${INSTALL_MAN} ${WRKSRC}/CHANGES.TXT ${PREFIX}/share/doc/snes9x
@@ -40,6 +43,4 @@ MAKE_ENV+=	FILEFORMAT=elf
 MAKE_ENV+=	ZSNESFX=1
 MAKE_ENV+=	ASMCPU=1
 .endif
-# XXX: this check should be redone -- DGA doesn't only exist on i386
-MAKE_ENV+=	NETBSD_USE_DGA=1
 .endif
diff --git a/emulators/snes9x/files/md5 b/emulators/snes9x/files/md5
index 8692cf7f96a..b0f2a213b40 100644
--- a/emulators/snes9x/files/md5
+++ b/emulators/snes9x/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/11/09 16:43:40 wiz Exp $
+$NetBSD: md5,v 1.2 2000/11/16 02:27:05 wiz Exp $
 
-MD5 (s9xs129.zip) = 1af2990cd62925359ad9786a52dda748
+MD5 (s9xs132.zip) = 67bd0f3b036cedb8d16f49a2f554bbab
diff --git a/emulators/snes9x/files/patch-sum b/emulators/snes9x/files/patch-sum
index 67e0bef1691..22d728b50f2 100644
--- a/emulators/snes9x/files/patch-sum
+++ b/emulators/snes9x/files/patch-sum
@@ -1,8 +1,9 @@
-$Id: patch-sum,v 1.2 2000/11/09 17:25:55 wiz Exp $
+$Id: patch-sum,v 1.3 2000/11/16 02:27:05 wiz Exp $
 
-MD5 (patch-aa) = d15e182a98c2239da48f4015a09e7d2f
+MD5 (patch-aa) = c956a4c089ee4c5d6fe59702360767d2
 MD5 (patch-ab) = 626e8bc7e260ff83708e13ef54e61cdd
 MD5 (patch-ac) = ad48bfa7a5b65c581c67ababd09cca99
 MD5 (patch-ad) = 79cf18843562488e62fdbaf503dd50c4
 MD5 (patch-ae) = 2ce2c9ae1a0abb2c42a4a4139b6d1a8e
-MD5 (patch-af) = ca4cdb571de8e6eb5826c451666522d7
+MD5 (patch-af) = 91cf512e0262622edc62d30e45e5d76a
+MD5 (patch-ag) = 466a9ed4c567fa7e69615eb3bbc754b9
diff --git a/emulators/snes9x/patches/patch-aa b/emulators/snes9x/patches/patch-aa
index c9935100145..3dd41006bf3 100644
--- a/emulators/snes9x/patches/patch-aa
+++ b/emulators/snes9x/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2000/11/09 17:25:55 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2000/11/16 02:27:05 wiz Exp $
 
---- Makefile.orig	Mon Jan 24 16:15:50 2000
+--- Makefile.orig	Mon Oct  2 09:36:11 2000
 +++ Makefile
-@@ -1,10 +1,10 @@
+@@ -1,11 +1,11 @@
 -ZSNESFX=1
 -ASMCPU=1
 +#ZSNESFX=1
@@ -10,13 +10,15 @@ $NetBSD: patch-aa,v 1.2 2000/11/09 17:25:55 wiz Exp $
  #SPC700ASM=1
  NETPLAY=1
  UNZIP=1
- #GLIDE=1
+-GLIDE=1
++#GLIDE=1
+ #GUI=1
 -THREAD_SOUND=1
 +#THREAD_SOUND=1
  
  ifdef ZSNESFX
- FXOBJ=i386/fxemu2b.o i386/fxemu2.o i386/fxemu2c.o i386/fxtable.o i386/sfxproc.o i386/zsnes.o
-@@ -18,7 +18,10 @@
+ FXOBJ=i386/fxemu2b.o i386/fxemu2.o i386/fxemu2c.o i386/fxtable.o i386/sfxproc.o i386/zsnes.o i386/spc.o
+@@ -19,7 +19,10 @@
  FXNO_DEPENDS=zsnes_fx
  endif
  
@@ -25,19 +27,21 @@ $NetBSD: patch-aa,v 1.2 2000/11/09 17:25:55 wiz Exp $
 +DGALIBS=-lXxf86dga -lXxf86vm
 +endif
  
- ifdef ASMCPU
  ifdef SPC700ASM
-@@ -70,15 +73,14 @@
+ SOUNDOBJ=spctool/spc700.o spctool/dsp.o spctool.o spctool/soundmod.o spc.o
+@@ -81,9 +84,9 @@
  CC = gcc
  NASM = nasm
  
 -INCLUDES=-I/usr/X11R6/include -I/usr/local/include
 +INCLUDES=-I${X11BASE}/include
  
--OPTIMISE=-O6 -mpentium -fomit-frame-pointer -fno-exceptions
-+OPTIMISE=-fomit-frame-pointer -fno-exceptions
+-OPTIMISE=-O6 -mpentium -fno-exceptions -Wall -W -pedantic -pipe -fomit-frame-pointer 
++OPTIMISE=-fno-exceptions -Wall -W -pedantic -pipe -fomit-frame-pointer 
  
- CCFLAGS = $(OPTIMISE) -DMITSHM \
+ #OPTIMISE=-g -fno-exceptions
+ #-DMITSHM 
+@@ -92,7 +95,6 @@
  -Ii386 \
  -I. \
  -Iunzip \
@@ -45,42 +49,33 @@ $NetBSD: patch-aa,v 1.2 2000/11/09 17:25:55 wiz Exp $
  -DZLIB \
  -DNO_INLINE_SET_GET \
  -DVAR_CYCLES \
-@@ -108,7 +110,7 @@
- # system using the egcs compiler get an undefined __register_frame_info
- # symbol error when run on a Redhat box.
+@@ -118,9 +120,9 @@
+ CFLAGS=$(CCFLAGS)
  
+ .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm
 -LDLIBS = -L/usr/X11R6/lib frame.o
 +LDLIBS = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
  
- ifdef GLIDE
- ifdef NETPLAY
-@@ -118,9 +120,9 @@
- endif
- else
- ifdef NETPLAY
--all: offsets snes9x ssnes9x s9xserver
-+all: offsets snes9x s9xserver
- else
 -all: offsets snes9x ssnes9x
 +all: offsets snes9x
- endif
- endif
  
-@@ -140,7 +142,7 @@
+ #ggisnes9x
+ #xf86snes9x
+@@ -138,7 +140,7 @@
  	./offsets >i386/offsets.h
  
- snes9x: $(OBJECTS) unix/x11.o
--	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/x11.o $(LDLIBS) -lXext -lX11 -lXxf86dga -lXxf86vm $(EXTRALIBS) -lz -lm
-+	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/x11.o $(LDLIBS) -lXext -lX11 $(DGALIBS) $(EXTRALIBS) -lz -lm
+ snes9x: $(OBJECTS) unix/x11.o $(GLIDEOBJS) $(GUIOBJS)
+-	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(GUILIBS) -lXxf86dga -lXxf86vm -lXext -lX11 $(EXTRALIBS) -lz -lm
++	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(GUILIBS) $(DGALIBS) -lXext -lX11 $(EXTRALIBS) -lz -lm
  
- ssnes9x: $(OBJECTS) unix/svga.o
- 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/svga.o $(LDLIBS) -lvga -lvgagl $(EXTRALIBS) -lz -lm
-@@ -170,7 +172,7 @@
+ ssnes9x: $(OBJECTS) unix/svga.o $(GLIDEOBJS) 
+ 	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/svga.o $(LDLIBS) $(GLIDELIBS) -lvga -lvgagl -lz $(EXTRALIBS) -lm
+@@ -168,7 +170,7 @@
  	$(CCC) $(INCLUDES) -c -E $(CCFLAGS) $*.S -o $@
  
  .asm.o:
--	$(NASM) -f elf -i . -i i386 -o $@ $*.asm
-+	$(NASM) -f ${FILEFORMAT} -i . -i i386 -o $@ $*.asm
+-	$(NASM) -f elf -i. -ii386 -o $@ $*.asm
++	$(NASM) -f ${FILEFORMAT} -i. -ii386 -o $@ $*.asm
  
- clean:
- 	rm -f $(OBJECTS) offsets.o unix/svga.o unix/x11.o unix/ggi.o unix/xf86.o
+ .obj.o:
+ 	cp $*.obj $*.o
diff --git a/emulators/snes9x/patches/patch-af b/emulators/snes9x/patches/patch-af
index 3133e12b901..449815892de 100644
--- a/emulators/snes9x/patches/patch-af
+++ b/emulators/snes9x/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/11/09 16:43:42 wiz Exp $
+$NetBSD: patch-af,v 1.2 2000/11/16 02:27:05 wiz Exp $
 
---- unix/unix.cpp.orig	Mon Jan 24 16:13:54 2000
+--- unix/unix.cpp.orig	Fri Oct  6 23:02:40 2000
 +++ unix/unix.cpp
 @@ -79,7 +79,14 @@
  #endif
@@ -18,7 +18,7 @@ $NetBSD: patch-af,v 1.1.1.1 2000/11/09 16:43:42 wiz Exp $
  typedef void (*SIG_PF)();
  #endif
  
-@@ -160,7 +167,7 @@
+@@ -167,7 +174,7 @@
  char *rom_filename = NULL;
  char *snapshot_filename = NULL;
  
@@ -27,7 +27,7 @@ $NetBSD: patch-af,v 1.1.1.1 2000/11/09 16:43:42 wiz Exp $
  static void sigbrkhandler(int)
  {
  #ifdef DEBUGGER
-@@ -1354,7 +1361,7 @@
+@@ -1373,7 +1380,7 @@
  }
  #endif
  
@@ -36,9 +36,9 @@ $NetBSD: patch-af,v 1.1.1.1 2000/11/09 16:43:42 wiz Exp $
  static int Rates[8] =
  {
      0, 8000, 11025, 16000, 22050, 32000, 37800, 44100
-@@ -1423,9 +1430,9 @@
+@@ -1442,9 +1449,9 @@
  {
-     int I, J, K;
+     int J, K;
  
 -    if ((so.sound_fd = open ("/dev/dsp", O_WRONLY)) < 0)
 +    if ((so.sound_fd = open ("/dev/audio", O_WRONLY)) < 0)
@@ -48,7 +48,7 @@ $NetBSD: patch-af,v 1.1.1.1 2000/11/09 16:43:42 wiz Exp $
  	return (FALSE);
      }
  
-@@ -1525,7 +1532,7 @@
+@@ -1546,7 +1553,7 @@
  }
  #endif
  
@@ -57,7 +57,7 @@ $NetBSD: patch-af,v 1.1.1.1 2000/11/09 16:43:42 wiz Exp $
  void S9xUnixProcessSound (void)
  {
  }
-@@ -1646,7 +1653,7 @@
+@@ -1669,7 +1676,7 @@
  #endif
  
  #endif
diff --git a/emulators/snes9x/patches/patch-ag b/emulators/snes9x/patches/patch-ag
new file mode 100644
index 00000000000..7760b0ed3a5
--- /dev/null
+++ b/emulators/snes9x/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2000/11/16 02:27:05 wiz Exp $
+
+--- apudebug.cpp.orig	Fri Oct  6 23:02:38 2000
++++ apudebug.cpp
+@@ -41,7 +41,6 @@
+ #include "apu.h"
+ #include "soundux.h"
+ #include "cpuexec.h"
+-#include "spctool/spc700.h"
+ 
+ #ifdef DEBUGGER
+ extern int NoiseFreq [32];
diff --git a/emulators/snes9x/pkg/PLIST b/emulators/snes9x/pkg/PLIST
index 2ba915f74e0..776411b7424 100644
--- a/emulators/snes9x/pkg/PLIST
+++ b/emulators/snes9x/pkg/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/09 16:43:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/11/16 02:27:05 wiz Exp $
 bin/snes9x
-bin/s9xserver
 bin/offsets
 share/doc/snes9x/CHANGES.TXT
 share/doc/snes9x/COPYRIGHT.TXT