Skip to content

Commit 366936c

Browse files
committed
Merge branch 'main' into emilk/native-av1-hdr
2 parents 325fc41 + df8dc62 commit 366936c

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

.github/workflows/reusable_test_wheels.yml

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ env:
3838

3939
RUSTDOCFLAGS: --deny warnings
4040

41+
RUST_BACKTRACE: "1"
42+
4143
# Disable the GHA backend (Github's 10GB storage) since we use our own GCS backend.
4244
# See: https://github.com/marketplace/actions/sccache-action
4345
SCCACHE_GHA_ENABLED: "false"

Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -6186,6 +6186,7 @@ dependencies = [
61866186
"puffin_http",
61876187
"re_log",
61886188
"rfd",
6189+
"wayland-sys",
61896190
]
61906191

61916192
[[package]]

Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ walkdir = "2.0"
294294
wasm-bindgen = "0.2.93"
295295
wasm-bindgen-cli-support = "=0.2.93"
296296
wasm-bindgen-futures = "0.4.33"
297+
wayland-sys = "0.31.5"
297298
web-sys = "0.3"
298299
web-time = "1.1.0"
299300
webbrowser = "1.0"

crates/utils/re_tracing/Cargo.toml

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ all-features = true
2424
default = []
2525

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

2929

3030
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
@@ -34,3 +34,7 @@ puffin.workspace = true
3434
puffin_http = { workspace = true, optional = true }
3535
re_log = { workspace = true, optional = true }
3636
rfd = { workspace = true, optional = true }
37+
38+
[target.'cfg(target_os = "linux")'.dependencies]
39+
# Work-around for https://github.com/Smithay/wayland-rs/issues/767
40+
wayland-sys = { workspace = true, optional = true, features = ["dlopen"] }

0 commit comments

Comments
 (0)