Merge lp:~sil2100/compiz/fix_ftbfs_arm_boost into lp:compiz/0.9.9

[Łukasz Zemczak]

Invalid parameter type for EGL function. Fix boost bind function madness for EGL. All these essentially should fix a FTBFS for arm*.

Please, if someone could check this and make sure it's done correctly!

- Problem:

Build failures for ARM (and other GLES configurations) since revision 3462 (http://bazaar.launchpad.net/~compiz-team/compiz/0.9.9/revision/3462). Boost issues and the like.

- Fix:

The GLES bind function handle requires an additional Display parameter. I tried adding it by intuition. There was also one signed -> unsigned type mismatch.

- Tests:

N/A

[Sam Spilsbury (smspillaz)]

I was going to mention changing the boost::function signature in GLDoubleBuffer, but then I remembered that we didn't want to introduce a dependency on Display * within GLDoubleBuffer and DoubleBuffer generally, so passing it as a non-variable parameter to fufill the bound function signature is perfectly fine.

It is tested btw, by the DoubleBuffer tests :)

review: Approve

=== modified file 'plugins/opengl/src/screen.cpp'
--- plugins/opengl/src/screen.cpp	2012-11-08 09:29:42 +0000
+++ plugins/opengl/src/screen.cpp	2012-11-13 11:38:40 +0000
@@ -281,7 +281,7 @@
 {
 namespace opengl
 {
-void swapIntervalGLX (int interval)
+void swapIntervalGLX (Display *d, int interval)
 {
     // Docs: http://www.opengl.org/registry/specs/SGI/swap_control.txt
     if (GL::swapInterval)
@@ -324,7 +324,7 @@
 
 int waitVSyncEGL (int wait,
 		  int remainder,
-		  int *count)
+		  unsigned int *count)
 {
     /* not supported */
     return 0;
@@ -1795,7 +1795,7 @@
 				  const CompSize &s,
 				  Window         output) :
     GLDoubleBuffer (d, s,
-		    boost::bind (compiz::opengl::swapIntervalGLX, _1),
+		    boost::bind (compiz::opengl::swapIntervalGLX, d, _1),
 		    boost::bind (compiz::opengl::waitVSyncGLX, _1, _2, _3)),
     mOutput (output)
 {
@@ -1872,7 +1872,7 @@
 				  const CompSize   &s,
 				  EGLSurface const &surface) :
     GLDoubleBuffer (d, s,
-		    boost::bind (compiz::opengl::swapIntervalEGL, _1),
+		    boost::bind (compiz::opengl::swapIntervalEGL, d, _1),
 		    boost::bind (compiz::opengl::waitVSyncEGL, _1, _2, _3)),
     mSurface (surface)
 {