From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 21 18:10:21 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 613BF16A4CE for ; Sun, 21 Nov 2004 18:10:21 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30F4C43D49 for ; Sun, 21 Nov 2004 18:10:21 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iALIALlY035078 for ; Sun, 21 Nov 2004 18:10:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iALIALg6035077; Sun, 21 Nov 2004 18:10:21 GMT (envelope-from gnats) Resent-Date: Sun, 21 Nov 2004 18:10:21 GMT Resent-Message-Id: <200411211810.iALIALg6035077@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Miguel Mendez" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6936C16A4CE for ; Sun, 21 Nov 2004 18:09:06 +0000 (GMT) Received: from mindfields.energyhq.es.eu.org (73.Red-213-97-200.pooles.rima-tde.net [213.97.200.73]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CF7643D45 for ; Sun, 21 Nov 2004 18:09:04 +0000 (GMT) (envelope-from flynn@energyhq.es.eu.org) Received: from scienide.energyhq.es.eu.org (scienide.energyhq.es.eu.org [192.168.100.1]) by mindfields.energyhq.es.eu.org (Postfix) with ESMTP id D166C35689 for ; Sun, 21 Nov 2004 19:09:01 +0100 (CET) Message-Id: <1101060527.0@scienide.energyhq.es.eu.org> Date: Sun, 21 Nov 2004 19:08:47 +0100 From: "Miguel Mendez" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4 Subject: ports/74207: [Maintainer Update] emulators/xmame to 0.88 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Nov 2004 18:10:21 -0000 >Number: 74207 >Category: ports >Synopsis: [Maintainer Update] emulators/xmame to 0.88 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Nov 21 18:10:20 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Miguel Mendez >Release: FreeBSD 5.3-RELEASE i386 >Organization: >Environment: System: FreeBSD 5.3-RELEASE #0: Sun Oct 24 16:35:51 CEST 2004 root@scienide.energyhq.es.eu.org:/usr/obj/usr/src/sys/SCIENIDE >Description: Two things about this: 1) The OpenGL driver is built as an extension of the X11 one, build the port with DISPLAY_TARGET set to opengl and you'll get the x11 version with GL enabled. (you set rendering to GL by using -vidmode 2, check the man page for more info.) 2) This version breaks compat with gxmame again, as some options have been changed. People wanting to use gxmame should put xmame in HOLD_PKGS in their pkgtools.conf. I might or might not do some surgery on gxmame to work with the new options, depends on how much spare time I have next week. I've done some testing with the SDL, OpenGL and X11 targets, and they work fine here, please test and report if you encounter any problem. >How-To-Repeat: >Fix: --- xmame.diff begins here --- diff -ruN xmame.old/Makefile xmame/Makefile --- xmame.old/Makefile Sat Nov 6 03:41:44 2004 +++ xmame/Makefile Sun Nov 21 17:32:42 2004 @@ -6,7 +6,7 @@ # PORTNAME?= xmame -PORTVERSION?= 0.87 +PORTVERSION?= 0.88 CATEGORIES= emulators MASTER_SITES= http://x.mame.net/download/:xmame \ http://www.sys2064.com/files/util/:history \ @@ -166,9 +166,9 @@ .endif .if ${DISPLAY_TARGET:L} == "opengl" -CFLAGS+= ${PTHREAD_CFLAGS} +CFLAGS+= ${PTHREAD_CFLAGS} -I${X11BASE}/include USE_GL= yes -DISPLAY_METHOD= xgl +DISPLAY_METHOD= x11 PLIST_SUB+= OPENGL="" ALL_DOCS+= ${GLDOCS} .else @@ -281,6 +281,10 @@ ${REINPLACE_CMD} -e "s@# JOY_SDL = 1@JOY_SDL = 1@g" ${WRKSRC}/makefile.unix .endif +.if ${DISPLAY_TARGET:L} == "opengl" + ${REINPLACE_CMD} -e "s@# X11_OPENGL = 1@X11_OPENGL = 1@g" ${WRKSRC}/makefile.unix +.endif + # png.h conflicts with libpng. .for f in mess/artworkx.c mess/artworkx.h src/artwork.c \ src/common.c src/png.c src/unix/video-drivers/glexport.c @@ -332,6 +336,15 @@ ${INSTALL_DATA} ${WRKDIR}/hiscore.dat ${PREFIX}/share/xmame ${INSTALL_DATA} ${WRKDIR}/history.dat ${PREFIX}/share/xmame ${INSTALL_DATA} ${WRKDIR}/cheat.dat ${PREFIX}/share/xmame +.endif +.if ${DISPLAY_TARGET:L} == "opengl" + @${ECHO_MSG} + @${ECHO_MSG} "**************************************************************" + @${ECHO_MSG} "* HEADSUP: The OpenGL code is now built on top of the X11" + @${ECHO_MSG} "* drivers. You can enable OpenGL rendering with the -vidmode 2" + @${ECHO_MSG} "* option." + @${ECHO_MSG} "**************************************************************" + @${ECHO_MSG} .endif .include diff -ruN xmame.old/distinfo xmame/distinfo --- xmame.old/distinfo Tue Nov 9 10:23:24 2004 +++ xmame/distinfo Wed Nov 17 18:15:08 2004 @@ -1,5 +1,5 @@ -MD5 (xmame/xmame-0.87.tar.bz2) = 817f825ea92baf5f5e98ecb13193b844 -SIZE (xmame/xmame-0.87.tar.bz2) = 14601566 +MD5 (xmame/xmame-0.88.tar.bz2) = 5f247adfc80362101ff207a061e81516 +SIZE (xmame/xmame-0.88.tar.bz2) = 14799683 MD5 (xmame/uhsdat795.zip) = c30956e15cd8218f558f41013a47f22e SIZE (xmame/uhsdat795.zip) = 43750 MD5 (xmame/history.dat.zip) = 8c758537d5f5bc90fc3224b19421ae12 diff -ruN xmame.old/files/patch-src::unix::video-drivers::xgl.c xmame/files/patch-src::unix::video-drivers::xgl.c --- xmame.old/files/patch-src::unix::video-drivers::xgl.c Thu Jan 1 01:00:00 1970 +++ xmame/files/patch-src::unix::video-drivers::xgl.c Wed Nov 17 23:12:54 2004 @@ -0,0 +1,10 @@ +--- src/unix/video-drivers/xgl.c.orig Wed Nov 17 23:12:16 2004 ++++ src/unix/video-drivers/xgl.c Wed Nov 17 23:10:31 2004 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include "glxtool.h" + #include "glmame.h" + #include "sysdep/sysdep_display_priv.h" --- xmame.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: