From c6b1abcdb61111873db96b0208f9897eb7a22141 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 12 Aug 2016 18:16:24 -0700 Subject: [PATCH 1/3] update mason deps and test data - refs mapnik/test-data#8 mapnik/test-data-visual#36 --- bootstrap.sh | 30 +++++++++++++++--------------- test/data | 2 +- test/data-visual | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 113d60f8c..c805774a9 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -11,7 +11,7 @@ todo - shrink icu data ' -MASON_VERSION="7ed8931" +MASON_VERSION="new-pkgs" function setup_mason() { if [[ ! -d ./.mason ]]; then @@ -19,7 +19,7 @@ function setup_mason() { (cd ./.mason && git checkout ${MASON_VERSION}) else echo "Updating to latest mason" - (cd ./.mason && git fetch && git checkout ${MASON_VERSION}) + (cd ./.mason && git fetch && git checkout ${MASON_VERSION} && git pull) fi export PATH=$(pwd)/.mason:$PATH export CXX=${CXX:-clang++} @@ -47,21 +47,21 @@ ICU_VERSION="55.1" function install_mason_deps() { FAIL=0 install ccache 3.2.4 & - install jpeg_turbo 1.4.0 libjpeg & - install libpng 1.6.20 libpng & - install libtiff 4.0.4beta libtiff & - install libpq 9.4.1 & - install sqlite 3.8.8.3 libsqlite3 & - install expat 2.1.0 libexpat & + install jpeg_turbo 1.5.0 libjpeg & + install libpng 1.6.24 libpng & + install libtiff 4.0.6 libtiff & + install libpq 9.5.2 & + install sqlite 3.14.1 libsqlite3 & + install expat 2.2.0 libexpat & install icu ${ICU_VERSION} & - install proj 4.8.0 libproj & - install pixman 0.32.6 libpixman-1 & - install cairo 1.14.2 libcairo & + install proj 4.9.2 libproj & + install pixman 0.34.0 libpixman-1 & + install cairo 1.14.6 libcairo & install protobuf 2.6.1 & # technically protobuf is not a mapnik core dep, but installing # here by default helps make mapnik-vector-tile builds easier - install webp 0.5.0 libwebp & - install gdal 1.11.2 libgdal & + install webp 0.5.1 libwebp & + install gdal 2.1.1 libgdal & install boost 1.61.0 & install boost_libsystem 1.61.0 & install boost_libfilesystem 1.61.0 & @@ -71,8 +71,8 @@ function install_mason_deps() { # here by default helps make python-mapnik builds easier install boost_libthread 1.61.0 & install boost_libpython 1.61.0 & - install freetype 2.6 libfreetype & - install harfbuzz 0.9.41 libharfbuzz & + install freetype 2.6.5 libfreetype & + install harfbuzz 1.3.0 libharfbuzz & for job in $(jobs -p) do wait $job || let "FAIL+=1" diff --git a/test/data b/test/data index fb1529e22..cb7f1aff2 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit fb1529e225b36f8a3077ad23f7005951a07c8a7e +Subproject commit cb7f1aff2ee5a43178111801356eb529b9ef098f diff --git a/test/data-visual b/test/data-visual index bb0a8927f..fb51e008e 160000 --- a/test/data-visual +++ b/test/data-visual @@ -1 +1 @@ -Subproject commit bb0a8927f4305df861d1b5c6366216bb4e530975 +Subproject commit fb51e008e009e37b5d067714a4b1273eb8426d65 From 95331eda407c1ee32c381795335452ebcfd7de82 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 26 Aug 2016 13:40:28 -0700 Subject: [PATCH 2/3] temporary workaround for https://github.com/mapbox/mason/issues/230 --- bootstrap.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bootstrap.sh b/bootstrap.sh index c805774a9..2234ef08f 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -39,6 +39,8 @@ function install() { fi fi fi + # the rm here is to workaround https://github.com/mapbox/mason/issues/230 + rm -f ./mason_packages/.link/mason.ini mason link $1 $2 } From 8b954a6fc3c842e1821ec57d4f2220329f768c48 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 26 Aug 2016 14:30:47 -0700 Subject: [PATCH 3/3] Get correct package of lndir --- .travis.yml | 4 ++-- circle.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c16bfa3a8..331979c2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ matrix: addons: apt: sources: [ 'ubuntu-toolchain-r-test'] - packages: [ 'libstdc++-5-dev', 'xutils'] + packages: [ 'libstdc++-5-dev', 'xutils-dev'] - os: linux sudo: false compiler: ": clang-coverage" @@ -37,7 +37,7 @@ matrix: addons: apt: sources: [ 'ubuntu-toolchain-r-test'] - packages: ['libstdc++-5-dev', 'xutils' ] + packages: ['libstdc++-5-dev', 'xutils-dev' ] - os: osx compiler: ": clang-osx" # https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions diff --git a/circle.yml b/circle.yml index 435cd077b..d9d4bad81 100644 --- a/circle.yml +++ b/circle.yml @@ -27,7 +27,7 @@ dependencies: - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test override: - sudo apt-get update -y - - sudo apt-get install -y libstdc++-5-dev xutils + - sudo apt-get install -y libstdc++-5-dev xutils-dev database: pre: