Update smithay and wayland-rs

Includes updates for split between `smithay::wayland::output` and
`smithay::output`.

src/backend/kms/mod.rs

@@ -27,6 +27,7 @@ use smithay::{
         session::{auto::AutoSession, Session, Signal},
         udev::{all_gpus, primary_gpu, UdevBackend, UdevEvent},
     },
+    output::{Mode as OutputMode, Output, PhysicalProperties, Subpixel},
     reexports::{
         calloop::{
             timer::{TimeoutAction, Timer},
@@ -35,19 +36,13 @@ use smithay::{
         drm::control::{connector, crtc, Device as ControlDevice, ModeTypeFlags},
         input::Libinput,
         nix::{fcntl::OFlag, sys::stat::dev_t},
-        wayland_server::{
-            protocol::{wl_output, wl_surface::WlSurface},
-            DisplayHandle, Resource,
-        },
+        wayland_server::{protocol::wl_surface::WlSurface, DisplayHandle, Resource},
     },
     utils::{
         signaling::{Linkable, SignalToken, Signaler},
-        Size,
-    },
-    wayland::{
-        dmabuf::DmabufGlobal,
-        output::{Mode as OutputMode, Output, PhysicalProperties},
+        Size, Transform,
     },
+    wayland::dmabuf::DmabufGlobal,
 };
 
 use std::{
@@ -650,7 +645,7 @@ impl Device {
             PhysicalProperties {
                 size: (phys_w as i32, phys_h as i32).into(),
                 // TODO: We need to read that from the connector properties
-                subpixel: wl_output::Subpixel::Unknown,
+                subpixel: Subpixel::Unknown,
                 make: edid_info.manufacturer,
                 model: edid_info.model,
             },
@@ -668,7 +663,7 @@ impl Device {
         output.change_current_state(
             Some(output_mode),
             // TODO: Readout property for monitor rotation
-            Some(wl_output::Transform::Normal),
+            Some(Transform::Normal),
             None,
             Some(position.into()),
         );

src/backend/render/mod.rs

@@ -29,8 +29,9 @@ use smithay::{
         utils::damage_from_surface_tree,
         Window,
     },
+    output::Output,
     utils::{Physical, Point, Rectangle, Scale, Transform},
-    wayland::{output::Output, shell::wlr_layer::Layer as WlrLayer},
+    wayland::shell::wlr_layer::Layer as WlrLayer,
 };
 
 pub mod cursor;

src/backend/winit.rs

@@ -14,14 +14,12 @@ use smithay::{
         winit::{self, WinitEvent, WinitGraphicsBackend, WinitVirtualDevice},
     },
     desktop::layer_map_for_output,
+    output::{Mode, Output, PhysicalProperties, Scale, Subpixel},
     reexports::{
         calloop::{ping, EventLoop},
-        wayland_server::{
-            protocol::wl_output::{Subpixel, Transform},
-            DisplayHandle,
-        },
+        wayland_server::DisplayHandle,
     },
-    wayland::output::{Mode, Output, PhysicalProperties, Scale},
+    utils::Transform,
 };
 use std::cell::RefCell;
 

src/backend/x11.rs

@@ -17,15 +17,13 @@ use smithay::{
         x11::{Window, WindowBuilder, X11Backend, X11Event, X11Handle, X11Input, X11Surface},
     },
     desktop::layer_map_for_output,
+    output::{Mode, Output, PhysicalProperties, Scale, Subpixel},
     reexports::{
         calloop::{ping, EventLoop, LoopHandle},
         gbm::{Device as GbmDevice, FdWrapper},
-        wayland_server::{
-            protocol::wl_output::{Subpixel, Transform},
-            DisplayHandle,
-        },
+        wayland_server::DisplayHandle,
     },
-    wayland::output::{Mode, Output, PhysicalProperties, Scale},
+    utils::Transform,
 };
 use std::{
     cell::RefCell,