Skip to content

Commit

Permalink
Merge branch 'main' into emilk/native-av1-hdr
Browse files Browse the repository at this point in the history
  • Loading branch information
emilk committed Nov 2, 2024
2 parents 325fc41 + df8dc62 commit 366936c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/workflows/reusable_test_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ env:

RUSTDOCFLAGS: --deny warnings

RUST_BACKTRACE: "1"

# Disable the GHA backend (Github's 10GB storage) since we use our own GCS backend.
# See: https://github.com/marketplace/actions/sccache-action
SCCACHE_GHA_ENABLED: "false"
Expand Down
1 change: 1 addition & 0 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6186,6 +6186,7 @@ dependencies = [
"puffin_http",
"re_log",
"rfd",
"wayland-sys",
]

[[package]]
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ walkdir = "2.0"
wasm-bindgen = "0.2.93"
wasm-bindgen-cli-support = "=0.2.93"
wasm-bindgen-futures = "0.4.33"
wayland-sys = "0.31.5"
web-sys = "0.3"
web-time = "1.1.0"
webbrowser = "1.0"
Expand Down
6 changes: 5 additions & 1 deletion crates/utils/re_tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ all-features = true
default = []

## Enable to easily host a puffin server. For binaries.
server = ["dep:puffin_http", "dep:re_log", "dep:rfd"]
server = ["dep:puffin_http", "dep:re_log", "dep:rfd", "dep:wayland-sys"]


[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
Expand All @@ -34,3 +34,7 @@ puffin.workspace = true
puffin_http = { workspace = true, optional = true }
re_log = { workspace = true, optional = true }
rfd = { workspace = true, optional = true }

[target.'cfg(target_os = "linux")'.dependencies]
# Work-around for https://github.com/Smithay/wayland-rs/issues/767
wayland-sys = { workspace = true, optional = true, features = ["dlopen"] }

0 comments on commit 366936c

Please sign in to comment.