diff --git a/Cargo.lock b/Cargo.lock index af7e6c0d7..a0dd1bddf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,66 +2,61 @@ name = "gstreamer" version = "0.1.0" dependencies = [ - "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.1.3 (git+https://github.com/gtk-rs/glib)", + "glib-sys 0.3.4 (git+https://github.com/gtk-rs/sys)", + "gobject-sys 0.3.4 (git+https://github.com/gtk-rs/sys)", + "gstreamer-sys 0.1.1 (git+https://github.com/sdroege/gstreamer-sys)", + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "bitflags" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "bitflags" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "glib" version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/gtk-rs/glib#46658ce0f51fa8f46468720cb3f2d03cef4e4b93" dependencies = [ - "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.4 (git+https://github.com/gtk-rs/sys)", + "gobject-sys 0.3.4 (git+https://github.com/gtk-rs/sys)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "glib-sys" version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/gtk-rs/sys#113444397b56ffda5214ffcc5a2ed80c25020fe5" dependencies = [ - "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gobject-sys" version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/gtk-rs/sys#113444397b56ffda5214ffcc5a2ed80c25020fe5" dependencies = [ - "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.4 (git+https://github.com/gtk-rs/sys)", + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gstreamer-sys" version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/sdroege/gstreamer-sys#01d79cc53ccdb1b06b09656fde04f3868c9dc246" dependencies = [ - "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.4 (git+https://github.com/gtk-rs/sys)", + "gobject-sys 0.3.4 (git+https://github.com/gtk-rs/sys)", + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -72,7 +67,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.22" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -81,12 +76,11 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" [metadata] -"checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23" -"checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4" -"checksum glib 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "81f514a8abd315ede0e94e39ce5987fdb99191c5f812e5066bc5bdb965104fc4" -"checksum glib-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8826cbc94631507bdd91ee40f7e099bfaa3cc4f43c086b4d1c15cff5b4e8220b" -"checksum gobject-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "87373f64e136e9ea192ff5d3ef676a51e9ac6ab06b629223a081e0523c5f04e2" -"checksum gstreamer-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "455214f6423a4db5727adf781355a3df068fc48c61c05ddb597aaadd51fe43ab" +"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" +"checksum glib 0.1.3 (git+https://github.com/gtk-rs/glib)" = "" +"checksum glib-sys 0.3.4 (git+https://github.com/gtk-rs/sys)" = "" +"checksum gobject-sys 0.3.4 (git+https://github.com/gtk-rs/sys)" = "" +"checksum gstreamer-sys 0.1.1 (git+https://github.com/sdroege/gstreamer-sys)" = "" "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf" -"checksum libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502" +"checksum libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)" = "38f5c2b18a287cf78b4097db62e20f43cace381dc76ae5c0a3073067f78b7ddc" "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903" diff --git a/gstreamer/Cargo.toml b/gstreamer/Cargo.toml index 67646998d..5635b40cd 100644 --- a/gstreamer/Cargo.toml +++ b/gstreamer/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" authors = ["Sebastian Dröge "] [dependencies] -bitflags = "0.8" +bitflags = "0.9" libc = "0.2" -glib-sys = "0.3.4" -gobject-sys = "0.3.4" -gstreamer-sys = "0.1.1" -glib = "0.1.3" +glib-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" } +gobject-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" } +gstreamer-sys = { version = "0.1.1", git = "https://github.com/sdroege/gstreamer-sys" } +glib = { version = "0.1.3", git = "https://github.com/gtk-rs/glib" } diff --git a/gstreamer/src/auto/alias.rs b/gstreamer/src/auto/alias.rs index 2ab092911..462b5b170 100644 --- a/gstreamer/src/auto/alias.rs +++ b/gstreamer/src/auto/alias.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (81e3f51) from gir-files (???) +// This file was generated by gir (b155303) from gir-files (???) // DO NOT EDIT pub type ClockTime = u64; diff --git a/gstreamer/src/auto/bin.rs b/gstreamer/src/auto/bin.rs index ff03c889d..f1901d2bf 100644 --- a/gstreamer/src/auto/bin.rs +++ b/gstreamer/src/auto/bin.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (81e3f51) from gir-files (???) +// This file was generated by gir (b155303) from gir-files (???) // DO NOT EDIT use Element; diff --git a/gstreamer/src/auto/bus.rs b/gstreamer/src/auto/bus.rs index a675d6332..f66b8e7e3 100644 --- a/gstreamer/src/auto/bus.rs +++ b/gstreamer/src/auto/bus.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (81e3f51) from gir-files (???) +// This file was generated by gir (b155303) from gir-files (???) // DO NOT EDIT use Object; diff --git a/gstreamer/src/auto/clock.rs b/gstreamer/src/auto/clock.rs index 8390b7f3d..0a7cfa107 100644 --- a/gstreamer/src/auto/clock.rs +++ b/gstreamer/src/auto/clock.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (81e3f51) from gir-files (???) +// This file was generated by gir (b155303) from gir-files (???) // DO NOT EDIT use ClockTime; diff --git a/gstreamer/src/auto/element.rs b/gstreamer/src/auto/element.rs index cc71a5716..17f6e303c 100644 --- a/gstreamer/src/auto/element.rs +++ b/gstreamer/src/auto/element.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (81e3f51) from gir-files (???) +// This file was generated by gir (b155303) from gir-files (???) // DO NOT EDIT use Bus; diff --git a/gstreamer/src/auto/element_factory.rs b/gstreamer/src/auto/element_factory.rs index 8a8400fb8..1d8cb72ac 100644 --- a/gstreamer/src/auto/element_factory.rs +++ b/gstreamer/src/auto/element_factory.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (81e3f51) from gir-files (???) +// This file was generated by gir (b155303) from gir-files (???) // DO NOT EDIT use Element; diff --git a/gstreamer/src/auto/enums.rs b/gstreamer/src/auto/enums.rs index 3bfcf2e96..a22f30695 100644 --- a/gstreamer/src/auto/enums.rs +++ b/gstreamer/src/auto/enums.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (81e3f51) from gir-files (???) +// This file was generated by gir (b155303) from gir-files (???) // DO NOT EDIT use ffi; diff --git a/gstreamer/src/auto/flags.rs b/gstreamer/src/auto/flags.rs index e8f8d6326..b6ccd668f 100644 --- a/gstreamer/src/auto/flags.rs +++ b/gstreamer/src/auto/flags.rs @@ -1,23 +1,23 @@ -// This file was generated by gir (81e3f51) from gir-files (???) +// This file was generated by gir (b155303) from gir-files (???) // DO NOT EDIT use ffi; use glib::translate::*; bitflags! { - pub flags SeekFlags: u32 { - const SEEK_FLAG_NONE = 0, - const SEEK_FLAG_FLUSH = 1, - const SEEK_FLAG_ACCURATE = 2, - const SEEK_FLAG_KEY_UNIT = 4, - const SEEK_FLAG_SEGMENT = 8, - const SEEK_FLAG_TRICKMODE = 16, - const SEEK_FLAG_SKIP = 16, - const SEEK_FLAG_SNAP_BEFORE = 32, - const SEEK_FLAG_SNAP_AFTER = 64, - const SEEK_FLAG_SNAP_NEAREST = 96, - const SEEK_FLAG_TRICKMODE_KEY_UNITS = 128, - const SEEK_FLAG_TRICKMODE_NO_AUDIO = 256, + pub struct SeekFlags: u32 { + const SEEK_FLAG_NONE = 0; + const SEEK_FLAG_FLUSH = 1; + const SEEK_FLAG_ACCURATE = 2; + const SEEK_FLAG_KEY_UNIT = 4; + const SEEK_FLAG_SEGMENT = 8; + const SEEK_FLAG_TRICKMODE = 16; + const SEEK_FLAG_SKIP = 16; + const SEEK_FLAG_SNAP_BEFORE = 32; + const SEEK_FLAG_SNAP_AFTER = 64; + const SEEK_FLAG_SNAP_NEAREST = 96; + const SEEK_FLAG_TRICKMODE_KEY_UNITS = 128; + const SEEK_FLAG_TRICKMODE_NO_AUDIO = 256; } } diff --git a/gstreamer/src/auto/mod.rs b/gstreamer/src/auto/mod.rs index f48ce9a79..743484996 100644 --- a/gstreamer/src/auto/mod.rs +++ b/gstreamer/src/auto/mod.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (81e3f51) from gir-files (???) +// This file was generated by gir (b155303) from gir-files (???) // DO NOT EDIT mod bin; diff --git a/gstreamer/src/auto/object.rs b/gstreamer/src/auto/object.rs index adfd49b2c..9a30162da 100644 --- a/gstreamer/src/auto/object.rs +++ b/gstreamer/src/auto/object.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (81e3f51) from gir-files (???) +// This file was generated by gir (b155303) from gir-files (???) // DO NOT EDIT use ClockTime; diff --git a/gstreamer/src/auto/pad.rs b/gstreamer/src/auto/pad.rs index 83db43fdf..60b0dc958 100644 --- a/gstreamer/src/auto/pad.rs +++ b/gstreamer/src/auto/pad.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (81e3f51) from gir-files (???) +// This file was generated by gir (b155303) from gir-files (???) // DO NOT EDIT use Element; diff --git a/gstreamer/src/auto/pad_template.rs b/gstreamer/src/auto/pad_template.rs index f3d245853..c1fc1c24b 100644 --- a/gstreamer/src/auto/pad_template.rs +++ b/gstreamer/src/auto/pad_template.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (81e3f51) from gir-files (???) +// This file was generated by gir (b155303) from gir-files (???) // DO NOT EDIT use Object; diff --git a/gstreamer/src/auto/pipeline.rs b/gstreamer/src/auto/pipeline.rs index c525f1642..56c588f22 100644 --- a/gstreamer/src/auto/pipeline.rs +++ b/gstreamer/src/auto/pipeline.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (81e3f51) from gir-files (???) +// This file was generated by gir (b155303) from gir-files (???) // DO NOT EDIT use Bin; diff --git a/gstreamer/src/auto/u_r_i_handler.rs b/gstreamer/src/auto/u_r_i_handler.rs index 36d00222f..2ac1471b8 100644 --- a/gstreamer/src/auto/u_r_i_handler.rs +++ b/gstreamer/src/auto/u_r_i_handler.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (81e3f51) from gir-files (???) +// This file was generated by gir (b155303) from gir-files (???) // DO NOT EDIT use Error;