[clutter-gst] plugin: Don't depend on libclutter-gst

[Damien Lespiau <dlespiau src gnome org>]

commit 898ab2a6f8160504c5254bcffee4dfb21e0bc33a
Author: Damien Lespiau <damien lespiau intel com>
Date:   Mon Nov 7 16:08:02 2011 +0000

    plugin: Don't depend on libclutter-gst
    
    One of the goals for the plugin is to be totally independant of
    libclutter-gst. These 2 should totally decoupled as I'd like to have the
    sink just depend on clutter and gstreamer.
    
    The library provides more things, but I'd love to keep those two
    orthogonal.

 clutter-gst/Makefile.am              |    1 -
 clutter-gst/clutter-gst-video-sink.c |   12 +++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am
index 6380048..4201e4f 100644
--- a/clutter-gst/Makefile.am
+++ b/clutter-gst/Makefile.am
@@ -109,7 +109,6 @@ plugin_LTLIBRARIES = libgstclutter.la
 libgstclutter_la_LIBADD  = $(PLUGIN_LIBS) $(HW_LIBS)
 libgstclutter_la_LDFLAGS =	\
 	$(GL_LDFLAGS)		\
-	libclutter-gst-1.0.la \
 	-module -avoid-version	\
 	-no-undefined		\
 	$(NULL)
diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
index c0bdb18..b96a975 100644
--- a/clutter-gst/clutter-gst-video-sink.c
+++ b/clutter-gst/clutter-gst-video-sink.c
@@ -65,6 +65,10 @@
 #include <gst/video/gstsurfacebuffer.h>
 #endif
 
+#if CLUTTER_WINDOWING_X11
+#include <X11/Xlib.h>
+#endif
+
 #include <glib.h>
 #include <string.h>
 
@@ -1640,8 +1644,14 @@ clutter_gst_navigation_interface_init (GstNavigationInterface *iface)
 static gboolean
 plugin_init (GstPlugin *plugin)
 {
+
+#if CLUTTER_WINDOWING_X11
+  /* Required by some GStreamer element like VA */
+  XInitThreads ();
+#endif
+
   /* We must enshure that clutter is initialized */
-  if (clutter_gst_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
+  if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
     return FALSE;
 
   return gst_element_register (plugin,