forked from mirrors/gstreamer-rs
Remove subclassing feature and make it the default
This commit is contained in:
parent
ea367bac14
commit
52509b4b95
9 changed files with 7 additions and 15 deletions
|
@ -51,9 +51,9 @@ stages:
|
|||
for crate in gstreamer*; do
|
||||
if [ -n "$ALL_FEATURES" ]; then
|
||||
if [ $crate = "gstreamer" ]; then
|
||||
FEATURES=subclassing,futures,ser_de,v1_16
|
||||
FEATURES=futures,ser_de,v1_16
|
||||
elif [ $crate = "gstreamer-base" -o $crate = "gstreamer-video" ]; then
|
||||
FEATURES=subclassing,v1_16
|
||||
FEATURES=v1_16
|
||||
elif [ $crate = "gstreamer-gl" ]; then
|
||||
FEATURES=egl,x11,wayland,v1_16
|
||||
else
|
||||
|
@ -131,9 +131,9 @@ clippy:
|
|||
- |
|
||||
for crate in gstreamer*; do
|
||||
if [ $crate = "gstreamer" ]; then
|
||||
FEATURES=subclassing,futures,ser_de,v1_16
|
||||
FEATURES=futures,ser_de,v1_16
|
||||
elif [ $crate = "gstreamer-base" -o $crate = "gstreamer-video" ]; then
|
||||
FEATURES=subclassing,v1_16
|
||||
FEATURES=v1_16
|
||||
elif [ $crate = "gstreamer-gl" ]; then
|
||||
FEATURES=egl,x11,wayland,v1_16
|
||||
else
|
||||
|
|
|
@ -4,7 +4,7 @@ version = "0.15.0"
|
|||
authors = ["Sebastian Dröge <sebastian@centricular.com>"]
|
||||
|
||||
[dependencies]
|
||||
glib = { git = "https://github.com/gtk-rs/glib", features = ["subclassing"] }
|
||||
glib = { git = "https://github.com/gtk-rs/glib" }
|
||||
gstreamer = { path = "../gstreamer" }
|
||||
gstreamer-gl = { path = "../gstreamer-gl", optional = true }
|
||||
gstreamer-app = { path = "../gstreamer-app" }
|
||||
|
|
|
@ -35,7 +35,6 @@ v1_16 = ["gstreamer/v1_16", "gstreamer-base-sys/v1_16", "v1_14_1"]
|
|||
embed-lgpl-docs = ["rustdoc-stripper"]
|
||||
purge-lgpl-docs = ["rustdoc-stripper"]
|
||||
dox = ["gstreamer-base-sys/dox", "glib/dox", "gstreamer/dox"]
|
||||
subclassing = ["gstreamer/subclassing"]
|
||||
|
||||
["package.metadata.docs.rs"]
|
||||
features = ["dox", "embed-lgpl-docs", "v1_16"]
|
||||
|
|
|
@ -87,7 +87,6 @@ impl<'a> fmt::Debug for BaseParseFrame<'a> {
|
|||
}
|
||||
|
||||
impl<'a> BaseParseFrame<'a> {
|
||||
#[cfg(feature = "subclassing")]
|
||||
pub(crate) unsafe fn new(
|
||||
frame: *mut gst_base_sys::GstBaseParseFrame,
|
||||
_parse: &'a BaseParse,
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
extern crate glib_sys;
|
||||
extern crate gobject_sys;
|
||||
#[cfg_attr(feature = "subclassing", macro_use)]
|
||||
#[macro_use]
|
||||
extern crate gstreamer as gst;
|
||||
extern crate gstreamer_base_sys as gst_base_sys;
|
||||
extern crate gstreamer_sys as gst_sys;
|
||||
|
@ -85,5 +85,4 @@ pub mod prelude {
|
|||
|
||||
mod utils;
|
||||
|
||||
#[cfg(feature = "subclassing")]
|
||||
pub mod subclass;
|
||||
|
|
|
@ -37,7 +37,6 @@ v1_16 = ["gstreamer/v1_16", "gstreamer-base/v1_16", "gstreamer-video-sys/v1_16",
|
|||
embed-lgpl-docs = ["rustdoc-stripper"]
|
||||
purge-lgpl-docs = ["rustdoc-stripper"]
|
||||
dox = ["gstreamer-video-sys/dox", "glib/dox", "gstreamer/dox"]
|
||||
subclassing = ["gstreamer/subclassing"]
|
||||
|
||||
["package.metadata.docs.rs"]
|
||||
features = ["dox", "embed-lgpl-docs", "v1_16"]
|
||||
|
|
|
@ -103,5 +103,4 @@ pub mod prelude {
|
|||
pub use video_overlay::VideoOverlayExtManual;
|
||||
}
|
||||
|
||||
#[cfg(feature = "subclassing")]
|
||||
pub mod subclass;
|
||||
|
|
|
@ -27,7 +27,7 @@ muldiv = "0.2"
|
|||
serde = { version = "1.0", optional = true }
|
||||
serde_bytes = { version = "0.11", optional = true }
|
||||
serde_derive = { version = "1.0", optional = true }
|
||||
paste = { version = "0.1", optional = true }
|
||||
paste = { version = "0.1" }
|
||||
|
||||
[build-dependencies]
|
||||
rustdoc-stripper = { version = "0.1", optional = true }
|
||||
|
@ -47,7 +47,6 @@ purge-lgpl-docs = ["rustdoc-stripper"]
|
|||
dox = ["gstreamer-sys/dox", "glib/dox", "futures", "ser_de"]
|
||||
futures = ["futures-core-preview"]
|
||||
ser_de = ["num-rational/serde", "serde", "serde_bytes", "serde_derive"]
|
||||
subclassing = ["glib/subclassing", "paste"]
|
||||
|
||||
["package.metadata.docs.rs"]
|
||||
features = ["dox", "embed-lgpl-docs", "v1_16"]
|
||||
|
|
|
@ -24,7 +24,6 @@ pub extern crate gobject_sys;
|
|||
#[doc(hidden)]
|
||||
pub extern crate gstreamer_sys as gst_sys;
|
||||
#[doc(hidden)]
|
||||
#[cfg(feature = "subclassing")]
|
||||
pub extern crate paste;
|
||||
|
||||
#[macro_use]
|
||||
|
@ -365,5 +364,4 @@ pub mod prelude {
|
|||
mod utils;
|
||||
|
||||
#[macro_use]
|
||||
#[cfg(feature = "subclassing")]
|
||||
pub mod subclass;
|
||||
|
|
Loading…
Reference in a new issue