From d313ec26727554124f22e54f134b046049247a14 Mon Sep 17 00:00:00 2001 From: Ben Widawsky Date: Mon, 9 Oct 2023 13:33:17 -0700 Subject: [PATCH 1/4] Remove calloop dep --- Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a002ca4..9199805 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,6 @@ rust-version = "1.56.1" # nix # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -calloop = "0.12.2" container_of = "0.5.1" memoffset = "0.9.0" nix = { version = "0.27.1", default-features = false, features = ["signal"] } From 0f6e4975fb3fd3eda87904e2f2e3b33be8ef872c Mon Sep 17 00:00:00 2001 From: Ben Widawsky Date: Mon, 9 Oct 2023 12:49:30 -0700 Subject: [PATCH 2/4] Run cargo fmt for CI --- src/ffi_wrappers.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ffi_wrappers.rs b/src/ffi_wrappers.rs index 1b0adb5..d8318e4 100644 --- a/src/ffi_wrappers.rs +++ b/src/ffi_wrappers.rs @@ -208,7 +208,9 @@ unsafe extern "C" fn create_pointer_ffi(ptr: *mut WlcsDisplayServer) -> match std::panic::catch_unwind(|| { let server = unsafe { get_display_server_handle_mut::(ptr) }; assert_eq!(server.wlcs_display_server.version, 3); - let Some(p) = server.wlcs.create_pointer() else { return std::ptr::null_mut() }; + let Some(p) = server.wlcs.create_pointer() else { + return std::ptr::null_mut(); + }; let handle: *mut PointerHandle = Box::into_raw(Box::new(PointerHandle { wlcs_pointer: wlcs_pointer::(), @@ -233,7 +235,9 @@ unsafe extern "C" fn create_touch_ffi(ptr: *mut WlcsDisplayServer) -> * match std::panic::catch_unwind(|| { let server = unsafe { get_display_server_handle_mut::(ptr) }; assert_eq!(server.wlcs_display_server.version, 3); - let Some(t) = server.wlcs.create_touch() else { return std::ptr::null_mut(); }; + let Some(t) = server.wlcs.create_touch() else { + return std::ptr::null_mut(); + }; let handle: *mut TouchHandle = Box::into_raw(Box::new(TouchHandle { wlcs_touch: wlcs_touch::(), t, From 44aa9ac22a7050c6c2f3a8151afc56a9085e7a78 Mon Sep 17 00:00:00 2001 From: Ben Widawsky Date: Mon, 9 Oct 2023 12:59:15 -0700 Subject: [PATCH 3/4] CI: Add libwayland-dev deps --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d894a8..f78313e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - run: sudo apt-get install -y libwayland-dev - name: Setup Rust uses: actions-rs/toolchain@v1 with: @@ -63,6 +64,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 + - run: sudo apt-get install -y libwayland-dev - uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -92,6 +94,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 + - run: sudo apt-get install -y libwayland-dev - uses: actions-rs/toolchain@v1 with: toolchain: nightly @@ -141,6 +144,8 @@ jobs: profile: minimal default: true override: true + - name: Install libwayland-dev + run: sudo apt-get install -y libdrm-dev libwayland-dev - name: Cargo cache uses: actions/cache@v2 with: From 2d88977dacda72a8ee13aae9d8e37ccbcd9194ea Mon Sep 17 00:00:00 2001 From: Ben Widawsky Date: Mon, 9 Oct 2023 13:26:51 -0700 Subject: [PATCH 4/4] README: fix dep name --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8c6ffe8..ec9e7cd 100644 --- a/README.md +++ b/README.md @@ -9,5 +9,5 @@ usage. Add wlcs-rs as a dependency in `Cargo.toml` ``` [dependencies] -udev = "^0.1.0" +wlcs-rs = "^0.1.0" ```