From owner-freebsd-ports Mon Apr 2 13:10:12 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E964637B71E for ; Mon, 2 Apr 2001 13:10:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f32KA1n22216; Mon, 2 Apr 2001 13:10:01 -0700 (PDT) (envelope-from gnats) Received: from pcwin002.win.tue.nl (pcwin002.win.tue.nl [131.155.71.72]) by hub.freebsd.org (Postfix) with ESMTP id EA94637B726 for ; Mon, 2 Apr 2001 13:02:27 -0700 (PDT) (envelope-from stijn@pcwin002.win.tue.nl) Received: (from stijn@localhost) by pcwin002.win.tue.nl (8.11.3/8.11.3) id f32K20l56242; Mon, 2 Apr 2001 22:02:00 +0200 (CEST) (envelope-from stijn) Message-Id: <200104022002.f32K20l56242@pcwin002.win.tue.nl> Date: Mon, 2 Apr 2001 22:02:00 +0200 (CEST) From: stijn@win.tue.nl Reply-To: stijn@win.tue.nl To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/26300: [MAINTAINER UPDATE]: emulators/xmame, emulators/xmess, emulators/xpinmame Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 26300 >Category: ports >Synopsis: [MAINTAINER UPDATE]: emulators/xmame, emulators/xmess, emulators/xpinmame >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: Mon Apr 02 13:10:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Stijn Hoop >Release: FreeBSD 4.3-RC i386 >Organization: >Environment: System: FreeBSD 4.3-RC #0: Mon Mar 26 04:36:57 CEST 2001 >Description: - Add OpenGL support for core version 0.37b13.1 Inspired by: Nick Sayer - Update xpinmame to version 0.99b1 - Add a temporary fix for an x{mame,mess,pinmame}rc.sample generation problem; the rc would countain literal ESC characters due to the SDL curses initialization codes being written to stdout - Update xmame/pkg-descr to reflect reality >How-To-Repeat: N/A >Fix: diff -urN --exclude=CVS /usr/ports/emulators/xmame/Makefile xmame/Makefile --- /usr/ports/emulators/xmame/Makefile Mon Apr 2 10:32:45 2001 +++ xmame/Makefile Mon Apr 2 21:58:29 2001 @@ -154,19 +154,39 @@ -malign-functions=4 -malign-jumps=4 -malign-loops=4 .endif -# SDL extension - enabled by default because x{mame,mess} can run full +# Choose one of several display targets: +# WITH_GL OpenGL based, displays vector games with hardware +# acceleration +# WITH_SDL Uses the SDL library to be able to play fullscreen +# without root rights +# WITH_X11 The standard display target, should work without +# dependancies other than X +# +# WITH_SDL is enabled by default because x{mame,mess} can run full # screen without having to be setuid root. +.if defined(WITH_GL) && ${WITH_GL} == "yes" +CFLAGS+= ${PTHREAD_CFLAGS} +USE_MESA= yes +DISPLAY_METHOD= xgl +PLIST_SUB+= OPENGL="" +.else +PLIST_SUB+= OPENGL="@comment " .if !defined(WITH_SDL) || ${WITH_SDL} != "no" LIB_DEPENDS= SDL-1.1.3:${PORTSDIR}/devel/sdl-devel SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config MAKE_ENV+= SDL_CONFIG=${SDL_CONFIG} DISPLAY_METHOD= SDL +.if !defined(WITH_SDL) pre-everything:: @${ECHO_MSG} "===> If you don't want ${MAMEMESS:U} to be built with SDL support," @${ECHO_MSG} " use \"make WITH_SDL=no\"" + @${ECHO_MSG} "===> If you want to build ${MAMEMESS:U} with OpenGL support for vector games," + @${ECHO_MSG} " use \"make WITH_GL=yes\"" +.endif .else DISPLAY_METHOD= x11 .endif +.endif # 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. @@ -182,9 +202,14 @@ -e "s@= x11@= ${DISPLAY_METHOD}@g" \ -e "s@= mame@= ${MAMEMESS}@g" \ -e "s@# X86_ASM@${ASM_COMMENT}X86_ASM@g" \ + -e "s@GLLIBS=.-ldl@GLLIBS= ${PTHREAD_LIBS}@g" \ ${WRKSRC}/makefile.unix.sed > ${WRKSRC}/makefile.unix -.if !defined(WITH_SDL) || ${WITH_SDL} != "no" ${PERL} -pi -e 's@SDL/@SDL11/@' ${WRKSRC}/src/unix/video-drivers/SDL.c +.if ${XMAMEVERSION} != "0.37b12.1" + ${PERL} -pi -e 's@png.h@../../png.h@' \ + ${WRKSRC}/src/unix/video-drivers/glexport.c + ${PERL} -pi -e 's@malloc.h@stdlib.h@' \ + ${WRKSRC}/src/unix/video-drivers/gljpg.c .endif post-build: diff -urN --exclude=CVS /usr/ports/emulators/xmame/distinfo xmame/distinfo --- /usr/ports/emulators/xmame/distinfo Mon Apr 2 10:32:45 2001 +++ xmame/distinfo Mon Apr 2 12:39:36 2001 @@ -4,4 +4,4 @@ MD5 (xmame/history.zip) = 69da5c33e6a78092c6cd75cbeb737c6a MD5 (xmame/hsdat7.zip) = 9e4a7e36448895f13128a675327e34e4 MD5 (xmame/xmame-0.37b13.1-cps2-20010330.patch.gz) = bf1d53ea84a4905d8377a187d3478883 -MD5 (xmame/xmame-0.37b13.1-pinmame-0.99b.patch.gz) = ea61399643a49b96025629960652455b +MD5 (xmame/xmame-0.37b13.1-pinmame-0.99b1.patch.gz) = 06526474f4bd5afa0874237ffe653d34 diff -urN --exclude=CVS /usr/ports/emulators/xmame/files/patch-ac xmame/files/patch-ac --- /usr/ports/emulators/xmame/files/patch-ac Mon Apr 2 10:32:45 2001 +++ xmame/files/patch-ac Mon Apr 2 12:32:41 2001 @@ -1,6 +1,11 @@ --- src/unix/unix.mak.orig Sat Mar 24 02:33:38 2001 -+++ src/unix/unix.mak Fri Mar 30 09:52:29 2001 -@@ -50,14 +50,14 @@ ++++ src/unix/unix.mak Mon Apr 2 12:32:36 2001 +@@ -46,18 +46,18 @@ + LIBS.x11 = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext + LIBS.svgalib = $(X11LIB) -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 $(PTHREAD_LIBS) LIBS.xfx = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x LIBS.svgafx = $(X11LIB) -lvga -lvgagl -lglide2x LIBS.openstep = -framework AppKit @@ -9,7 +14,8 @@ LIBS.photon2 = -L/usr/lib -lph -lphrender CFLAGS.x11 = $(X11INC) $(JOY_X11_CFLAGS) - CFLAGS.xgl = $(X11INC) $(JOY_X11_CFLAGS) +-CFLAGS.xgl = $(X11INC) $(JOY_X11_CFLAGS) ++CFLAGS.xgl = $(X11INC) $(JOY_X11_CFLAGS) -I/usr/local/include $(PTHREAD_CFLAGS) CFLAGS.xfx = $(X11INC) $(JOY_X11_CFLAGS) -I/usr/include/glide CFLAGS.svgafx = -I/usr/include/glide -CFLAGS.SDL = -D_REENTRANT @@ -17,12 +23,22 @@ CFLAGS.photon2 = INST.x11 = doinstall -@@ -326,7 +326,7 @@ +@@ -317,7 +317,7 @@ + + doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt + ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -showconfig | \ +- grep -v loadconfig > doc/x$(TARGET)rc.dist ++ grep -v loadconfig | tr "\033" \# > doc/x$(TARGET)rc.dist + cat src/unix/xmamerc-keybinding-notes.txt >> doc/x$(TARGET)rc.dist + + doc/gamelist.$(TARGET): all +@@ -326,7 +326,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 - ./x$(TARGET).$(DISPLAY_METHOD) -manhelp >> doc/x$(TARGET).6 -+ ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp >> doc/x$(TARGET).6 ++ ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp | \ ++ tr "\033" \# >> doc/x$(TARGET).6 cat src/unix/xmame.6-3 >> doc/x$(TARGET).6 install: $(INST.$(DISPLAY_METHOD)) install-man diff -urN --exclude=CVS /usr/ports/emulators/xmame/pkg-descr xmame/pkg-descr --- /usr/ports/emulators/xmame/pkg-descr Sun Aug 20 05:15:37 2000 +++ xmame/pkg-descr Mon Apr 2 15:16:28 2001 @@ -2,7 +2,7 @@ the hardware, video, sound, and other services, of many classic arcade game machines. -As of this release, XMAME supports an incredible 2073 arcade games, and +As of this release, XMAME supports an incredible 2843 arcade games, and the number grows every day! A partial list of the (more popular and well-known) games currently supported by this emulator include: @@ -20,5 +20,3 @@ you can obtain ROM images for XMAME on the Net. WWW: http://x.mame.net/ - -[ Maintained by Jacob A. Hart . ] diff -urN --exclude=CVS /usr/ports/emulators/xmame/pkg-plist xmame/pkg-plist --- /usr/ports/emulators/xmame/pkg-plist Mon Apr 2 10:32:45 2001 +++ xmame/pkg-plist Mon Apr 2 10:54:21 2001 @@ -36,6 +36,18 @@ %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/keys.txt %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/sounds.dat %%PORTDOCS%%@dirrm share/doc/%%MAMEMESS%% +%%OPENGL%%share/%%MAMEMESS%%/cab/glmame/cabfront.jpg +%%OPENGL%%share/%%MAMEMESS%%/cab/glmame/cabtitle.jpg +%%OPENGL%%share/%%MAMEMESS%%/cab/glmame/glmame.cab +%%OPENGL%%@dirrm share/%%MAMEMESS%%/cab/glmame +%%OPENGL%%share/%%MAMEMESS%%/cab/glmamejau/cabfront.jpg +%%OPENGL%%share/%%MAMEMESS%%/cab/glmamejau/cabside.jpg +%%OPENGL%%share/%%MAMEMESS%%/cab/glmamejau/cabtitle.jpg +%%OPENGL%%share/%%MAMEMESS%%/cab/glmamejau/glmamejau.cab +%%OPENGL%%@dirrm share/%%MAMEMESS%%/cab/glmamejau +%%OPENGL%%share/%%MAMEMESS%%/cab/trans/trans.cab +%%OPENGL%%@dirrm share/%%MAMEMESS%%/cab/trans +%%OPENGL%%@dirrm share/%%MAMEMESS%%/cab @dirrm share/%%MAMEMESS%%/roms @dirrm share/%%MAMEMESS%% @unexec rmdir %%SPOOLGAMES%%/%%MAMEMESS%% 2>/dev/null || true diff -urN --exclude=CVS /usr/ports/emulators/xmess/files/patch-ac xmess/files/patch-ac --- /usr/ports/emulators/xmess/files/patch-ac Sun Apr 1 19:15:56 2001 +++ xmess/files/patch-ac Mon Apr 2 12:36:31 2001 @@ -1,5 +1,5 @@ ---- src/unix/unix.mak.orig Sat Mar 10 09:11:54 2001 -+++ src/unix/unix.mak Sun Mar 11 19:26:27 2001 +--- src/unix/unix.mak.orig Sat Mar 17 03:11:38 2001 ++++ src/unix/unix.mak Mon Apr 2 12:36:22 2001 @@ -50,14 +50,14 @@ LIBS.xfx = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x LIBS.svgafx = $(X11LIB) -lvga -lvgagl -lglide2x @@ -17,12 +17,22 @@ CFLAGS.photon2 = INST.x11 = doinstall -@@ -326,7 +326,7 @@ +@@ -317,7 +317,7 @@ + + doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt + ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -showconfig | \ +- grep -v loadconfig > doc/x$(TARGET)rc.dist ++ grep -v loadconfig | tr "\033" \# > doc/x$(TARGET)rc.dist + cat src/unix/xmamerc-keybinding-notes.txt >> doc/x$(TARGET)rc.dist + + doc/gamelist.$(TARGET): all +@@ -326,7 +326,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 - ./x$(TARGET).$(DISPLAY_METHOD) -manhelp >> doc/x$(TARGET).6 -+ ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp >> doc/x$(TARGET).6 ++ ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp | \ ++ tr "\033" \# >> doc/x$(TARGET).6 cat src/unix/xmame.6-3 >> doc/x$(TARGET).6 install: $(INST.$(DISPLAY_METHOD)) install-man diff -urN --exclude=CVS /usr/ports/emulators/xpinmame/Makefile xpinmame/Makefile --- /usr/ports/emulators/xpinmame/Makefile Mon Apr 2 11:14:18 2001 +++ xpinmame/Makefile Mon Apr 2 12:34:02 2001 @@ -19,6 +19,6 @@ MAMEMESS= pinmame XMAMEVERSION= 0.37b13.1 -PINMAMEVERSION= 0.99b +PINMAMEVERSION= 0.99b1 .include "${MASTERDIR}/Makefile" >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message