From 47410fe63a6390a1a16af7d07cf774f2bc318ad3 Mon Sep 17 00:00:00 2001 From: Nova Date: Sat, 27 May 2023 09:48:34 -0400 Subject: [PATCH] fix: janky dmabuf hack --- Cargo.lock | 56 +++++++++++++++++++++++++++++++++++------------------- Cargo.toml | 13 +++++++------ 2 files changed, 43 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 34121e6..8c6ec7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -163,7 +163,7 @@ checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" dependencies = [ "async-trait", "axum-core", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "http", @@ -233,7 +233,7 @@ version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -255,6 +255,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" + [[package]] name = "bumpalo" version = "3.12.2" @@ -340,7 +346,7 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.7.4", ] [[package]] @@ -362,7 +368,7 @@ checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" dependencies = [ "anstream", "anstyle", - "bitflags", + "bitflags 1.3.2", "clap_lex", "strsim", ] @@ -619,7 +625,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" dependencies = [ - "libloading", + "libloading 0.7.4", ] [[package]] @@ -686,7 +692,7 @@ version = "23.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77f5399c2c9c50ae9418e522842ad362f61ee48b346ac106807bd355a8a7c619" dependencies = [ - "bitflags", + "bitflags 1.3.2", "rustc_version", ] @@ -706,7 +712,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15d14128f06405808ce75bfebe11e9b0f9da18719ede6d7bdb1702d6bfe0f7e8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "num_enum 0.5.11", "serde", @@ -1114,6 +1120,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "libloading" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "link-cplusplus" version = "1.0.8" @@ -1269,7 +1285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.6.5", @@ -1281,7 +1297,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", @@ -1686,7 +1702,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1695,7 +1711,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1766,7 +1782,7 @@ version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -1915,10 +1931,10 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/smithay/smithay.git#80c094c3b8c50dc9cf18ff19173826c2d4605e67" +source = "git+https://github.com/technobaboo/smithay.git#6a4a98b4383073c52f11323f9cdc31ed60e7f0a4" dependencies = [ "appendlist", - "bitflags", + "bitflags 2.3.1", "calloop", "cgmath", "downcast-rs", @@ -1927,7 +1943,7 @@ dependencies = [ "indexmap", "lazy_static", "libc", - "libloading", + "libloading 0.8.0", "nix 0.26.2", "once_cell", "rand", @@ -2031,7 +2047,7 @@ version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f90dda01589858b2cbbff23b616bdf8b9d1c5119afd1b1f0463a3f44cebe5b46" dependencies = [ - "bitflags", + "bitflags 1.3.2", "concat-idents", "glam 0.23.0", "ndk-context", @@ -2505,7 +2521,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fefbeb8a360abe67ab7c2efe1d297a1a50ee011f5460791bc18870c26bb84e2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "wayland-backend", "wayland-scanner", "wayland-server", @@ -2517,7 +2533,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897d4e99645e1ed9245e9e6b5efa78828d2b23b661016d63d55251243d812f8b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "wayland-backend", "wayland-protocols", "wayland-scanner", @@ -2530,7 +2546,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fce991093320e4a6a525876e6b629ab24da25f9baef0c2e0080ad173ec89588a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "wayland-backend", "wayland-protocols", "wayland-scanner", @@ -2554,7 +2570,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9062def387c1b1d80e366d8243c2b3bd6d9e4f343032a3e5da8d4aa03866cf89" dependencies = [ - "bitflags", + "bitflags 1.3.2", "downcast-rs", "io-lifetimes", "nix 0.26.2", diff --git a/Cargo.toml b/Cargo.toml index ee73c11..37c3d51 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ auto_link_exclude_list = [ "libpthread*", "ld-linux*", "libGL*", - "libEGL*" + "libEGL*", ] [profile.dev.package."*"] @@ -39,13 +39,13 @@ lto = true color-eyre = { version = "0.6.2", default-features = false } clap = { version = "4.2.4", features = ["derive"] } dashmap = "5.4.0" -glam = {version = "0.23.0", features = ["mint"]} +glam = { version = "0.23.0", features = ["mint"] } lazy_static = "1.4.0" mint = "0.5.9" nanoid = "0.4.0" once_cell = "1.17.1" parking_lot = "0.12.1" -portable-atomic = {version = "1.2.0", features = ["float", "std"]} +portable-atomic = { version = "1.2.0", features = ["float", "std"] } rustc-hash = "1.1.0" tokio = { version = "1.27.0", features = ["rt-multi-thread", "signal"] } send_wrapper = "0.6.0" @@ -65,8 +65,9 @@ features = ["linux-egl"] version = "0.16.7" [dependencies.smithay] -# git = "https://github.com/technobaboo/smithay.git" # Until we get stereokit to understand OES samplers and external textures -git = "https://github.com/smithay/smithay.git" # Until we get stereokit to understand OES samplers and external textures +git = "https://github.com/technobaboo/smithay.git" # Until we get stereokit to understand OES samplers and external textures +# git = "https://github.com/smithay/smithay.git" # Until we get stereokit to understand OES samplers and external textures +# path = "../smithay" default-features = false features = ["desktop", "renderer_gl", "wayland_frontend"] version = "*" @@ -87,4 +88,4 @@ optional = true # [patch.crates-io.stardust-xr] # path = "../core/core" # [patch.crates-io.stardust-xr-schemas] -# path = "../core/schemas" \ No newline at end of file +# path = "../core/schemas"