From 0d72c86570a7319f4833041af5d4950ca01e2662 Mon Sep 17 00:00:00 2001 From: Brian Feldman Date: Sat, 13 Jan 2001 20:28:00 +0000 Subject: [PATCH] Update to 1.34a --- emulators/snes9x/Makefile | 5 ++-- emulators/snes9x/distinfo | 2 +- emulators/snes9x/files/patch-aa | 48 ++++++++++++++++----------------- emulators/snes9x/files/patch-af | 13 ++++----- emulators/snes9x/files/patch-ai | 10 ------- 5 files changed, 34 insertions(+), 44 deletions(-) delete mode 100644 emulators/snes9x/files/patch-ai diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile index 1e98608978f9..5be0d3be7f76 100644 --- a/emulators/snes9x/Makefile +++ b/emulators/snes9x/Makefile @@ -6,11 +6,10 @@ # PORTNAME= snes9x -PORTVERSION= 1.32 -PORTREVISION= 2 +PORTVERSION= 1.34a CATEGORIES= emulators MASTER_SITES= http://www.snes9x.com/zips/ -DISTNAME= s9xs132 +DISTNAME= s9xs134a MAINTAINER= nakai@FreeBSD.org diff --git a/emulators/snes9x/distinfo b/emulators/snes9x/distinfo index c3dd0118c737..50c1f99796b3 100644 --- a/emulators/snes9x/distinfo +++ b/emulators/snes9x/distinfo @@ -1 +1 @@ -MD5 (s9xs132.zip) = 67bd0f3b036cedb8d16f49a2f554bbab +MD5 (s9xs134a.zip) = a977b4d5c9b64f942535c84077b2e73a diff --git a/emulators/snes9x/files/patch-aa b/emulators/snes9x/files/patch-aa index 2329a7cc493a..fb929f4b0c72 100644 --- a/emulators/snes9x/files/patch-aa +++ b/emulators/snes9x/files/patch-aa @@ -1,6 +1,6 @@ ---- Makefile.orig Mon Oct 2 03:36:11 2000 -+++ Makefile Sun Nov 19 01:59:35 2000 -@@ -3,7 +3,6 @@ +--- Makefile.orig Sat Jan 6 03:05:29 2001 ++++ Makefile Fri Jan 12 23:50:27 2001 +@@ -4,7 +4,6 @@ #SPC700ASM=1 NETPLAY=1 UNZIP=1 @@ -8,7 +8,7 @@ #GUI=1 THREAD_SOUND=1 -@@ -60,11 +59,6 @@ +@@ -71,11 +70,6 @@ UNZIPDEFINES=-DUNZIP_SUPPORT endif @@ -20,7 +20,7 @@ ifdef GLIDE GLIDEOBJS = unix/glide.o GLIDEDEFINES = -DUSE_GLIDE -I/usr/include/glide -@@ -77,28 +71,26 @@ +@@ -88,13 +82,13 @@ endif MOC = $(QTDIR)/bin/moc @@ -30,32 +30,24 @@ NASM = nasm -INCLUDES=-I/usr/X11R6/include -I/usr/local/include -- --OPTIMISE=-O6 -mpentium -fno-exceptions -Wall -W -pedantic -pipe -fomit-frame-pointer +INCLUDES= -I$(X11BASE)/include -I$(LOCALBASE)/include +-OPTIMISE=-O6 -mpentium -fomit-frame-pointer -fno-exceptions -Wall -W -pedantic -pipe ++OPTIMISE= $(CFLAGS) -fomit-frame-pointer -fno-exceptions -Wall -W -pedantic + #OPTIMISE=-g -fno-exceptions #-DMITSHM - --CCFLAGS = $(OPTIMISE) -DMITSHM \ -+CCFLAGS = $(CFLAGS) -fomit-frame-pointer -DMITSHM \ - -Ii386 \ - -I. \ - -Iunzip \ ---DJOYSTICK_SUPPORT \ - -DZLIB \ - -DNO_INLINE_SET_GET \ - -DVAR_CYCLES \ +@@ -109,6 +103,7 @@ -DDEBUGGER \ -DCPU_SHUTDOWN \ -DSPC700_SHUTDOWN \ +-DSOUND \ $(LINUXDEFINES) \ $(FXDEFINES) \ - $(CPUDEFINES) \ -@@ -108,6 +100,11 @@ - $(GLIDEDEFINES) \ + $(C4DEFINES) \ +@@ -120,6 +115,11 @@ $(GUIDEFINES) + #-DNO_INLINE_SET_GET +ifdef USB_JOYSTICK_SUPPORT +CCFLAGS += -DJOYSTICK_SUPPORT @@ -65,14 +57,13 @@ #-DSOUND #-DDEBUGGER #-DNO_INLINE_SET_GET -@@ -115,12 +112,12 @@ +@@ -127,12 +127,10 @@ #-DCPU_SHUTDOWN #-DSPC700_SHUTDOWN -CFLAGS=$(CCFLAGS) -+#CFLAGS=$(CCFLAGS) - - .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm +- + .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm .obj -LDLIBS = -L/usr/X11R6/lib frame.o +LDLIBS = -L$(X11BASE)/lib @@ -81,3 +72,12 @@ #ggisnes9x #xf86snes9x +@@ -154,7 +152,7 @@ + ./offsets >i386/offsets.h + + 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) $(OPTIMISE) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(GUILIBS) -lXxf86dga -lXxf86vm -lXext -lX11 $(EXTRALIBS) -lz -lm + + ssnes9x: $(OBJECTS) unix/svga.o $(GLIDEOBJS) + $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) unix/svga.o $(LDLIBS) $(GLIDELIBS) -lvga -lvgagl -lz $(EXTRALIBS) -lm diff --git a/emulators/snes9x/files/patch-af b/emulators/snes9x/files/patch-af index fbc768902502..d2b26c71c49f 100644 --- a/emulators/snes9x/files/patch-af +++ b/emulators/snes9x/files/patch-af @@ -1,5 +1,5 @@ --- unix/unix.cpp.orig Fri Oct 6 17:02:40 2000 -+++ unix/unix.cpp Sat Nov 18 23:12:45 2000 ++++ unix/unix.cpp Sun Dec 10 12:39:28 2000 @@ -49,9 +49,11 @@ #include @@ -266,7 +266,7 @@ void InitJoysticks () { #ifdef JSIOCGVERSION -@@ -738,6 +762,179 @@ +@@ -738,6 +762,180 @@ } #endif } @@ -297,7 +297,8 @@ + warn("%s", dev); + return (-1); + } -+ reportlen = hid_report_size(rd, hid_input, &report_id); ++ report_id = 0; ++ reportlen = hid_report_size(rd, report_id, hid_input); + my_info->buf = (char *)malloc(reportlen); + if (my_info->buf == NULL) + err(1, "malloc"); @@ -446,7 +447,7 @@ #endif // defined (JOYSTICK_SUPPORT) const char *GetHomeDirectory () -@@ -1427,7 +1624,7 @@ +@@ -1427,7 +1625,7 @@ } #endif @@ -455,7 +456,7 @@ static int Rates[8] = { 0, 8192, 11025, 16500, 22050, 29300, 36600, 44000 -@@ -1546,7 +1743,7 @@ +@@ -1546,7 +1744,7 @@ } #endif @@ -464,7 +465,7 @@ void S9xUnixProcessSound (void) { } -@@ -1645,7 +1842,7 @@ +@@ -1645,7 +1843,7 @@ void *S9xProcessSound (void *) { diff --git a/emulators/snes9x/files/patch-ai b/emulators/snes9x/files/patch-ai deleted file mode 100644 index 703ba3ebc44d..000000000000 --- a/emulators/snes9x/files/patch-ai +++ /dev/null @@ -1,10 +0,0 @@ ---- apudebug.cpp.orig Fri Oct 13 18:39:22 2000 -+++ apudebug.cpp Fri Oct 13 18:39:28 2000 -@@ -41,7 +41,6 @@ - #include "apu.h" - #include "soundux.h" - #include "cpuexec.h" --#include "spctool/spc700.h" - - #ifdef DEBUGGER - extern int NoiseFreq [32];