diff options
| author |   David Holm <dholm@gentoo.org> | 2004-02-22 10:39:45 +0000 |
|---|---|---|
| committer | David Holm <dholm@gentoo.org> | 2004-02-22 10:39:45 +0000 |
| commit | 4fb70c9b51957b7a041f9e603e3812766e690955 (patch) | |
| tree | 472bd23ea4f59cf3b6e5540127dbdd9860a4be4a | |
| parent | whoops, didnt mean to prune amd64 (diff) | |
| download | gentoo-2-4fb70c9b51957b7a041f9e603e3812766e690955.tar.gz gentoo-2-4fb70c9b51957b7a041f9e603e3812766e690955.tar.bz2 gentoo-2-4fb70c9b51957b7a041f9e603e3812766e690955.zip | |
Closed bug #42268
| -rw-r--r-- | games-emulation/xmame/ChangeLog | 6 | ||||
| -rw-r--r-- | games-emulation/xmame/files/0.79.1-glx-fix.patch | 19 | ||||
| -rw-r--r-- | games-emulation/xmame/xmame-0.79.1.ebuild | 29 |
3 files changed, 49 insertions, 5 deletions
diff --git a/games-emulation/xmame/ChangeLog b/games-emulation/xmame/ChangeLog index 9ccb40273ad3..8b064a5f0cc6 100644 --- a/games-emulation/xmame/ChangeLog +++ b/games-emulation/xmame/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-emulation/xmame # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/ChangeLog,v 1.14 2004/02/21 21:39:45 dholm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/ChangeLog,v 1.15 2004/02/22 10:39:45 dholm Exp $ + + 22 Feb 2004; David Holm <dholm@gentoo.org> xmame-0.79.1.ebuild, + files/0.79.1-glx-fix.patch: + Added some bugfixes from bug #42268. Added to ~x86, ~amd64 and ~ia64. *xmame-0.79.1 (21 Feb 2004) diff --git a/games-emulation/xmame/files/0.79.1-glx-fix.patch b/games-emulation/xmame/files/0.79.1-glx-fix.patch new file mode 100644 index 000000000000..20d29a9d0573 --- /dev/null +++ b/games-emulation/xmame/files/0.79.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/games-emulation/xmame/xmame-0.79.1.ebuild b/games-emulation/xmame/xmame-0.79.1.ebuild index 0349ce0f1d39..ca431dd3566c 100644 --- a/games-emulation/xmame/xmame-0.79.1.ebuild +++ b/games-emulation/xmame/xmame-0.79.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.79.1.ebuild,v 1.1 2004/02/21 21:39:45 dholm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.79.1.ebuild,v 1.2 2004/02/22 10:39:45 dholm Exp $ inherit games flag-o-matic gcc eutils @@ -12,7 +12,7 @@ SRC_URI="http://x.mame.net/download/xmame-${PV}.tar.bz2" LICENSE="xmame" SLOT="0" -KEYWORDS="~ppc ~sparc ~alpha ~hppa" +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 @@ -35,11 +35,12 @@ S=${WORKDIR}/xmame-${PV} src_unpack() { unpack ${A} cd ${S} + epatch ${FILESDIR}/${PV}-glx-fix.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) + x86) sed -i \ -e '/X86_ASM_68000 =/s:#::' \ -e '/X86_MIPS3_DRC =/s:#::' Makefile \ @@ -50,6 +51,26 @@ src_unpack() { || 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) sed -i \ -e '/^MY_CPU/s:i386:risc:' Makefile \ @@ -122,7 +143,7 @@ src_unpack() { fi case ${ARCH} in - x86) append-flags -Wno-unused -fomit-frame-pointer -fstrict-aliasing -fstrength-reduce -ffast-math + 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 |