version bump

7 files changed, 177 insertions, 251 deletions

diff --git a/app-emulation/xmame/ChangeLog b/app-emulation/xmame/ChangeLog
index c3d633fd4ce4..fddfca839e63 100644
--- a/app-emulation/xmame/ChangeLog
+++ b/app-emulation/xmame/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xmame
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmame/ChangeLog,v 1.21 2003/07/16 01:50:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmame/ChangeLog,v 1.22 2003/08/16 06:06:12 vapier Exp $
+
+*xmame-0.71.1 (16 Aug 2003)
+
+  16 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #24986 + mips patch.
 
 *xmame-0.70.1 (11 Jul 2003)
 
diff --git a/app-emulation/xmame/files/0.71.1-glx-fix.patch b/app-emulation/xmame/files/0.71.1-glx-fix.patch
new file mode 100644
index 000000000000..20d29a9d0573
--- /dev/null
+++ b/app-emulation/xmame/files/0.71.1-glx-fix.patch
@@ -0,0 +1,19 @@
+diff -urN xmame-0.70.1-orig/src/unix/osd_cpu.h xmame-0.70.1/src/unix/osd_cpu.h
+--- xmame-0.70.1-orig/src/unix/osd_cpu.h	2003-06-12 05:37:50.000000000 +0200
++++ xmame-0.70.1/src/unix/osd_cpu.h	2003-07-15 15:09:03.000000000 +0200
+@@ -39,11 +39,15 @@
+ #endif
+ 
+ /* grrr work around some stupid header conflicts */
++#ifndef xgl
+ #if !defined __XF86_DGA_C && !defined __XOPENGL_C_ && !defined LONG64
+ typedef signed   char      INT8;
+ typedef signed   short     INT16;
+ typedef signed   int       INT32;
+ #endif
++#else
++#include <X11/Xmd.h>
++#endif
+ 
+ #ifndef LONG64
+ typedef signed   long long INT64;
diff --git a/app-emulation/xmame/files/0.71.1-mips-fix.patch b/app-emulation/xmame/files/0.71.1-mips-fix.patch
new file mode 100644
index 000000000000..d7259a7967f8
--- /dev/null
+++ b/app-emulation/xmame/files/0.71.1-mips-fix.patch
@@ -0,0 +1,26 @@
+--- xmame-0.71.1-orig/src/cpu/mips/mips3drc.c.orig	2003-08-02 20:49:23.023587861 -0500
++++ xmame-0.71.1/src/cpu/mips/mips3drc.c		2003-08-02 20:51:44.377905935 -0500
+@@ -162,11 +162,11 @@
+ **#################################################################################################*/
+ 
+ /* PC and pointer pair */
+-struct pc_ptr_pair
++/*struct pc_ptr_pair
+ {
+ 	UINT32		pc;
+ 	UINT8 *		target;
+-};
++};*/
+ 
+ 
+ /* memory access function table */
+@@ -358,7 +358,8 @@
+ 
+ 	/* fill in the config */
+ 	memset(&drconfig, 0, sizeof(drconfig));
+-	drconfig.cachesize      = CACHE_SIZE;
++	drconfig.cache_size      = CACHE_SIZE;
++	drconfig.max_instructions = MAX_INSTRUCTIONS;
+ 	drconfig.address_bits   = 32;
+ 	drconfig.lsbs_to_ignore = 2;
+ 	drconfig.uses_fp        = 1;
diff --git a/app-emulation/xmame/files/digest-xmame-0.69.1 b/app-emulation/xmame/files/digest-xmame-0.69.1
deleted file mode 100644
index 55aa56fc4ff2..000000000000
--- a/app-emulation/xmame/files/digest-xmame-0.69.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4ecfdc3e7259bb938e8a99b4b44b983 xmame-0.69.1.tar.bz2 9803019
diff --git a/app-emulation/xmame/files/digest-xmame-0.71.1 b/app-emulation/xmame/files/digest-xmame-0.71.1
new file mode 100644
index 000000000000..21eaf8c78dfc
--- /dev/null
+++ b/app-emulation/xmame/files/digest-xmame-0.71.1
@@ -0,0 +1 @@
+MD5 652341c43e216a96d26a2731b4ab5ffe xmame-0.71.1.tar.bz2 10051496
diff --git a/app-emulation/xmame/xmame-0.69.1.ebuild b/app-emulation/xmame/xmame-0.69.1.ebuild
deleted file mode 100644
index 24730121527c..000000000000
--- a/app-emulation/xmame/xmame-0.69.1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmame/xmame-0.69.1.ebuild,v 1.4 2003/08/05 15:15:51 vapier Exp $
-
-DESCRIPTION="Multiple Arcade Machine Emulator for X11"
-HOMEPAGE="http://x.mame.net/"
-SRC_URI="http://x.mame.net/download/${P}.tar.bz2"
-
-LICENSE="xmame"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE="sdl dga xv alsa esd opengl X 3dfx svga ggi arts"
-
-DEPEND="sdl? ( >=media-libs/libsdl-1.2.0 )
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	xv? ( >=x11-base/xfree-4.1.0 )
-	dga? ( >=x11-base/xfree-4.1.0 )
-	esd? ( >=media-sound/esound-0.2.29 )
-	svga? ( media-libs/svgalib )
-	ggi? ( media-libs/libggi )
-	arts? ( kde-base/arts )
-	x86? ( dev-lang/nasm )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -e "s:CFLAGS    = -O -Wall:\#CFLAGS=:g" -e \
-	"s:PREFIX = /usr/local:PREFIX = /usr:g" -e \
-	"s:MANDIR = \$\(PREFIX\)/man/man6:MANDIR = \$\(PREFIX\)/share/man/man6:g" \
-	makefile.unix > makefile.unix.tmp
-	mv makefile.unix.tmp makefile.unix
-
-	if [ ${ARCH} = "x86" ]
-	then
-		# Enable joystick support
-		sed -e "s/\# JOY_I386/JOY_I386/g" makefile.unix > makefile.unix.tmp
-		mv makefile.unix.tmp makefile.unix
-		# Enable M68K asm core
-		sed -e "s/\# X86_ASM_68000 = 1/X86_ASM_68000 = 1/g" makefile.unix > makefile.unix.tmp
-		mv makefile.unix.tmp makefile.unix
-	fi
-
-	if [ ${ARCH} = "ppc" ]
-	then
-		sed -e "s:MY_CPU = i386:\#MY_CPU = i386:g" -e \
-		"s:\# MY_CPU = risc$:MY_CPU = risc:" makefile.unix > makefile.unix.tmp
-	        mv makefile.unix.tmp makefile.unix
-	fi
-
-	if [ "`use esd`" ]; then
-		sed -e "s/\# SOUND_ESOUND/SOUND_ESOUND/g" makefile.unix > makefile.unix.tmp
-		mv makefile.unix.tmp makefile.unix
-	fi
-
-	if [ "`use alsa`" ]; then
-		sed -e "s/\# SOUND_ALSA/SOUND_ALSA/g" makefile.unix > makefile.unix.tmp
-		mv makefile.unix.tmp makefile.unix
-	fi
-
-	if [ "`use arts`" ]; then
-		sed -e "s/\# SOUND_ARTS/SOUND_ARTS/g" makefile.unix > makefile.unix.tmp
-		mv makefile.unix.tmp makefile.unix
-	fi
-
-	if [ "`use X`" ] || [ "`use dga`" ] || [ "`use xv`" ]; then
-		cp makefile.unix makefile.x11;
-	fi
-
-	if [ "`use svga`" ]; then
-		cp makefile.unix makefile.svga
-		sed -e "s/DISPLAY_METHOD = x11/DISPLAY_METHOD = svgalib/g" \
-		makefile.svga > makefile.svga.tmp
-		mv makefile.svga.tmp makefile.svga
-	fi
-
-	if [ "`use sdl`" ]; then
-		cp makefile.unix makefile.SDL
-		sed -e "s/DISPLAY_METHOD = x11/DISPLAY_METHOD = SDL/g" \
-		makefile.SDL > makefile.SDL.tmp
-		mv makefile.SDL.tmp makefile.SDL
-	fi
-
-	if [ "`use ggi`" ]; then
-		cp makefile.unix makefile.ggi
-		sed -e "s/DISPLAY_METHOD = x11/DISPLAY_METHOD = ggi/g" \
-		makefile.ggi > makefile.ggi.tmp
-		mv makefile.ggi.tmp makefile.ggi
-	fi
-
-	if [ "`use opengl`" ]; then
-		cp makefile.unix makefile.xgl
-		sed -e "s/DISPLAY_METHOD = x11/DISPLAY_METHOD = xgl/g" \
-		makefile.xgl > makefile.xgl.tmp
-		mv makefile.xgl.tmp makefile.xgl
-		sed -e "s/<GL\/glx.h>/\"\/usr\/lib\/opengl\/xfree\/include\/glx.h\"/g" \
-		src/unix/video-drivers/gltool.h > src/unix/video-drivers/gltool.h.tmp
-		mv src/unix/video-drivers/gltool.h.tmp src/unix/video-drivers/gltool.h
-	fi
-	
-	if [ "`use dga`" ]; then
-		sed -e "s/\# X11_DGA = 1/X11_DGA = 1/g" \
-		makefile.x11 > makefile.x11.tmp
-		mv makefile.x11.tmp makefile.x11
-		if [ "`use 3dfx`" ]; then
-			sed -e "s/\# TDFX_DGA_WORKAROUND/TDFX_DGA_WORKAROUND/g" \
-			makefile.x11 > makefile.x11.tmp
-			mv makefile.x11.tmp makefile.x11
-		fi
-		if [ "`use sdl`" ]; then
-			sed -e "s/\# X11_DGA = 1/X11_DGA = 1/g" \
-			makefile.SDL > makefile.SDL.tmp
-			mv makefile.SDL.tmp makefile.SDL
-			if [ "`use 3dfx`" ]; then
-				sed -e "s/\# TDFX_DGA_WORKAROUND/TDFX_DGA_WORKAROUND/g" \
-				makefile.SDL > makefile.SDL.tmp
-				mv makefile.SDL.tmp makefile.SDL
-			fi
-		fi
-	fi
-
-	if [ "`use xv`" ]; then
-		sed -e "s/\# X11_XV = 1/X11_XV = 1/g" makefile.x11 > makefile.x11.tmp
-		mv makefile.x11.tmp  makefile.x11
-	fi
-}
-
-src_compile() {
-	local MYFLAGS
-	local GCCMAJ
-	MYFLAGS=""
-	# 08 Oct 2002 Caleb Shay
-	# Parallel makes breaks the build
-	MAKEOPTS=""
-
-	GCCMAJ=`gcc -v 2>&1 | grep version | awk '{print $3}' | cut -f1 -d\.`
-
-	if [ ${ARCH} = "ppc" ] ; then
-		# add Makefile suggested flags for ppc
-		MYFLAGS="${CFLAGS} -funroll-loops \
-		-fstrength-reduce -fomit-frame-pointer -ffast-math -fsigned-char"
-	fi
-
-	if [ ${ARCH} = "x86" ] ; then
-		# add Makefile suggested flags for x86
-		MYFLAGS="${CFLAGS} -O3 -Wall -Wno-unused -funroll-loops \
-		-fstrength-reduce -fomit-frame-pointer -ffast-math"
-		if [ ${GCCMAJ} = "2" ]; then
-			MYFLAGS="${MYFLAGS} -malign-functions=2 -malign-jumps=2 -malign-loops=2"
-		else
-			MYFLAGS="${MYFLAGS} -falign-functions=2 -falign-jumps=2 -falign-loops=2"
-		fi
-	fi
-
-	if [ "`use X`" ] || [ "`use dga`" ] || [ "`use xv`" ]; then
-		cp makefile.x11 Makefile
-		emake CFLAGS="${MYFLAGS}" || die
-	fi
-
-	if [ "`use sdl`" ]; then
-		cp makefile.SDL Makefile
-		emake CFLAGS="${MYFLAGS}" || die
-	fi
-
-	if [ "`use svga`" ]; then
-		cp makefile.svga Makefile
-		emake CFLAGS="${MYFLAGS}" || die
-	fi
-
-	if [ "`use ggi`" ]; then
-		cp makefile.ggi Makefile
-		emake CFLAGS="${MYFLAGS}" || die
-	fi
-	
-	if [ "`use opengl`" ]; then
-		cp makefile.xgl Makefile
-		emake CFLAGS="${MYFLAGS}" || die
-	fi
-}
-
-src_install() {
-	if [ "`use X`" ] || [ "`use dga`" ] || [ "`use xv`" ]; then
-		cp makefile.x11 Makefile
-		make \
-			PREFIX=${D}/usr \
-			MANDIR=${D}/usr/share/man/man6 \
-			install
-	fi
-	if [ "`use sdl`" ]; then
-		cp makefile.SDL Makefile
-		make \
-			PREFIX=${D}/usr \
-			MANDIR=${D}/usr/share/man/man6 \
-			install
-	fi
-	if [ "`use svga`" ]; then
-		cp makefile.svga Makefile
-		make \
-			PREFIX=${D}/usr \
-			MANDIR=${D}/usr/share/man/man6 \
-			install
-	fi
-	if [ "`use ggi`" ]; then
-		cp makefile.ggi Makefile
-		make \
-			PREFIX=${D}/usr \
-			MANDIR=${D}/usr/share/man/man6 \
-			install
-	fi
-
-	if [ "`use opengl`" ]; then
-		cp makefile.xgl Makefile
-		make \
-			PREFIX=${D}/usr \
-			MANDIR=${D}/usr/share/man/man6 \
-			install
-	fi
-
-	dodoc doc/{changes.*,dga2.txt,gamelist.mame,readme.mame,xmamerc.dist}
-	dodoc doc/{xmame-doc.ps,xmame-doc.txt}
-
-	dohtml -r doc
-
-	if [ "`use X`" ] || [ "`use dga`" ] || [ "`use xv`" ]; then
-		dosym xmame.x11 /usr/bin/xmame
-	fi
-}
-
-pkg_postinst() {
-	einfo "Your available MAME binaries are:"
-	if [ "`use X`" ] || [ "`use dga`" ] || [ "`use xv`" ]; then
-		einfo "	xmame.x11";
-	fi
-	if [ "`use sdl`" ]; then
-		einfo "	xmame.SDL"
-	fi
-	if [ "`use svga`" ]; then
-		einfo "	xmame.svgalib"
-	fi
-	if [ "`use ggi`" ]; then
-		einfo "	xmame.ggi"
-	fi
-	if [ "`use opengl`" ]; then
-		einfo "	xmame.xgl"
-	fi
-	if [ "`use X`" ] || [ "`use dga`" ] || [ "`use xv`" ]; then
-		einfo "xmame is a symbolic link to xmame.x11"
-	fi
-}
diff --git a/app-emulation/xmame/xmame-0.71.1.ebuild b/app-emulation/xmame/xmame-0.71.1.ebuild
new file mode 100644
index 000000000000..de7bfaff8993
--- /dev/null
+++ b/app-emulation/xmame/xmame-0.71.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmame/xmame-0.71.1.ebuild,v 1.1 2003/08/16 06:06:12 vapier Exp $
+
+inherit games flag-o-matic gcc eutils
+
+TARGET=${PN}
+
+DESCRIPTION="Multiple Arcade Machine Emulator for X11"
+SRC_URI="http://x.mame.net/download/xmame-${PV}.tar.bz2"
+HOMEPAGE="http://x.mame.net/"
+
+LICENSE="xmame"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha"
+IUSE="sdl dga xv alsa esd opengl X 3dfx svga ggi arts joystick"
+
+DEPEND="sys-libs/zlib
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	alsa? ( media-libs/alsa-lib )
+	xv? ( >=x11-base/xfree-4.1.0 )
+	dga? ( >=x11-base/xfree-4.1.0 )
+	esd? ( >=media-sound/esound-0.2.29 )
+	svga? ( media-libs/svgalib )
+	ggi? ( media-libs/libggi )
+	arts? ( kde-base/arts )
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/xmame-${PV}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-glx-fix.patch
+	epatch ${FILESDIR}/${PV}-mips-fix.patch
+
+	[ ${ARCH} == "x86" ] && sed -i -e '/X86_ASM_68000 =/s:#::' -e '/X86_MIPS3_DRC =/s:#::' Makefile
+	[ ${ARCH} == "ppc" ] && sed -i '/^MY_CPU/s:i386:risc:' Makefile
+	[ ${ARCH} == "sparc" ] && sed -i '/^MY_CPU/s:i386:risc:' Makefile
+	[ ${ARCH} == "alpha" ] && sed -i '/^MY_CPU/s:i386:alpha:' Makefile
+	[ ${ARCH} == "mips" ] && sed -i '/^MY_CPU/s:i386:mips:' Makefile
+
+	[ ${ARCH} == "x86" ] && [ `use joystick` ] && sed -i '/JOY_I386.*=/s:#::' Makefile
+
+	[ `use esd` ] && sed -i '/SOUND_ESOUND/s:#::' Makefile
+	[ `use alsa` ] && sed -i '/SOUND_ALSA/s:#::' Makefile
+	[ `use arts` ] && sed -i '/SOUND_ARTS/s:#::' Makefile
+	[ `use sdl` ] && sed -i '/SOUND_SDL/s:#::' Makefile
+
+	if [ `use dga` ] ; then
+		sed -i '/X11_DGA/s:#::' Makefile
+		[ `use 3dfx` ] && sed -i '/TDFX_DGA_WORKAROUND/s:#::' Makefile
+	fi
+
+	[ `use xv` ] && sed -i '/X11_XV/s:#::' Makefile
+
+	sed -i \
+		-e "/^PREFIX/s:=.*:=/usr:" \
+		-e "/^BINDIR/s:=.*:=${GAMES_BINDIR}:" \
+		-e "/^XMAMEROOT/s:=.*:=${GAMES_DATADIR}/${TARGET}:" \
+		-e "/^TARGET/s:mame:${TARGET:1}:" \
+		Makefile
+
+	case ${ARCH} in
+		x86)	append-flags -Wno-unused -fomit-frame-pointer -fstrict-aliasing -fstrength-reduce -ffast-math
+			[ `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
+			;;
+	esac
+	sed -i "s:^CFLAGS =:CFLAGS=${CFLAGS}:" Makefile
+}
+
+src_compile() {
+	[ ! -z "`use X``use dga``use xv`" ] && { make DISPLAY_METHOD=x11 || die; }
+	[ `use sdl` ] && { make DISPLAY_METHOD=SDL || die; }
+	[ `use svga` ] && { make DISPLAY_METHOD=svgalib || die; }
+	[ `use ggi` ] && { make DISPLAY_METHOD=ggi || die; }
+	[ `use opengl` ] && { make DISPLAY_METHOD=xgl || die; }
+}
+
+src_install() {
+	sed -i \
+		-e "s:^PREFIX.*:PREFIX=${D}/usr:" \
+		-e "s:^BINDIR.*:BINDIR=${D}/${GAMES_BINDIR}:" \
+		-e "s:^XMAMEROOT.*:XMAMEROOT=${D}/${GAMES_DATADIR}/${TARGET}:" \
+		Makefile
+
+	[ ! -z "`use X``use dga``use xv`" ]	&& { make DISPLAY_METHOD=x11 install || die; }
+	[ `use sdl` ]				&& { make DISPLAY_METHOD=SDL install || die; }
+	[ `use svga` ]				&& { make DISPLAY_METHOD=svgalib install || die; }
+	[ `use ggi` ]				&& { make DISPLAY_METHOD=ggi install || die; }
+	[ `use opengl` ]			&& { make DISPLAY_METHOD=xgl install || die; }
+
+	dodoc doc/{changes.*,*.txt,mame/*,${TARGET}rc.dist} README todo
+	dohtml -r doc/*
+
+	if [ `use opengl` ] ; then
+		dosym ${TARGET}.xgl ${GAMES_BINDIR}/${TARGET}
+	elif [ ! -z "`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:"
+	[ ! -z "`use X``use dga``use xv`" ] && einfo " ${TARGET}.x11"
+	[ `use sdl` ] && einfo " ${TARGET}.SDL"
+	[ `use svga` ] && einfo " ${TARGET}.svgalib"
+	[ `use ggi` ] && einfo " ${TARGET}.ggi"
+	[ `use opengl` ] && einfo " ${TARGET}.xgl"
+}