optional net support #34802, fix icc compiling #35607, increase # of joybuttons 36818

3 files changed, 112 insertions, 71 deletions

diff --git a/games-emulation/xmame/ChangeLog b/games-emulation/xmame/ChangeLog
index e4ab75ba8f72..212e8ecce6ff 100644
--- a/games-emulation/xmame/ChangeLog
+++ b/games-emulation/xmame/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for games-emulation/xmame
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/ChangeLog,v 1.10 2003/12/12 17:31:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/ChangeLog,v 1.11 2003/12/31 15:39:55 vapier Exp $
 
 *xmame-0.77.1 (30 Nov 2003)
 
+  31 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add patch to fix icc compilation #35607.
+  Increase number of available joybuttons from 16 to 32 #36818.
+  Add a local USE flag, net, to control network support #34802.
+
   12 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
   Add patch to work with alsa-1.0.0 #35108.
 
diff --git a/games-emulation/xmame/files/0.77.1-icc.patch b/games-emulation/xmame/files/0.77.1-icc.patch
new file mode 100644
index 000000000000..4e091bd550a4
--- /dev/null
+++ b/games-emulation/xmame/files/0.77.1-icc.patch
@@ -0,0 +1,21 @@
+--- Makefile	2003-12-31 10:09:34.498349816 -0500
++++ Makefile.icc	2003-12-31 10:18:46.570422104 -0500
+@@ -266,7 +266,7 @@
+ ifeq ($(CC),icc)
+ 
+   # Optimizations for the Intel compiler.
+-  CFLAGS    = -O3 -rcd -Xa -ipo -ipo_obj
++  CFLAGS    = -O3 -rcd -ipo -ipo_obj -w
+ 
+ else
+ ifeq ($(CC),sun-forte)
+--- src/unix/osinline.h	2003-11-13 00:06:05.000000000 -0500
++++ src/unix/osinline.h.icc	2003-12-31 10:19:16.673845688 -0500
+@@ -20,6 +20,7 @@
+ #define osd_mark_vector_dirty(x,y)
+ #endif
+ 
++#undef X86_ASM
+ #ifdef X86_ASM
+ #define vec_mult _vec_mult
+ INLINE int _vec_mult(int x, int y)
diff --git a/games-emulation/xmame/xmame-0.77.1.ebuild b/games-emulation/xmame/xmame-0.77.1.ebuild
index cf7e1613d2c7..dc2da02b0c02 100644
--- a/games-emulation/xmame/xmame-0.77.1.ebuild
+++ b/games-emulation/xmame/xmame-0.77.1.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.77.1.ebuild,v 1.2 2003/12/12 17:31:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.77.1.ebuild,v 1.3 2003/12/31 15:39:55 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/"
+SRC_URI="http://x.mame.net/download/xmame-${PV}.tar.bz2"
 
 LICENSE="xmame"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~ia64 ~amd64"
-IUSE="sdl dga xv alsa esd opengl X 3dfx svga ggi arts joystick icc"
+IUSE="sdl dga xv alsa esd opengl X 3dfx svga ggi arts joystick icc net"
 
 RDEPEND="sys-libs/zlib
 	sdl? ( >=media-libs/libsdl-1.2.0 )
@@ -36,77 +36,84 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-glx-fix.patch
 	epatch ${FILESDIR}/${PV}-alsa-1.0.0.patch
+	sed -i 's:JOY_BUTTONS 16:JOY_BUTTONS 32:' src/unix/devices.h || die "setting joybuttons failed" #36818
 
 	ln -s makefile.unix Makefile
 	case "${ARCH}" in
 	x86|ia64|amd64)
 		sed -i \
 			-e '/X86_ASM_68000 =/s:#::' \
-			-e '/X86_MIPS3_DRC =/s:#::' Makefile || \
-				die "sed Makefile (x86) failed"
+			-e '/X86_MIPS3_DRC =/s:#::' Makefile \
+			|| die "sed Makefile (x86) failed"
 		if  [ `use joystick` ] ; then
 			sed -i \
