The workaround for gcc problems on sparc and arm was a bit too draconian.

Change it to only disable the macros that do massive unrolling (instead
of disable all optimization).

PKGREVISION++

6 files changed, 87 insertions, 10 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 3c8ffca2055..11b73011a76 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.82 2002/12/02 00:14:33 kristerw Exp $
+# $NetBSD: Makefile,v 1.83 2002/12/07 20:59:52 kristerw Exp $
 #
 
 DISTNAME=		xmame-0.62.1-rc1
 PKGNAME=		xmame-0.62.1
+PKGREVISION=		1
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://x.mame.net/download/ \
 			http://roms2.mame.dk/emu/
@@ -25,10 +26,9 @@ UNLIMIT_RESOURCES=	datasize
 
 .include "../../mk/bsd.prefs.mk"
 
+# XXX On arm(32)/sparc, the src/unix/video_drivers/x11_window.c causes problems
 .if (${MACHINE_ARCH} == "arm32" || ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "sparc")
-.  if (${CFLAGS:M-O2} == "-O2")
-CFLAGS:=         ${CFLAGS:S/-O2/-O0/}
-.  endif
+CFLAGS+=		-DBROKEN_COMPILER
 .endif
 
 ROMPATH=		${PREFIX}/share/${TARGET}
diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo
index 61f34fc8c30..04795ff3b41 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.26 2002/12/02 00:14:33 kristerw Exp $
+$NetBSD: distinfo,v 1.27 2002/12/07 20:59:52 kristerw Exp $
 
 SHA1 (xmame-0.62.1-rc1.tar.bz2) = 9f05a2a4112f0e7e4e64d374fba99079780df2d8
 Size (xmame-0.62.1-rc1.tar.bz2) = 6115463 bytes
 SHA1 (patch-aa) = be131167296c50e3aea55da46288dfc16bf3ad8e
+SHA1 (patch-ad) = e389102fc29bd7c40711cfd493bad902ee102ae2
 SHA1 (patch-ae) = cb851b96ff0911a872f7eb07abf24aec8ad9dae2
diff --git a/emulators/xmame/patches/patch-ad b/emulators/xmame/patches/patch-ad
new file mode 100644
index 00000000000..8868e2d5a46
--- /dev/null
+++ b/emulators/xmame/patches/patch-ad
@@ -0,0 +1,38 @@
+$NetBSD: patch-ad,v 1.3 2002/12/07 20:59:53 kristerw Exp $
+--- src/unix/video-drivers/blit.h.orig	Sat Dec  7 03:00:00 2002
++++ src/unix/video-drivers/blit.h	Sat Dec  7 03:02:49 2002
+@@ -156,6 +156,7 @@
+ 
+ 
+ 
++#ifndef BROKEN_COMPILER
+ case 2:
+ #define SCALE_X(X) ((X)*2)
+ #ifdef INDIRECT
+@@ -265,6 +266,7 @@
+ #include "blit_core.h"
+ break;
+ 
++#endif /* #ifndef BROKEN_COMPILER */
+ #undef SCALE_X
+ #undef COPY_LINE2
+ 
+@@ -503,6 +505,7 @@
+ #define SCALE_Y(Y) (Y)
+ 
+ /* 1x1 we don't do scanlines with 1x1 */
++#ifndef BROKEN_COMPILER
+ case 0x00101:
+ case 0x10101:
+ #define COPY_LINE(SRC, END, DST) { COPY_LINE2(SRC, END, DST) }
+@@ -958,6 +961,10 @@
+ /* This is what happens when you give an assembly-language programmer
+    a C compiler.  Thanks to td, of course.                             -JDL */
+ 
++#endif /* #ifndef BROKEN_COMPILER */
++#undef COPY_LINE2
++#undef SCALE_X
++#undef SCALE_Y
+ default:
+ 
+ #ifdef INDIRECT
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index 556847ed33c..295d7d9fe7a 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2002/11/14 03:58:14 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2002/12/07 21:00:08 kristerw Exp $
 #
 
 DISTNAME=		xmame-0.56.2
 PKGNAME=		xmess-0.56.2
+PKGREVISION=		1
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://x.mame.net/download/
 EXTRACT_SUFX=		.tar.bz2
@@ -26,9 +27,7 @@ UNLIMIT_RESOURCES=	datasize
 
 # XXX On arm(32)/sparc, the src/unix/video_drivers/x11_window.c causes problems
 .if (${MACHINE_ARCH} == "arm32" || ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "sparc")
-.  if (${CFLAGS:M-O2} == "-O2")
-CFLAGS:=		${CFLAGS:S/-O2/-O0/}
-.  endif
+CFLAGS+=		-DBROKEN_COMPILER
 .endif
 
 ROMPATH=		${PREFIX}/share/${TARGET}
diff --git a/emulators/xmess/distinfo b/emulators/xmess/distinfo
index c42d1b95f9b..e98b27ab604 100644
--- a/emulators/xmess/distinfo
+++ b/emulators/xmess/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2002/01/12 22:53:16 kristerw Exp $
+$NetBSD: distinfo,v 1.4 2002/12/07 21:00:08 kristerw Exp $
 
 SHA1 (xmame-0.56.2.tar.bz2) = a6fa58be23231d919540f5b3c619a1f2565b03e8
 Size (xmame-0.56.2.tar.bz2) = 7049295 bytes
 SHA1 (patch-aa) = be131167296c50e3aea55da46288dfc16bf3ad8e
 SHA1 (patch-ab) = b6bb3acba452b91c8b9dd946531e9195d5d196fb
 SHA1 (patch-ac) = 08dda8c365c9891e1f54ef622325015a38cb9758
+SHA1 (patch-ad) = e389102fc29bd7c40711cfd493bad902ee102ae2
 SHA1 (patch-ae) = dfd2f103139dbf1f575cf00d8feda75085db39be
diff --git a/emulators/xmess/patches/patch-ad b/emulators/xmess/patches/patch-ad
new file mode 100644
index 00000000000..7fb26aacd46
--- /dev/null
+++ b/emulators/xmess/patches/patch-ad
@@ -0,0 +1,38 @@
+$NetBSD: patch-ad,v 1.1 2002/12/07 21:00:09 kristerw Exp $
+--- src/unix/video-drivers/blit.h.orig	Sat Dec  7 03:00:00 2002
++++ src/unix/video-drivers/blit.h	Sat Dec  7 03:02:49 2002
+@@ -156,6 +156,7 @@
+ 
+ 
+ 
++#ifndef BROKEN_COMPILER
+ case 2:
+ #define SCALE_X(X) ((X)*2)
+ #ifdef INDIRECT
+@@ -265,6 +266,7 @@
+ #include "blit_core.h"
+ break;
+ 
++#endif /* #ifndef BROKEN_COMPILER */
+ #undef SCALE_X
+ #undef COPY_LINE2
+ 
+@@ -503,6 +505,7 @@
+ #define SCALE_Y(Y) (Y)
+ 
+ /* 1x1 we don't do scanlines with 1x1 */
++#ifndef BROKEN_COMPILER
+ case 0x00101:
+ case 0x10101:
+ #define COPY_LINE(SRC, END, DST) { COPY_LINE2(SRC, END, DST) }
+@@ -958,6 +961,10 @@
+ /* This is what happens when you give an assembly-language programmer
+    a C compiler.  Thanks to td, of course.                             -JDL */
+ 
++#endif /* #ifndef BROKEN_COMPILER */
++#undef COPY_LINE2
++#undef SCALE_X
++#undef SCALE_Y
+ default:
+ 
+ #ifdef INDIRECT