From fdfa292676f3c7419b98a524f3a99b16b36099f9 Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <tmpsantos@gmail.com>
Date: Tue, 28 Nov 2017 16:41:39 +0200
Subject: Bump Mapbox GL Native

mapbox-gl-native @ 5da5ba7706eb28b359b5d781bd2c769e336ca5ca
---
 platform/default/run_loop.cpp          | 6 ++++--
 platform/qt/mbgl/gl/gl_impl.hpp        | 7 ++++++-
 platform/qt/src/run_loop.cpp           | 6 ++++--
 src/mbgl/text/placement.cpp            | 2 +-
 src/mbgl/tile/custom_geometry_tile.cpp | 3 ++-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/platform/default/run_loop.cpp b/platform/default/run_loop.cpp
index 6375dba78e..5bccd21d56 100644
--- a/platform/default/run_loop.cpp
+++ b/platform/default/run_loop.cpp
@@ -130,8 +130,10 @@ LOOP_HANDLE RunLoop::getLoopHandle() {
 }
 
 void RunLoop::push(std::shared_ptr<WorkTask> task) {
-    withMutex([&] { queue.push(std::move(task)); });
-    impl->async->send();
+    withMutex([&] {
+        queue.push(std::move(task));
+        impl->async->send();
+    });
 }
 
 void RunLoop::run() {
diff --git a/platform/qt/mbgl/gl/gl_impl.hpp b/platform/qt/mbgl/gl/gl_impl.hpp
index a9f720db7c..b08efe1eec 100644
--- a/platform/qt/mbgl/gl/gl_impl.hpp
+++ b/platform/qt/mbgl/gl/gl_impl.hpp
@@ -4,7 +4,12 @@
 
 // Qt4
 #if QT_VERSION < 0x050000
-    #if MBGL_USE_GLES2
+    #if __APPLE__
+        #include "TargetConditionals.h"
+        #include <OpenGL/OpenGL.h>
+        #include <OpenGL/gl.h>
+        #include <OpenGL/glext.h>
+    #elif MBGL_USE_GLES2
         #define GL_GLEXT_PROTOTYPES
         #include <GLES2/gl2.h>
         #include <GLES2/gl2ext.h>
diff --git a/platform/qt/src/run_loop.cpp b/platform/qt/src/run_loop.cpp
index 71ea19032a..af0c50ebb9 100644
--- a/platform/qt/src/run_loop.cpp
+++ b/platform/qt/src/run_loop.cpp
@@ -53,8 +53,10 @@ LOOP_HANDLE RunLoop::getLoopHandle() {
 }
 
 void RunLoop::push(std::shared_ptr<WorkTask> task) {
-    withMutex([&] { queue.push(task); });
-    impl->async->send();
+    withMutex([&] {
+        queue.push(std::move(task));
+        impl->async->send();
+    });
 }
 
 void RunLoop::run() {
diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp
index 9284e213c2..e363d7bc03 100644
--- a/src/mbgl/text/placement.cpp
+++ b/src/mbgl/text/placement.cpp
@@ -15,7 +15,7 @@ OpacityState::OpacityState(bool placed_, bool offscreen)
 }
 
 OpacityState::OpacityState(const OpacityState& prevState, float increment, bool placed_) :
-    opacity(std::fmax(0, std::fmin(1, prevState.opacity + (prevState.placed ? increment : -increment)))),
+    opacity(::fmax(0, ::fmin(1, prevState.opacity + (prevState.placed ? increment : -increment)))),
     placed(placed_) {}
 
 bool OpacityState::isHidden() const {
diff --git a/src/mbgl/tile/custom_geometry_tile.cpp b/src/mbgl/tile/custom_geometry_tile.cpp
index 0d0ff5be61..b608d90d83 100644
--- a/src/mbgl/tile/custom_geometry_tile.cpp
+++ b/src/mbgl/tile/custom_geometry_tile.cpp
@@ -4,6 +4,7 @@
 #include <mbgl/renderer/tile_parameters.hpp>
 #include <mbgl/actor/scheduler.hpp>
 #include <mbgl/style/filter_evaluator.hpp>
+#include <mbgl/util/string.hpp>
 
 #include <mapbox/geojsonvt.hpp>
 
@@ -33,7 +34,7 @@ void CustomGeometryTile::setTileData(const GeoJSON& geoJSON) {
 
         mapbox::geojsonvt::TileOptions vtOptions;
         vtOptions.extent = util::EXTENT;
-        vtOptions.buffer = std::round(scale * options.buffer);
+        vtOptions.buffer = ::round(scale * options.buffer);
         vtOptions.tolerance = scale * options.tolerance;
         featureData = mapbox::geojsonvt::geoJSONToTile(geoJSON, id.canonical.z, id.canonical.x, id.canonical.y, vtOptions).features;
     } else {
-- 
cgit v1.2.1