mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-12-23 00:26:31 +00:00
Code Issues Projects Releases Wiki Activity

Remove subclassing feature and make it the default

Browse source
This commit is contained in:
Sebastian Dröge 2019-09-09 10:40:54 +03:00
parent ea367bac14
commit 52509b4b95
9 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -51,9 +51,9 @@ stages:
for crate in gstreamer*; do for crate in gstreamer*; do
if [ -n "$ALL_FEATURES" ]; then if [ -n "$ALL_FEATURES" ]; then
if [ $crate = "gstreamer" ]; 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 elif [ $crate = "gstreamer-base" -o $crate = "gstreamer-video" ]; then
FEATURES=subclassing,v1_16 FEATURES=v1_16
elif [ $crate = "gstreamer-gl" ]; then elif [ $crate = "gstreamer-gl" ]; then
FEATURES=egl,x11,wayland,v1_16 FEATURES=egl,x11,wayland,v1_16
else else
@ -131,9 +131,9 @@ clippy:
- | - |
for crate in gstreamer*; do for crate in gstreamer*; do
if [ $crate = "gstreamer" ]; 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 elif [ $crate = "gstreamer-base" -o $crate = "gstreamer-video" ]; then
FEATURES=subclassing,v1_16 FEATURES=v1_16
elif [ $crate = "gstreamer-gl" ]; then elif [ $crate = "gstreamer-gl" ]; then
FEATURES=egl,x11,wayland,v1_16 FEATURES=egl,x11,wayland,v1_16
else else

2
examples/Cargo.toml
View file

@ -4,7 +4,7 @@ version = "0.15.0"
authors = ["Sebastian Dröge <sebastian@centricular.com>"] authors = ["Sebastian Dröge <sebastian@centricular.com>"]
[dependencies] [dependencies]
glib = { git = "https://github.com/gtk-rs/glib", features = ["subclassing"] } glib = { git = "https://github.com/gtk-rs/glib" }
gstreamer = { path = "../gstreamer" } gstreamer = { path = "../gstreamer" }
gstreamer-gl = { path = "../gstreamer-gl", optional = true } gstreamer-gl = { path = "../gstreamer-gl", optional = true }
gstreamer-app = { path = "../gstreamer-app" } gstreamer-app = { path = "../gstreamer-app" }

1
gstreamer-base/Cargo.toml
View file

@ -35,7 +35,6 @@ v1_16 = ["gstreamer/v1_16", "gstreamer-base-sys/v1_16", "v1_14_1"]
embed-lgpl-docs = ["rustdoc-stripper"] embed-lgpl-docs = ["rustdoc-stripper"]
purge-lgpl-docs = ["rustdoc-stripper"] purge-lgpl-docs = ["rustdoc-stripper"]
dox = ["gstreamer-base-sys/dox", "glib/dox", "gstreamer/dox"] dox = ["gstreamer-base-sys/dox", "glib/dox", "gstreamer/dox"]
subclassing = ["gstreamer/subclassing"]
["package.metadata.docs.rs"] ["package.metadata.docs.rs"]
features = ["dox", "embed-lgpl-docs", "v1_16"] features = ["dox", "embed-lgpl-docs", "v1_16"]

1
gstreamer-base/src/base_parse_frame.rs
View file

@ -87,7 +87,6 @@ impl<'a> fmt::Debug for BaseParseFrame<'a> {
} }
impl<'a> BaseParseFrame<'a> { impl<'a> BaseParseFrame<'a> {
#[cfg(feature = "subclassing")]
pub(crate) unsafe fn new( pub(crate) unsafe fn new(
frame: *mut gst_base_sys::GstBaseParseFrame, frame: *mut gst_base_sys::GstBaseParseFrame,
_parse: &'a BaseParse, _parse: &'a BaseParse,

3
gstreamer-base/src/lib.rs
View file

@ -8,7 +8,7 @@
extern crate glib_sys; extern crate glib_sys;
extern crate gobject_sys; extern crate gobject_sys;
#[cfg_attr(feature = "subclassing", macro_use)] #[macro_use]
extern crate gstreamer as gst; extern crate gstreamer as gst;
extern crate gstreamer_base_sys as gst_base_sys; extern crate gstreamer_base_sys as gst_base_sys;
extern crate gstreamer_sys as gst_sys; extern crate gstreamer_sys as gst_sys;
@ -85,5 +85,4 @@ pub mod prelude {
mod utils; mod utils;
#[cfg(feature = "subclassing")]
pub mod subclass; pub mod subclass;

1
gstreamer-video/Cargo.toml
View file

@ -37,7 +37,6 @@ v1_16 = ["gstreamer/v1_16", "gstreamer-base/v1_16", "gstreamer-video-sys/v1_16",
embed-lgpl-docs = ["rustdoc-stripper"] embed-lgpl-docs = ["rustdoc-stripper"]
purge-lgpl-docs = ["rustdoc-stripper"] purge-lgpl-docs = ["rustdoc-stripper"]
dox = ["gstreamer-video-sys/dox", "glib/dox", "gstreamer/dox"] dox = ["gstreamer-video-sys/dox", "glib/dox", "gstreamer/dox"]
subclassing = ["gstreamer/subclassing"]
["package.metadata.docs.rs"] ["package.metadata.docs.rs"]
features = ["dox", "embed-lgpl-docs", "v1_16"] features = ["dox", "embed-lgpl-docs", "v1_16"]

1
gstreamer-video/src/lib.rs
View file

@ -103,5 +103,4 @@ pub mod prelude {
pub use video_overlay::VideoOverlayExtManual; pub use video_overlay::VideoOverlayExtManual;
} }
#[cfg(feature = "subclassing")]
pub mod subclass; pub mod subclass;

3
gstreamer/Cargo.toml
View file

@ -27,7 +27,7 @@ muldiv = "0.2"
serde = { version = "1.0", optional = true } serde = { version = "1.0", optional = true }
serde_bytes = { version = "0.11", optional = true } serde_bytes = { version = "0.11", optional = true }
serde_derive = { version = "1.0", optional = true } serde_derive = { version = "1.0", optional = true }
paste = { version = "0.1", optional = true } paste = { version = "0.1" }
[build-dependencies] [build-dependencies]
rustdoc-stripper = { version = "0.1", optional = true } 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"] dox = ["gstreamer-sys/dox", "glib/dox", "futures", "ser_de"]
futures = ["futures-core-preview"] futures = ["futures-core-preview"]
ser_de = ["num-rational/serde", "serde", "serde_bytes", "serde_derive"] ser_de = ["num-rational/serde", "serde", "serde_bytes", "serde_derive"]
subclassing = ["glib/subclassing", "paste"]
["package.metadata.docs.rs"] ["package.metadata.docs.rs"]
features = ["dox", "embed-lgpl-docs", "v1_16"] features = ["dox", "embed-lgpl-docs", "v1_16"]

2
gstreamer/src/lib.rs
View file

@ -24,7 +24,6 @@ pub extern crate gobject_sys;
#[doc(hidden)] #[doc(hidden)]
pub extern crate gstreamer_sys as gst_sys; pub extern crate gstreamer_sys as gst_sys;
#[doc(hidden)] #[doc(hidden)]
#[cfg(feature = "subclassing")]
pub extern crate paste; pub extern crate paste;
#[macro_use] #[macro_use]
@ -365,5 +364,4 @@ pub mod prelude {
mod utils; mod utils;
#[macro_use] #[macro_use]
#[cfg(feature = "subclassing")]
pub mod subclass; pub mod subclass;