Update mozangle

This should allow servo to take advantage of faster compilation speeds
on Windows.
This commit is contained in:
Martin Robinson 2023-07-01 17:33:19 +02:00 committed by Martin Robinson
parent f034eb6032
commit 96eeb5865c
9 changed files with 7 additions and 12 deletions

4
Cargo.lock generated
View file

@ -3722,9 +3722,9 @@ checksum = "eeb5a94c61e12e2cfc16ee3e2b6eca8f126a43c888586626337544a7e824a1af"
[[package]]
name = "mozangle"
version = "0.3.4"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abe944fd6e85e054436f598b5fb12f492da8cf9554981bd4a23a91982f72657c"
checksum = "094982bba06f6658a8a7997983e44efb9b129cb032050cb3ec845e875e618ea0"
dependencies = [
"cc",
"gl_generator 0.13.1",

View file

@ -48,6 +48,7 @@ malloc_size_of_derive = "0.1"
mime = "0.3.13"
mime_guess = "2.0.3"
mitochondria = "1.1.2"
mozangle = "0.3"
num-traits = "0.2"
parking_lot = "0.11"
percent-encoding = "2.0"

View file

@ -122,4 +122,4 @@ webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
xml5ever = { workspace = true }
[target.'cfg(not(target_os = "ios"))'.dependencies]
mozangle = { version = "0.3", features = ["egl", "build_dlls"] }
mozangle = { workspace = true }

View file

@ -13,7 +13,6 @@ crate-type = ["rlib"]
[features]
debugmozjs = ["script/debugmozjs"]
egl = ["mozangle/egl"]
googlevr = ["webxr/googlevr"]
jitspew = ["script/jitspew"]
js_backtrace = ["script/js_backtrace"]
@ -61,6 +60,7 @@ layout_thread_2013 = { path = "../layout_thread", optional = true }
layout_thread_2020 = { path = "../layout_thread_2020", optional = true }
log = { workspace = true }
media = { path = "../media" }
mozangle = { workspace = true }
msg = { path = "../msg" }
net = { path = "../net" }
net_traits = { path = "../net_traits" }
@ -92,4 +92,4 @@ webxr-api = { git = "https://github.com/servo/webxr" }
gaol = "0.2.1"
[target.'cfg(target_os = "windows")'.dependencies]
mozangle = { version = "0.3", features = ["egl", "build_dlls"] }
mozangle = { workspace = true, features = ["egl", "build_dlls"] }

View file

@ -35,7 +35,6 @@ serde_json = { workspace = true }
[features]
debugmozjs = ["libservo/debugmozjs"]
default = ["webdriver", "max_log_level"]
egl = ["libservo/egl"]
googlevr = ["libservo/googlevr"]
jitspew = ["libservo/jitspew"]
js_backtrace = ["libservo/js_backtrace"]

View file

@ -31,7 +31,6 @@ cbindgen = "0.20"
[features]
debugmozjs = ["simpleservo/debugmozjs"]
default = ["webdriver", "max_log_level"]
egl = ["simpleservo/egl"]
googlevr = ["simpleservo/googlevr"]
jitspew = ["simpleservo/jitspew"]
js_backtrace = ["simpleservo/js_backtrace"]

View file

@ -29,7 +29,6 @@ cc = "1.0"
[features]
debugmozjs = ["simpleservo/debugmozjs"]
default = ["webdriver", "max_log_level"]
egl = ["simpleservo/egl"]
googlevr = ["simpleservo/googlevr"]
js_backtrace = ["simpleservo/js_backtrace"]
layout-2013 = ["simpleservo/layout-2013"]

View file

@ -28,7 +28,6 @@ ProductName = "Servo"
[features]
debugmozjs = ["libservo/debugmozjs"]
default = ["webdriver", "max_log_level"]
egl = ["libservo/egl"]
jitspew = ["libservo/jitspew"]
js_backtrace = ["libservo/js_backtrace"]
layout-2013 = ["libservo/layout-2013"]

View file

@ -833,9 +833,7 @@ class CommandBase(object):
if self.is_uwp_build:
features.append("no-wgl")
features.append("uwp")
else:
# Non-UWP builds provide their own libEGL via mozangle.
features.append("egl")
if with_layout_2020 or (self.config["build"]["layout-2020"] and not with_layout_2013):
features.append("layout-2020")
elif "layout-2020" not in features: