diff options
21 files changed, 16 insertions, 765 deletions
diff --git a/games-emulation/xmame/ChangeLog b/games-emulation/xmame/ChangeLog index 71449fb28530..9485feef5df0 100644 --- a/games-emulation/xmame/ChangeLog +++ b/games-emulation/xmame/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-emulation/xmame # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/ChangeLog,v 1.36 2005/03/17 02:29:23 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/ChangeLog,v 1.37 2005/03/31 04:35:28 mr_bones_ Exp $ + +*xmame-0.95 (30 Mar 2005) + + 30 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> + -files/0.82.1-glx-fix.patch, -xmame-0.82.1.ebuild, -xmame-0.90.ebuild, + -xmame-0.92.ebuild, +xmame-0.95.ebuild: + version bump; clean older ebuilds *xmame-0.94 (16 Mar 2005) diff --git a/games-emulation/xmame/Manifest b/games-emulation/xmame/Manifest index 1edd4c7f6fee..7d8756d33f3f 100644 --- a/games-emulation/xmame/Manifest +++ b/games-emulation/xmame/Manifest @@ -5,6 +5,7 @@ MD5 33e6fdecc49c4a9b7fe62bc42ae7b9df xmame-0.83.1.ebuild 6777 MD5 959a3e9031cc9c5b381e66125f35dcd5 xmame-0.92.ebuild 5656 MD5 8a2f29f9b5409562fc439963d723dc64 xmame-0.90.ebuild 5656 MD5 45c8d0f25a0a94014d363211224d668e xmame-0.94.ebuild 5736 +MD5 45c8d0f25a0a94014d363211224d668e xmame-0.95.ebuild 5736 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 @@ -23,5 +24,6 @@ MD5 d60ae5dd2d8a993999a9a252d20507cf files/digest-xmame-0.82.1 67 MD5 bd94e56aecab93b1d9e02b6fb3d8a0e9 files/digest-xmame-0.83.1 67 MD5 22d18a43e0c863d4ae3dd5ecd1c97dcd files/digest-xmame-0.92 65 MD5 f35e45e67ae14ead8e17b2dfcb9b161e files/digest-xmame-0.94 65 +MD5 4510ec28e6e4e66892e55b85cbe5ea0a files/digest-xmame-0.95 65 MD5 240bd404f0deb6cd68bf6a98a5fb76db files/0.88-glx-fix.patch 386 MD5 7e05f3a6946fa925c047e236acd492c8 files/digest-xmame-0.90 65 diff --git a/games-emulation/xmame/files/0.77.1-alsa-1.0.0.patch b/games-emulation/xmame/files/0.77.1-alsa-1.0.0.patch deleted file mode 100644 index c092e98da603..000000000000 --- a/games-emulation/xmame/files/0.77.1-alsa-1.0.0.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/unix/sysdep/dsp-drivers/alsa-old.c 2003-12-09 23:29:46.000000000 -0700 -+++ src/unix/sysdep/dsp-drivers/alsa.c 2003-12-09 23:28:33.000000000 -0700 -@@ -59,6 +59,9 @@ - - #ifdef SYSDEP_DSP_ALSA - -+/* Eventually we should use the 1.0 API. */ -+#define ALSA_PCM_OLD_HW_PARAMS_API 1 -+ - #include <sys/ioctl.h> /* System and I/O control */ - #include <alsa/asoundlib.h> /* ALSA sound library header */ - #include "sysdep/sysdep_dsp.h" diff --git a/games-emulation/xmame/files/0.77.1-glx-fix.patch b/games-emulation/xmame/files/0.77.1-glx-fix.patch deleted file mode 100644 index 20d29a9d0573..000000000000 --- a/games-emulation/xmame/files/0.77.1-glx-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -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/games-emulation/xmame/files/0.77.1-icc.patch b/games-emulation/xmame/files/0.77.1-icc.patch deleted file mode 100644 index 4e091bd550a4..000000000000 --- a/games-emulation/xmame/files/0.77.1-icc.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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/files/0.78.1-big_endian.patch b/games-emulation/xmame/files/0.78.1-big_endian.patch deleted file mode 100644 index 3314d3ef4900..000000000000 --- a/games-emulation/xmame/files/0.78.1-big_endian.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- src/unix/video-drivers/x11_window.c 2003-12-27 00:29:16.000000000 +0100 -+++ src/unix/video-drivers/x11_window.c 2004-02-03 23:04:22.000000000 +0100 -@@ -1463,7 +1463,11 @@ - - /* Storing this data in YUYV order simplifies using the data for - YUY2, both with and without smoothing... */ -+#ifdef LSB_FIRST - hwscale_yuvlookup[i]=(y<<0) | (u<<8) | (y<<16) | (v<<24); -+#else -+ hwscale_yuvlookup[i]=(y<<24) | (u<<16) | (y<<8) | (v<<0); -+#endif - } - } - } ---- src/unix/video-drivers/blit.h 2003-12-27 00:29:16.000000000 +0100 -+++ src/unix/video-drivers/blit.h 2004-02-04 01:17:56.000000000 +0100 -@@ -72,6 +72,7 @@ - }\ - } - #elif defined BLIT_HWSCALE_YUY2 -+#ifdef LSB_FIRST /* x86 etc */ - #define COPY_LINE2(SRC, END, DST) \ - {\ - SRC_PIXEL *src = SRC; \ -@@ -89,6 +90,25 @@ - *dst++=y|y2|((uv1+uv2)&0xff00ff00);\ - } \ - } -+#else /* ppc etc */ -+#define COPY_LINE2(SRC, END, DST) \ -+ {\ -+ SRC_PIXEL *src = SRC; \ -+ SRC_PIXEL *end = END; \ -+ unsigned long *dst = (unsigned long *)DST; \ -+ unsigned int r,y,y2,uv1,uv2; \ -+ for(;src<end;) \ -+ { \ -+ r=INDIRECT[*src++]; \ -+ y=r&0xff000000 ; \ -+ uv1=(r&0x00ff00ff); \ -+ r=INDIRECT[*src++]; \ -+ uv2=(uv1+(r&0x00ff00ff))>>1; \ -+ y2=r&0xff00; \ -+ *dst++=y|y2|(uv2&0x00ff00ff); \ -+ } \ -+ } -+#endif - #else /* normal indirect */ - #define COPY_LINE2(SRC, END, DST) \ - {\ -@@ -428,24 +448,43 @@ - *(dst+2) = (INDIRECT[*(src+2)]>>16) | (INDIRECT[*(src+3)]<< 8); \ - } - #elif defined BLIT_HWSCALE_YUY2 -+#ifdef LSB_FIRST /* x86 etc */ - #define COPY_LINE2(SRC, END, DST) \ - {\ - SRC_PIXEL *src = SRC; \ - SRC_PIXEL *end = END; \ - unsigned long *dst = (unsigned long *)DST; \ -- unsigned int r,r2,y,y2,uv1,uv2; \ -+ unsigned int r,y,y2,uv1,uv2; \ - for(;src<end;) \ - { \ - r=INDIRECT[*src++]; \ -- r2=INDIRECT[*src++]; \ -- y=r&0xff; \ -- y2=r2&0xff0000; \ -+ y=r&255; \ - uv1=(r&0xff00ff00)>>1; \ -- uv2=(r2&0xff00ff00)>>1; \ -- uv1=(uv1+uv2)&0xff00ff00; \ -- *dst++=y|y2|uv1; \ -+ r=INDIRECT[*src++]; \ -+ uv2=(r&0xff00ff00)>>1; \ -+ y2=r&0xff0000; \ -+ *dst++=y|y2|((uv1+uv2)&0xff00ff00);\ -+ } \ -+ } -+#else /* ppc etc */ -+#define COPY_LINE2(SRC, END, DST) \ -+ {\ -+ SRC_PIXEL *src = SRC; \ -+ SRC_PIXEL *end = END; \ -+ unsigned long *dst = (unsigned long *)DST; \ -+ unsigned int r,y,y2,uv1,uv2; \ -+ for(;src<end;) \ -+ { \ -+ r=INDIRECT[*src++]; \ -+ y=r&0xff000000 ; \ -+ uv1=(r&0x00ff00ff); \ -+ r=INDIRECT[*src++]; \ -+ uv2=(uv1+(r&0x00ff00ff))>>1; \ -+ y2=r&0xff00; \ -+ *dst++=y|y2|(uv2&0x00ff00ff); \ - } \ - } -+#endif - #else /* normal indirect */ - #define COPY_LINE2(SRC, END, DST) \ - SRC_PIXEL *src = SRC; \ - diff --git a/games-emulation/xmame/files/0.78.1-glx-fix.patch b/games-emulation/xmame/files/0.78.1-glx-fix.patch deleted file mode 100644 index 20d29a9d0573..000000000000 --- a/games-emulation/xmame/files/0.78.1-glx-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -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/games-emulation/xmame/files/0.78.1-icc.patch b/games-emulation/xmame/files/0.78.1-icc.patch deleted file mode 100644 index 4e091bd550a4..000000000000 --- a/games-emulation/xmame/files/0.78.1-icc.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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/files/0.78.1-osd_die.patch b/games-emulation/xmame/files/0.78.1-osd_die.patch deleted file mode 100644 index c664052108a1..000000000000 --- a/games-emulation/xmame/files/0.78.1-osd_die.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ./src/cpu/z80/z80.c.orig 2004-01-28 12:52:51.340762752 -0500 -+++ ./src/cpu/z80/z80.c 2004-01-28 12:53:35.817001336 -0500 -@@ -3991,6 +3991,14 @@ - /**************************************************************************** - * Processor initialization - ****************************************************************************/ -+void CLIB_DECL osd_die(const char *text,...) -+{ -+va_list va; -+va_start(va, text); -+vprintf(text, va); -+va_end(va); -+exit(1); -+} - void z80_init(void) - { - int cpu = cpu_getactivecpu(); diff --git a/games-emulation/xmame/files/0.79.1-glx-fix.patch b/games-emulation/xmame/files/0.79.1-glx-fix.patch deleted file mode 100644 index 20d29a9d0573..000000000000 --- a/games-emulation/xmame/files/0.79.1-glx-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -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/games-emulation/xmame/files/0.80.1-glx-fix.patch b/games-emulation/xmame/files/0.80.1-glx-fix.patch deleted file mode 100644 index 20d29a9d0573..000000000000 --- a/games-emulation/xmame/files/0.80.1-glx-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -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/games-emulation/xmame/files/0.80.1-make.patch b/games-emulation/xmame/files/0.80.1-make.patch deleted file mode 100644 index 2b7d0bda8b00..000000000000 --- a/games-emulation/xmame/files/0.80.1-make.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -urN xmame-0.80.1/makefile.unix xmame-0.80.2/makefile.unix ---- xmame-0.80.1/makefile.unix 2004-03-16 07:10:18.615979992 -0600 -+++ xmame-0.80.2/makefile.unix 2004-03-16 07:10:36.664236240 -0600 -@@ -28,6 +28,12 @@ - ########################################################################### - - -+############################################################################## -+# Makefile Identification -+############################################################################## -+CURMAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) -+ -+ - ########################################################################### - # Xmame or xmess or...? - ########################################################################### -diff -urN xmame-0.80.1/src/unix/unix.mak xmame-0.80.2/src/unix/unix.mak ---- xmame-0.80.1/src/unix/unix.mak 2004-03-16 07:10:27.393645584 -0600 -+++ xmame-0.80.2/src/unix/unix.mak 2004-03-16 07:19:43.053172496 -0600 -@@ -147,7 +147,8 @@ - ZLIB = src/unix/contrib/cutzlib-1.2.1/libz.a - endif - --all: objdirs osdepend-objdirs $(NAME).$(DISPLAY_METHOD) -+all: objdirs osdepend-objdirs -+ $(MAKE) -f $(CURMAKEFILE) $(MAKEFLAGS) $(NAME).$(DISPLAY_METHOD) - - # CPU core include paths - VPATH = src $(wildcard src/cpu/*) diff --git a/games-emulation/xmame/files/0.81.1-glx-fix.patch b/games-emulation/xmame/files/0.81.1-glx-fix.patch deleted file mode 100644 index cbcb32d8a7dc..000000000000 --- a/games-emulation/xmame/files/0.81.1-glx-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/0.82.1-glx-fix.patch b/games-emulation/xmame/files/0.82.1-glx-fix.patch deleted file mode 100644 index cbcb32d8a7dc..000000000000 --- a/games-emulation/xmame/files/0.82.1-glx-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.82.1 b/games-emulation/xmame/files/digest-xmame-0.82.1 deleted file mode 100644 index 760afea7d115..000000000000 --- a/games-emulation/xmame/files/digest-xmame-0.82.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 b0598b587c59a022f22337ced8f6cfd6 xmame-0.82.1.tar.bz2 12833581 diff --git a/games-emulation/xmame/files/digest-xmame-0.90 b/games-emulation/xmame/files/digest-xmame-0.90 deleted file mode 100644 index d95d41652f7c..000000000000 --- a/games-emulation/xmame/files/digest-xmame-0.90 +++ /dev/null @@ -1 +0,0 @@ -MD5 63ef58711f711c20d77f8d91cc4805c8 xmame-0.90.tar.bz2 15113067 diff --git a/games-emulation/xmame/files/digest-xmame-0.92 b/games-emulation/xmame/files/digest-xmame-0.92 deleted file mode 100644 index 83bae054966b..000000000000 --- a/games-emulation/xmame/files/digest-xmame-0.92 +++ /dev/null @@ -1 +0,0 @@ -MD5 f8f79a4de41ae67ebe8d0a444efe29c1 xmame-0.92.tar.bz2 15316807 diff --git a/games-emulation/xmame/files/digest-xmame-0.95 b/games-emulation/xmame/files/digest-xmame-0.95 new file mode 100644 index 000000000000..1e30fc9a4652 --- /dev/null +++ b/games-emulation/xmame/files/digest-xmame-0.95 @@ -0,0 +1 @@ +MD5 e2571ce90bdf1517eea4d8085170fe6c xmame-0.95.tar.bz2 15460834 diff --git a/games-emulation/xmame/xmame-0.82.1.ebuild b/games-emulation/xmame/xmame-0.82.1.ebuild deleted file mode 100644 index f875c1ef3b29..000000000000 --- a/games-emulation/xmame/xmame-0.82.1.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.82.1.ebuild,v 1.4 2005/01/24 06:00:40 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="x86 ppc sparc alpha hppa amd64 ia64" -IUSE="sdl dga xv alsa esd opengl X 3dfx svga ggi arts joystick net" - -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 ) - 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}" - -src_unpack() { - unpack ${A} - cd ${S} - epatch "${FILESDIR}/${PV}-glx-fix.patch" - sed -i \ - -e 's:JOY_BUTTONS 16:JOY_BUTTONS 32:' src/unix/devices.h \ - || die "setting joybuttons failed" #36818 - - case "${ARCH}" in - x86) - sed -i \ - -e '/X86_ASM_68000 =/s:#::' \ - -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" - fi - ;; - ia64) - sed -i \ - -e '/^MY_CPU/s:i386:ia64:' Makefile \ - || die "sed Makefile (ia64) failed" - if use joystick ; then - sed -i \ - -e '/JOY_I386.*=/s:#::' Makefile \ - || die "sed Makefile (joystick) failed" - fi - ;; - amd64) - sed -i \ - -e '/^MY_CPU/s:i386:amd64:' Makefile \ - || die "sed Makefile (amd64) failed" - if use joystick ; then - sed -i \ - -e '/JOY_I386.*=/s:#::' Makefile \ - || die "sed Makefile (joystick) failed" - fi - ;; - ppc|sparc|hppa) - sed -i \ - -e '/^MY_CPU/s:i386:risc:' Makefile \ - || die "sed Makefile (ppc|sparc|hppa) failed" - ;; - alpha) - sed -i \ - -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" - ;; - esac - - 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" - fi - if use alsa ; then - sed -i \ - -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" - fi - if use sdl ; then - sed -i \ - -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" - if use 3dfx ; then - sed -i \ - -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" - fi - - case ${ARCH} in - x86|ia64|amd64) 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 - ;; - hppa) append-flags -ffunction-sections - ;; - esac - - sed -i \ - -e "/^PREFIX/s:=.*:=/usr:" \ - -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" -} - -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 use opengl ; then - emake DISPLAY_METHOD=xgl || die "emake failed (xgl)" - disp=1 - fi - if [ ${disp} -eq 0 ] || 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:Xmame:${TARGET}:g" \ - -e "s:xmame:${TARGET}:g" doc/*.6 \ - || die "sed man pages failed" - 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 use opengl ; then - make DISPLAY_METHOD=xgl install || die "install failed (xgl)" - disp=1 - fi - if [ ${disp} -eq 0 ] || use X || use dga || use xv ; 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 [ ${disp} -eq 0 ] || 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 use X || use dga || use xv ; then - einfo " ${TARGET}.x11" - fi - use sdl > /dev/null && einfo " ${TARGET}.SDL" - use ggi > /dev/null && einfo " ${TARGET}.ggi" - use svga > /dev/null && einfo " ${TARGET}.svgalib" - use opengl > /dev/null && einfo " ${TARGET}.xgl" -} diff --git a/games-emulation/xmame/xmame-0.92.ebuild b/games-emulation/xmame/xmame-0.92.ebuild deleted file mode 100644 index b897af874c2f..000000000000 --- a/games-emulation/xmame/xmame-0.92.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.92.ebuild,v 1.1 2005/02/26 04:39:57 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 expat ggi joystick mmx 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 )" -# 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}" - - 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 "/^CFLAGS =/d" \ - 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" - # no, we don't want to install setuid (bug #81693) - sed -i \ - -e 's/^doinstallsuid/notforus/' \ - -e 's/doinstallsuid/doinstall/' \ - -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 - ewarn "GGI support is currently (${PV}) broken :(" - 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 - ewarn "GGI support is currently (${PV}) broken :(" - 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 || die "doexe failed" - if [[ ${PN} == "xmame" ]] ; then - doexe xml2info || die "doexe failed" - 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 [ ${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" -} diff --git a/games-emulation/xmame/xmame-0.90.ebuild b/games-emulation/xmame/xmame-0.95.ebuild index 0ea79180de88..1bbd6af33195 100644 --- a/games-emulation/xmame/xmame-0.90.ebuild +++ b/games-emulation/xmame/xmame-0.95.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.90.ebuild,v 1.2 2005/02/12 20:35:13 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.95.ebuild,v 1.1 2005/03/31 04:35:28 mr_bones_ Exp $ inherit flag-o-matic gcc eutils games @@ -84,8 +84,6 @@ src_unpack() { 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 @@ -186,10 +184,11 @@ src_install() { || 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 + # default to sdl since the client is a bit more featureful + if use sdl ; then dosym "${TARGET}.SDL" "${GAMES_BINDIR}/${TARGET}" + elif [ ${disp} -eq 0 ] || use opengl || use X || use dga || use xv ; then + dosym "${TARGET}.x11" "${GAMES_BINDIR}/${TARGET}" elif use svga ; then dosym ${TARGET}.svgalib "${GAMES_BINDIR}/${TARGET}" #elif use ggi ; then |