Merge lp:~vanvugt/compiz-core/fix-921406 into lp:compiz-core/0.9.5

[Daniel van Vugt]

Fix build failures with glib 2.30 (oneiric) (LP: #921406)

Amazingly, there is no compatible GThread/GMutex/GCond API that is compatible with both glib 2.30 (oneiric) and 2.31 (precise). So we need to #if them :(

[Alan Griffiths (alan-griffiths)]

Messy, but if it needs to be...

review: Approve

[Sam Spilsbury (smspillaz)]

Ack, we also hit similar problems in unity too

[Daniel van Vugt (vanvugt)]

Actually you could emulate the old 2.30 API using the new one (2.31) with a bunch of wrapper functions and/or macros. But since this is the only place in compiz affected, not worth doing (yet).

=== modified file 'plugins/composite/tests/paintscheduler/test-paintscheduler.cpp'
--- plugins/composite/tests/paintscheduler/test-paintscheduler.cpp	2012-01-24 09:30:19 +0000
+++ plugins/composite/tests/paintscheduler/test-paintscheduler.cpp	2012-01-25 07:39:23 +0000
@@ -166,8 +166,13 @@
 	int             drmFD;
 	DRMInfo         *info;
 	GThread    	*eventThread;
+#if GLIB_CHECK_VERSION(2, 31, 0)
 	GMutex		eventMutex;
 	GCond		eventCondition;
+#else
+	GMutex		*eventMutex;
+	GCond		*eventCondition;
+#endif
 	bool            pendingVBlank;
 };
 
@@ -456,13 +461,22 @@
 
     drmWaitVBlank (fd, &vbl);
 
+#if GLIB_CHECK_VERSION(2, 31, 0)
     g_mutex_lock (&info->self->eventMutex);
+#else
+    g_mutex_lock (info->self->eventMutex);
+#endif
 
     if (info->self->timingCount != info->self->periods.size ())
 	info->self->pendingVBlank = true;
 
+#if GLIB_CHECK_VERSION(2, 31, 0)
     g_cond_signal (&info->self->eventCondition);
     g_mutex_unlock (&info->self->eventMutex);
+#else
+    g_cond_signal (info->self->eventCondition);
+    g_mutex_unlock (info->self->eventMutex);
+#endif
 }
 
 gpointer
@@ -506,8 +520,13 @@
 {
     const char  *modules[] = { "i915", "radeon", "nouveau", "vmwgfx" };
 
+#if GLIB_CHECK_VERSION(2, 31, 0)
     g_mutex_init (&eventMutex);
     g_cond_init  (&eventCondition);
+#else
+    eventMutex = g_mutex_new ();
+    eventCondition = g_cond_new ();
+#endif
 
     for (unsigned int i = 0; i < ARRAY_SIZE (modules); i++)
     {
@@ -555,7 +574,12 @@
     evctx.vblank_handler = DRMVBlankWaiter::vblankHandler;
     evctx.page_flip_handler = NULL;
 
+#if GLIB_CHECK_VERSION(2, 31, 0)
     eventThread = g_thread_try_new ("drm_wait_t", &DRMVBlankWaiter::drmEventHandlerThread, (void *) this, NULL);
+#else
+    eventThread = g_thread_create (&DRMVBlankWaiter::drmEventHandlerThread,
+                                   (void *) this, TRUE, NULL);
+#endif
 
     if (!eventThread)
     {
@@ -571,6 +595,15 @@
     delete info;
 
     drmClose (drmFD);
+
+#if GLIB_CHECK_VERSION(2, 31, 0)
+    g_mutex_clear (&eventMutex);
+    g_cond_clear (&eventCondition);
+#else
+    g_mutex_free (eventMutex);
+    g_cond_free (eventCondition);
+#endif
+
 }
 
 NilVBlankWaiter::NilVBlankWaiter (DummyPaintDispatch *o, unsigned int n) :
@@ -606,12 +639,21 @@
 {
     VBlankWaiter::time_value tv;
 
+#if GLIB_CHECK_VERSION(2, 31, 0)
     g_mutex_lock (&eventMutex);
     if (!pendingVBlank && !owner->isDone ())
 	g_cond_wait (&eventCondition, &eventMutex);
 
     pendingVBlank = false;
     g_mutex_unlock (&eventMutex);
+#else
+    g_mutex_lock (eventMutex);
+    if (!pendingVBlank && !owner->isDone ())
+	g_cond_wait (eventCondition, eventMutex);
+
+    pendingVBlank = false;
+    g_mutex_unlock (eventMutex);
+#endif
 
     gettimeofday (&tv, NULL);
 
@@ -679,6 +721,10 @@
    
 int main (void)
 {
+#if !GLIB_CHECK_VERSION(2, 31, 0)
+    g_thread_init (NULL);
+#endif
+
     gettimeofday (&SleepVBlankWaiter::start_time, NULL);
 
     TimeoutHandler     *th = new TimeoutHandler ();

=== modified file 'src/signalsource.cpp'
--- src/signalsource.cpp	2012-01-21 13:34:31 +0000
+++ src/signalsource.cpp	2012-01-25 07:39:23 +0000
@@ -24,7 +24,12 @@
  */
 
 #include "privatesignalsource.h"
+
+/* Add missing decls: https://bugzilla.gnome.org/show_bug.cgi?id=663880 */
+#include <glib.h>
+G_BEGIN_DECLS
 #include <glib-unix.h>
+G_END_DECLS
 
 CompSignalSource *
 CompSignalSource::create (int signum, const callbackFunc &f)