summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-09-20 12:34:21 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-09-20 16:39:02 +0200
commita8032b5c6ae2dc33fa35e89e1cf45b7c7aebf05e (patch)
treef23dd34efbb0faec0a4c038259da7136f8b701ee
parentfd71c360251518e1007720dcb909e144094175d3 (diff)
downloadqtlocation-mapboxgl-a8032b5c6ae2dc33fa35e89e1cf45b7c7aebf05e.tar.gz
[build] upgrade dependencies
libuv 1.7.5 => 1.9.1 libjpeg-turbo 1.4.2 => 1.5.0 libpng 1.6.20 => 1.6.25 libzip 0.11.2 => 1.1.3 nunicode 1.6 => 1.7.1
-rw-r--r--platform/android/config.cmake8
-rw-r--r--platform/linux/config.cmake8
-rw-r--r--platform/qt/config.cmake4
3 files changed, 10 insertions, 10 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake
index b8e83da239..513e9e2bac 100644
--- a/platform/android/config.cmake
+++ b/platform/android/config.cmake
@@ -2,10 +2,10 @@
include(${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake)
mason_use(jni.hpp VERSION 2.0.0 HEADER_ONLY)
-mason_use(libjpeg-turbo VERSION 1.4.2)
-mason_use(libpng VERSION 1.6.20)
-mason_use(libzip VERSION 0.11.2)
-mason_use(nunicode VERSION 1.6)
+mason_use(libjpeg-turbo VERSION 1.5.0)
+mason_use(libpng VERSION 1.6.25)
+mason_use(libzip VERSION 1.1.3)
+mason_use(nunicode VERSION 1.7.1)
mason_use(sqlite VERSION 3.14.2)
macro(mbgl_platform_core)
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake
index 6ff665afaf..369c68491f 100644
--- a/platform/linux/config.cmake
+++ b/platform/linux/config.cmake
@@ -1,10 +1,10 @@
mason_use(glfw VERSION 3.2.1)
mason_use(boost_libprogram_options VERSION 1.60.0)
mason_use(sqlite VERSION 3.14.2)
-mason_use(libuv VERSION 1.7.5)
-mason_use(nunicode VERSION 1.6)
-mason_use(libpng VERSION 1.6.20)
-mason_use(libjpeg-turbo VERSION 1.4.2)
+mason_use(libuv VERSION 1.9.1)
+mason_use(nunicode VERSION 1.7.1)
+mason_use(libpng VERSION 1.6.25)
+mason_use(libjpeg-turbo VERSION 1.5.0)
mason_use(webp VERSION 0.5.1)
mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX})
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake
index 41c5a2a248..09e53a9f6a 100644
--- a/platform/qt/config.cmake
+++ b/platform/qt/config.cmake
@@ -4,8 +4,8 @@ mason_use(sqlite VERSION 3.14.2)
mason_use(gtest VERSION 1.7.0${MASON_CXXABI_SUFFIX})
if(NOT WITH_QT_DECODERS)
- mason_use(libjpeg-turbo VERSION 1.4.2)
- mason_use(libpng VERSION 1.6.20)
+ mason_use(libjpeg-turbo VERSION 1.5.0)
+ mason_use(libpng VERSION 1.6.25)
mason_use(webp VERSION 0.5.1)
endif()