Date: Thu, 22 Nov 2001 11:34:08 +0100 (CET) From: stijn@win.tue.nl To: FreeBSD-gnats-submit@freebsd.org Subject: ports/32182: [MAINTAINER UPDATE]: emulators/xmame Message-ID: <200111221034.fAMAY8s18821@pcwin002.win.tue.nl>
next in thread | raw e-mail | index | archive | help
>Number: 32182 >Category: ports >Synopsis: [MAINTAINER UPDATE]: emulators/xmame >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Nov 22 02:40:02 PST 2001 >Closed-Date: >Last-Modified: >Originator: Stijn Hoop >Release: FreeBSD 4.4-STABLE i386 >Organization: >Environment: System: FreeBSD 4.4-STABLE #0: Thu Nov 15 09:17:23 CET 2001 >Description: - Update to xmame 0.56.1, with lots of fixes. GL target should work again. - First try to add svgalib support. Unfortunately I couldn't get this to work. It compiles however it tries to run and immediately quits again. Maybe an svgalib guru can fix this. It probably has to do with my compilation fix in files/patch-ad not being correct, but I couldn't find anything else in the svgalib docs. - Fix some portlint errors (unfortunately the Makefile is way too complicated to fix all portlint warnings) - Change the name of the package to include the display method. Theoretically this way slave ports could be created to have different packages for different display methods. >How-To-Repeat: N/A >Fix: diff -urN --exclude=CVS /usr/ports/emulators/xmame/Makefile xmame/Makefile --- /usr/ports/emulators/xmame/Makefile Sat Oct 6 20:05:18 2001 +++ xmame/Makefile Thu Nov 22 11:26:00 2001 @@ -6,26 +6,29 @@ # PORTNAME?= xmame -PORTVERSION?= 0.55.2 +PORTVERSION?= 0.56.1 CATEGORIES= emulators MASTER_SITES= http://x.mame.net/download/ \ - ftp://ftp.kaupp.cx/pub/xmame/ \ http://www.mame.net/zips/ \ http://cheat.retrogames.com/ \ http://www.sys2064.com/files/mame/ DISTNAME= xmame-${XMAMEVERSION:S/p/pre/} DIST_SUBDIR= xmame -XMAMEVERSION?= ${PORTVERSION} -USE_BZIP2= yes MAINTAINER?= stijn@win.tue.nl -USE_XPM= yes -USE_X_PREFIX= yes +USE_BZIP2= yes USE_GMAKE= yes MAN6= x${MAMEMESS}.6 +XMAMEVERSION?= ${PORTVERSION} + +.if !defined(WITH_SVGALIB) || ${WITH_SVGALIB} != "yes" +USE_XPM= yes +USE_X_PREFIX= yes +.endif + # Are we building MAME, MESS or PinMAME? (also set by slave ports) MAMEMESS?= mame @@ -162,6 +165,9 @@ # acceleration # WITH_SDL Uses the SDL library to be able to play fullscreen # without root rights +# WITH_SVGALIB Uses the svgalib library to allow playing without X. This +# has not been extensively tested; patches welcome to make +# this actually work. # WITH_X11 The standard display target, should work without # dependancies other than X # @@ -175,6 +181,12 @@ ALL_DOCS+= ${GLDOCS} .else PLIST_SUB+= OPENGL="@comment " +.if defined(WITH_SVGALIB) && ${WITH_SVGALIB} == "yes" +LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib +CFLAGS+= -I${LOCALBASE}/include +MAKE_ENV+= LOCALBASE=${LOCALBASE} +DISPLAY_METHOD= svgalib +.else .if !defined(WITH_SDL) || ${WITH_SDL} != "no" LIB_DEPENDS= SDL-1.1.3:${PORTSDIR}/devel/sdl12 SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config @@ -191,6 +203,8 @@ DISPLAY_METHOD= x11 .endif .endif +.endif +PKGNAMESUFFIX=-${DISPLAY_METHOD:L} # USB joysticks - only enabled on -STABLE because of conflicting USB # prototypes in -STABLE & -CURRENT. @@ -222,12 +236,14 @@ ${WRKSRC}/src/unix/video-drivers/glexport.c ${PERL} -pi -e 's@malloc.h@stdlib.h@' \ ${WRKSRC}/src/unix/video-drivers/gljpg.c + ${PERL} -pi -e 's@asm/io.h@machine/cpufunc.h@' \ + ${WRKSRC}/src/unix/video-drivers/twkuser.c # The large number of sed regexes here is intended to make this port a whole # lot easier to maintain - please don't convert them into a patch. do-configure: ${SED} -e "s@= gcc@?= ${CC}@g" \ - -e "s@= -O2 -Wall@?= ${CFLAGS}@g" \ + -e "s@^CFLAGS.*@CFLAGS ?= ${CFLAGS}@g" \ -e "s@= cp@?= ${INSTALL} ${COPY}@g" \ -e "s@lib/x\$$(TARGET)@share/x\$$(TARGET)@g" \ -e "s@/usr/X11R6@${X11BASE}@g" \ diff -urN --exclude=CVS /usr/ports/emulators/xmame/distinfo xmame/distinfo --- /usr/ports/emulators/xmame/distinfo Sat Oct 6 20:05:18 2001 +++ xmame/distinfo Thu Nov 22 11:09:04 2001 @@ -1,4 +1,4 @@ -MD5 (xmame/xmame-0.55.2.tar.bz2) = 23ebdb97a56690678b881f883089675a +MD5 (xmame/xmame-0.56.1.tar.bz2) = 220c071b2852b883b98cb8f637df17c4 MD5 (xmame/xmame-0.37b15.2.tar.bz2) = 9c05a92aac0e29811e7b276c631153ed MD5 (xmame/xmame-0.37b14.2.tar.bz2) = 34bfba3d1412a8f8e1abd4d738de3f27 MD5 (xmame/cheat.zip) = aa2c0a7af3e18db041e6b9e6bae60f11 diff -urN --exclude=CVS /usr/ports/emulators/xmame/files/patch-ac xmame/files/patch-ac --- /usr/ports/emulators/xmame/files/patch-ac Sat Apr 14 14:16:57 2001 +++ xmame/files/patch-ac Thu Nov 22 11:12:08 2001 @@ -1,21 +1,24 @@ ---- src/unix/unix.mak.orig Mon Apr 9 03:54:42 2001 -+++ src/unix/unix.mak Tue Apr 10 10:52:06 2001 -@@ -46,18 +46,18 @@ +--- src/unix/unix.mak.orig Thu Nov 15 07:15:47 2001 ++++ src/unix/unix.mak Thu Nov 22 11:11:35 2001 +@@ -45,20 +45,20 @@ + + # svga and ggi also use $(X11LIB) since that's where zlib often is LIBS.x11 = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext - LIBS.svgalib = $(X11LIB) -lvga -lvgagl +-LIBS.svgalib = $(X11LIB) -lvga -lvgagl ++LIBS.svgalib = -L$(LOCALBASE)/lib -lvga -lvgagl LIBS.ggi = $(X11LIB) -lggi -LIBS.xgl = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -ljpeg -+LIBS.xgl = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -L/usr/local/lib -ljpeg ++LIBS.xgl = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -L$(LOCALBASE)/lib -ljpeg LIBS.xfx = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x LIBS.svgafx = $(X11LIB) -lvga -lvgagl -lglide2x LIBS.openstep = -framework AppKit --LIBS.SDL = -ldl -lSDL -lpthread -D_REENTRANT +-LIBS.SDL = `sdl-config --libs` +LIBS.SDL = `$(SDL_CONFIG) --libs` LIBS.photon2 = -L/usr/lib -lph -lphrender CFLAGS.x11 = $(X11INC) $(JOY_X11_CFLAGS) -CFLAGS.xgl = $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS) -+CFLAGS.xgl = -DGLU_VERSION_1_2 $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS) -I/usr/local/include $(PTHREAD_CFLAGS) ++CFLAGS.xgl = -DGLU_VERSION_1_2 $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS) -I$(LOCALBASE)/include $(PTHREAD_CFLAGS) CFLAGS.xfx = $(X11INC) $(JOY_X11_CFLAGS) -I/usr/include/glide CFLAGS.svgafx = -I/usr/include/glide -CFLAGS.SDL = -D_REENTRANT @@ -23,7 +26,7 @@ CFLAGS.photon2 = INST.x11 = doinstall -@@ -322,7 +322,7 @@ +@@ -340,7 +340,7 @@ doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -showconfig | \ @@ -32,7 +35,7 @@ cat src/unix/xmamerc-keybinding-notes.txt >> doc/x$(TARGET)rc.dist doc/gamelist.$(TARGET): all -@@ -331,7 +331,8 @@ +@@ -349,7 +349,8 @@ doc/x$(TARGET).6: all src/unix/xmame.6-1 src/unix/xmame.6-3 cat src/unix/xmame.6-1 > doc/x$(TARGET).6 diff -urN --exclude=CVS /usr/ports/emulators/xmame/files/patch-ad xmame/files/patch-ad --- /usr/ports/emulators/xmame/files/patch-ad Thu Jan 1 01:00:00 1970 +++ xmame/files/patch-ad Wed Oct 17 12:44:18 2001 @@ -0,0 +1,13 @@ +--- src/unix/video-drivers/svgainput.c.orig Tue Oct 16 11:06:30 2001 ++++ src/unix/video-drivers/svgainput.c Tue Oct 16 11:05:37 2001 +@@ -12,6 +12,10 @@ + #include "devices.h" + #include "keyboard.h" + ++#ifdef __FreeBSD__ ++#define SIGUNUSED SIGUSR2 ++#endif ++ + static int console_fd = -1; + static int mouse_fd = -1; + static int leds = 0; >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?200111221034.fAMAY8s18821>