-				-e '/JOY_I386.*=/s:#::' Makefile || \
-					die "sed Makefile (joystick) failed"
+				-e '/JOY_I386.*=/s:#::' Makefile \
+				|| die "sed Makefile (joystick) failed"
 		fi
 		;;
 	ppc|sparc)
 		sed -i \
-			-e '/^MY_CPU/s:i386:risc:' Makefile || \
-				die "sed Makefile (ppc|sparc) failed"
+			-e '/^MY_CPU/s:i386:risc:' Makefile \
+			|| die "sed Makefile (ppc|sparc) failed"
 		;;
 	alpha)
 		sed -i \
-			-e '/^MY_CPU/s:i386:alpha:' Makefile || \
-				die "sed Makefile (alpha) failed"
+			-e '/^MY_CPU/s:i386:alpha:' Makefile \
+			|| die "sed Makefile (alpha) failed"
 		;;
 	mips)
 		sed -i \
-			-e '/^MY_CPU/s:i386:mips:' Makefile || \
-				die "sed Makefile (mips) failed"
+			-e '/^MY_CPU/s:i386:mips:' Makefile \
+			|| die "sed Makefile (mips) failed"
 		;;
 	esac
 
 	if [ `use icc` ] ; then
+		epatch ${FILESDIR}/${PV}-icc.patch
 		sed -i \
-			-e '/^CC/s:gcc:icc:' Makefile || \
-				die "sed Makefile (icc) failed"
+			-e '/^CC/s:gcc:icc:' Makefile \
+			|| die "sed Makefile (icc) failed"
+	fi
+	if [ `use net` ] ; then
+		sed -i \
+			-e '/XMAME_NET/s:#::' Makefile \
+			|| die "sed Makefile (net) failed"
 	fi
 	if [ `use esd` ] ; then
 		sed -i \
-			-e '/SOUND_ESOUND/s:#::' Makefile || \
-				die "sed Makefile (esd) failed"
+			-e '/SOUND_ESOUND/s:#::' Makefile \
+			|| die "sed Makefile (esd) failed"
 	fi
 	if [ `use alsa` ] ; then
 		sed -i \
-			-e '/SOUND_ALSA/s:#::' Makefile || \
-				die "sed Makefile (alsa) failed"
+			-e '/SOUND_ALSA/s:#::' Makefile \
+			|| die "sed Makefile (alsa) failed"
 	fi
 	if [ `use arts` ] ; then
 		sed -i \
-			-e '/SOUND_ARTS/s:#::' Makefile || \
-				die "sed Makefile (arts) failed"
+			-e '/SOUND_ARTS/s:#::' Makefile \
+			|| die "sed Makefile (arts) failed"
 	fi
 	if [ `use sdl` ] ; then
 		sed -i \
-			-e '/SOUND_SDL/s:#::' Makefile || \
-				die "sed Makefile (sdl) failed"
+			-e '/SOUND_SDL/s:#::' Makefile \
+			|| die "sed Makefile (sdl) failed"
 	fi
 	if [ `use dga` ] ; then
 		sed -i \
-			-e '/X11_DGA/s:#::' Makefile || \
-				die "sed Makefile (dga) failed"
+			-e '/X11_DGA/s:#::' Makefile \
+			|| die "sed Makefile (dga) failed"
 		if [ `use 3dfx` ] ; then
 			sed -i \
-				-e '/TDFX_DGA_WORKAROUND/s:#::' Makefile || \
-					die "sed Makefile (dga) failed"
+				-e '/TDFX_DGA_WORKAROUND/s:#::' Makefile \
+				|| die "sed Makefile (dga) failed"
 		fi
 	fi
 
 	if [ `use xv` ] ; then
 		sed -i \
-			-e '/X11_XV/s:#::' Makefile || \
-				die "sed Makefile (xv) failed"
+			-e '/X11_XV/s:#::' Makefile \
+			|| die "sed Makefile (xv) failed"
 	fi
 
 	case ${ARCH} in
