From tlp@LiquidX.org  Fri Nov 21 10:20:40 2003
Return-Path: <tlp@LiquidX.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 459D516A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Nov 2003 10:20:40 -0800 (PST)
Received: from scanmail1.cableone.net (scanmail1.cableone.net [24.116.0.121])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1438343FBF
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Nov 2003 10:20:39 -0800 (PST)
	(envelope-from tlp@LiquidX.org)
Received: from scanmail1.cableone.net ([10.116.0.121]) by scanmail1.cableone.net  with Microsoft SMTPSVC(5.5.1877.687.68);
	 Fri, 21 Nov 2003 11:19:45 -0700
Received: from scanmail1.cableone.net [24.116.0.121] by scanmail1.cableone.net
  (SMTPD32-7.04) id A74113EE0134; Fri, 21 Nov 2003 11:19:45 -0700
Received: from  (24-119-12-184.cpe.cableone.net [24.119.12.184]) by mail.cableone.net with SMTP (MailShield v2.04 - WIN32 Jul 17 2001 17:12:42); Fri, 21 Nov 2003 11:19:45 -0700
Message-Id: <20031121111549.Y67187@maya.liquidx.org>
Date: Fri, 21 Nov 2003 11:20:42 -0700 (MST)
From: Travis Poppe <tlp@LiquidX.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [FIX PORT] Patched to support newer xmame versions

