mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-08-01 13:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(libmonado): update to latest

Browse source
This commit is contained in:
Nova 2024-07-22 03:47:10 -04:00
commit 26fb9c3a20
3 changed files with 36 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Cargo.lock generated
View file

@ -1078,14 +1078,18 @@ dependencies = [
[[package]] [[package]]
name = "libmonado-rs" name = "libmonado-rs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/technobaboo/libmonado-rs?rev=e32e78c79ce9ec4a5a5de9eff30661c6c4307347#e32e78c79ce9ec4a5a5de9eff30661c6c4307347" source = "git+https://github.com/technobaboo/libmonado-rs#626d8f52d218c59a915edc61e91f849b8dc8922e"
dependencies = [ dependencies = [
"bindgen", "bindgen",
"cmake", "cmake",
"convert_case", "convert_case",
"dlopen2", "dlopen2",
"flagset", "flagset",
"mint",
"semver", "semver",
"serde",
"serde_json",
"xdg",
] ]
[[package]] [[package]]
@ -1206,6 +1210,12 @@ dependencies = [
"adler", "adler",
] ]
[[package]]
name = "mint"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
[[package]] [[package]]
name = "mio" name = "mio"
version = "0.8.11" version = "0.8.11"
@ -1500,18 +1510,18 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.67" version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.33" version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
] ]
@ -1778,18 +1788,18 @@ checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.188" version = "1.0.204"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.188" version = "1.0.204"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1798,9 +1808,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.107" version = "1.0.120"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
dependencies = [ dependencies = [
"itoa", "itoa",
"ryu", "ryu",
@ -1876,9 +1886,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.37" version = "2.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

33
Cargo.toml
View file

@ -7,36 +7,21 @@ edition = "2021"
[dependencies] [dependencies]
anyhow = "1.0.75" anyhow = "1.0.75"
gettext-rs = { version = "0.7.0", features = [ gettext-rs = { version = "0.7.0", features = ["gettext-system"] }
"gettext-system"
] }
git2 = "0.18.2" git2 = "0.18.2"
gtk4 = { version = "0.8.2", features = [ gtk4 = { version = "0.8.2", features = ["v4_10"] }
"v4_10",
] }
lazy_static = "1.4.0" lazy_static = "1.4.0"
libadwaita = { version = "0.6.0", features = [ libadwaita = { version = "0.6.0", features = ["v1_4"] }
"v1_4" libmonado-rs = { git = "https://github.com/technobaboo/libmonado-rs" }
] }
libmonado-rs = { git = "https://github.com/technobaboo/libmonado-rs", rev = "e32e78c79ce9ec4a5a5de9eff30661c6c4307347" }
rusb = "0.9.4" rusb = "0.9.4"
nix = { version = "0.29.0", features = [ nix = { version = "0.29.0", features = ["fs", "signal"] }
"fs",
"signal"
] }
phf = "0.11.2" phf = "0.11.2"
phf_macros = "0.11.2" phf_macros = "0.11.2"
relm4 = { version = "0.8.1", features = [ relm4 = { version = "0.8.1", features = ["libadwaita"] }
"libadwaita"
] }
relm4-components = "0.8.1" relm4-components = "0.8.1"
reqwest = { version = "0.12.4", features = [ reqwest = { version = "0.12.4", features = ["blocking"] }
"blocking" serde = { version = "1.0.204", features = ["derive"] }
] } serde_json = "1.0.120"
serde = { version = "1.0.188", features = [
"derive"
] }
serde_json = "1.0.106"
tracker = "0.2.1" tracker = "0.2.1"
uuid = { version = "1.8.0", features = ["v4", "fast-rng"] } uuid = { version = "1.8.0", features = ["v4", "fast-rng"] }
vte4 = { version = "0.7.1", features = ["v0_72"] } vte4 = { version = "0.7.1", features = ["v0_72"] }

9
src/xr_devices.rs
View file

@ -300,7 +300,7 @@ impl XRDevice {
XRDeviceRole::Gamepad, XRDeviceRole::Gamepad,
XRDeviceRole::Eyes, XRDeviceRole::Eyes,
] ]
.iter() .into_iter()
.for_each(|xrd| { .for_each(|xrd| {
if let Ok(dev) = monado.device_from_role(xrd.to_monado_str()) { if let Ok(dev) = monado.device_from_role(xrd.to_monado_str()) {
devs_with_role.push(dev.id); devs_with_role.push(dev.id);
@ -318,11 +318,10 @@ impl XRDevice {
// } // }
// }; // };
res.push(Self { res.push(Self {
name: dev.name,
index: dev.id.to_string(), index: dev.id.to_string(),
// serial, serial: dev.serial().ok(),
serial: None, name: dev.name,
dev_type: xrd.clone(), dev_type: xrd,
..Default::default() ..Default::default()
}) })
} }