Skip to content

Commit

Permalink
Merge pull request #647 from Smithay/deps/0.30.0-beta.5
Browse files Browse the repository at this point in the history
Update to wayland-rs 0.30.0-beta.5
  • Loading branch information
Drakulix authored Jun 23, 2022
2 parents 27de600 + 5c70956 commit 01ffd33
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ jobs:
with:
command: doc
# TODO: Update nix when drm-rs is updated
args: --no-deps --features "test_all_features" -p smithay -p calloop:0.10.1 -p dbus -p drm -p gbm -p input -p nix:0.22.3 -p udev -p slog -p wayland-server:0.30.0-beta.4 -p wayland-backend -p wayland-protocols:0.30.0-beta.4 -p winit -p x11rb
args: --no-deps --features "test_all_features" -p smithay -p calloop:0.10.1 -p dbus -p drm -p gbm -p input -p nix:0.22.3 -p udev -p slog -p wayland-server:0.30.0-beta.5 -p wayland-backend -p wayland-protocols:0.30.0-beta.5 -p winit -p x11rb

- name: Setup index
run: cp ./doc_index.html ./target/doc/index.html
Expand Down
14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "smithay"
version = "0.3.0"
authors = ["Victor Berger <victor.berger@m4x.org>", "Drakulix (Victor Brekenfeld)"]
authors = ["Victor Berger <victor.berger@m4x.org>", "Drakulix (Victoria Brekenfeld)"]
license = "MIT"
description = "Smithay is a library for writing wayland compositors."
repository = "https://github.com/Smithay/smithay"
Expand Down Expand Up @@ -47,12 +47,12 @@ slog-stdlog = { version = "4", optional = true }
tempfile = { version = "3.0", optional = true }
thiserror = "1.0.25"
udev = { version = "0.6", optional = true }
wayland-egl = { version = "=0.30.0-beta.4", optional = true }
wayland-protocols = { version = "=0.30.0-beta.4", features = ["unstable", "staging", "server"], optional = true }
wayland-protocols-wlr = { version = "=0.1.0-beta.4", features = ["server"]}
wayland-server = { version = "=0.30.0-beta.4", optional = true }
wayland-sys = { version = "=0.30.0-beta.4", optional = true }
wayland-backend = { version = "=0.1.0-beta.4", optional = true }
wayland-egl = { version = "=0.30.0-beta.5", optional = true }
wayland-protocols = { version = "=0.30.0-beta.5", features = ["unstable", "staging", "server"], optional = true }
wayland-protocols-wlr = { version = "=0.1.0-beta.5", features = ["server"]}
wayland-server = { version = "=0.30.0-beta.5", optional = true }
wayland-sys = { version = "=0.30.0-beta.5", optional = true }
wayland-backend = { version = "=0.1.0-beta.5", optional = true }
winit = { version = "0.26", optional = true }
x11rb = { version = "0.10.0", optional = true }
xkbcommon = "0.4.0"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017 Victor Berger and Victor Brekenfeld
Copyright (c) 2017 Victor Berger and Victoria Brekenfeld

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion anvil/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "anvil"
version = "0.0.1"
authors = ["Victor Berger <victor.berger@m4x.org>", "Drakulix (Victor Brekenfeld)"]
authors = ["Victor Berger <victor.berger@m4x.org>", "Drakulix (Victoria Brekenfeld)"]
license = "MIT"
publish = false
edition = "2018"
Expand Down
4 changes: 2 additions & 2 deletions wlcs_anvil/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "wlcs_anvil"
version = "0.0.1"
authors = ["Victor Berger <victor.berger@m4x.org>", "Drakulix (Victor Brekenfeld)"]
authors = ["Victor Berger <victor.berger@m4x.org>", "Drakulix (Victoria Brekenfeld)"]
license = "MIT"
publish = false
edition = "2018"
Expand All @@ -12,7 +12,7 @@ crate-type = ["cdylib"]
[dependencies]
smithay = { path = "..", default-features=false, features=["wayland_frontend", "use_system_lib"] }
anvil = { path = "../anvil", default-features=false }
wayland-sys = { version = "=0.30.0-beta.4", features = ["client", "server"] }
wayland-sys = { version = "=0.30.0-beta.5", features = ["client", "server"] }
libc = "0.2"
memoffset = "0.6"
slog = "2.0"
Expand Down

0 comments on commit 01ffd33

Please sign in to comment.