Closed bug #42268

4 files changed, 52 insertions, 7 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/Manifest b/games-emulation/xmame/Manifest
index 1cf22e707306..cea1038989e6 100644
--- a/games-emulation/xmame/Manifest
+++ b/games-emulation/xmame/Manifest
@@ -1,5 +1,5 @@
-MD5 39da85ca6fe29ee078d283aa777c730a ChangeLog 5144
-MD5 38fce5153f468a39bb829c0611729c6f xmame-0.79.1.ebuild 6190
+MD5 b6457ef67e7df4f224333c99bd4e5dd7 ChangeLog 5313
+MD5 99c692bc54ba270cfe781aa7d29c5e72 xmame-0.79.1.ebuild 6721
 MD5 9f4c00afb295a5316c4049f8775d3d79 xmame-0.78.1.ebuild 6412
 MD5 0234d9024c471faf92bb1219242614ef metadata.xml 1566
 MD5 13dc5b32bbff98dec74c41dd0c9b33a1 files/0.77.1-glx-fix.patch 597
@@ -11,3 +11,4 @@ MD5 93b9c4a740015eb7262b223c7b8b7bbf files/0.78.1-icc.patch 584
 MD5 0f77c568ca5f6a46b543e899c910d38a files/0.78.1-osd_die.patch 521
 MD5 97e593e1ae9774f4ef817e90f8b05d35 files/digest-xmame-0.78.1 67
 MD5 96b4074a6c4b94b57fb7c6258a36ef20 files/0.78.1-big_endian.patch 2969
+MD5 13dc5b32bbff98dec74c41dd0c9b33a1 files/0.79.1-glx-fix.patch 597
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