@@ -123,26 +130,31 @@ src_unpack() {
 		-e "/^BINDIR/s:=.*:=${GAMES_BINDIR}:" \
 		-e "/^XMAMEROOT/s:=.*:=${GAMES_DATADIR}/${TARGET}:" \
 		-e "/^TARGET/s:mame:${TARGET:1}:" \
-		-e "s:^CFLAGS =:CFLAGS=${CFLAGS}:" Makefile || \
-			die "sed Makefile failed"
+		-e "s:^CFLAGS =:CFLAGS=${CFLAGS}:" Makefile \
+		|| die "sed Makefile failed"
 }
 
 src_compile() {
-	[ ! -z "`use X``use dga``use xv`" ] && {
-		emake -j1 DISPLAY_METHOD=x11 || die "emake failed (x11)";
-	}
-	[ `use sdl` ] && {
-		emake -j1 DISPLAY_METHOD=SDL || die "emake failed (SDL)";
-	}
-	[ `use svga` ] && {
-		emake -j1 DISPLAY_METHOD=svgalib || die "emake failed (svgalib)";
-	}
-	[ `use ggi` ] && {
-		emake -j1 DISPLAY_METHOD=ggi || die "emake failed (ggi)";
-	}
-	[ `use opengl` ] && {
-		emake -j1 DISPLAY_METHOD=xgl || die "emake failed (xgl)";
-	}
+	local disp=0
+	if [ `use sdl` ] ; then
+		emake -j1 DISPLAY_METHOD=SDL || die "emake failed (SDL)"
+		disp=1
+	fi
+	if [ `use svga` ] ; then
+		emake -j1 DISPLAY_METHOD=svgalib || die "emake failed (svgalib)"
+		disp=1
+	fi
+	if [ `use ggi` ] ; then
+		emake -j1 DISPLAY_METHOD=ggi || die "emake failed (ggi)"
+		disp=1
+	fi
+	if [ `use opengl` ] ; then
+		emake -j1 DISPLAY_METHOD=xgl || die "emake failed (xgl)"
+		disp=1
+	fi
+	if [ ! -z "`use X``use dga``use xv`" ] || [ ${disp} -eq 0 ] ; then
+		emake -j1 DISPLAY_METHOD=x11 || die "emake failed (x11)"
+	fi
 }
 
 src_install() {
@@ -156,32 +168,35 @@ src_install() {
 		-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;
-	}
-
-	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"
+	local disp=0
+	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 [ `use opengl` ] ; then
+		make DISPLAY_METHOD=xgl install || die "install failed (xgl)"
+		disp=1
+	fi
+	if [ ! -z "`use X``use dga``use xv`" ] || [ ${disp} -eq 0 ] ; then
+		make DISPLAY_METHOD=x11 install || die "install failed (x11)"
+	fi
+
+	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 [ `use opengl` ] ; then
 		dosym ${TARGET}.xgl ${GAMES_BINDIR}/${TARGET}
-	elif [ ! -z "`use X``use dga``use xv`" ] ; then
+	elif [ ! -z "`use X``use dga``use xv`" -o ${disp} -eq 0 ] ; then
 		dosym ${TARGET}.x11 ${GAMES_BINDIR}/${TARGET}
 	elif [ `use sdl` ] ; then
 		dosym ${TARGET}.SDL ${GAMES_BINDIR}/${TARGET}
@@ -195,7 +210,7 @@ src_install() {
 
 pkg_postinst() {
 	games_pkg_postinst
-	einfo "Your available MAME binaries are:"
+	einfo "Your available MAME binaries are: ${TARGET}"
 	[ ! -z "`use X``use dga``use xv`" ] && einfo " ${TARGET}.x11"
 	[ `use sdl` ]                       && einfo " ${TARGET}.SDL"
 	[ `use ggi` ]                       && einfo " ${TARGET}.ggi"