Skip to content

Commit 8df29e2

Browse files
authored
Fix Linux build: Make the nasm feature a no-op (#7675)
### What * Circumvent #7671 ### Checklist * [x] I have read and agree to [Contributor Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and the [Code of Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md) * [x] I've included a screenshot or gif (if applicable) * [x] I have tested the web demo (if applicable): * Using examples from latest `main` build: [rerun.io/viewer](https://rerun.io/viewer/pr/7675?manifest_url=https://app.rerun.io/version/main/examples_manifest.json) * Using full set of examples from `nightly` build: [rerun.io/viewer](https://rerun.io/viewer/pr/7675?manifest_url=https://app.rerun.io/version/nightly/examples_manifest.json) * [x] The PR title and labels are set such as to maximize their usefulness for the next release's CHANGELOG * [x] If applicable, add a new check to the [release checklist](https://github.com/rerun-io/rerun/blob/main/tests/python/release_checklist)! * [x] If have noted any breaking changes to the log API in `CHANGELOG.md` and the migration guide - [PR Build Summary](https://build.rerun.io/pr/7675) - [Recent benchmark results](https://build.rerun.io/graphs/crates.html) - [Wasm size tracking](https://build.rerun.io/graphs/sizes.html) To run all checks from `main`, comment on the PR with `@rerun-bot full-check`.
1 parent 25df77e commit 8df29e2

File tree

5 files changed

+9
-2
lines changed

5 files changed

+9
-2
lines changed

crates/store/re_video/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ av1 = ["dep:dav1d"]
3131

3232
## Enable faster native video decoding with assembly.
3333
## You need to install [nasm](https://nasm.us/) to compile with this feature.
34-
nasm = ["dav1d?/default"] # The default feature set of dav1d has asm enabled
34+
# TODO(#7671): this feature flag currently does nothing
35+
# nasm = ["dav1d?/default"] # The default feature set of dav1d has asm enabled
36+
nasm = [] ## TODO(#7671): fix Linux build
3537

3638
[dependencies]
3739
re_log.workspace = true

crates/store/re_video/src/decode/av1.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ impl SyncDav1dDecoder {
1616
pub fn new() -> Result<Self> {
1717
re_tracing::profile_function!();
1818

19-
if !cfg!(feature = "nasm") {
19+
// TODO(#7671): enable this warning again when the `nasm` feature actually does something
20+
#[allow(clippy::overly_complex_bool_expr)]
21+
if false && !cfg!(feature = "nasm") {
2022
re_log::warn_once!(
2123
"NOTE: native AV1 video decoder is running extra slowly. \
2224
Speed it up by compiling Rerun with the `nasm` feature enabled. \

crates/top/rerun-cli/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ default = ["native_viewer", "web_viewer"]
4343

4444
## Enable faster native video decoding with assembly.
4545
## You need to install [nasm](https://nasm.us/) to compile with this feature.
46+
# TODO(#7671): this feature flag currently does nothing
4647
nasm = ["rerun/nasm"]
4748

4849
## Support spawning a native viewer.

crates/top/rerun/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ log = ["dep:env_logger", "dep:log"]
7373

7474
## Enable faster native video decoding with assembly.
7575
## You need to install [nasm](https://nasm.us/) to compile with this feature.
76+
# TODO(#7671): this feature flag currently does nothing
7677
nasm = ["re_video/nasm"]
7778

7879
## Support spawning a native viewer.

rerun_py/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ extension-module = ["pyo3/extension-module"]
3030

3131
## Enable faster native video decoding with assembly.
3232
## You need to install [nasm](https://nasm.us/) to compile with this feature.
33+
# TODO(#7671): this feature flag currently does nothing
3334
nasm = ["re_video/nasm"]
3435

3536
## Support serving a web viewer over HTTP with `serve()`.

0 commit comments

Comments
 (0)