Merge lp:~afrantzis/mir/work-around-glm-initializer-list-breakage into lp:mir

[Alexandros Frantzis]

Work around GLM initializer list breakage

These problems have been fixed in GLM 0.9.5.2:
  https://github.com/g-truc/glm/issues/159
  https://github.com/g-truc/glm/issues/160
...but until then we can work around them.

Work around GLM initializer list breakage

These problems have been fixed in GLM 0.9.5.2:

  https://github.com/g-truc/glm/issues/159
  https://github.com/g-truc/glm/issues/160

...but until we update GLM in the archive we can work around them.

[Alberto Aguirre (albaguirre)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1433
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/956/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1068
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1066
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/660
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/688
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/688/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/693
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/693/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/661
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/661/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/629
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4358

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/956/rebuild

review: Approve (continuous-integration)

=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2014-02-26 10:14:37 +0000
+++ examples/render_surfaces.cpp	2014-02-27 18:41:06 +0000
@@ -199,7 +199,7 @@
           h{static_cast<float>(s->size().height.as_uint32_t())},
           dx{dx},
           dy{dy},
-          rotation_axis{rotation_axis},
+          rotation_axis(rotation_axis),
           alpha_offset{alpha_offset}
     {
     }

=== modified file 'src/server/compositor/gl_renderer.cpp'
--- src/server/compositor/gl_renderer.cpp	2014-02-14 09:45:44 +0000
+++ src/server/compositor/gl_renderer.cpp	2014-02-27 18:41:06 +0000
@@ -289,7 +289,7 @@
      * (top-left is (0,0), bottom-right is (W,H)) to the normalized GL coordinate system
      * (top-left is (-1,1), bottom-right is (1,-1))
      */
-    glm::mat4 screen_to_gl_coords = glm::translate(glm::mat4{1.0f}, glm::vec3{-1.0f, 1.0f, 0.0f});
+    glm::mat4 screen_to_gl_coords = glm::translate(glm::mat4(1.0f), glm::vec3{-1.0f, 1.0f, 0.0f});
     screen_to_gl_coords = glm::scale(screen_to_gl_coords,
             glm::vec3{2.0f / rect.size.width.as_float(),
                       -2.0f / rect.size.height.as_float(),

=== modified file 'src/server/scene/basic_surface.cpp'
--- src/server/scene/basic_surface.cpp	2014-02-26 05:22:52 +0000
+++ src/server/scene/basic_surface.cpp	2014-02-27 18:41:06 +0000
@@ -241,7 +241,7 @@
 {
     {
         std::unique_lock<std::mutex> lk(guard);
-        rotation_matrix = glm::rotate(glm::mat4{1.0f}, degrees, axis);
+        rotation_matrix = glm::rotate(glm::mat4(1.0f), degrees, axis);
         transformation_dirty = true;
     }
     notify_change();
@@ -263,7 +263,7 @@
                                  0.0f};
 
         /* Get the center of the renderable's area */
-        const glm::vec3 center_vec{top_left_vec + 0.5f * size_vec};
+        const glm::vec3 center_vec(top_left_vec + 0.5f * size_vec);
 
         /*
          * Every renderable is drawn using a 1x1 quad centered at 0,0.