Auto merge of #3308 - emilio:osmesa-src-upstream, r=jrmuizel

Switch to upstream servo/osmesa-src.

Make the mac hack for #2638 specific for CI, via `CARGO_MAKEFLAGS`.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/3308)
<!-- Reviewable:end -->

.taskcluster.yml

@@ -156,6 +156,9 @@ tasks:
             export RUSTFLAGS='--deny warnings'
             export PKG_CONFIG_PATH="/usr/local/opt/zlib/lib/pkgconfig:$PKG_CONFIG_PATH"
             export RUSTC_WRAPPER=sccache
+            echo 'exec make -j1 "$@"' > $HOME/make # See #2638
+            chmod +x $HOME/make
+            export MAKE="$HOME/make"
             (cd wrench && python script/headless.py reftest)
             (cd wrench && cargo build --release)
             (cd wrench && cargo run --release -- --precache reftest reftests/clip/fixed-position-clipping.yaml)
@@ -200,6 +203,9 @@ tasks:
             export RUSTFLAGS='--deny warnings'
             export PKG_CONFIG_PATH="/usr/local/opt/zlib/lib/pkgconfig:$PKG_CONFIG_PATH"
             export RUSTC_WRAPPER=sccache
+            echo 'exec make -j1 "$@"' > $HOME/make # See #2638
+            chmod +x $HOME/make
+            export MAKE="$HOME/make"
             (cd webrender_api && cargo test --verbose --features "ipc")
             (cd webrender && cargo check --verbose --no-default-features)
             (cd webrender && cargo check --verbose --no-default-features --features capture)

wrench/Cargo.toml

@@ -24,7 +24,7 @@ ron = "0.1.5"
 time = "0.1"
 crossbeam = "0.2"
 osmesa-sys = { version = "0.1.2", optional = true }
-osmesa-src = { git = "https://github.com/jrmuizel/osmesa-src", optional = true, branch = "serialize" }
+osmesa-src = { git = "https://github.com/servo/osmesa-src", optional = true }
 webrender = {path = "../webrender", features=["capture","replay","debugger","png","profiler"]}
 webrender_api = {path = "../webrender_api", features=["serialize","deserialize"]}
 winit = "0.16"