[gst-cvs] gst-plugins-good: [MOVED FROM BAD 04/56] Fix compilation on generic x86/ amd64 and include deinterlace2 in the build system. Because of several bugs it's still...

[Sebastian Dröge]

Module: gst-plugins-good
Branch: master
Commit: 8a90334f9e6d7a9a1edd5b3c17910f541d676110
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=8a90334f9e6d7a9a1edd5b3c17910f541d676110

Author: Sebastian Dröge <slomo at circular-chaos.org>
Date:   Fri Jun 20 13:24:29 2008 +0000

[MOVED FROM BAD 04/56] Fix compilation on generic x86/amd64 and include deinterlace2 in the build system. Because of several bugs it's still...

Original commit message from CVS:
* configure.ac:
* gst/deinterlace2/Makefile.am:
* gst/deinterlace2/tvtime/greedyh.asm:
* gst/deinterlace2/tvtime/tomsmocomp/SearchLoopBottom.inc:
Fix compilation on generic x86/amd64 and include deinterlace2 in the
build system. Because of several bugs it's still enabled only
by --enable-experimental.

---

 gst/deinterlace2/Makefile.am                       |    2 +-
 gst/deinterlace2/tvtime/greedyh.asm                |    3 ++-
 .../tvtime/tomsmocomp/SearchLoopBottom.inc         |    3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gst/deinterlace2/Makefile.am b/gst/deinterlace2/Makefile.am
index 7d625f7..1af5a91 100644
--- a/gst/deinterlace2/Makefile.am
+++ b/gst/deinterlace2/Makefile.am
@@ -28,7 +28,7 @@ libgstdeinterlace2_la_SOURCES = \
 	tvtime/tomsmocomp/WierdBob.inc
 
 libgstdeinterlace2_la_CFLAGS = $(GST_CFLAGS) \
-	$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(LIBOIL_CFLAGS) -march=athlon-xp
+	$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(LIBOIL_CFLAGS) -DHAVE_MMX -DHAVE_SSE
 libgstdeinterlace2_la_LIBADD = $(GST_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LIBOIL_LIBS)
 libgstdeinterlace2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst/deinterlace2/tvtime/greedyh.asm b/gst/deinterlace2/tvtime/greedyh.asm
index 92ad1fe..8fd0ab6 100644
--- a/gst/deinterlace2/tvtime/greedyh.asm
+++ b/gst/deinterlace2/tvtime/greedyh.asm
@@ -282,7 +282,8 @@ void FUNCT_NAME( GstDeinterlace2 *object)
 #ifdef HAVE_CPU_I386
                "st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)",
 #endif
-               "mm0", "mm1", "mm2", "mm3", "mm4", "mm5", "mm6", "mm7",
+               /* FIXME: breaks unless compiling with -mmmx
+	          "mm0", "mm1", "mm2", "mm3", "mm4", "mm5", "mm6", "mm7", */
                "memory", "cc"
             );
 
diff --git a/gst/deinterlace2/tvtime/tomsmocomp/SearchLoopBottom.inc b/gst/deinterlace2/tvtime/tomsmocomp/SearchLoopBottom.inc
index 4b64b52..e65a213 100644
--- a/gst/deinterlace2/tvtime/tomsmocomp/SearchLoopBottom.inc
+++ b/gst/deinterlace2/tvtime/tomsmocomp/SearchLoopBottom.inc
@@ -101,7 +101,8 @@
 #ifdef ARCH_386
           "st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)",
 #endif
-          "mm0", "mm1", "mm2", "mm3", "mm4", "mm5", "mm6", "mm7",
+          /* FIXME: breaks unless compiling with -mmmx
+	     "mm0", "mm1", "mm2", "mm3", "mm4", "mm5", "mm6", "mm7", */
           "memory", "cc"
         );