From ce844ba9f810d0fc72d43a08bac9c2aeee81fcb4 Mon Sep 17 00:00:00 2001 From: Demur Rumed Date: Sun, 8 Oct 2017 14:18:56 +0000 Subject: [PATCH] Cargo.toml: include repo, update nix/image --- CONTRIBUTING.md | 2 +- Cargo.toml | 5 +++-- src/backend/drm/backend.rs | 2 +- src/backend/graphics/egl.rs | 5 ++--- src/backend/winit.rs | 2 +- src/wayland/shm/pool.rs | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 78da01c..853c90e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ use matrix, this room is also bridged to gitter: https://gitter.im/smithay/Lobby Smithay attempts to be as generic and un-opinionated as possible. As such, if you have an idea of a feature that would be usefull for your compositor project and would like it to be integrated in Smithay, please consider whether it is in its scope: -- If this is a very generic feature that probably many different projects would find usefull, it can be integrated in Smithay +- If this is a very generic feature that probably many different projects would find useful, it can be integrated in Smithay - If it is a rather specific feature, but can be framed as a special case of a more general feature, this general feature is likely worth adding to Smithay - If this feature is really specific to your use-case, it is out of scope for Smithay diff --git a/Cargo.toml b/Cargo.toml index df7ffb5..b1931b7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,10 +4,11 @@ version = "0.1.0" authors = ["Victor Berger ", "Drakulix (Victor Brekenfeld)"] license = "MIT" description = "Smithay is a library for writing wayland compositors." +repository = "https://github.com/Smithay/smithay" [dependencies] wayland-server = "0.10.2" -nix = "0.7.0" +nix = "0.9.0" xkbcommon = "0.2.1" tempfile = "2.1.5" slog = { version = "2.0.0" } @@ -21,7 +22,7 @@ glium = { version = "0.17.1", optional = true, default-features = false } input = { version = "0.2.0", optional = true } rental = "0.4.11" wayland-protocols = { version = "0.10.2", features = ["unstable_protocols", "server"] } -image = "0.15.0" +image = "0.16.0" error-chain = "0.11.0" [build-dependencies] diff --git a/src/backend/drm/backend.rs b/src/backend/drm/backend.rs index d9b66d0..d2ccd95 100644 --- a/src/backend/drm/backend.rs +++ b/src/backend/drm/backend.rs @@ -6,7 +6,7 @@ use drm::control::{Device, ResourceInfo}; use drm::control::{connector, crtc, encoder, framebuffer, Mode}; use gbm::{BufferObject, BufferObjectFlags, Format as GbmFormat, Surface as GbmSurface, SurfaceBufferHandle}; use image::{ImageBuffer, Rgba}; -use nix::c_void; +use nix::libc::c_void; use std::cell::Cell; use std::rc::Rc; diff --git a/src/backend/graphics/egl.rs b/src/backend/graphics/egl.rs index 994ae98..ad809d8 100644 --- a/src/backend/graphics/egl.rs +++ b/src/backend/graphics/egl.rs @@ -9,7 +9,7 @@ use super::GraphicsBackend; #[cfg(feature = "backend_drm")] use gbm::{AsRaw, Device as GbmDevice, Surface as GbmSurface}; use libloading::Library; -use nix::{c_int, c_void}; +use nix::libc::{c_int, c_void}; use rental::TryNewError; use slog; use std::error; @@ -28,8 +28,7 @@ use winit::os::unix::WindowExt; #[allow(non_camel_case_types, dead_code)] mod ffi { - use nix::c_void; - use nix::libc::{c_long, int32_t, uint64_t}; + use nix::libc::{c_long, c_void, int32_t, uint64_t}; pub type khronos_utime_nanoseconds_t = khronos_uint64_t; pub type khronos_uint64_t = uint64_t; diff --git a/src/backend/winit.rs b/src/backend/winit.rs index f09381d..f81b1d4 100644 --- a/src/backend/winit.rs +++ b/src/backend/winit.rs @@ -8,7 +8,7 @@ use backend::input::{Axis, AxisSource, Event as BackendEvent, InputBackend, Inpu KeyboardKeyEvent, MouseButton, MouseButtonState, PointerAxisEvent, PointerButtonEvent, PointerMotionAbsoluteEvent, Seat, SeatCapabilities, TouchCancelEvent, TouchDownEvent, TouchMotionEvent, TouchSlot, TouchUpEvent, UnusedEvent}; -use nix::c_void; +use nix::libc::c_void; use rental::TryNewError; use std::cell::Cell; use std::cmp; diff --git a/src/wayland/shm/pool.rs b/src/wayland/shm/pool.rs index 227f669..20faa62 100644 --- a/src/wayland/shm/pool.rs +++ b/src/wayland/shm/pool.rs @@ -1,6 +1,6 @@ -use nix::{c_int, c_void, libc, unistd}; +use nix::{libc, unistd}; use nix::sys::mman; use nix::sys::signal::{self, SigAction, SigHandler, Signal}; use std::cell::Cell; @@ -210,7 +210,7 @@ unsafe fn reraise_sigbus() { let _ = signal::raise(Signal::SIGBUS); } -extern "C" fn sigbus_handler(_signum: c_int, info: *mut libc::siginfo_t, _context: *mut c_void) { +extern "C" fn sigbus_handler(_signum: libc::c_int, info: *mut libc::siginfo_t, _context: *mut libc::c_void) { let faulty_ptr = unsafe { siginfo_si_addr(info) } as *mut u8; SIGBUS_GUARD.with(|guard| { let (memmap, _) = guard.get(); @@ -238,7 +238,7 @@ extern "C" fn sigbus_handler(_signum: c_int, info: *mut libc::siginfo_t, _contex // I guess it's good enough? #[cfg(any(target_os = "linux", target_os = "android"))] -unsafe fn siginfo_si_addr(info: *mut libc::siginfo_t) -> *mut c_void { +unsafe fn siginfo_si_addr(info: *mut libc::siginfo_t) -> *mut libc::c_void { #[repr(C)] struct siginfo_t { a: [libc::c_int; 3], // si_signo, si_errno, si_code @@ -249,6 +249,6 @@ unsafe fn siginfo_si_addr(info: *mut libc::siginfo_t) -> *mut c_void { } #[cfg(not(any(target_os = "linux", target_os = "android")))] -unsafe fn siginfo_si_addr(info: *mut libc::siginfo_t) -> *mut c_void { +unsafe fn siginfo_si_addr(info: *mut libc::siginfo_t) -> *mut libc::c_void { (*info).si_addr }