Update to Snes9X 1.29, and get Makefile.alpha built.

5 files changed, 68 insertions, 63 deletions

diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index e19a67f3aab1..353cbc6dcef4 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -6,8 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=	s9xs126
-PKGNAME=	snes9x-1.26
+DISTNAME=	s9xs129
+PKGNAME=	snes9x-1.29
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.snes9x.com/zips/
 
@@ -28,6 +28,17 @@ WRKSRC=		${WRKDIR}/release
 
 ONLY_FOR_ARCHS=	i386 alpha
 
+.if ${MACHINE_ARCH} == alpha
+post-patch:
+	@${SED} -e '/^ZSNESFX/d' \
+	    -e '/^ASMCPU/d' \
+	    -e '/^OPTIMISE/s/-mpentium //' \
+	    -e '/^-Ii386/d' \
+	    -e '/offsets >/s:i386/::' \
+	    < ${WRKSRC}/Makefile \
+	    > ${WRKSRC}/Makefile.alpha
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/s9xserver ${PREFIX}/bin
diff --git a/emulators/snes9x/distinfo b/emulators/snes9x/distinfo
index b90b0f1de820..9ac471142f00 100644
--- a/emulators/snes9x/distinfo
+++ b/emulators/snes9x/distinfo
@@ -1 +1 @@
-MD5 (s9xs126.zip) = 8abfad0ff46c230b65f5d56b132748cb
+MD5 (s9xs129.zip) = 1af2990cd62925359ad9786a52dda748
diff --git a/emulators/snes9x/files/patch-aa b/emulators/snes9x/files/patch-aa
index 267ac89fc0c4..caca8ac4e03c 100644
--- a/emulators/snes9x/files/patch-aa
+++ b/emulators/snes9x/files/patch-aa
@@ -1,36 +1,39 @@
-diff -ru ../../work/release/Makefile ./Makefile
---- ../../work/release/Makefile	Wed Sep 22 18:46:14 1999
-+++ ./Makefile	Wed Dec 29 01:54:04 1999
-@@ -3,9 +3,9 @@
- #SPC700ASM=1
- NETPLAY=1
- UNZIP=1
--GLIDE=1
-+#GLIDE=1
- #GUI=1
--THREAD_SOUND=1
-+#THREAD_SOUND=1
+--- Makefile.orig	Mon Jan 24 16:15:50 2000
++++ Makefile	Wed Mar  8 23:24:45 2000
+@@ -50,11 +50,6 @@
+ UNZIPDEFINES=-DUNZIP_SUPPORT
+ endif
  
- ifdef ZSNESFX
- FXOBJ=i386/fxemu2b.o i386/fxemu2.o i386/fxemu2c.o i386/fxtable.o i386/sfxproc.o i386/zsnes.o
-@@ -73,13 +73,13 @@
+-ifdef THREAD_SOUND
+-CPUDEFINES += -DUSE_THREADS
+-EXTRALIBS += -lpthread
+-endif
+-
+ ifdef GLIDE
+ GLIDEOBJS = unix/glide.o
+ GLIDEDEFINES = -DUSE_GLIDE -I/usr/include/glide
+@@ -66,24 +61,30 @@
+ GLIDENO_DEPENDS=use_glide
  endif
  
- MOC = $(QTDIR)/bin/moc
--CCC = g++ -fno-rtti
+-CCC = gcc
 -CC = gcc
-+CCC = ${CXX} -fno-rtti
++CCC = $(CXX) -fno-rtti
 +CC ?= gcc
  NASM = nasm
  
++ifdef THREAD_SOUND
++CPUDEFINES += -DUSE_THREADS
++CC += -pthread
++CCC += -pthread
++endif
++
  INCLUDES=-I/usr/X11R6/include -I/usr/local/include
  
 -OPTIMISE=-O6 -mpentium -fomit-frame-pointer -fno-exceptions
-+OPTIMISE= ${CXXFLAGS} -fomit-frame-pointer
- #OPTIMISE=-g -fno-exceptions 
- #-DMITSHM 
++OPTIMISE= $(CXXFLAGS) -O6 -mpentium -fomit-frame-pointer -fno-exceptions
  
-@@ -87,7 +87,6 @@
+ CCFLAGS = $(OPTIMISE) -DMITSHM \
  -Ii386 \
  -I. \
  -Iunzip \
@@ -38,23 +41,24 @@ diff -ru ../../work/release/Makefile ./Makefile
  -DZLIB \
  -DNO_INLINE_SET_GET \
  -DVAR_CYCLES \