>Number:         59558
>Category:       ports
>Synopsis:       [FIX PORT] Patched to support newer xmame versions
>Confidential:   yes
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 21 10:30:18 PST 2003
>Closed-Date:    Fri Nov 21 17:13:19 PST 2003
>Last-Modified:  Fri Nov 21 17:13:19 PST 2003
>Originator:     Travis Poppe
>Release:        
>Organization:
>Environment:
>Description:
Fixes problems with newer xmame versions
>How-To-Repeat:
>Fix:
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	/usr/ports/emulators/gxmame
#	/usr/ports/emulators/gxmame/distinfo
#	/usr/ports/emulators/gxmame/Makefile
#	/usr/ports/emulators/gxmame/pkg-descr
#	/usr/ports/emulators/gxmame/pkg-plist
#
echo c - /usr/ports/emulators/gxmame
mkdir -p /usr/ports/emulators/gxmame > /dev/null 2>&1
echo x - /usr/ports/emulators/gxmame/distinfo
sed 's/^X//' >/usr/ports/emulators/gxmame/distinfo << 'END-of-/usr/ports/emulators/gxmame/distinfo'
XMD5 (gxmame-0.33.tar.gz) = b3469d300ccb6654f893e88823d93799
XMD5 (gxmame-0.33-xmame074.diff) = f10c89038e56c8f6bcd5d502f842791a
END-of-/usr/ports/emulators/gxmame/distinfo
echo x - /usr/ports/emulators/gxmame/Makefile
sed 's/^X//' >/usr/ports/emulators/gxmame/Makefile << 'END-of-/usr/ports/emulators/gxmame/Makefile'
X# New ports collection makefile for:	gxmame
X# Date created:			04 Oct 2003
X# Whom:				Travis Poppe <tlp@liquidx.org>
X#
X# $FreeBSD: ports/emulators/gxmame/Makefile,v 1.2 2003/10/06 06:30:01 edwin Exp $
X#
X
XPORTNAME=	gxmame
XPORTVERSION=	0.33
XPORTREVISION=	1
XCATEGORIES=	emulators
XMASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
XMASTER_SITE_SUBDIR=	${PORTNAME}
X
XPATCH_SITES=	http://shell.n.ml.org/n/tlp/
XPATCHFILES=	gxmame-0.33-xmame074.diff
XPATCH_DIST_STRIP=	-p1
X
XMAINTAINER=	tlp@liquidx.org
XCOMMENT=	GXmame is a GTK frontend for xmame
X
XRUN_DEPENDS=	xmame:${PORTSDIR}/emulators/xmame
XLIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
X		intl.5:${PORTSDIR}/devel/gettext
X
XUSE_GZIP=	yes
XUSE_XLIB=	yes
XUSE_GNOME=	gtk12 gdkpixbuf glib12
X
XGNU_CONFIGURE=	yes
XCONFIGURE_ARGS=	--disable-joystick
X
X.include <bsd.port.mk>
END-of-/usr/ports/emulators/gxmame/Makefile
echo x - /usr/ports/emulators/gxmame/pkg-descr
sed 's/^X//' >/usr/ports/emulators/gxmame/pkg-descr << 'END-of-/usr/ports/emulators/gxmame/pkg-descr'
XGXMame is a GTK frontend for xmame. Its goal is to provide an interface
Xmuch like that of MAME32.
X
XWWW: http://gxmame.sourceforge.net
X
X- Travis Poppe
Xtlp@liquidx.org
END-of-/usr/ports/emulators/gxmame/pkg-descr
echo x - /usr/ports/emulators/gxmame/pkg-plist
sed 's/^X//' >/usr/ports/emulators/gxmame/pkg-plist << 'END-of-/usr/ports/emulators/gxmame/pkg-plist'
Xbin/gxmame
Xshare/locale/fr/LC_MESSAGES/gxmame.mo
Xshare/locale/es/LC_MESSAGES/gxmame.mo
Xshare/locale/it/LC_MESSAGES/gxmame.mo
Xshare/locale/nl/LC_MESSAGES/gxmame.mo
Xshare/locale/de/LC_MESSAGES/gxmame.mo
Xshare/locale/pl/LC_MESSAGES/gxmame.mo
Xshare/locale/zh_TW/LC_MESSAGES/gxmame.mo
Xshare/applnk/Games/Arcade/gxmame.desktop
Xshare/gnome/apps/Games/Arcade/gxmame.desktop
Xshare/icons/gxmame.png
Xshare/icons/mini/gxmame.xpm
X%%PORTDOCS%%share/doc/gxmame-0.33/AUTHORS
X%%PORTDOCS%%share/doc/gxmame-0.33/BUGS
X%%PORTDOCS%%share/doc/gxmame-0.33/COPYING
X%%PORTDOCS%%share/doc/gxmame-0.33/ChangeLog
X%%PORTDOCS%%share/doc/gxmame-0.33/NEWS
X%%PORTDOCS%%share/doc/gxmame-0.33/README
X%%PORTDOCS%%share/doc/gxmame-0.33/TODO
X%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc.html
X%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc-1.html
X%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc-2.html
X%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc.2.html
X%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc-3.html
X%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc-4.html
X%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc-5.html
X%%PORTDOCS%%share/doc/gxmame-0.33/html/gxmame-doc-6.html
X%%PORTDOCS%%share/doc/gxmame-0.33/html/gui/metal2.jpg
X%%PORTDOCS%%share/doc/gxmame-0.33/html/includes/gxmame.css
X%%PORTDOCS%%@dirrm share/doc/gxmame-0.33/html/includes
X%%PORTDOCS%%@dirrm share/doc/gxmame-0.33/html/gui
X%%PORTDOCS%%@dirrm share/doc/gxmame-0.33/html
X%%PORTDOCS%%@dirrm share/doc/gxmame-0.33
END-of-/usr/ports/emulators/gxmame/pkg-plist
exit
>Release-Note:
>Audit-Trail:

From: Clement Laforet <sheepkiller@cultdeadsheep.org>
To: Travis Poppe <tlp@LiquidX.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/59558: [FIX PORT] Patched to support newer xmame versions
Date: Fri, 21 Nov 2003 19:47:10 +0100

 On Fri, 21 Nov 2003 11:20:42 -0700 (MST)
 Travis Poppe <tlp@LiquidX.org> wrote:
 
 Can you submit as follow-up to GNATS an unified diff ?
 
 While you're here, can you use %%DOCSDIR%% ?
 Please patch Makefiles to avoid using share/doc/${PORTNAME}-${VERSION}.
 (and the you can replace share/doc/gxmane by %%DOCSDIR%% in pkg-plist)
 Next time, chosse maintainer-update for class and use [maintainer fix]
 instead of [port fix], if you want to speed up the commit ;-)
 
 clem

From: Travis Poppe <tlp@LiquidX.org>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/59558: [FIX PORT] Patched to support newer xmame versions
Date: Fri, 21 Nov 2003 12:58:30 -0700 (MST)

 This version of the port has been modified upon request to use %%DOCSDIR%%
 
 # This is a shell archive.  Save it in a file, remove anything before
 # this line, and then unpack it by entering "sh file".  Note, it may
 # create directories; files and directories will be owned by you and
 # have default permissions.
 #
 # This archive contains:
 #
 #	/usr/ports/emulators/gxmame/
 #	/usr/ports/emulators/gxmame/distinfo
 #	/usr/ports/emulators/gxmame/Makefile
 #	/usr/ports/emulators/gxmame/pkg-descr
 #	/usr/ports/emulators/gxmame/pkg-plist
 #	/usr/ports/emulators/gxmame/files
 #	/usr/ports/emulators/gxmame/files/patch-aa
 #
 echo c - /usr/ports/emulators/gxmame/
 mkdir -p /usr/ports/emulators/gxmame/ > /dev/null 2>&1
 echo x - /usr/ports/emulators/gxmame/distinfo
 sed 's/^X//' >/usr/ports/emulators/gxmame/distinfo << 'END-of-/usr/ports/emulators/gxmame/distinfo'
 XMD5 (gxmame-0.33.tar.gz) = b3469d300ccb6654f893e88823d93799
 XMD5 (gxmame-0.33-xmame074.diff) = f10c89038e56c8f6bcd5d502f842791a
 END-of-/usr/ports/emulators/gxmame/distinfo
 echo x - /usr/ports/emulators/gxmame/Makefile
 sed 's/^X//' >/usr/ports/emulators/gxmame/Makefile << 'END-of-/usr/ports/emulators/gxmame/Makefile'
 X# New ports collection makefile for:	gxmame
 X# Date created:			04 Oct 2003
 X# Whom:				Travis Poppe <tlp@liquidx.org>
 X#
 X# $FreeBSD: ports/emulators/gxmame/Makefile,v 1.2 2003/10/06 06:30:01 edwin Exp $
 X#
 X
 XPORTNAME=	gxmame
 XPORTVERSION=	0.33
 XPORTREVISION=	1
 XCATEGORIES=	emulators
 XMASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 XMASTER_SITE_SUBDIR=	${PORTNAME}
 X
 XPATCH_SITES=	http://shell.n.ml.org/n/tlp/
 XPATCHFILES=	gxmame-0.33-xmame074.diff
 XPATCH_DIST_STRIP=	-p1
 X
 XMAINTAINER=	tlp@liquidx.org
 XCOMMENT=	GXmame is a GTK frontend for xmame
 X
 XRUN_DEPENDS=	xmame:${PORTSDIR}/emulators/xmame
 XLIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
 X		intl.5:${PORTSDIR}/devel/gettext
 X
 XUSE_GZIP=	yes
 XUSE_XLIB=	yes
 XUSE_GNOME=	gtk12 gdkpixbuf glib12
 X
 XDOCDIR=		share/doc/${PORTNAME}
 XGNU_CONFIGURE=	yes
 XCONFIGURE_ARGS=	--disable-joystick
 X
 X.include <bsd.port.mk>
 END-of-/usr/ports/emulators/gxmame/Makefile
 echo x - /usr/ports/emulators/gxmame/pkg-descr
 sed 's/^X//' >/usr/ports/emulators/gxmame/pkg-descr << 'END-of-/usr/ports/emulators/gxmame/pkg-descr'
 XGXMame is a GTK frontend for xmame. Its goal is to provide an interface
 Xmuch like that of MAME32.
 X
 XWWW: http://gxmame.sourceforge.net
 X
 X- Travis Poppe
 Xtlp@liquidx.org
 END-of-/usr/ports/emulators/gxmame/pkg-descr
 echo x - /usr/ports/emulators/gxmame/pkg-plist
 sed 's/^X//' >/usr/ports/emulators/gxmame/pkg-plist << 'END-of-/usr/ports/emulators/gxmame/pkg-plist'
 Xbin/gxmame
 Xshare/locale/fr/LC_MESSAGES/gxmame.mo
 Xshare/locale/es/LC_MESSAGES/gxmame.mo
 Xshare/locale/it/LC_MESSAGES/gxmame.mo
 Xshare/locale/nl/LC_MESSAGES/gxmame.mo
 Xshare/locale/de/LC_MESSAGES/gxmame.mo
 Xshare/locale/pl/LC_MESSAGES/gxmame.mo
 Xshare/locale/zh_TW/LC_MESSAGES/gxmame.mo
 Xshare/applnk/Games/Arcade/gxmame.desktop
 Xshare/gnome/apps/Games/Arcade/gxmame.desktop
 Xshare/icons/gxmame.png
 Xshare/icons/mini/gxmame.xpm
 X%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 X%%PORTDOCS%%%%DOCSDIR%%/BUGS
 X%%PORTDOCS%%%%DOCSDIR%%/COPYING
 X%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 X%%PORTDOCS%%%%DOCSDIR%%/NEWS
 X%%PORTDOCS%%%%DOCSDIR%%/README
 X%%PORTDOCS%%%%DOCSDIR%%/TODO
 X%%PORTDOCS%%%%DOCSDIR%%/html/gxmame-doc.html
 X%%PORTDOCS%%%%DOCSDIR%%/html/gxmame-doc-1.html
 X%%PORTDOCS%%%%DOCSDIR%%/html/gxmame-doc-2.html
 X%%PORTDOCS%%%%DOCSDIR%%/html/gxmame-doc.2.html
 X%%PORTDOCS%%%%DOCSDIR%%/html/gxmame-doc-3.html
 X%%PORTDOCS%%%%DOCSDIR%%/html/gxmame-doc-4.html
 X%%PORTDOCS%%%%DOCSDIR%%/html/gxmame-doc-5.html
 X%%PORTDOCS%%%%DOCSDIR%%/html/gxmame-doc-6.html
 X%%PORTDOCS%%%%DOCSDIR%%/html/gui/metal2.jpg
 X%%PORTDOCS%%%%DOCSDIR%%/html/includes/gxmame.css
 X%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/includes
 X%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/gui
 X%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 X%%PORTDOCS%%@dirrm %%DOCSDIR%%
 END-of-/usr/ports/emulators/gxmame/pkg-plist
 echo c - /usr/ports/emulators/gxmame/files
 mkdir -p /usr/ports/emulators/gxmame/files > /dev/null 2>&1
 echo x - /usr/ports/emulators/gxmame/files/patch-aa
 sed 's/^X//' >/usr/ports/emulators/gxmame/files/patch-aa << 'END-of-/usr/ports/emulators/gxmame/files/patch-aa'
 X--- Makefile.in.orig	Fri Nov 21 12:35:25 2003
 X+++ Makefile.in	Fri Nov 21 12:36:06 2003
 X@@ -112,7 +112,7 @@
 X icon2dir = $(datadir)/icons/mini
 X icon2_DATA = gxmame.xpm
 X
 X-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 X+docdir = $(datadir)/doc/$(PACKAGE)
 X doc_DATA = BUGS NEWS COPYING AUTHORS README TODO ChangeLog
 X ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 X mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 X@@ -362,7 +362,7 @@
 X
 X maintainer-clean-tags:
 X
 X-distdir = $(PACKAGE)-$(VERSION)
 X+distdir = $(PACKAGE)
 X top_distdir = $(distdir)
 X
 X # This target untars the dist file and tries a VPATH configuration.  Then
 X--- html/Makefile.in.orig	Fri Nov 21 12:47:52 2003
 X+++ html/Makefile.in	Fri Nov 21 12:48:16 2003
 X@@ -97,7 +97,7 @@
 X
 X EXTRA_DIST = *html includes gui
 X
 X-htmldir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html
 X+htmldir = $(datadir)/doc/$(PACKAGE)/html
 X html_DATA = *.html
 X mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 X CONFIG_HEADER = ../config.h
 X@@ -143,7 +143,7 @@
 X TAGS:
 X
 X
 X-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 X+distdir = $(top_builddir)/$(PACKAGE)/$(subdir)
 X
 X subdir = html
 X
 END-of-/usr/ports/emulators/gxmame/files/patch-aa
 exit

