version bump

6 files changed, 234 insertions, 10 deletions

diff --git a/games-emulation/xmame/ChangeLog b/games-emulation/xmame/ChangeLog
index 2fd8d6a4a006..ce93a3783a0b 100644
--- a/games-emulation/xmame/ChangeLog
+++ b/games-emulation/xmame/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/xmame
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/ChangeLog,v 1.27 2004/09/02 20:17:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/ChangeLog,v 1.28 2004/11/16 11:47:16 mr_bones_ Exp $
+
+*xmame-0.88 (16 Nov 2004)
+
+  16 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> +xmame-0.88.ebuild:
+  version bump
 
   02 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> xmame-0.86.ebuild:
   Install chdman and xml2info in GAMES_LIBDIR
diff --git a/games-emulation/xmame/Manifest b/games-emulation/xmame/Manifest
index cfd7d326761a..ecb483adec3b 100644
--- a/games-emulation/xmame/Manifest
+++ b/games-emulation/xmame/Manifest
@@ -1,22 +1,25 @@
-MD5 2b93aa8389b10e61bb443a0077704236 ChangeLog 7039
+MD5 ebe3484485bb38ba10b27ff421908875 ChangeLog 7157
 MD5 e44da7fe9271f2f2e299cc34df120830 metadata.xml 1537
 MD5 30e8d4b0106df48fc70f99beb5608280 xmame-0.82.1.ebuild 6437
 MD5 3bfc553fbd6d37187aba00e77fb80875 xmame-0.83.1.ebuild 6774
-MD5 88ff19f62105c58b4ac9f277a8ae8776 xmame-0.86.ebuild 5874
-MD5 93b9c4a740015eb7262b223c7b8b7bbf files/0.77.1-icc.patch 584
+MD5 4fb4b2db147acb6d28ea9abf4531fc21 xmame-0.88.ebuild 5417
+MD5 8678f14a1893c1e9c8fa453ebd051382 xmame-0.86.ebuild 5877
 MD5 9bbbd2de60f0c41f643674a694cd2c90 files/0.77.1-alsa-1.0.0.patch 438
 MD5 13dc5b32bbff98dec74c41dd0c9b33a1 files/0.77.1-glx-fix.patch 597
+MD5 93b9c4a740015eb7262b223c7b8b7bbf files/0.77.1-icc.patch 584
+MD5 96b4074a6c4b94b57fb7c6258a36ef20 files/0.78.1-big_endian.patch 2969
 MD5 13dc5b32bbff98dec74c41dd0c9b33a1 files/0.78.1-glx-fix.patch 597
 MD5 93b9c4a740015eb7262b223c7b8b7bbf files/0.78.1-icc.patch 584
 MD5 0f77c568ca5f6a46b543e899c910d38a files/0.78.1-osd_die.patch 521
-MD5 96b4074a6c4b94b57fb7c6258a36ef20 files/0.78.1-big_endian.patch 2969
 MD5 13dc5b32bbff98dec74c41dd0c9b33a1 files/0.79.1-glx-fix.patch 597
 MD5 13dc5b32bbff98dec74c41dd0c9b33a1 files/0.80.1-glx-fix.patch 597
 MD5 a956d1afa6724941d56732f2b91f42eb files/0.80.1-make.patch 1243
 MD5 240bd404f0deb6cd68bf6a98a5fb76db files/0.81.1-glx-fix.patch 386
 MD5 240bd404f0deb6cd68bf6a98a5fb76db files/0.82.1-glx-fix.patch 386
-MD5 d60ae5dd2d8a993999a9a252d20507cf files/digest-xmame-0.82.1 67
 MD5 240bd404f0deb6cd68bf6a98a5fb76db files/0.83.1-glx-fix.patch 386
+MD5 240bd404f0deb6cd68bf6a98a5fb76db files/0.86-glx-fix.patch 386
+MD5 d60ae5dd2d8a993999a9a252d20507cf files/digest-xmame-0.82.1 67
 MD5 bd94e56aecab93b1d9e02b6fb3d8a0e9 files/digest-xmame-0.83.1 67
 MD5 1c5281cca09cd38869fa3715b3839b1b files/digest-xmame-0.86 65
-MD5 240bd404f0deb6cd68bf6a98a5fb76db files/0.86-glx-fix.patch 386
+MD5 60b1266244271466b84fb43fc9483ff2 files/digest-xmame-0.88 65
+MD5 240bd404f0deb6cd68bf6a98a5fb76db files/0.88-glx-fix.patch 386
diff --git a/games-emulation/xmame/files/0.88-glx-fix.patch b/games-emulation/xmame/files/0.88-glx-fix.patch
new file mode 100644
index 000000000000..cbcb32d8a7dc
--- /dev/null
+++ b/games-emulation/xmame/files/0.88-glx-fix.patch
@@ -0,0 +1,11 @@
+--- src/unix/osd_cpu.h.orig	2004-04-20 14:30:49.000000000 -0700
++++ src/unix/osd_cpu.h	2004-04-20 14:31:48.000000000 -0700
+@@ -38,7 +38,7 @@
+ #endif
+ #endif
+ 
+-#ifndef __ARCH_solaris
++#if !defined __ARCH_solaris && !defined xgl
+ /* grrr work around some stupid header conflicts */
+ #if !defined __XF86_DGA_C && !defined __XOPENGL_C_ && !defined LONG64
+ typedef signed   char      INT8;
diff --git a/games-emulation/xmame/files/digest-xmame-0.88 b/games-emulation/xmame/files/digest-xmame-0.88
new file mode 100644
index 000000000000..43de6c9f3f17
--- /dev/null
+++ b/games-emulation/xmame/files/digest-xmame-0.88
@@ -0,0 +1 @@
+MD5 5f247adfc80362101ff207a061e81516 xmame-0.88.tar.bz2 14799683
diff --git a/games-emulation/xmame/xmame-0.86.ebuild b/games-emulation/xmame/xmame-0.86.ebuild
index 861cabe9893f..5b96363de3ce 100644
--- a/games-emulation/xmame/xmame-0.86.ebuild
+++ b/games-emulation/xmame/xmame-0.86.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/xmame/xmame-0.86.ebuild,v 1.4 2004/11/12 18:11:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.86.ebuild,v 1.5 2004/11/16 11:47:16 mr_bones_ Exp $
 
 inherit flag-o-matic gcc eutils games
 
