Bump dependencies

Cargo.lock

@@ -493,9 +493,9 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "cliclack"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f719b8100982672e07acc352f388e7cd555bcc2c7bb0619d735e17b76e31dd5"
+checksum = "4febf49beeedc40528e4956995631f1bbdb4d8804ef940b44351f393a996c739"
 dependencies = [
  "console",
  "indicatif",
@@ -2247,7 +2247,7 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
 [[package]]
 name = "smithay"
 version = "0.3.0"
-source = "git+https://github.com/Smithay/smithay?rev=54208d5#54208d54f67165b0d9c6c622fc28526ab5e8ff8a"
+source = "git+https://github.com/Smithay/smithay?rev=e237b07#e237b077bd922e17849eff91ba05853c7a68f958"
 dependencies = [
  "appendlist",
  "ash",
@@ -2322,7 +2322,7 @@ dependencies = [
 [[package]]
 name = "smithay-drm-extras"
 version = "0.1.0"
-source = "git+https://github.com/Smithay/smithay?rev=e5f0068#e5f006818df7ebb92d206985f45e713ba1e9c1c9"
+source = "git+https://github.com/Smithay/smithay?rev=e237b07#e237b077bd922e17849eff91ba05853c7a68f958"
 dependencies = [
  "drm",
  "edid-rs",
@@ -2372,9 +2372,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
 [[package]]
 name = "sysinfo"
-version = "0.30.8"
+version = "0.30.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b1a378e48fb3ce3a5cf04359c456c9c98ff689bcf1c1bc6e6a31f247686f275"
+checksum = "26d7c217777061d5a2d652aea771fb9ba98b6dade657204b08c4b9604d11555b"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",

Cargo.toml

@@ -11,7 +11,7 @@ repository = "https://github.com/pinnacle-comp/pinnacle/"
 tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread"]}
 tokio-stream = { version = "0.1.15", features = ["net"] }
 # gRPC
-prost = "0.12.3"
+prost = "0.12.4"
 tonic = "0.11.0"
 tonic-reflection = "0.11.0"
 tonic-build = "0.11.0"
@@ -37,7 +37,7 @@ keywords = ["wayland", "compositor", "smithay", "lua"]
 [dependencies]
 # Smithay
 # smithay is down there somewhere
-smithay-drm-extras = { git = "https://github.com/Smithay/smithay", rev = "e5f0068" }
+smithay-drm-extras = { git = "https://github.com/Smithay/smithay", rev = "e237b07" }
 # Tracing
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "registry"] }
@@ -57,7 +57,7 @@ tokio = { workspace = true, features = ["process", "io-util", "signal"] }
 tokio-stream = { workspace = true }
 # CLI
 clap = { version = "4.5.4", features = ["derive"] }
-cliclack = "0.2.3"
+cliclack = "0.2.5"
 # Misc.
 bitflags = "2.5.0"
 serde = { version = "1.0.197", features = ["derive"] }
@@ -66,7 +66,7 @@ shellexpand = { version = "3.1.0", features = ["path"] }
 x11rb = { version = "0.13.0", default-features = false, features = ["composite"] }
 xkbcommon = { workspace = true }
 xdg = { workspace = true }
-sysinfo = "0.30.7"
+sysinfo = "0.30.10"
 nix = { version = "0.28.0", features = ["user", "resource"] }
 pinnacle-api-defs = { workspace = true }
 dircpy = "0.3.16"
@@ -75,7 +75,7 @@ bytemuck = "1.15.0"
 
 [dependencies.smithay]
 git = "https://github.com/Smithay/smithay"
-rev = "54208d5"
+rev = "e237b07"
 default-features = false
 features = [
     "desktop",

src/backend/udev.rs

@@ -36,7 +36,7 @@ use smithay::{
             gles::{GlesRenderbuffer, GlesRenderer},
             multigpu::{gbm::GbmGlesBackend, GpuManager, MultiRenderer, MultiTexture},
             sync::SyncPoint,
-            utils::CommitCounter,
+            utils::{CommitCounter, DamageSet},
             Bind, Blit, BufferType, ExportMem, ImportDma, ImportEgl, ImportMemWl, Offscreen,
             Renderer, TextureFilter,
         },
@@ -1614,10 +1614,10 @@ fn handle_pending_screencopy<'a>(
         .unwrap_or_else(|| {
             // Returning `None` means the previous CommitCounter is too old or damage
             // was reset, so damage the whole output
-            vec![Rectangle::from_loc_and_size(
+            DamageSet::from_slice(&[Rectangle::from_loc_and_size(
                 Point::from((0, 0)),
                 untransformed_output_size,
-            )]
+            )])
         });
 
         // INFO: This code is here for if the bug where `blit_frame_result` makes the area around

src/backend/winit.rs

@@ -344,11 +344,16 @@ impl State {
 
         match render_res {
             Ok(render_output_result) => {
-                winit.handle_pending_screencopy(output, &render_output_result, &self.loop_handle);
+                Winit::handle_pending_screencopy(
+                    &mut winit.backend,
+                    output,
+                    &render_output_result,
+                    &self.loop_handle,
+                );
 
                 let has_rendered = render_output_result.damage.is_some();
                 if let Some(damage) = render_output_result.damage {
-                    if let Err(err) = winit.backend.submit(Some(&damage)) {
+                    if let Err(err) = winit.backend.submit(Some(damage)) {
                         error!("Failed to submit buffer: {}", err);
                     }
                 }
@@ -392,7 +397,7 @@ impl State {
 
 impl Winit {
     fn handle_pending_screencopy(
-        &mut self,
+        backend: &mut WinitGraphicsBackend<GlesRenderer>,
         output: &Output,
         render_output_result: &RenderOutputResult,
         loop_handle: &LoopHandle<'static, State>,
@@ -416,7 +421,7 @@ impl Winit {
         let sync_point = if let Ok(dmabuf) = dmabuf::get_dmabuf(screencopy.buffer()) {
             trace!("Dmabuf screencopy");
 
-            self.backend
+            backend
                 .renderer()
                 .blit_to(
                     dmabuf,
@@ -438,7 +443,7 @@ impl Winit {
             trace!("Shm screencopy");
 
             let sync_point = {
-                let renderer = self.backend.renderer();
+                let renderer = backend.renderer();
                 let screencopy = &screencopy;
                 if !matches!(buffer_type(screencopy.buffer()), Some(BufferType::Shm)) {
                     warn!("screencopy does not have a shm buffer");
@@ -520,7 +525,7 @@ impl Winit {
 
             // We must rebind to the underlying EGL surface for buffer swapping
             // as it is bound to a `GlesRenderbuffer` above.
-            if let Err(err) = self.backend.bind() {
+            if let Err(err) = backend.bind() {
                 error!("Failed to rebind EGL surface after screencopy: {err}");
             }