diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d05be7a0..cab79337 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - rust_version: ['1.64.0', stable, nightly] + rust_version: ['1.65.0', stable, nightly] platform: - { target: x86_64-pc-windows-msvc, os: windows-latest, } - { target: i686-pc-windows-msvc, os: windows-latest, } @@ -79,9 +79,13 @@ jobs: targets: ${{ matrix.platform.target }} components: clippy, rust-src + - name: Install libwayland + if: (matrix.platform.os == 'ubuntu-latest') + run: sudo apt-get update && sudo apt-get install libwayland-dev + - name: Install GCC Multilib if: (matrix.platform.os == 'ubuntu-latest') && contains(matrix.platform.target, 'i686') - run: sudo apt-get update && sudo apt-get install gcc-multilib + run: sudo apt-get install gcc-multilib - name: Build crate shell: bash @@ -94,7 +98,7 @@ jobs: !contains(matrix.platform.target, 'redox') && !contains(matrix.platform.target, 'freebsd') && !contains(matrix.platform.target, 'netbsd') && - matrix.rust_version != '1.64.0' + matrix.rust_version != '1.65.0' run: cargo $CMD test --no-run --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES - name: Run tests diff --git a/Cargo.toml b/Cargo.toml index a23923e3..179012da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/rust-windowing/softbuffer" keywords = ["framebuffer", "windowing"] categories = ["game-development", "graphics", "gui", "multimedia", "rendering"] exclude = ["examples"] -rust-version = "1.64.0" +rust-version = "1.65.0" [[bench]] name = "buffer_mut" @@ -36,9 +36,9 @@ drm-sys = { version = "0.4.0", default-features = false, optional = true } memmap2 = { version = "0.7.1", optional = true } nix = { version = "0.26.1", optional = true } tiny-xlib = { version = "0.2.1", optional = true } -wayland-backend = { version = "0.1.0", features = ["client_system"], optional = true } -wayland-client = { version = "0.30.0", optional = true } -wayland-sys = "0.30.0" +wayland-backend = { version = "0.3.0", features = ["client_system"], optional = true } +wayland-client = { version = "0.31.0", optional = true } +wayland-sys = "0.31.0" x11rb = { version = "0.12.0", features = ["allow-unsafe-code", "shm"], optional = true } [target.'cfg(all(unix, not(any(target_vendor = "apple", target_os = "android", target_os = "redox", target_os = "linux", target_os = "freebsd"))))'.dependencies] diff --git a/src/wayland/buffer.rs b/src/wayland/buffer.rs index 51a94663..f4aed3c8 100644 --- a/src/wayland/buffer.rs +++ b/src/wayland/buffer.rs @@ -2,7 +2,7 @@ use memmap2::MmapMut; use std::{ ffi::CStr, fs::File, - os::unix::prelude::{AsRawFd, FromRawFd}, + os::unix::prelude::{AsFd, AsRawFd, FromRawFd}, slice, sync::{ atomic::{AtomicBool, Ordering}, @@ -107,7 +107,7 @@ impl WaylandBuffer { let map = unsafe { map_file(&tempfile) }; // Create wayland shm pool and buffer - let pool = shm.create_pool(tempfile.as_raw_fd(), pool_size, qh, ()); + let pool = shm.create_pool(tempfile.as_fd(), pool_size, qh, ()); let released = Arc::new(AtomicBool::new(true)); let buffer = pool.create_buffer( 0,