Date: Tue, 4 Dec 2001 14:48:15 -0800 (PST) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/32517: Update port: emulators/snes9x to 1.39 Message-ID: <200112042248.fB4MmFN58535@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 32517 >Category: ports >Synopsis: Update port: emulators/snes9x to 1.39 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Dec 04 14:50:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.39 >How-To-Repeat: >Fix: diff -urN /usr/ports/emulators/snes9x/Makefile emulators/snes9x/Makefile --- /usr/ports/emulators/snes9x/Makefile Thu Mar 29 21:35:27 2001 +++ emulators/snes9x/Makefile Mon Dec 3 04:09:37 2001 @@ -6,42 +6,36 @@ # PORTNAME= snes9x -PORTVERSION= 1.37c +PORTVERSION= 1.39 CATEGORIES= emulators MASTER_SITES= http://www.snes9x.com/zips/ -DISTNAME= s9xs137c +DISTNAME= s9xs${PORTVERSION:S/.//g} MAINTAINER= green@FreeBSD.org .if ${MACHINE_ARCH} == i386 BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm -.elif ${MACHINE_ARCH} == alpha -MAKEFILE= Makefile.alpha -FORBIDDEN= currently does not work on alpha .endif -USE_GMAKE= YES +ONLY_FOR_ARCHS= i386 alpha + +WRKSRC= ${WRKDIR}/release + +USE_ZIP= YES USE_X_PREFIX= YES +USE_GMAKE= YES MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" -USE_ZIP= YES -WRKSRC= ${WRKDIR}/release + CXXFLAGS="${CXXFLAGS}" \ + PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" \ + THREAD_SOUND=yes NETPLAY=yes UNZIP=yes .if exists(/usr/lib/libusb.a) MAKE_ENV+= USB_JOYSTICK_SUPPORT=yes .endif -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 +.if ${MACHINE_ARCH} == i386 +MAKE_ENV+= ZSNESFX=yes ZSNESC4=1 SPC700ASM=yes ASMCPU=yes ASMKREED=yes .endif do-install: diff -urN /usr/ports/emulators/snes9x/distinfo emulators/snes9x/distinfo --- /usr/ports/emulators/snes9x/distinfo Thu Mar 29 21:35:27 2001 +++ emulators/snes9x/distinfo Sat Dec 1 05:30:47 2001 @@ -1 +1 @@ -MD5 (s9xs137c.zip) = 45a29cb3ba2354c3fa7ad936ac655a07 +MD5 (s9xs139.zip) = eb8fb2cc365a9dcc18106a05bcdd3ac1 diff -urN /usr/ports/emulators/snes9x/files/patch-aa emulators/snes9x/files/patch-aa --- /usr/ports/emulators/snes9x/files/patch-aa Thu Mar 29 21:36:15 2001 +++ emulators/snes9x/files/patch-aa Sun Dec 2 04:37:45 2001 @@ -1,70 +1,101 @@ ---- Makefile.orig Wed Feb 28 15:29:58 2001 -+++ Makefile Sat Mar 24 23:16:22 2001 -@@ -4,7 +4,6 @@ +--- Makefile.orig Tue Sep 18 15:03:58 2001 ++++ Makefile Sat Dec 1 23:58:29 2001 +@@ -1,14 +1,14 @@ +-ZSNESFX=1 +-ZSNESC4=1 +-ASMCPU=1 ++#ZSNESFX=1 ++#ZSNESC4=1 ++#ASMCPU=1 #SPC700ASM=1 - NETPLAY=1 - UNZIP=1 --GLIDE=1 +-NETPLAY=1 +-UNZIP=1 ++#NETPLAY=1 ++#UNZIP=1 + #GLIDE=1 + #OPENGL=1 #GUI=1 - THREAD_SOUND=1 - ASMKREED=1 -@@ -81,11 +80,6 @@ - UNZIPDEFINES=-DUNZIP_SUPPORT +-THREAD_SOUND=1 +-ASMKREED=1 ++#THREAD_SOUND=1 ++#ASMKREED=1 + + ifdef ZSNESFX + FXOBJ=i386/fxemu2b.o i386/fxemu2.o i386/fxemu2c.o i386/fxtable.o i386/sfxproc.o i386/zsnes.o +@@ -37,15 +37,16 @@ + LINUXDEFINES=-DUSE_DGA_EXTENSION -DUSE_VIDMODE_EXTENSION + + ifdef SPC700ASM +-SOUNDOBJ=spctool/spc700.o spctool/dsp.o spctool.o spctool/soundmod.o spc.o +-SOUNDDEFINES=-DSPCTOOL +-else + SOUNDOBJ=spc700.o soundux.o apu.o i386/spc.o + SOUNDDEFINES=-DSPC700_C ++else ++SOUNDOBJ=spc700.o soundux.o apu.o ++SOUNDDEFINES=-DSPC700_C endif --ifdef THREAD_SOUND + ifdef ASMCPU + CPUOBJ=i386/cpuops.o i386/cpuexec.o i386/sa1ops.o ++CPUDEFINES+=-Ii386 + else + CPUOBJ=cpuops.o cpuexec.o sa1cpu.o + endif +@@ -82,8 +83,8 @@ + endif + + ifdef THREAD_SOUND -CPUDEFINES += -DUSE_THREADS -EXTRALIBS += -lpthread --endif -- ++CPUDEFINES += -DUSE_THREADS ${PTHREAD_CFLAGS} ++EXTRALIBS += ${PTHREAD_LIBS} + endif + ifdef GLIDE - GLIDEOBJS = unix/glide.o - GLIDEDEFINES = -DUSE_GLIDE -I/usr/include/glide -@@ -98,13 +92,13 @@ +@@ -109,19 +110,18 @@ endif MOC = $(QTDIR)/bin/moc -CCC = g++ -fno-rtti +-CC = gcc +CCC = $(CXX) -fno-rtti - CC = gcc ++CC ?= gcc NASM = nasm -INCLUDES=-I/usr/X11R6/include -I/usr/local/include -+INCLUDES=-I$(X11BASE)/include -I$(LOCALBASE)/include ++INCLUDES=-I$(X11BASE)/include -OPTIMISE= -O6 -mpentium -fomit-frame-pointer -fno-exceptions -Wall -W -pedantic -pipe -+OPTIMISE= $(CFLAGS) -fomit-frame-pointer -fno-exceptions -Wall -W -pedantic -pipe ++OPTIMISE= $(CFLAGS) -fomit-frame-pointer -fno-exceptions -Wall -W -pedantic #OPTIMISE=-g -fno-exceptions #-DMITSHM -@@ -119,6 +113,7 @@ - -DDEBUGGER \ - -DCPU_SHUTDOWN \ - -DSPC700_SHUTDOWN \ -+-DSOUND \ - $(LINUXDEFINES) \ - $(FXDEFINES) \ - $(C4DEFINES) \ -@@ -131,6 +126,11 @@ - $(KREEDDEFINES) - #-DNO_INLINE_SET_GET + + CCFLAGS = $(OPTIMISE) -DMITSHM \ +--Ii386 \ + -I. \ + -Iunzip \ + -DJOYSTICK_SUPPORT \ +@@ -144,6 +144,10 @@ + $(KREEDDEFINES) \ + -DNO_INLINE_SET_GET +ifdef USB_JOYSTICK_SUPPORT -+CCFLAGS += -DJOYSTICK_SUPPORT +EXTRALIBS += -lusb +endif + #-DSOUND #-DDEBUGGER #-DNO_INLINE_SET_GET -@@ -138,12 +138,10 @@ +@@ -151,12 +155,10 @@ #-DCPU_SHUTDOWN #-DSPC700_SHUTDOWN -CFLAGS=$(CCFLAGS) - .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm .obj --LDLIBS = -L/usr/X11R6/lib frame.o +-LDLIBS = -L/usr/X11R6/lib +LDLIBS = -L$(X11BASE)/lib -all: offsets snes9x ssnes9x @@ -72,12 +103,12 @@ #ggisnes9x #xf86snes9x -@@ -165,7 +163,7 @@ +@@ -182,7 +184,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 + snes9x: $(OBJECTS) unix/x11.o $(GLIDEOBJS) $(OPENGLOBJS) $(GUIOBJS) $(KREEDOBJ) +- $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(GLIDEOBJS) $(OPENGLOBJS) $(KREEDOBJ) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(OPENGLLIBS) $(GUILIBS) -lXxf86dga -lXxf86vm -lXext -lX11 $(EXTRALIBS) -lz -lm ++ $(CCC) $(INCLUDES) $(OPTIMIZE) -o $@ $(OBJECTS) $(GLIDEOBJS) $(OPENGLOBJS) $(KREEDOBJ) unix/x11.o $(GUIOBJS) $(LDLIBS) $(GLIDELIBS) $(OPENGLLIBS) $(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 -urN /usr/ports/emulators/snes9x/files/patch-ae emulators/snes9x/files/patch-ae --- /usr/ports/emulators/snes9x/files/patch-ae Sat Oct 14 10:03:29 2000 +++ emulators/snes9x/files/patch-ae Sat Dec 1 23:16:31 2001 @@ -1,30 +1,40 @@ ---- port.h.orig Fri Oct 6 17:02:39 2000 -+++ port.h Fri Oct 13 18:37:38 2000 -@@ -56,15 +56,15 @@ +--- port.h.orig Tue Sep 18 15:03:39 2001 ++++ port.h Sat Dec 1 23:16:20 2001 +@@ -47,7 +47,7 @@ + #include <memory.h> + #include <string.h> + #else +-#include strings.h> ++#include <strings.h> + #include <clib/powerpc_protos.h> + #endif +@@ -81,16 +81,16 @@ #ifndef snes9x_types_defined #define snes9x_types_defined + +-typedef unsigned char bool8; ++typedef u_int8_t bool8; + + #ifndef __WIN32__ -typedef unsigned char uint8; -typedef unsigned short uint16; --typedef unsigned int uint32; --typedef unsigned char bool8; -typedef signed char int8; -typedef short int16; +-typedef int int32; +-typedef unsigned int uint32; +-typedef long long int64; +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; - #ifndef __WIN32__ --typedef int int32; --typedef long long int64; +typedef int32_t int32; ++typedef u_int32_t uint32; +typedef int64_t int64; - #else - #ifndef WSAAPI - // winsock2.h typedefs int32 as well. -@@ -162,6 +162,10 @@ + #else // __WIN32__ + + #ifdef __BORLANDC__ +@@ -202,6 +202,10 @@ #ifdef __linux #define TITLE "Snes9X: Linux" >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200112042248.fB4MmFN58535>