tidy up apis, mainly the part of egl and waymirror

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
     - name: Build
       run: |
         rm Cargo.lock
-        cargo build --release
+        cargo build --workspace --release
     - name: Clippy check
       run:
         cargo clippy -- -D warnings

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 resolver = "2"
-members = ["wayshot", "libwayshot"]
+members = ["wayshot", "libwayshot", "./waymirror-egl"]
+default-members = ["wayshot", "libwayshot"]
 
 [workspace.package]
 authors = ["Shinyzenith <https://aakash.is-a.dev>"]
@@ -15,3 +16,4 @@ edition = "2024"
 [workspace.dependencies]
 libwayshot = { version = "0.7.0", path = "./libwayshot" }
 tracing = "0.1.44"
+r-egl-wayland = "0.7.1"

libwayshot/Cargo.toml

@@ -24,12 +24,16 @@ rustix = { version = "1.1", features = ["fs", "shm"] }
 thiserror = "2"
 
 wayland-client = "0.31.8"
-wayland-protocols = { version = "0.32.6", features = ["client", "staging", "unstable"] }
+wayland-protocols = { version = "0.32.6", features = [
+	"client",
+	"staging",
+	"unstable",
+] }
 wayland-protocols-wlr = { version = "0.3.6", features = ["client"] }
 wayland-backend = { version = "0.3.10", features = ["client_system"] }
 
 gbm = "0.18.0"
 drm = "0.14.1"
 
 gl = "0.14.0"
-khronos-egl = { version = "6.0.0", features = ["static"] }
+r-egl-wayland.workspace = true

libwayshot/examples/waymirror.rs

@@ -47,7 +47,7 @@ fn main() {
         .try_init_dmabuf(WayshotTarget::Screen(output.clone()))
         .expect("Cannot find a drm");
     let cast = wayshot
-        .create_screencast_with_dmabuf(None, WayshotTarget::Screen(output), true)
+        .create_screencast_with_dmabuf(WayshotTarget::Screen(output), true, None)
         .unwrap();
 
     let view_porter = globals

libwayshot/src/error.rs

@@ -2,6 +2,7 @@ use std::{io, result};
 
 use drm::buffer::UnrecognizedFourcc;
 use gbm::InvalidFdError;
+use r_egl_wayland::r_egl as egl;
 use thiserror::Error;
 use wayland_client::{
     ConnectError, DispatchError, WEnum,
@@ -46,7 +47,7 @@ pub enum Error {
     #[error("dmabuf color format provided by compositor is invalid")]
     UnrecognizedColorCode(#[from] UnrecognizedFourcc),
     #[error("dmabuf device has been destroyed")]
-    EGLError(#[from] khronos_egl::Error),
+    EGLError(#[from] egl::Error),
     #[error("No EGLImageTargetTexture2DOES function located, this extension may not be supported")]
     EGLImageToTexProcNotFoundError,
     #[error("Capture failed: {0}")]
@@ -264,11 +265,11 @@ mod tests {
 
     #[test]
     fn test_from_egl_error() {
-        let egl_error = khronos_egl::Error::ContextLost;
+        let egl_error = egl::Error::ContextLost;
         let wayshot_error: Error = egl_error.into();
 
         match wayshot_error {
-            Error::EGLError(khronos_egl::Error::ContextLost) => {}
+            Error::EGLError(egl::Error::ContextLost) => {}
             _ => panic!("Expected Error::EGLError(khronos_egl::Error::ContextLost)"),
         }
     }