sys/ximage/gstximagesrc.c: Fix build for systems that don't have XDamage.

Original commit message from CVS:
* sys/ximage/gstximagesrc.c: (gst_ximage_src_stop):
Fix build for systems that don't have XDamage.

diff --git a/ChangeLog b/ChangeLog
index f16cf35..366c97a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-08  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+       * sys/ximage/gstximagesrc.c: (gst_ximage_src_stop):
+       Fix build for systems that don't have XDamage.
+
 2008-10-07  Wim Taymans  <wim.taymans@collabora.co.uk>
 
        * tests/examples/rtp/client-H263p.sdp:

diff --git a/common b/common
index ea93f2e..46eefd2 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit ea93f2ed580bcc19322e4c07f677eda980c821eb
+Subproject commit 46eefd2f8474ee748864c59635be87b5a29317d1

diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c
index f6782b6..5f02b95 100644 (file)
--- a/sys/ximage/gstximagesrc.c
+++ b/sys/ximage/gstximagesrc.c
@@ -222,15 +222,19 @@ gst_ximage_src_stop (GstBaseSrc * basesrc)
 {
   GstXImageSrc *src = GST_XIMAGE_SRC (basesrc);
 
+#ifdef HAVE_XDAMAGE
   if (src->last_ximage)
     gst_buffer_unref (GST_BUFFER_CAST (src->last_ximage));
   src->last_ximage = NULL;
+#endif
 
   gst_ximage_src_clear_bufpool (src);
 
+#ifdef HAVE_XFIXES
   if (src->cursor_image)
     XFree (src->cursor_image);
   src->cursor_image = NULL;
+#endif
 
   if (src->xcontext) {
     g_mutex_lock (src->x_lock);