forward-port 17091 and 17104 from 0.8.6

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 5f61184f986c6915084ca8ea3522d2275324c547..97b6106cf1daa2763371aa994d1189d73469d622 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/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

diff --git a/extras/contrib/src/Patches/goom2k4-0-nommx.patch b/extras/contrib/src/Patches/goom2k4-0-nommx.patch
deleted file mode 100644 (file)
index af0cd38..0000000
--- a/extras/contrib/src/Patches/goom2k4-0-nommx.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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\r
- case "$host" in\r
- i*86-*-*)\r
--      AC_DEFINE(HAVE_MMX)\r
-+#     AC_DEFINE(HAVE_MMX)\r
-       AC_DEFINE(CPU_X86)\r
-       HAVE_MMX="yes"\r
-       ;;\r