1
0
Fork 0

Update nih_plug_iced to the latest baseview

The feature branch used to add mouse modifiers has long been merged into
upstream baseview.
This commit is contained in:
Robbert van der Helm 2022-12-02 19:23:24 +01:00
parent ec34e54bfe
commit 1767e6abe4
2 changed files with 32 additions and 47 deletions

77
Cargo.lock generated
View file

@ -362,24 +362,6 @@ version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "baseview"
version = "0.1.0"
source = "git+https://github.com/robbert-vdh/baseview.git?branch=feature/mouse-event-modifiers#5b57af2463ef55c4ac702ef662c3472c328a3c6b"
dependencies = [
"cocoa",
"core-foundation",
"keyboard-types",
"nix 0.22.3",
"objc",
"raw-window-handle 0.4.3",
"uuid",
"winapi",
"x11",
"xcb 0.9.0",
"xcb-util",
]
[[package]]
name = "baseview"
version = "0.1.0"
@ -416,6 +398,24 @@ dependencies = [
"xcb-util",
]
[[package]]
name = "baseview"
version = "0.1.0"
source = "git+https://github.com/RustAudio/baseview.git#ee156fb8840452984b5f9946635e9a35b2857c41"
dependencies = [
"cocoa",
"core-foundation",
"keyboard-types",
"nix 0.22.3",
"objc",
"raw-window-handle 0.4.3",
"uuid",
"winapi",
"x11",
"xcb 0.9.0",
"xcb-util",
]
[[package]]
name = "bindgen"
version = "0.61.0"
@ -851,9 +851,9 @@ dependencies = [
[[package]]
name = "cpal"
version = "0.14.1"
version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e73413ddcb69c398125f5529714492e070c64c6a090ad5b01d8c082b320a0809"
checksum = "f342c1b63e185e9953584ff2199726bf53850d96610a310e3aca09e9405a2d0b"
dependencies = [
"alsa",
"core-foundation-sys",
@ -864,7 +864,6 @@ dependencies = [
"mach",
"ndk 0.7.0",
"ndk-context",
"nix 0.25.0",
"oboe",
"once_cell",
"parking_lot 0.12.1",
@ -1894,9 +1893,9 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
[[package]]
name = "iced_baseview"
version = "0.0.3"
source = "git+https://github.com/robbert-vdh/iced_baseview.git?branch=feature/update-baseview#116e9043779946c9b2a1b4d2a06bf46752930919"
source = "git+https://github.com/robbert-vdh/iced_baseview.git?branch=feature/update-baseview#41cd024dbb20c39c03215c2c33bcc2be69756e6f"
dependencies = [
"baseview 0.1.0 (git+https://github.com/robbert-vdh/baseview.git?branch=feature/mouse-event-modifiers)",
"baseview 0.1.0 (git+https://github.com/RustAudio/baseview.git)",
"copypasta 0.7.1",
"iced_core",
"iced_futures",
@ -2676,7 +2675,7 @@ name = "nih_plug_iced"
version = "0.0.0"
dependencies = [
"atomic_refcell",
"baseview 0.1.0 (git+https://github.com/robbert-vdh/baseview.git?branch=feature/mouse-event-modifiers)",
"baseview 0.1.0 (git+https://github.com/RustAudio/baseview.git)",
"crossbeam",
"iced_baseview",
"nih_plug",
@ -2735,9 +2734,9 @@ dependencies = [
[[package]]
name = "nix"
version = "0.24.2"
version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc"
checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
dependencies = [
"bitflags",
"cfg-if 1.0.0",
@ -2745,20 +2744,6 @@ dependencies = [
"memoffset 0.6.5",
]
[[package]]
name = "nix"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
dependencies = [
"autocfg",
"bitflags",
"cfg-if 1.0.0",
"libc",
"memoffset 0.6.5",
"pin-utils",
]
[[package]]
name = "nohash-hasher"
version = "0.2.0"
@ -3147,9 +3132,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
[[package]]
name = "pest"
version = "2.5.0"
version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f400b0f7905bf702f9f3dc3df5a121b16c54e9e8012c082905fdf09a931861a"
checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0"
dependencies = [
"thiserror",
"ucd-trie",
@ -4001,7 +3986,7 @@ dependencies = [
"lazy_static",
"log",
"memmap2 0.5.8",
"nix 0.24.2",
"nix 0.24.3",
"pkg-config",
"wayland-client",
"wayland-cursor",
@ -4771,7 +4756,7 @@ dependencies = [
"bitflags",
"downcast-rs",
"libc",
"nix 0.24.2",
"nix 0.24.3",
"scoped-tls",
"wayland-commons",
"wayland-scanner",
@ -4784,7 +4769,7 @@ version = "0.29.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902"
dependencies = [
"nix 0.24.2",
"nix 0.24.3",
"once_cell",
"smallvec",
"wayland-sys",
@ -4796,7 +4781,7 @@ version = "0.29.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661"
dependencies = [
"nix 0.24.2",
"nix 0.24.3",
"wayland-client",
"xcursor",
]

View file

@ -57,7 +57,7 @@ nih_plug = { path = ".." }
nih_plug_assets = { git = "https://github.com/robbert-vdh/nih_plug_assets.git" }
atomic_refcell = "0.1"
baseview = { git = "https://github.com/robbert-vdh/baseview.git", branch = "feature/mouse-event-modifiers" }
baseview = { git = "https://github.com/RustAudio/baseview.git" }
crossbeam = "0.8"
# Upstream doesn't work with the current iced version, this branch also contains
# additional features