forward-port 17091 and 17104 from 0.8.6

extras/contrib/src/Makefile

@@ -1121,13 +1121,12 @@ goom: goom$(GOOM2k4_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
 	patch -p 0 < Patches/goom.patch
-	patch -p 0 < Patches/goom2k4-0-mmx.patch
-else
-	patch -p 0 < Patches/goom2k4-0-nommx.patch
 endif
 ifdef HAVE_WIN32
 	(cd $@; dos2unix configure.in)
-	patch -p 0 <Patches/goom2k4-0-win32.patch
+	patch -p 0 < Patches/goom2k4-0-win32.patch
+else
+	patch -p 0 < Patches/goom2k4-0-mmx.patch
 endif
 
 .goom2k4: goom

extras/contrib/src/Patches/goom2k4-0-nommx.patch

---- goom.orig/configure.in	2005-02-07 14:46:41.000000000 +0100
-+++ goom/configure.in	2006-10-14 22:59:48.000000000 +0200
-@@ -58,7 +58,7 @@
- dnl ARCH
- case "$host" in
- i*86-*-*)
--	AC_DEFINE(HAVE_MMX)
-+#	AC_DEFINE(HAVE_MMX)
- 	AC_DEFINE(CPU_X86)
- 	HAVE_MMX="yes"
- 	;;