@@ -74,8 +74,8 @@ src_unpack() {
 
 	if use ppc ; then
 		sed -i \
-			-e '/LD.*--relax/s:^# ::' \
-			Makefile || die "sed Makefile (ppc/LD) failed"
+			-e '/LD.*--relax/s:^# ::' Makefile \
+			|| die "sed Makefile (ppc/LD) failed"
 	fi
 
 	toggle_feature sdl JOY_SDL
diff --git a/games-emulation/xmame/xmame-0.88.ebuild b/games-emulation/xmame/xmame-0.88.ebuild
new file mode 100644
index 000000000000..a2360cc20a73
--- /dev/null
+++ b/games-emulation/xmame/xmame-0.88.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.88.ebuild,v 1.1 2004/11/16 11:47:16 mr_bones_ Exp $
+
+inherit flag-o-matic gcc eutils games
+
+TARGET="${PN}"
+
+DESCRIPTION="Multiple Arcade Machine Emulator for X11"
+HOMEPAGE="http://x.mame.net/"
+SRC_URI="http://x.mame.net/download/xmame-${PV}.tar.bz2"
+
+LICENSE="xmame"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="3dfx alsa arts dga esd ggi joystick net opengl sdl svga X xv"
+
+RDEPEND="sys-libs/zlib
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	alsa? ( media-libs/alsa-lib )
+	xv? ( virtual/x11 )
+	dga? ( virtual/x11 )
+	X? ( virtual/x11 )
+	opengl (
+		virtual/x11
+		virtual/opengl
+		virtual/glu )
+	expat? ( dev-libs/expat )
+	esd? ( >=media-sound/esound-0.2.29 )
+	svga? ( media-libs/svgalib )
+	ggi? ( media-libs/libggi )
+	arts? ( kde-base/arts )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	>=sys-apps/sed-4"
+# Icc sucks. bug #41342
+#	icc? ( dev-lang/icc )
+
+S="${WORKDIR}/xmame-${PV}"
+
+toggle_feature() {
+	if use $1 ; then
+		sed -i \
+			-e "/$2.*=/s:#::" Makefile \
+			|| die "sed Makefile ($1 / $2) failed"
+	fi
+}
+toggle_feature2() {
+	use $1 && toggle_feature $2 $3
+}
+
+src_unpack() {
+	local mycpu=
+
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-glx-fix.patch"
+
+	case ${ARCH} in
+		x86)	mycpu="i386";;
+		ia64)	mycpu="ia64";;
+		amd64)	mycpu="amd64";;
+		ppc)	mycpu="risc";;
+		sparc)	mycpu="risc";;
+		hppa)	mycpu="risc";;
+		alpha)	mycpu="alpha";;
+		mips)	mycpu="mips";;
+	esac
+
+	sed -i \
+		-e '/^BUILD_EXPAT/s/^/#/' \
+		-e "/^PREFIX/s:=.*:=/usr:" \
+		-e "/^MY_CPU/s:i386:${mycpu}:" \
+		-e "/^BINDIR/s:=.*:=${GAMES_BINDIR}:" \
+		-e "/^MANDIR/s:=.*:=/usr/share/man/man6:" \
+		-e "/^XMAMEROOT/s:=.*:=${GAMES_DATADIR}/${TARGET}:" \
+		-e "/^TARGET/s:mame:${TARGET:1}:" \
+		-e "s:^CFLAGS =:CFLAGS=${CFLAGS}:" \
+		Makefile \
+		|| die "sed Makefile failed"
+
+	if use ppc ; then
+		sed -i \
+			-e '/LD.*--relax/s:^# ::' Makefile \
+			|| die "sed Makefile (ppc/LD) failed"
+	fi
+
+
+	#toggle_feature x86 X86_ASM_68020 # Broken
+	toggle_feature x86 X86_ASM_68000
+	toggle_feature x86 X86_MIPS3_DRC
+	toggle_feature2 x86 mmx EFFECT_MMX_ASM
+	toggle_feature joystick JOY_STANDARD
+	use net && ewarn "Network support is currently (${PV}) broken :("
+	#toggle_feature net XMAME_NET # Broken
+	toggle_feature esd SOUND_ESOUND
+	toggle_feature alsa SOUND_ALSA
+	toggle_feature arts SOUND_ARTS
+	toggle_feature dga X11_DGA
+	toggle_feature xv X11_XV
+	toggle_feature expat BUILD_EXPAT
+	toggle_feature opengl X11_OPENGL
+
+	case ${ARCH} in
+		x86|ia64|amd64)
+			append-flags -Wno-unused -fomit-frame-pointer -fstrict-aliasing -fstrength-reduce
+			use amd64 || append-flags -ffast-math #54270
+			[ $(gcc-major-version) -eq 3 ] \
+				&& append-flags -falign-functions=2 -falign-jumps=2 -falign-loops=2 \
+				|| append-flags -malign-functions=2 -malign-jumps=2 -malign-loops=2
+			;;
+		ppc)
+			append-flags -Wno-unused -funroll-loops -fstrength-reduce -fomit-frame-pointer -ffast-math -fsigned-char
+			;;
+		hppa)
+			append-flags -ffunction-sections
+			;;
+	esac
+
+	sed -i \
+		-e "s:[Xx]mame:${TARGET}:g" \
+		doc/*.6 \
+		|| die "sed man pages failed"
+	sed -i \
+		-e '/^QUIET/s:^:#:' src/unix/unix.mak \
+		|| die "sed src/unix/unix.mak failed"
+}
+
+src_compile() {
+	local disp=0
+	if use sdl ; then
+		emake DISPLAY_METHOD=SDL || die "emake failed (SDL)"
+		disp=1
+	fi
+	if use svga ; then
+		emake DISPLAY_METHOD=svgalib || die "emake failed (svgalib)"
+		disp=1
+	fi
+	if use ggi ; then
+		emake DISPLAY_METHOD=ggi || die "emake failed (ggi)"
+		disp=1
+	fi
+	if  [ ${disp} -eq 0 ] || use opengl || use X || use dga || use xv ; then
+		emake DISPLAY_METHOD=x11 || die "emake failed (x11)"
+	fi
+}
+
+src_install() {
+	local disp=0
+
+	sed -i \
+		-e "s:^PREFIX.*:PREFIX=${D}/usr:" \
+		-e "s:^BINDIR.*:BINDIR=${D}/${GAMES_BINDIR}:" \
+		-e "s:^MANDIR.*:MANDIR=${D}/usr/share/man/man6:" \
+		-e "s:^XMAMEROOT.*:XMAMEROOT=${D}/${GAMES_DATADIR}/${TARGET}:" \
+		Makefile \
+		|| die "sed Makefile failed"
+
+	if use sdl ; then
+		make DISPLAY_METHOD=SDL install || die "install failed (sdl)"
+		disp=1
+	fi
+	if use svga ; then
+		make DISPLAY_METHOD=svgalib install || die "install failed (svga)"
+		disp=1
+	fi
+	if use ggi ; then
+		make DISPLAY_METHOD=ggi install || die "install failed (ggi)"
+		disp=1
+	fi
+	if [ ${disp} -eq 0 ] || use opengl || use X || use dga || use xv ; then
+		make DISPLAY_METHOD=x11 install || die "install failed (x11)"
+	fi
+	exeinto "${GAMES_LIBDIR}/${PN}"
+	doexe chdman xml2info || die "doexe failed"
+
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp -r ctrlr "${D}/${GAMES_DATADIR}/${PN}/" || die "cp failed"
+	dodoc doc/{changes.*,*.txt,mame/*,${TARGET}rc.dist} README todo \
+		|| die "dodoc failed"
+	dohtml -r doc/* || die "dohtml failed"
+
+	if [ ${disp} -eq 0 ] || use opengl || use X || use dga || use xv ; then
+		dosym "${TARGET}.x11" "${GAMES_BINDIR}/${TARGET}"
+	elif use sdl ; then
+		dosym "${TARGET}.SDL" "${GAMES_BINDIR}/${TARGET}"
+	elif use svga ; then
+		dosym ${TARGET}.svgalib "${GAMES_BINDIR}/${TARGET}"
+	elif use ggi ; then
+		dosym ${TARGET}.ggi "${GAMES_BINDIR}/${TARGET}"
+	fi
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	einfo "Your available MAME binaries are: ${TARGET}"
+	if useq opengl || useq X || useq dga || useq xv ; then
+		einfo " ${TARGET}.x11"
+	fi
+	useq sdl    && einfo " ${TARGET}.SDL"
+	useq ggi    && einfo " ${TARGET}.ggi"
+	useq svga   && einfo " ${TARGET}.svgalib"
+}