From b543a6890e090d5bafb4bcb2e4adb7287ab5982b Mon Sep 17 00:00:00 2001 From: James Hogan Date: Fri, 16 May 2025 20:22:22 +0100 Subject: [PATCH] Update openxrs to fix jsoncpp compilation error (#215) Update openxrs to get the fix for a cmake error: "requires target 'jsoncpp_interface' that is not in any export set" [1], and update call to create_space() to take an API change [2] into account. [1] https://github.com/Ralith/openxrs/issues/148 [2] https://github.com/Ralith/openxrs/commit/d8ea5553d52c4bbaefe2537b8d70b8752f73694d --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- src/backend/openxr/input.rs | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cac4287..1a9900d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3010,7 +3010,7 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "openxr" version = "0.19.0" -source = "git+https://github.com/Ralith/openxrs?rev=6c7747aee678048642dc16aad8bab3d6961dce03#6c7747aee678048642dc16aad8bab3d6961dce03" +source = "git+https://github.com/Ralith/openxrs?rev=d0afdd3365bc1e14de28f6a3a21f457e788a702e#d0afdd3365bc1e14de28f6a3a21f457e788a702e" dependencies = [ "libc", "libloading", @@ -3021,7 +3021,7 @@ dependencies = [ [[package]] name = "openxr-sys" version = "0.11.0" -source = "git+https://github.com/Ralith/openxrs?rev=6c7747aee678048642dc16aad8bab3d6961dce03#6c7747aee678048642dc16aad8bab3d6961dce03" +source = "git+https://github.com/Ralith/openxrs?rev=d0afdd3365bc1e14de28f6a3a21f457e788a702e#d0afdd3365bc1e14de28f6a3a21f457e788a702e" dependencies = [ "cmake", "libc", diff --git a/Cargo.toml b/Cargo.toml index 729608d..c476821 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ json = { version = "0.12.4", optional = true } json5 = "0.4.1" libc = "0.2.155" log = "0.4.21" -openxr = { git = "https://github.com/Ralith/openxrs", rev = "6c7747aee678048642dc16aad8bab3d6961dce03", features = [ +openxr = { git = "https://github.com/Ralith/openxrs", rev = "d0afdd3365bc1e14de28f6a3a21f457e788a702e", features = [ "static", "mint", ], optional = true } diff --git a/src/backend/openxr/input.rs b/src/backend/openxr/input.rs index 7e8010d..cc5c13d 100644 --- a/src/backend/openxr/input.rs +++ b/src/backend/openxr/input.rs @@ -299,10 +299,9 @@ impl OpenXrInputSource { impl OpenXrHand { pub(super) fn new(xr: &XrState, source: OpenXrHandSource) -> Result { - let space = - source - .pose - .create_space(xr.session.clone(), xr::Path::NULL, xr::Posef::IDENTITY)?; + let space = source + .pose + .create_space(&xr.session, xr::Path::NULL, xr::Posef::IDENTITY)?; Ok(Self { source, space }) }