update deps

wlx-overlay-s/Cargo.toml

@@ -30,8 +30,8 @@ ctrlc = { version = "3.5.0", features = ["termination"] }
 dbus = { version = "0.9.9" }
 futures = "0.3.31"
 glam = { workspace = true, features = ["mint", "serde"] }
-idmap = { version = "0.2.22", features = ["serde"] }
-idmap-derive = "0.1.2"
+idmap = { workspace = true, features = ["serde"] }
+idmap-derive = "0.2.2"
 input-linux = "0.7.1"
 json = { version = "0.12.4", optional = true }
 json5 = "0.4.1"
@@ -45,8 +45,9 @@ ovr_overlay = { features = [
   "ovr_input",
   "ovr_system",
 ], git = "https://github.com/galister/ovr_overlay_oyasumi", optional = true }
-regex = "1.11.2"
-rodio = { version = "0.20.1", default-features = false, features = [
+regex = { workspace = true }
+rodio = { version = "0.21.1", default-features = false, features = [
+  "playback",
   "wav",
   "hound",
 ] }
@@ -54,9 +55,10 @@ rosc = { version = "0.11.4", optional = true }
 serde = { version = "1.0.225", features = ["derive", "rc"] }
 serde_json = "1.0.145"
 serde_yaml = "0.9.34"
+slotmap = { workspace = true }
 smallvec = "1.15.1"
 strum = { version = "0.27.2", features = ["derive"] }
-sysinfo = { version = "0.35" }
+sysinfo = { version = "0.37" }
 thiserror = "2.0"
 wlx-capture = { path = "../wlx-capture" }
 libmonado = { version = "1.3.2", optional = true }
@@ -64,7 +66,7 @@ winit = { version = "0.30.12", optional = true }
 xdg = "3.0"
 log-panics = { version = "2.1.0", features = ["with-backtrace"] }
 serde_json5 = "0.2.1"
-xkbcommon = { version = "0.8.0" }
+xkbcommon = { version = "0.9.0" }
 xcb = { version = "1.6.0", optional = true, features = [
   "as-raw-xcb-connection",
 ] }
@@ -82,7 +84,7 @@ wgui = { path = "../wgui" }
 #WayVR-only deps
 ################################
 khronos-egl = { version = "6.0.0", features = ["static"], optional = true }
-smithay = { version = "0.5.1", default-features = false, features = [
+smithay = { version = "0.7.0", default-features = false, features = [
   "renderer_gl",
   "backend_egl",
   "backend_drm",

wlx-overlay-s/src/backend/wayvr/display.rs

@@ -2,13 +2,13 @@ use std::{cell::RefCell, rc::Rc, sync::Arc};
 
 use smithay::{
     backend::renderer::{
-        Bind, Color32F, Frame, Renderer,
         element::{
+            surface::{render_elements_from_surface_tree, WaylandSurfaceRenderElement},
             Kind,
-            surface::{WaylandSurfaceRenderElement, render_elements_from_surface_tree},
         },
-        gles::{GlesRenderer, GlesTexture, ffi},
+        gles::{ffi, GlesRenderer, GlesTexture},
         utils::draw_render_elements,
+        Bind, Color32F, Frame, Renderer,
     },
     input,
     utils::{Logical, Point, Rectangle, Size, Transform},
@@ -22,8 +22,8 @@ use crate::{
 };
 
 use super::{
-    BlitMethod, WayVRSignal, client::WayVRCompositor, comp::send_frames_surface_tree, egl_data,
-    event_queue::SyncEventQueue, process, smithay_wrapper, time, window,
+    client::WayVRCompositor, comp::send_frames_surface_tree, egl_data, event_queue::SyncEventQueue,
+    process, smithay_wrapper, time, window, BlitMethod, WayVRSignal,
 };
 
 fn generate_auth_key() -> String {
@@ -308,7 +308,8 @@ impl Display {
     }
 
     pub fn tick_render(&mut self, renderer: &mut GlesRenderer, time_ms: u64) -> anyhow::Result<()> {
-        renderer.bind(self.gles_texture.clone())?;
+        let mut gles_texture = self.gles_texture.clone();
+        let mut target = renderer.bind(&mut gles_texture)?;
 
         let size = Size::from((i32::from(self.width), i32::from(self.height)));
         let damage: Rectangle<i32, smithay::utils::Physical> = Rectangle::from_size(size);
@@ -337,7 +338,7 @@ impl Display {
             })
             .collect();
 
-        let mut frame = renderer.render(size, Transform::Normal)?;
+        let mut frame = renderer.render(&mut target, size, Transform::Normal)?;
 
         let clear_color = if self.displayed_windows.is_empty() {
             Color32F::new(0.5, 0.5, 0.5, 0.5)

wlx-overlay-s/src/subsystem/audio.rs

@@ -1,9 +1,9 @@
 use std::io::Cursor;
 
-use rodio::{Decoder, OutputStream, OutputStreamHandle, Source};
+use rodio::{Decoder, OutputStreamBuilder, stream::OutputStream};
 
 pub struct AudioOutput {
-    audio_stream: Option<(OutputStream, OutputStreamHandle)>,
+    audio_stream: Option<OutputStream>,
     first_try: bool,
 }
 
@@ -15,17 +15,17 @@ impl AudioOutput {
         }
     }
 
-    fn get_handle(&mut self) -> Option<&OutputStreamHandle> {
+    fn get_handle(&mut self) -> Option<&OutputStream> {
         if self.audio_stream.is_none() && self.first_try {
             self.first_try = false;
-            if let Ok((stream, handle)) = OutputStream::try_default() {
-                self.audio_stream = Some((stream, handle));
+            if let Ok(stream) = OutputStreamBuilder::open_default_stream() {
+                self.audio_stream = Some(stream);
             } else {
                 log::error!("Failed to open audio stream. Audio will not work.");
                 return None;
             }
         }
-        self.audio_stream.as_ref().map(|(_, h)| h)
+        self.audio_stream.as_ref()
     }
 
     pub fn play(&mut self, wav_bytes: &'static [u8]) {
@@ -40,6 +40,6 @@ impl AudioOutput {
                 return;
             }
         };
-        let _ = handle.play_raw(source.convert_samples());
+        let _ = handle.mixer().add(source);
     }
 }

wlx-overlay-s/src/subsystem/hid/mod.rs

@@ -1,5 +1,5 @@
 use glam::{IVec2, Vec2};
-use idmap::{IdMap, idmap};
+use idmap::{idmap, IdMap};
 use idmap_derive::IntegerId;
 use input_linux::{
     AbsoluteAxis, AbsoluteInfo, AbsoluteInfoSetup, EventKind, InputId, Key, RelativeAxis,