From 47c6bb5bd49b1535208a7d20e2646c21ab9687ff Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Wed, 24 Sep 2014 16:10:36 -0400 Subject: [PATCH 1/5] update MP_HASH --- setup-libraries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-libraries.sh b/setup-libraries.sh index 7947efe49..a4fc59b93 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -51,7 +51,7 @@ set -u NODE=$(which node) NPM=$(which npm) -MP_HASH="c0fc970e52950a6f16e3172f1114e5a4ae1e0aa9" +MP_HASH="573abb5e0bfb87798172f6f9b90094e9efc58ad9" DIR_HASH=$(echo `pwd` | git hash-object --stdin) if [ ! -d 'mapnik-packaging/' ]; then git clone https://github.com/mapnik/mapnik-packaging.git From 86b7367994c933c1b91d571d348ec57620c7d26c Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Wed, 24 Sep 2014 16:30:01 -0400 Subject: [PATCH 2/5] Revert "add debugging" This reverts commit 0cdaf58027b758650f4bb7ca7a006cb8568c080c. --- common/headless_view.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/common/headless_view.cpp b/common/headless_view.cpp index 94a6cd03b..42d595310 100644 --- a/common/headless_view.cpp +++ b/common/headless_view.cpp @@ -2,7 +2,6 @@ #include #include -#include namespace mbgl { @@ -159,10 +158,6 @@ HeadlessView::~HeadlessView() { #endif #if MBGL_USE_GLX - std::cerr << "~HeadlessView()" << '\n'; - std::cerr << "x_display: " << x_display << '\n'; - std::cerr << "glx_pixmap: " << glx_pixmap << '\n'; - std::cerr << "gl_context: " << gl_context << '\n'; glXMakeCurrent(x_display, None, NULL); glXDestroyContext(x_display, gl_context); XFree(x_info); @@ -183,10 +178,6 @@ void HeadlessView::make_active() { #endif #if MBGL_USE_GLX - std::cerr << "make_active()" << '\n'; - std::cerr << "x_display: " << x_display << '\n'; - std::cerr << "glx_pixmap: " << glx_pixmap << '\n'; - std::cerr << "gl_context: " << gl_context << '\n'; if (!glXMakeCurrent(x_display, glx_pixmap, gl_context)) { fprintf(stderr, "Switching OpenGL context failed\n"); } From 735d2456974f7a7c870c2c15c1cfaf0d7ad07c3b Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Wed, 24 Sep 2014 16:40:10 -0400 Subject: [PATCH 3/5] fix ios builds? --- setup-libraries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-libraries.sh b/setup-libraries.sh index a4fc59b93..b110390a2 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -51,7 +51,7 @@ set -u NODE=$(which node) NPM=$(which npm) -MP_HASH="573abb5e0bfb87798172f6f9b90094e9efc58ad9" +MP_HASH="e2beefa4b52ab81dd8578f0d1a822e4a6e434d99" DIR_HASH=$(echo `pwd` | git hash-object --stdin) if [ ! -d 'mapnik-packaging/' ]; then git clone https://github.com/mapnik/mapnik-packaging.git From 768e23069c191dd73dd99985d0a620c581b0036d Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Wed, 24 Sep 2014 17:11:18 -0400 Subject: [PATCH 4/5] build iPhoneSimulator64 against libuv 0.10.28 --- setup-libraries.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/setup-libraries.sh b/setup-libraries.sh index b110390a2..20fa5568b 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -104,6 +104,7 @@ export LIBUV_VERSION=0.10.28 echo ' ...done' source iPhoneSimulator64.sh +export LIBUV_VERSION=0.10.28 if [ ! -f out/build-cpp11-libcpp-x86_64-iphonesimulator/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi if [ ! -f out/build-cpp11-libcpp-x86_64-iphonesimulator/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi echo ' ...done' From 92d00347a87eee10b961d4a1836c1dd6e1df6ba7 Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Wed, 24 Sep 2014 18:51:52 -0400 Subject: [PATCH 5/5] remove travis conditional in darwin_configure.sh --- setup-libraries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-libraries.sh b/setup-libraries.sh index 20fa5568b..791db81a8 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -51,7 +51,7 @@ set -u NODE=$(which node) NPM=$(which npm) -MP_HASH="e2beefa4b52ab81dd8578f0d1a822e4a6e434d99" +MP_HASH="e82e6c00ea5a0cda147e4c121a3c7751cae69ff8" DIR_HASH=$(echo `pwd` | git hash-object --stdin) if [ ! -d 'mapnik-packaging/' ]; then git clone https://github.com/mapnik/mapnik-packaging.git