From f22b5c87a8e5fb7839f2b8c8b32354a22577dc58 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Tue, 16 Nov 2004 11:53:09 +0000 Subject: clamp the version of xmame to the latest one that works; removed old version --- games-emulation/gxmame/ChangeLog | 6 +- games-emulation/gxmame/Manifest | 7 +- games-emulation/gxmame/files/0.33-newxmame.patch | 186 --------------------- games-emulation/gxmame/files/digest-gxmame-0.33-r1 | 1 - games-emulation/gxmame/gxmame-0.33-r1.ebuild | 37 ---- games-emulation/gxmame/gxmame-0.34b.ebuild | 4 +- 6 files changed, 9 insertions(+), 232 deletions(-) delete mode 100644 games-emulation/gxmame/files/0.33-newxmame.patch delete mode 100644 games-emulation/gxmame/files/digest-gxmame-0.33-r1 delete mode 100644 games-emulation/gxmame/gxmame-0.33-r1.ebuild (limited to 'games-emulation/gxmame') diff --git a/games-emulation/gxmame/ChangeLog b/games-emulation/gxmame/ChangeLog index 95345f23d4a8..8baa1855f03a 100644 --- a/games-emulation/gxmame/ChangeLog +++ b/games-emulation/gxmame/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-emulation/gxmame # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/gxmame/ChangeLog,v 1.8 2004/11/11 01:47:13 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/gxmame/ChangeLog,v 1.9 2004/11/16 11:53:09 mr_bones_ Exp $ + + 16 Nov 2004; Michael Sterrett + -files/0.33-newxmame.patch, -gxmame-0.33-r1.ebuild, gxmame-0.34b.ebuild: + clamp the version of xmame to the latest one that works; removed old version 11 Nov 2004; Joseph Jezak gxmame-0.34b.ebuild: Marked ppc stable. diff --git a/games-emulation/gxmame/Manifest b/games-emulation/gxmame/Manifest index 1515270ebbc6..84b180d284bf 100644 --- a/games-emulation/gxmame/Manifest +++ b/games-emulation/gxmame/Manifest @@ -1,7 +1,4 @@ -MD5 5971ff10f8af3c4f40c7c86f613aebd8 ChangeLog 1401 -MD5 69cdc435ccb7842a62419617e6c73d42 gxmame-0.33-r1.ebuild 840 -MD5 96d31b05d108afcff1d98d3bea42ff12 gxmame-0.34b.ebuild 964 +MD5 3e5889258c5f597dd3943abc9e34df69 ChangeLog 1614 +MD5 9db467bbb63d9150aca82a71e1b75640 gxmame-0.34b.ebuild 973 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 -MD5 16aef46d5c7fa3b76dd76631d6e63de2 files/0.33-newxmame.patch 5497 -MD5 791cb9798cc5acf94cc7c6bf879b3b92 files/digest-gxmame-0.33-r1 63 MD5 fc586b42205f2bfd474e189d0a04c930 files/digest-gxmame-0.34b 64 diff --git a/games-emulation/gxmame/files/0.33-newxmame.patch b/games-emulation/gxmame/files/0.33-newxmame.patch deleted file mode 100644 index 3eaf8eabd60c..000000000000 --- a/games-emulation/gxmame/files/0.33-newxmame.patch +++ /dev/null @@ -1,186 +0,0 @@ ---- src/gxmame.h.orig 2003-09-21 13:00:00.000000000 -0500 -+++ src/gxmame.h 2003-09-21 13:39:33.220657471 -0500 -@@ -645,6 +645,7 @@ - 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 xvext; /* xv extension 0.60 + patch from - Alastair M. Robinson*/ - gboolean vidix; /* another target from Alastair M. Robinson ---- src/mameio.c.orig 2003-09-21 13:00:45.000000000 -0500 -+++ src/mameio.c 2003-09-21 13:03:07.000000000 -0500 -@@ -956,9 +956,14 @@ - for (p=opt;(*p && (*p++ != ' '));); - 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; - - /* 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) - opt=g_strdup_printf("%s -showusage -noloadconfig 2>/dev/null",real_mame_executable); - else -@@ -989,7 +994,17 @@ - available_options.list_mixer_plugins = FALSE; - available_options.keyboard_leds = FALSE; - available_options.dirty = FALSE; -- available_options.xvext = 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 +1014,7 @@ - available_options.x11joyname = FALSE; - available_options.joydevname = FALSE; - available_options.video_mode = FALSE; -- available_options.fullscreen = FALSE; -+/* available_options.fullscreen = FALSE; */ - available_options.cfgname = FALSE; - available_options.grabmouse = FALSE; - available_options.grabkeyboard = FALSE; ---- src/options.c.orig 2003-09-21 13:03:18.000000000 -0500 -+++ src/options.c 2003-09-21 14:00:12.360568312 -0500 -@@ -34,6 +34,7 @@ - #include - - #include "gxmame.h" -+#include "mameio.h" - #include "options.h" - #include "io.h" - #include "callbacks.h" -@@ -6267,7 +6268,8 @@ - *vidix=NULL, - *geometry = NULL, - *newext = NULL; -- -+ int x11mode = 0; -+ - if (available_options.mitshm) - { - mitshm = g_strdup_printf("-%smitshm",(target->mitshm)?"":"no"); -@@ -6276,7 +6278,22 @@ - /* 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 */ -+/* 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,7 +6302,8 @@ - available_options.yuv?((target->yuv)?"-yuv":"-noyuv"):"", - available_options.yv12?((target->yv12)?"-yv12":"-noyv12"):"" - ); -- -+ } -+ - if (available_options.xvext) - { - if (target->mitshm) -@@ -6305,6 +6323,46 @@ - - Video_Mode_option = create_Video_Mode_Related_options_string(); - -+ -+ /* 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 " /* xvext */ -+ "%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 */ -@@ -6328,6 +6386,7 @@ - (target->mtxil)?"":"no", - Video_Mode_option?Video_Mode_option:"" - ); -+ } - g_free(Video_Mode_option); - g_free(xvext); - g_free(vidix); -@@ -6555,8 +6555,8 @@ - "-%sanalogstick " - "%s " /* joy */ - "-%smouse " -- "-%shotrod " -- "-%shotrodse " -+ "%s " -+ "%s " - "-%susbpspad " - "-%srapidfire " - "%s " /* trackball1 */ -@@ -6571,8 +6571,8 @@ - (target->analogstick)?"":"no", - joy?joy:"", - (target->mouse)?"":"no", -- (target->hotrod)?"":"no", -- (target->hotrodse)?"":"no", -+ (target->hotrod)?"-ctrlr HotRod":"", -+ (target->hotrodse)?"-ctrlr HotRodSE":"", - (target->usbpspad)?"":"no", - (target->rapidfire)?"":"no", - trackball1?trackball1:"", diff --git a/games-emulation/gxmame/files/digest-gxmame-0.33-r1 b/games-emulation/gxmame/files/digest-gxmame-0.33-r1 deleted file mode 100644 index 252d98a085ee..000000000000 --- a/games-emulation/gxmame/files/digest-gxmame-0.33-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 b3469d300ccb6654f893e88823d93799 gxmame-0.33.tar.gz 556360 diff --git a/games-emulation/gxmame/gxmame-0.33-r1.ebuild b/games-emulation/gxmame/gxmame-0.33-r1.ebuild deleted file mode 100644 index 3a495cb1683d..000000000000 --- a/games-emulation/gxmame/gxmame-0.33-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/gxmame/gxmame-0.33-r1.ebuild,v 1.4 2004/06/24 22:29:14 agriffis Exp $ - -inherit eutils - -DESCRIPTION="frontend for XMame using the GTK library" -HOMEPAGE="http://gxmame.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ~ppc" -IUSE="nls" - -DEPEND="virtual/x11 - =x11-libs/gtk+-1.2* - =dev-libs/glib-1.2* - media-libs/gdk-pixbuf" -RDEPEND="nls? ( sys-devel/gettext ) - games-emulation/xmame" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PV}-newxmame.patch -} - -src_compile() { - econf `use_enable nls` || die - emake || die -} - -src_install() { - make install DESTDIR=${D} || die - dodoc AUTHORS BUGS ChangeLog NEWS README TODO -} diff --git a/games-emulation/gxmame/gxmame-0.34b.ebuild b/games-emulation/gxmame/gxmame-0.34b.ebuild index a032180c4e65..6f8b05169a4d 100644 --- a/games-emulation/gxmame/gxmame-0.34b.ebuild +++ b/games-emulation/gxmame/gxmame-0.34b.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/gxmame/gxmame-0.34b.ebuild,v 1.7 2004/11/11 01:47:13 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/gxmame/gxmame-0.34b.ebuild,v 1.8 2004/11/16 11:53:09 mr_bones_ Exp $ DESCRIPTION="frontend for XMame using the GTK library" HOMEPAGE="http://gxmame.sourceforge.net/" @@ -16,7 +16,7 @@ DEPEND="virtual/x11 =dev-libs/glib-2* sys-libs/zlib" RDEPEND="nls? ( sys-devel/gettext ) - games-emulation/xmame" +