This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-mapnik.
commit 9f3a8542cea514ca5c0cf17c4df4acb6e63c94f9 Author: Bas Couwenberg <[email protected]> Date: Thu Sep 8 15:49:46 2016 +0200 Imported Upstream version 0.0~20160830-541fd96 --- bootstrap.sh | 50 +++++++++++++-------- scripts/setup_mason.sh | 2 +- .../images/style-image-filter/agg-stack-blur22.png | Bin 33700 -> 33686 bytes .../images/style-image-filter/blur.png | Bin 27212 -> 27207 bytes .../images/style-image-filter/edge-detect.png | Bin 22467 -> 22471 bytes .../images/style-image-filter/emboss.png | Bin 24564 -> 24552 bytes .../images/style-image-filter/gray.png | Bin 23594 -> 23599 bytes .../images/style-image-filter/invert.png | Bin 24135 -> 24136 bytes .../images/style-image-filter/none.png | Bin 24072 -> 24079 bytes .../images/style-image-filter/sharpen.png | Bin 22765 -> 22760 bytes .../images/style-image-filter/sobel.png | Bin 23934 -> 23955 bytes .../images/style-image-filter/x-gradient.png | Bin 27052 -> 27060 bytes .../images/style-image-filter/y-gradient.png | Bin 27276 -> 27268 bytes .../encoding-opts/aerial_rgba-webp+method=0.webp | Bin 11778 -> 11780 bytes .../encoding-opts/aerial_rgba-webp+method=6.webp | Bin 10010 -> 9892 bytes .../blank-webp+alpha_filtering=2.webp | Bin 224 -> 224 bytes .../encoding-opts/blank-webp+alpha_quality=50.webp | Bin 224 -> 224 bytes .../encoding-opts/blank-webp+autofilter=0.webp | Bin 224 -> 224 bytes .../blank-webp+filter_sharpness=4.webp | Bin 224 -> 224 bytes .../blank-webp+filter_strength=50.webp | Bin 224 -> 224 bytes .../blank-webp+filter_type=1+autofilter=1.webp | Bin 220 -> 220 bytes .../support/encoding-opts/blank-webp+method=0.webp | Bin 282 -> 282 bytes .../support/encoding-opts/blank-webp+method=6.webp | Bin 240 -> 240 bytes .../blank-webp+partition_limit=50.webp | Bin 224 -> 224 bytes .../encoding-opts/blank-webp+partitions=3.webp | Bin 224 -> 224 bytes .../support/encoding-opts/blank-webp+pass=10.webp | Bin 224 -> 224 bytes .../encoding-opts/blank-webp+preprocessing=1.webp | Bin 224 -> 224 bytes .../encoding-opts/blank-webp+quality=64.webp | Bin 222 -> 222 bytes .../encoding-opts/blank-webp+segments=3.webp | Bin 222 -> 222 bytes .../encoding-opts/blank-webp+sns_strength=50.webp | Bin 224 -> 224 bytes .../encoding-opts/blank-webp+target_PSNR=.5.webp | Bin 224 -> 224 bytes .../encoding-opts/blank-webp+target_size=100.webp | Bin 224 -> 224 bytes .../images/support/encoding-opts/blank-webp.webp | Bin 224 -> 224 bytes .../support/encoding-opts/solid-webp+method=6.webp | Bin 216 -> 222 bytes .../support/marker-text-line-scale-factor-0.1.png | Bin 3851 -> 3845 bytes .../marker-text-line-scale-factor-0.899.png | Bin 17229 -> 17232 bytes .../support/marker-text-line-scale-factor-1.5.png | Bin 11502 -> 11508 bytes .../support/marker-text-line-scale-factor-1.png | Bin 18310 -> 18310 bytes .../support/marker-text-line-scale-factor-10.png | Bin 8348 -> 8369 bytes .../marker-text-line-scale-factor-1e-05.png | Bin 1637 -> 1638 bytes .../support/marker-text-line-scale-factor-2.png | Bin 11823 -> 11838 bytes .../support/marker-text-line-scale-factor-5.png | Bin 13987 -> 13978 bytes .../images/support/transparency/white0.webp | Bin 738 -> 318 bytes 43 files changed, 32 insertions(+), 20 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index ad8422a..7c41fb9 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -7,6 +7,8 @@ function install() { MASON_PLATFORM_ID=$(mason env MASON_PLATFORM_ID) if [[ ! -d ./mason_packages/${MASON_PLATFORM_ID}/${1}/ ]]; then mason install $1 $2 + # the rm here is to workaround https://github.com/mapbox/mason/issues/230 + rm -f ./mason_packages/.link/mason.ini mason link $1 $2 fi } @@ -14,32 +16,42 @@ function install() { ICU_VERSION="55.1" function install_mason_deps() { + FAIL=0 install mapnik latest & 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 & - wait + 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 & - wait - install webp 0.4.2 libwebp & - install gdal 1.11.2 libgdal & + 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.1 libwebp & + install gdal 2.1.1 libgdal & install boost 1.61.0 & - install boost_libthread 1.61.0 & - install boost_libpython 1.61.0 & install boost_libsystem 1.61.0 & install boost_libfilesystem 1.61.0 & install boost_libprogram_options 1.61.0 & - install boost_libregex 1.61.0 & - install freetype 2.6 libfreetype & - install harfbuzz 0.9.41 libharfbuzz & - wait + install boost_libregex_icu 1.61.0 & + # technically boost thread and python are not a core dep, but installing + # 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.5 libfreetype & + install harfbuzz 1.3.0 libharfbuzz & + for job in $(jobs -p) + do + wait $job || let "FAIL+=1" + done + if [[ "$FAIL" != "0" ]]; then + exit ${FAIL} + fi } function setup_runtime_settings() { diff --git a/scripts/setup_mason.sh b/scripts/setup_mason.sh index e867b7d..c9cbc2b 100755 --- a/scripts/setup_mason.sh +++ b/scripts/setup_mason.sh @@ -4,7 +4,7 @@ set -eu set -o pipefail # we pin the mason version to avoid changes in mason breaking builds -MASON_VERSION="3ddc419" +MASON_VERSION="new-pkgs" function setup_mason() { if [[ ! -d ./.mason ]]; then diff --git a/test/python_tests/images/style-image-filter/agg-stack-blur22.png b/test/python_tests/images/style-image-filter/agg-stack-blur22.png index 1d1b7ca..54f92ea 100644 Binary files a/test/python_tests/images/style-image-filter/agg-stack-blur22.png and b/test/python_tests/images/style-image-filter/agg-stack-blur22.png differ diff --git a/test/python_tests/images/style-image-filter/blur.png b/test/python_tests/images/style-image-filter/blur.png index ec6fc7f..dfda77e 100644 Binary files a/test/python_tests/images/style-image-filter/blur.png and b/test/python_tests/images/style-image-filter/blur.png differ diff --git a/test/python_tests/images/style-image-filter/edge-detect.png b/test/python_tests/images/style-image-filter/edge-detect.png index 74eff4d..825b43c 100644 Binary files a/test/python_tests/images/style-image-filter/edge-detect.png and b/test/python_tests/images/style-image-filter/edge-detect.png differ diff --git a/test/python_tests/images/style-image-filter/emboss.png b/test/python_tests/images/style-image-filter/emboss.png index bf74d99..b9af978 100644 Binary files a/test/python_tests/images/style-image-filter/emboss.png and b/test/python_tests/images/style-image-filter/emboss.png differ diff --git a/test/python_tests/images/style-image-filter/gray.png b/test/python_tests/images/style-image-filter/gray.png index 7ee05f5..1dc357e 100644 Binary files a/test/python_tests/images/style-image-filter/gray.png and b/test/python_tests/images/style-image-filter/gray.png differ diff --git a/test/python_tests/images/style-image-filter/invert.png b/test/python_tests/images/style-image-filter/invert.png index 52bcf95..a3a94bc 100644 Binary files a/test/python_tests/images/style-image-filter/invert.png and b/test/python_tests/images/style-image-filter/invert.png differ diff --git a/test/python_tests/images/style-image-filter/none.png b/test/python_tests/images/style-image-filter/none.png index 245966d..2a9dfc2 100644 Binary files a/test/python_tests/images/style-image-filter/none.png and b/test/python_tests/images/style-image-filter/none.png differ diff --git a/test/python_tests/images/style-image-filter/sharpen.png b/test/python_tests/images/style-image-filter/sharpen.png index 8599186..ecae501 100644 Binary files a/test/python_tests/images/style-image-filter/sharpen.png and b/test/python_tests/images/style-image-filter/sharpen.png differ diff --git a/test/python_tests/images/style-image-filter/sobel.png b/test/python_tests/images/style-image-filter/sobel.png index c1b7092..ba2e564 100644 Binary files a/test/python_tests/images/style-image-filter/sobel.png and b/test/python_tests/images/style-image-filter/sobel.png differ diff --git a/test/python_tests/images/style-image-filter/x-gradient.png b/test/python_tests/images/style-image-filter/x-gradient.png index fdc5f74..6548571 100644 Binary files a/test/python_tests/images/style-image-filter/x-gradient.png and b/test/python_tests/images/style-image-filter/x-gradient.png differ diff --git a/test/python_tests/images/style-image-filter/y-gradient.png b/test/python_tests/images/style-image-filter/y-gradient.png index b84a491..683d642 100644 Binary files a/test/python_tests/images/style-image-filter/y-gradient.png and b/test/python_tests/images/style-image-filter/y-gradient.png differ diff --git a/test/python_tests/images/support/encoding-opts/aerial_rgba-webp+method=0.webp b/test/python_tests/images/support/encoding-opts/aerial_rgba-webp+method=0.webp index f0f3838..209cf47 100644 Binary files a/test/python_tests/images/support/encoding-opts/aerial_rgba-webp+method=0.webp and b/test/python_tests/images/support/encoding-opts/aerial_rgba-webp+method=0.webp differ diff --git a/test/python_tests/images/support/encoding-opts/aerial_rgba-webp+method=6.webp b/test/python_tests/images/support/encoding-opts/aerial_rgba-webp+method=6.webp index be253e2..56c90f2 100644 Binary files a/test/python_tests/images/support/encoding-opts/aerial_rgba-webp+method=6.webp and b/test/python_tests/images/support/encoding-opts/aerial_rgba-webp+method=6.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+alpha_filtering=2.webp b/test/python_tests/images/support/encoding-opts/blank-webp+alpha_filtering=2.webp index a7369dc..0209012 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+alpha_filtering=2.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+alpha_filtering=2.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+alpha_quality=50.webp b/test/python_tests/images/support/encoding-opts/blank-webp+alpha_quality=50.webp index 10cea1c..7a73677 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+alpha_quality=50.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+alpha_quality=50.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+autofilter=0.webp b/test/python_tests/images/support/encoding-opts/blank-webp+autofilter=0.webp index a7369dc..0209012 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+autofilter=0.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+autofilter=0.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+filter_sharpness=4.webp b/test/python_tests/images/support/encoding-opts/blank-webp+filter_sharpness=4.webp index 932a4de..d95307b 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+filter_sharpness=4.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+filter_sharpness=4.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+filter_strength=50.webp b/test/python_tests/images/support/encoding-opts/blank-webp+filter_strength=50.webp index 2e65b9b..053ef81 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+filter_strength=50.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+filter_strength=50.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+filter_type=1+autofilter=1.webp b/test/python_tests/images/support/encoding-opts/blank-webp+filter_type=1+autofilter=1.webp index 7e3bd76..1375c7e 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+filter_type=1+autofilter=1.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+filter_type=1+autofilter=1.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+method=0.webp b/test/python_tests/images/support/encoding-opts/blank-webp+method=0.webp index 5c64924..ed98c59 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+method=0.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+method=0.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+method=6.webp b/test/python_tests/images/support/encoding-opts/blank-webp+method=6.webp index ef84f4c..05413d2 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+method=6.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+method=6.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+partition_limit=50.webp b/test/python_tests/images/support/encoding-opts/blank-webp+partition_limit=50.webp index a7369dc..0209012 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+partition_limit=50.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+partition_limit=50.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+partitions=3.webp b/test/python_tests/images/support/encoding-opts/blank-webp+partitions=3.webp index a7369dc..0209012 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+partitions=3.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+partitions=3.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+pass=10.webp b/test/python_tests/images/support/encoding-opts/blank-webp+pass=10.webp index a7369dc..0209012 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+pass=10.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+pass=10.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+preprocessing=1.webp b/test/python_tests/images/support/encoding-opts/blank-webp+preprocessing=1.webp index a7369dc..0209012 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+preprocessing=1.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+preprocessing=1.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+quality=64.webp b/test/python_tests/images/support/encoding-opts/blank-webp+quality=64.webp index 0eb26aa..5e0ba88 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+quality=64.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+quality=64.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+segments=3.webp b/test/python_tests/images/support/encoding-opts/blank-webp+segments=3.webp index af3082b..039cf25 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+segments=3.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+segments=3.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+sns_strength=50.webp b/test/python_tests/images/support/encoding-opts/blank-webp+sns_strength=50.webp index a7369dc..0209012 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+sns_strength=50.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+sns_strength=50.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+target_PSNR=.5.webp b/test/python_tests/images/support/encoding-opts/blank-webp+target_PSNR=.5.webp index a7369dc..0209012 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+target_PSNR=.5.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+target_PSNR=.5.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp+target_size=100.webp b/test/python_tests/images/support/encoding-opts/blank-webp+target_size=100.webp index a7369dc..0209012 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp+target_size=100.webp and b/test/python_tests/images/support/encoding-opts/blank-webp+target_size=100.webp differ diff --git a/test/python_tests/images/support/encoding-opts/blank-webp.webp b/test/python_tests/images/support/encoding-opts/blank-webp.webp index a7369dc..0209012 100644 Binary files a/test/python_tests/images/support/encoding-opts/blank-webp.webp and b/test/python_tests/images/support/encoding-opts/blank-webp.webp differ diff --git a/test/python_tests/images/support/encoding-opts/solid-webp+method=6.webp b/test/python_tests/images/support/encoding-opts/solid-webp+method=6.webp index 5a76594..02e0106 100644 Binary files a/test/python_tests/images/support/encoding-opts/solid-webp+method=6.webp and b/test/python_tests/images/support/encoding-opts/solid-webp+method=6.webp differ diff --git a/test/python_tests/images/support/marker-text-line-scale-factor-0.1.png b/test/python_tests/images/support/marker-text-line-scale-factor-0.1.png index 306424d..c3a06ac 100644 Binary files a/test/python_tests/images/support/marker-text-line-scale-factor-0.1.png and b/test/python_tests/images/support/marker-text-line-scale-factor-0.1.png differ diff --git a/test/python_tests/images/support/marker-text-line-scale-factor-0.899.png b/test/python_tests/images/support/marker-text-line-scale-factor-0.899.png index cb2c651..fdd53da 100644 Binary files a/test/python_tests/images/support/marker-text-line-scale-factor-0.899.png and b/test/python_tests/images/support/marker-text-line-scale-factor-0.899.png differ diff --git a/test/python_tests/images/support/marker-text-line-scale-factor-1.5.png b/test/python_tests/images/support/marker-text-line-scale-factor-1.5.png index a1b34a3..b93b287 100644 Binary files a/test/python_tests/images/support/marker-text-line-scale-factor-1.5.png and b/test/python_tests/images/support/marker-text-line-scale-factor-1.5.png differ diff --git a/test/python_tests/images/support/marker-text-line-scale-factor-1.png b/test/python_tests/images/support/marker-text-line-scale-factor-1.png index c86c5fa..bc485f7 100644 Binary files a/test/python_tests/images/support/marker-text-line-scale-factor-1.png and b/test/python_tests/images/support/marker-text-line-scale-factor-1.png differ diff --git a/test/python_tests/images/support/marker-text-line-scale-factor-10.png b/test/python_tests/images/support/marker-text-line-scale-factor-10.png index 8a7842f..7dc7b5e 100644 Binary files a/test/python_tests/images/support/marker-text-line-scale-factor-10.png and b/test/python_tests/images/support/marker-text-line-scale-factor-10.png differ diff --git a/test/python_tests/images/support/marker-text-line-scale-factor-1e-05.png b/test/python_tests/images/support/marker-text-line-scale-factor-1e-05.png index 0f36830..e9f9e7f 100644 Binary files a/test/python_tests/images/support/marker-text-line-scale-factor-1e-05.png and b/test/python_tests/images/support/marker-text-line-scale-factor-1e-05.png differ diff --git a/test/python_tests/images/support/marker-text-line-scale-factor-2.png b/test/python_tests/images/support/marker-text-line-scale-factor-2.png index e3ad67f..2d67030 100644 Binary files a/test/python_tests/images/support/marker-text-line-scale-factor-2.png and b/test/python_tests/images/support/marker-text-line-scale-factor-2.png differ diff --git a/test/python_tests/images/support/marker-text-line-scale-factor-5.png b/test/python_tests/images/support/marker-text-line-scale-factor-5.png index 2be5f2d..7a9d49e 100644 Binary files a/test/python_tests/images/support/marker-text-line-scale-factor-5.png and b/test/python_tests/images/support/marker-text-line-scale-factor-5.png differ diff --git a/test/python_tests/images/support/transparency/white0.webp b/test/python_tests/images/support/transparency/white0.webp index f276b81..27af0fd 100644 Binary files a/test/python_tests/images/support/transparency/white0.webp and b/test/python_tests/images/support/transparency/white0.webp differ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-mapnik.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
