diff options
author | wiz <wiz> | 2000-11-16 02:27:04 +0000 |
---|---|---|
committer | wiz <wiz> | 2000-11-16 02:27:04 +0000 |
commit | e8f73040ecdf63a51c8e06ad3e41fde03000ca7e (patch) | |
tree | f18c07a7f4f521122cb31cd066fab210e9a6f020 /emulators/snes9x/patches | |
parent | 4bb49dd366c4d494620f6cc09b34f198956ae976 (diff) | |
download | pkgsrc-e8f73040ecdf63a51c8e06ad3e41fde03000ca7e.tar.gz |
Update to 1.32. Changes are mainly bugfixes (see the installed CHANGES.TXT).
Package change: DGA detection, instead of hardcoding on i386.
Diffstat (limited to 'emulators/snes9x/patches')
-rw-r--r-- | emulators/snes9x/patches/patch-aa | 67 | ||||
-rw-r--r-- | emulators/snes9x/patches/patch-af | 16 | ||||
-rw-r--r-- | emulators/snes9x/patches/patch-ag | 12 |
3 files changed, 51 insertions, 44 deletions
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]; |