Commit a3dffc2f authored by Sebastian Dröge's avatar Sebastian Dröge 🍵

Switch from futures to futures-preview crates

Fixes https://github.com/sdroege/gstreamer-rs/issues/118
parent e0972ae1
......@@ -17,7 +17,7 @@ gstreamer-rtsp-server-sys = { git = "https://github.com/sdroege/gstreamer-sys",
gtk = { git = "https://github.com/gtk-rs/gtk", features = ["v3_6"], optional = true }
gdk = { git = "https://github.com/gtk-rs/gdk", optional = true }
gio = { git = "https://github.com/gtk-rs/gio", optional = true }
futures = { version = "0.2", optional = true }
futures-preview = { version = "0.2", optional = true }
send-cell = "0.1"
byte-slice-cast = "0.2"
failure = "0.1"
......@@ -29,7 +29,7 @@ gtksink = ["gtk", "gio"]
gtkvideooverlay = ["gtk", "gdk", "gio"]
gtkvideooverlay-x11 = ["gtkvideooverlay"]
gtkvideooverlay-quartz = ["gtkvideooverlay"]
generic-futures = ["gstreamer/futures", "futures"]
generic-futures = ["gstreamer/futures", "futures-preview"]
glib-futures = ["generic-futures", "glib/futures"]
gst-rtsp-server = ["gstreamer-rtsp-server"]
gst-rtsp-server-record = ["gstreamer-rtsp-server", "gstreamer-rtsp", "gio"]
......
......@@ -22,7 +22,7 @@ gstreamer-sys = { git = "https://github.com/sdroege/gstreamer-sys", features = [
glib = { git = "https://github.com/gtk-rs/glib" }
num-rational = { version = "0.2", default-features = false, features = [] }
lazy_static = "1.0"
futures-core = { version = "0.2", optional = true }
futures-core-preview = { version = "0.2", optional = true }
muldiv = "0.2"
[build-dependencies.rustdoc-stripper]
......@@ -36,7 +36,7 @@ v1_14 = ["gstreamer-sys/v1_14", "v1_12"]
embed-lgpl-docs = ["rustdoc-stripper"]
purge-lgpl-docs = ["rustdoc-stripper"]
dox = ["gstreamer-sys/dox", "glib/dox", "futures"]
futures = ["futures-core"]
futures = ["futures-core-preview"]
default-features = []
[badges]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment