* Backport [16925] (goom2k MMX patch)

* Enabled x264 contrib

extras/contrib/src/Makefile

@@ -141,12 +141,14 @@ ifdef HAVE_DARWIN_OS
 	.dvdcss .dvdnav .dvdread .dvbpsi .live .x264 .caca .mod \
 	.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
 	.glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \
-        .libdca
+        .libdca .goom2k4 .x264
 # .expat .clinkcc don't work with SDK yet
 # .glib .libidl .gecko are required to build the mozilla plugin
 # .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
+# 
+# Things only enabled on PPC
 ifneq ($(HOST),i686-apple-darwin8)
-all: .goom2k4
+all:
 endif
 else
 
@@ -1119,6 +1121,7 @@ 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
 endif
 ifdef HAVE_WIN32
 	(cd $@; dos2unix configure.in)

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

+diff -ruN goom.orig/src/xmmx.c goom/src/xmmx.c
+--- goom.orig/src/xmmx.c	2006-10-01 22:10:15.000000000 +0200
++++ goom/src/xmmx.c	2006-10-01 23:45:59.000000000 +0200
+@@ -69,8 +69,8 @@
+ 		 */
+ 
+ 		asm volatile
+-      ("#1 \n\t movq %[brutS], %%mm0"
+-       "#1 \n\t movq %[brutD], %%mm1"
++      ("#1 \n\t movq (%[brutS]), %%mm0"
++       "#1 \n\t movq (%[brutD]), %%mm1"
+        "#1 \n\t psubd   %%mm0, %%mm1" /* mm1 = D - S */
+        "#1 \n\t movq    %%mm1, %%mm2" /* mm2 = D - S */
+        "#1 \n\t pslld     $16, %%mm1"