-@@ -100,7 +99,8 @@
- $(NETPLAYDEFINES) \
- $(UNZIPDEFINES) \
- $(GLIDEDEFINES) \
--$(GUIDEFINES)
-+$(GUIDEFINES) \
-+-DSOUND
- 
- #-DSOUND
- #-DDEBUGGER
-@@ -112,12 +112,12 @@
- CFLAGS=$(CCFLAGS)
+ -DCPU_SHUTDOWN \
+ -DSPC700_SHUTDOWN \
++-DSOUND \
+ $(LINUXDEFINES) \
+ $(FXDEFINES) \
+ $(CPUDEFINES) \
+@@ -108,7 +109,7 @@
+ # system using the egcs compiler get an undefined __register_frame_info
+ # symbol error when run on a Redhat box.
  
- .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm
 -LDLIBS = -L/usr/X11R6/lib frame.o
 +LDLIBS = -L/usr/X11R6/lib
  
+ ifdef GLIDE
+ ifdef NETPLAY
+@@ -118,9 +119,9 @@
+ endif
+ else
  ifdef NETPLAY
 -all: offsets snes9x ssnes9x s9xserver
 +all: offsets snes9x s9xserver
@@ -62,11 +66,5 @@ diff -ru ../../work/release/Makefile ./Makefile
 -all: offsets snes9x ssnes9x
 +all: offsets snes9x
  endif
+ endif
  
- #ggisnes9x
-@@ -236,5 +236,4 @@
- snaporig.o: cpuexec.h
- unix/x11.o: snes9x.h port.h
- unix/glide.o: snes9x.h port.h 3d.h
--unix/x11.o: unix/snes9x_gui.h
- unix/snes9x_gui.o: unix/snes9x_gui.h
diff --git a/emulators/snes9x/files/patch-ab b/emulators/snes9x/files/patch-ab
index 4b4510776f64..1fc3debf0b8d 100644
--- a/emulators/snes9x/files/patch-ab
+++ b/emulators/snes9x/files/patch-ab
@@ -1,6 +1,5 @@
-diff -ru ../../work/release/fxemu.h ./fxemu.h
---- ../../work/release/fxemu.h	Thu Sep 23 19:56:48 1999
-+++ ./fxemu.h	Wed Dec 29 01:54:04 1999
+--- fxemu.h.orig	Mon Jan 24 16:13:54 2000
++++ fxemu.h	Wed Mar  8 23:04:52 2000
 @@ -39,18 +39,7 @@
  #ifndef _FXEMU_H_
  #define _FXEMU_H_ 1
@@ -11,7 +10,7 @@ diff -ru ../../work/release/fxemu.h ./fxemu.h
 -
 -typedef unsigned char uint8;
 -typedef unsigned short uint16;
--typedef unsigned long uint32;
+-typedef unsigned int uint32;
 -typedef unsigned char bool8;
 -typedef signed char int8;
 -typedef short int16;
diff --git a/emulators/snes9x/files/patch-ae b/emulators/snes9x/files/patch-ae
index fefabe7ec422..57798904e310 100644
--- a/emulators/snes9x/files/patch-ae
+++ b/emulators/snes9x/files/patch-ae
@@ -1,33 +1,30 @@
-diff -ru ../../work/release/port.h ./port.h
---- ../../work/release/port.h	Thu Sep 23 19:56:48 1999
-+++ ./port.h	Wed Dec 29 01:54:04 1999
-@@ -56,17 +56,17 @@
+--- port.h.orig	Mon Jan 24 16:13:54 2000
++++ port.h	Wed Mar  8 23:09:50 2000
+@@ -56,15 +56,15 @@
  
  #ifndef snes9x_types_defined
  #define snes9x_types_defined
 -typedef unsigned char uint8;
 -typedef unsigned short uint16;
--typedef unsigned long uint32;
+-typedef unsigned int uint32;
 -typedef unsigned char bool8;
 -typedef signed char int8;
 -typedef short int16;
--typedef int int32;
 +typedef u_int8_t uint8;
 +typedef u_int16_t uint16;
 +typedef u_int32_t uint32;
 +typedef u_int8_t bool8;
 +typedef int8_t int8;
 +typedef int16_t int16;
-+typedef int32_t int32;
  #ifndef _WIN32
- typedef long long int64;
+-typedef int int32;
+-typedef long long int64;
++typedef int32_t int32;
++typedef int64_t int64;
  #else
--typedef __int64 int64;
-+typedef u_int64_t int64;
- #endif
- #endif
- 
-@@ -156,6 +156,10 @@
+ #ifndef WSAAPI
+ // winsock2.h typedefs int32 as well.
+@@ -162,6 +162,10 @@
  
  #ifdef __linux
  #define TITLE "Snes9X: Linux"