From: Travis Poppe <tlp@LiquidX.org>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/59558: [FIX PORT] Patched to support newer xmame versions
Date: Fri, 21 Nov 2003 13:04:21 -0700 (MST)

 I'm not sure if you meant for me to submit the diff that fixes xmame
 compatibility, or if you wanted me to submit a diff to make my port use
 %%DOCSDIR%%
 
 I have re-submitted my fixed port as an sh archive, and below is the
 unified diff to fix xmame compatibility. Hope it works this time :-)
 
 diff -urNp gxmame-0.33/src/gxmame.h gxmame-0.33.7274fixed/src/gxmame.h
 --- gxmame-0.33/src/gxmame.h	2003-05-29 21:41:28.000000000 +0100
 +++ gxmame-0.33.7274fixed/src/gxmame.h	2003-09-21 00:43:38.000000000 +0100
 @@ -519,6 +519,7 @@ typedef struct _xmame_game_options {
  	gboolean mouse;			/* Enable/disable mouse (if supported) */
  	gboolean hotrod;		/* Enable HotRod joystick support */
  	gboolean hotrodse;		/* Select HotRod SE joystick support */
 +	gboolean newhotrodusage;	/* 0.74.1 has new hotrod options */
  	gboolean usbpspad;		/* The Joystick(s) are USB PS Game Pads */
  	gboolean rapidfire;		/* Enable rapid-fire support for joysticks */
 
 @@ -645,6 +646,8 @@ typedef struct _xmame_available_options
  	gboolean list_mixer_plugins;	/* list mixer plugins */
  	gboolean keyboard_leds;		/* use keyboard leds */
  	gboolean dirty;			/* dirty not in 0.61 pr1 */
 +	gboolean newx11modeusage;	/* for 0.72.1 -x11-mode changes */
 +	gboolean newhotrodusage;	/* for 0.74.1 -hotrod[se] changes */
  	gboolean xvext;			/* xv extension 0.60 + patch from
  					   Alastair M. Robinson*/
  	gboolean vidix;			/* another target from Alastair M. Robinson
 diff -urNp gxmame-0.33/src/mameio.c gxmame-0.33.7274fixed/src/mameio.c
 --- gxmame-0.33/src/mameio.c	2003-05-29 21:32:26.000000000 +0100
 +++ gxmame-0.33.7274fixed/src/mameio.c	2003-09-21 00:43:38.000000000 +0100
 @@ -32,8 +32,6 @@
  #include <unistd.h>
  #define BUFFER_SIZE 1000
 
 -
 -
  gboolean create_game_list_file(void)
  {
  	FILE *xmame_pipe=NULL;
 @@ -957,6 +955,18 @@ gboolean get_mame_options(void)
  	version=atof(p);
  	g_free(opt);
 
 +	/* version 0.72.1 introduces new syntax for the -x11-mode option */
 +	if (version>=0.72)
 +		available_options.newx11modeusage=TRUE;
 +	else
 +		available_options.newx11modeusage=FALSE;
 +
 +	/* version 0.74.1 introduces new syntax for -hotrod[se] options */
 +	if (version>=0.74)
 +		available_options.newhotrodusage=TRUE;
 +	else
 +		available_options.newhotrodusage=FALSE;
 +
  	/* do not test anymore if the executable is valid since its already tested previously  */
  	/* to be able to load the 0.68 options */
  	if (version==0.68)
 @@ -989,7 +999,16 @@ gboolean get_mame_options(void)
  	available_options.list_mixer_plugins = FALSE;
  	available_options.keyboard_leds = FALSE;
  	available_options.dirty = FALSE;
 -	available_options.xvext = FALSE;
 +	if (version>=0.72)
 +	{
 +		available_options.xvext=TRUE;
 +		available_options.fullscreen=TRUE;
 +	}
 +	else
 +	{
 +		available_options.xvext = FALSE;
 +		available_options.fullscreen = FALSE;
 +	}
  	available_options.vidix = FALSE;
  	available_options.yuv = FALSE;
  	available_options.yv12 = FALSE;
 @@ -999,7 +1018,7 @@ gboolean get_mame_options(void)
  	available_options.x11joyname = FALSE;
  	available_options.joydevname = FALSE;
  	available_options.video_mode = FALSE;
 -	available_options.fullscreen = FALSE;
 +
  	available_options.cfgname = FALSE;
  	available_options.grabmouse = FALSE;
  	available_options.grabkeyboard = FALSE;
 diff -urNp gxmame-0.33/src/options.c gxmame-0.33.7274fixed/src/options.c
 --- gxmame-0.33/src/options.c	2003-06-08 19:48:37.000000000 +0100
 +++ gxmame-0.33.7274fixed/src/options.c	2003-09-21 00:45:33.000000000 +0100
 @@ -34,6 +34,7 @@
  #include <gtk/gtk.h>
 
  #include "gxmame.h"
 +#include "mameio.h"
  #include "options.h"
  #include "io.h"
  #include "callbacks.h"
 @@ -6267,6 +6268,7 @@ char *create_Renderer_Related_options_st
  			*vidix=NULL,
  			*geometry = NULL,
  			*newext = NULL;
 +		int	x11mode = 0;
 
  		if (available_options.mitshm)
  		{
 @@ -6276,7 +6278,21 @@ char *create_Renderer_Related_options_st
  		/* put the new extention option (xv and vidix) in a string*/
  		if (target->xvgeom_flag && strcmp(target->geometry,""))
  			geometry = g_strdup_printf("-geometry %s",target->geometry);
 -		newext =  g_strdup_printf("%s "					/* fullscreen */
 +		/* 0.72 removes -fullscreen option in favour of new */
 +		/* -x11-mode values */
 +		if (available_options.newx11modeusage)
 +		{
 +			newext =  g_strdup_printf("%s "					/* geometry */
 +					  "%s "					/* yuv */
 +					  "%s",					/* yv12 */
 +					  geometry?geometry:"",
 +					  available_options.yuv?((target->yuv)?"-yuv":"-noyuv"):"",
 +					  available_options.yv12?((target->yv12)?"-yv12":"-noyv12"):""
 +					);
 +		}
 +		else
 +		{
 +			newext =  g_strdup_printf("%s "					/* fullscreen */
  					  "%s "					/* geometry */
  					  "%s "					/* yuv */
  					  "%s",					/* yv12 */
 @@ -6285,6 +6301,7 @@ char *create_Renderer_Related_options_st
  					  available_options.yuv?((target->yuv)?"-yuv":"-noyuv"):"",
  					  available_options.yv12?((target->yv12)?"-yv12":"-noyv12"):""
  					);
 +		}
 
  		if (available_options.xvext)
  		{
 @@ -6304,8 +6321,47 @@ char *create_Renderer_Related_options_st
 
 
  		Video_Mode_option = create_Video_Mode_Related_options_string();
 -
 -		option_string = g_strdup_printf ("-x11-mode %i "
 +
 +		/* 0.72 introduces new usage of -x11-mode: */
 +		/* 0 = normal windowed */
 +		/* 1 = DGA fullscreen */
 +		/* 2 = Xv windowed */
 +		/* 3 = Xv fullscreen */
 +		if (available_options.newx11modeusage)
 +		{
 +			x11mode=target->x11_mode;
 +			if (target->xvext)
 +			{
 +				x11mode=2;
 +				if (target->xvfullscreen)
 +					x11mode=3;
 +			}
 +
 +			option_string = g_strdup_printf ("-x11-mode %i "
 +						"-%scursor "
 +						"%s "				/* mitshm */
 +						"%s "				/* vidix */
 +						"%s "				/* newext */
 +						"-%sxsync "
 +						"-%sprivatecmap "
 +						"-%sxil "
 +						"-%smtxil "
 +						"%s ",				/* Video mode */
 +						x11mode,
 +						(target->cursor)?"":"no",
 +						mitshm?mitshm:"",
 +						vidix?vidix:"",
 +						newext?newext:"",
 +						(target->xsync)?"":"no",
 +						(target->privatecmap)?"":"no",
 +						(target->xil)?"":"no",
 +						(target->mtxil)?"":"no",
 +						Video_Mode_option?Video_Mode_option:""
 +						);
 +		}
 +		else
 +		{
 +			option_string = g_strdup_printf ("-x11-mode %i "
  						"-%scursor "
  						"%s "				/* mitshm */
  						"%s "				/* xvext */
 @@ -6327,7 +6383,8 @@ char *create_Renderer_Related_options_st
  						(target->xil)?"":"no",
  						(target->mtxil)?"":"no",
  						Video_Mode_option?Video_Mode_option:""
 -						);
 +						);
 +		}
  		g_free(Video_Mode_option);
  		g_free(xvext);
  		g_free(vidix);
 @@ -6551,7 +6608,46 @@ char *create_Input_Related_options_strin
  				(target->winkeys)?"":"no"
  				);
  	}
 -	option_string = g_strdup_printf ("-joytype %i "
 +//AJB
 +	if (available_options.newhotrodusage)
 +	{
 +		option_string = g_strdup_printf ("-joytype %i "
 +				"-%sanalogstick "
 +				"%s "					/* joy */
 +				"-%smouse "
 +				"%s "
 +				"%s "
 +				"-%susbpspad "
 +				"-%srapidfire "
 +				"%s "					/* trackball1 */
 +				"%s "					/* trackball2 */
 +				"%s "					/* trackball3 */
 +				"%s "					/* trackball4 */
 +				"%s "					/* x11_options*/
 +				"%s " 					/* grabkeyboard */
 +				"%s "					/* keymap */
 +				"%s ",					/* ugcicoin */
 +				target->joytype,
 +				(target->analogstick)?"":"no",
 +				joy?joy:"",
 +				(target->mouse)?"":"no",
 +				(target->hotrod)?"-ctrlr HotRod":"",
 +				(target->hotrodse)?"-ctrlr HotRodSE":"",
 +				(target->usbpspad)?"":"no",
 +				(target->rapidfire)?"":"no",
 +				trackball1?trackball1:"",
 +				trackball2?trackball2:"",
 +				trackball3?trackball3:"",
 +				trackball4?trackball4:"",
 +				x11_options?x11_options:"",
 +				available_options.grabkeyboard?((target->grabkeyboard)?"-grabkeyboard":"-nograbkeyboard"):"",
 +				keymap?keymap:"",
 +				available_options.ugcicoin?((target->ugcicoin)?"-ugcicoin":"-nougcicoin"):""
 +				);
 +	}
 +	else
 +	{
 +		option_string = g_strdup_printf ("-joytype %i "
  				"-%sanalogstick "
  				"%s "					/* joy */
  				"-%smouse "
 @@ -6584,6 +6680,7 @@ char *create_Input_Related_options_strin
  				keymap?keymap:"",
  				available_options.ugcicoin?((target->ugcicoin)?"-ugcicoin":"-nougcicoin"):""
  				);
 +	}
 
  	g_free(joy);
  	g_free(trackball1);
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Fri Nov 21 17:12:49 PST 2003 
State-Changed-Why:  
Superceded by ports/59567. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=59558 
>Unformatted:
