servius/helvum
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/helvum synced 2026-03-15 03:26:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies

Browse Source 
Glib MainContext is now aquired manually because a change in gtk-rs would lead to
a panic when attaching the receiver otherwise, because gtk::init() doesn't
"leak" the default main context anymore.
This commit is contained in:
Tom A. Wagner
2021-05-22 14:00:51 +02:00
parent 24fd54affe
commit dce228ff60
2 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
Cargo.lock generated
View File

@@ -91,7 +91,7 @@ dependencies = [
[[package]]
name = "cairo-rs"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#74a02cdd2855a387ebbe700eb509029c8e338d19"
source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c"
dependencies = [
"bitflags",
"cairo-sys-rs",
@@ -103,7 +103,7 @@ dependencies = [
[[package]]
name = "cairo-sys-rs"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#74a02cdd2855a387ebbe700eb509029c8e338d19"
source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c"
dependencies = [
"glib-sys",
"libc",
@@ -220,9 +220,9 @@ dependencies = [
[[package]]
name = "field-offset"
version = "0.3.3"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf539fba70056b50f40a22e0da30639518a12ee18c35807858a63b158cb6dde7"
checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
dependencies = [
"memoffset",
"rustc_version",
@@ -236,24 +236,24 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
[[package]]
name = "futures-channel"
version = "0.3.14"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25"
checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2"
dependencies = [
"futures-core",
]
[[package]]
name = "futures-core"
version = "0.3.14"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815"
checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1"
[[package]]
name = "futures-executor"
version = "0.3.14"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d"
checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79"
dependencies = [
"futures-core",
"futures-task",
@@ -262,22 +262,23 @@ dependencies = [
[[package]]
name = "futures-io"
version = "0.3.14"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04"
checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1"
[[package]]
name = "futures-task"
version = "0.3.14"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc"
checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae"
[[package]]
name = "futures-util"
version = "0.3.14"
version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025"
checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967"
dependencies = [
"autocfg",
"futures-core",
"futures-task",
"pin-project-lite",
@@ -294,7 +295,7 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
[[package]]
name = "gdk-pixbuf"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#74a02cdd2855a387ebbe700eb509029c8e338d19"
source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c"
dependencies = [
"gdk-pixbuf-sys",
"gio",
@@ -305,7 +306,7 @@ dependencies = [
[[package]]
name = "gdk-pixbuf-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#74a02cdd2855a387ebbe700eb509029c8e338d19"
source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c"
dependencies = [
"gio-sys",
"glib-sys",
@@ -317,7 +318,7 @@ dependencies = [
[[package]]
name = "gdk4"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs/#e90c5752ba5229f874e912e84bc83739003434ed"
source = "git+https://github.com/gtk-rs/gtk4-rs/#39f35f14cf0540094eed7999fd803c76d16be07a"
dependencies = [
"bitflags",
"cairo-rs",
@@ -332,7 +333,7 @@ dependencies = [
[[package]]
name = "gdk4-sys"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs/#e90c5752ba5229f874e912e84bc83739003434ed"
source = "git+https://github.com/gtk-rs/gtk4-rs/#39f35f14cf0540094eed7999fd803c76d16be07a"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -348,7 +349,7 @@ dependencies = [
[[package]]
name = "gio"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#74a02cdd2855a387ebbe700eb509029c8e338d19"
source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c"
dependencies = [
"bitflags",
"futures-channel",
@@ -364,7 +365,7 @@ dependencies = [
[[package]]
name = "gio-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#74a02cdd2855a387ebbe700eb509029c8e338d19"
source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -376,7 +377,7 @@ dependencies = [
[[package]]
name = "glib"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#74a02cdd2855a387ebbe700eb509029c8e338d19"
source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c"
dependencies = [
"bitflags",
"futures-channel",
@@ -394,7 +395,7 @@ dependencies = [
[[package]]
name = "glib-macros"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#74a02cdd2855a387ebbe700eb509029c8e338d19"
source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c"
dependencies = [
"anyhow",
"heck",
@@ -408,7 +409,7 @@ dependencies = [
[[package]]
name = "glib-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#74a02cdd2855a387ebbe700eb509029c8e338d19"
source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c"
dependencies = [
"libc",
"system-deps",
@@ -423,7 +424,7 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]]
name = "gobject-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#74a02cdd2855a387ebbe700eb509029c8e338d19"
source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c"
dependencies = [
"glib-sys",
"libc",
@@ -433,7 +434,7 @@ dependencies = [
[[package]]
name = "graphene-rs"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#74a02cdd2855a387ebbe700eb509029c8e338d19"
source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c"
dependencies = [
"glib",
"graphene-sys",
@@ -443,7 +444,7 @@ dependencies = [
[[package]]
name = "graphene-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#74a02cdd2855a387ebbe700eb509029c8e338d19"
source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c"
dependencies = [
"glib-sys",
"libc",
@@ -454,7 +455,7 @@ dependencies = [
[[package]]
name = "gsk4"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs/#e90c5752ba5229f874e912e84bc83739003434ed"
source = "git+https://github.com/gtk-rs/gtk4-rs/#39f35f14cf0540094eed7999fd803c76d16be07a"
dependencies = [
"bitflags",
"cairo-rs",
@@ -469,7 +470,7 @@ dependencies = [
[[package]]
name = "gsk4-sys"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs/#e90c5752ba5229f874e912e84bc83739003434ed"
source = "git+https://github.com/gtk-rs/gtk4-rs/#39f35f14cf0540094eed7999fd803c76d16be07a"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
@@ -484,7 +485,7 @@ dependencies = [
[[package]]
name = "gtk4"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs/#e90c5752ba5229f874e912e84bc83739003434ed"
source = "git+https://github.com/gtk-rs/gtk4-rs/#39f35f14cf0540094eed7999fd803c76d16be07a"
dependencies = [
"bitflags",
"cairo-rs",
@@ -506,7 +507,7 @@ dependencies = [
[[package]]
name = "gtk4-macros"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs/#e90c5752ba5229f874e912e84bc83739003434ed"
source = "git+https://github.com/gtk-rs/gtk4-rs/#39f35f14cf0540094eed7999fd803c76d16be07a"
dependencies = [
"anyhow",
"heck",
@@ -521,7 +522,7 @@ dependencies = [
[[package]]
name = "gtk4-sys"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs/#e90c5752ba5229f874e912e84bc83739003434ed"
source = "git+https://github.com/gtk-rs/gtk4-rs/#39f35f14cf0540094eed7999fd803c76d16be07a"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -624,7 +625,7 @@ dependencies = [
[[package]]
name = "libspa"
version = "0.3.0"
source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs?branch=main#f8dc21b0f85f391201e7c6346b121fbd21c02836"
source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs?branch=main#edc9152b9d8e051c418d41a08640b6bdb61619e2"
dependencies = [
"bitflags",
"cc",
@@ -639,7 +640,7 @@ dependencies = [
[[package]]
name = "libspa-sys"
version = "0.3.0"
source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs?branch=main#f8dc21b0f85f391201e7c6346b121fbd21c02836"
source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs?branch=main#edc9152b9d8e051c418d41a08640b6bdb61619e2"
dependencies = [
"bindgen",
"system-deps",
@@ -714,7 +715,7 @@ checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
[[package]]
name = "pango"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#74a02cdd2855a387ebbe700eb509029c8e338d19"
source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c"
dependencies = [
"bitflags",
"glib",
@@ -726,7 +727,7 @@ dependencies = [
[[package]]
name = "pango-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#74a02cdd2855a387ebbe700eb509029c8e338d19"
source = "git+https://github.com/gtk-rs/gtk-rs-core#aca50f8871183039098503c3f81fbf866cf8f54c"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -764,7 +765,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pipewire"
version = "0.3.0"
source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs?branch=main#f8dc21b0f85f391201e7c6346b121fbd21c02836"
source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs?branch=main#edc9152b9d8e051c418d41a08640b6bdb61619e2"
dependencies = [
"anyhow",
"bitflags",
@@ -781,7 +782,7 @@ dependencies = [
[[package]]
name = "pipewire-sys"
version = "0.3.0"
source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs?branch=main#f8dc21b0f85f391201e7c6346b121fbd21c02836"
source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs?branch=main#edc9152b9d8e051c418d41a08640b6bdb61619e2"
dependencies = [
"bindgen",
"libspa-sys",
@@ -830,9 +831,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.26"
version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
dependencies = [
"unicode-xid",
]
@@ -910,9 +911,9 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.125"
version = "1.0.126"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
[[package]]
name = "shlex"

4
src/main.rs
View File

@@ -54,6 +54,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
env_logger::init();
gtk::init()?;
// Aquire main context so that we can attach the gtk channel later.
let ctx = glib::MainContext::default();
let _guard = ctx.acquire().unwrap();
// Start the pipewire thread with channels in both directions.
let (gtk_sender, gtk_receiver) = glib::MainContext::channel(PRIORITY_DEFAULT);
let (pw_sender, pw_receiver) = pipewire::channel::channel();