Update OSMesa.

servo · jdm · Oct 25, 2019 · Oct 25, 2019 · 00b6920648f5f2109cef4dfed4373c14be40b669
commit 00b6920648f5f2109cef4dfed4373c14be40b669
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
@@ -73,4 +73,4 @@ sig = "1.0"
 winapi = { version = "0.3", features = ["wingdi", "winuser", "winnt", "winbase", "processenv", "namedpipeapi", "ntdef", "minwindef", "handleapi", "debugapi"] }
 
 [target.'cfg(any(target_os = "macos", all(target_arch = "x86_64", target_os = "linux")))'.dependencies]
-osmesa-src = {git = "https://github.com/servo/osmesa-src"}
+osmesa-src = {git = "https://github.com/servo/osmesa-src", branch = "meson"}
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
@@ -233,9 +233,9 @@ def set_osmesa_env(bin_path, env):
         if not osmesa_dep_path:
             return None
         osmesa_path = path.join(osmesa_dep_path,
-                                "out", "src", "gallium", "targets", "osmesa", ".libs")
+                                "out", "src", "gallium", "targets", "osmesa")
         glapi_path = path.join(osmesa_dep_path,
-                               "out", "src", "mapi", "shared-glapi", ".libs")
+                               "out", "src", "mapi", "shared-glapi")
         append_to_path_env(osmesa_path + ":" + glapi_path, env, "DYLD_LIBRARY_PATH")
         env["GALLIUM_DRIVER"] = "softpipe"
     return env