[vlc-commits] Goom: deactivate MMXEXT accelerations

[Jean-Baptiste Kempf]

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jan 23 15:46:53 2011 +0100| [a51eca957784db1ab174efae9cbeb0d1740d5839] | committer: Jean-Baptiste Kempf

Goom: deactivate MMXEXT accelerations

Close #2052, #4039, #4390, #2796
Apparently Goom developers don't understand SIMD registers...

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=a51eca957784db1ab174efae9cbeb0d1740d5839
---

 extras/contrib/src/Makefile                     |    3 ++-
 extras/contrib/src/Patches/goom2k4-noxmmx.patch |   20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index dae12f9..d522443 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1324,7 +1324,8 @@ endif
 ifdef HAVE_DARWIN
 	patch -p0 < Patches/goom2k4-osx.patch
 endif
-	(cd $@; rm -f configure; ACLOCAL="aclocal -I m4/" autoreconf -ivf)
+	patch -p0 < Patches/goom2k4-noxmmx.patch
+	(cd $@; rm -f configure; autoreconf -ivf)
 
 .goom2k4: goom
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
diff --git a/extras/contrib/src/Patches/goom2k4-noxmmx.patch b/extras/contrib/src/Patches/goom2k4-noxmmx.patch
new file mode 100644
index 0000000..d9f07a2
--- /dev/null
+++ b/extras/contrib/src/Patches/goom2k4-noxmmx.patch
@@ -0,0 +1,20 @@
+--- goom/src/plugin_info.c	2005-02-07 14:46:41.000000000 +0100
++++ goom.new/src/plugin_info.c	2011-01-23 15:37:37.524184437 +0100
+@@ -31,6 +31,7 @@
+ /*    p->methods.create_output_with_brightness = create_output_with_brightness;*/
+ 
+ #ifdef CPU_X86
++#if 0
+ 	if (cpuFlavour & CPU_OPTION_XMMX) {
+ #ifdef VERBOSE
+ 		printf ("Extented MMX detected. Using the fastest methods !\n");
+@@ -38,7 +39,8 @@
+ 		p->methods.draw_line = draw_line_mmx;
+ 		p->methods.zoom_filter = zoom_filter_xmmx;
+ 	}
+-	else if (cpuFlavour & CPU_OPTION_MMX) {
++#endif
++	if (cpuFlavour & CPU_OPTION_MMX) {
+ #ifdef VERBOSE
+ 		printf ("MMX detected. Using fast methods !\n");
+ #endif