From 132477f51f806bfd95799d14639ddf764b4ff76d Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Fri, 13 Nov 2020 23:33:50 +0100 Subject: [PATCH] cargo.toml: Add v1_20 feature to all crates --- gstreamer-app/Cargo.toml | 3 ++- gstreamer-audio/Cargo.toml | 3 ++- gstreamer-base/Cargo.toml | 3 ++- gstreamer-check/Cargo.toml | 3 ++- gstreamer-controller/Cargo.toml | 3 ++- gstreamer-editing-services/Cargo.toml | 3 ++- gstreamer-gl/Cargo.toml | 3 ++- gstreamer-net/Cargo.toml | 3 ++- gstreamer-pbutils/Cargo.toml | 3 ++- gstreamer-player/Cargo.toml | 3 ++- gstreamer-rtp/Cargo.toml | 3 ++- gstreamer-rtsp-server/Cargo.toml | 3 ++- gstreamer-rtsp/Cargo.toml | 3 ++- gstreamer-sdp/Cargo.toml | 3 ++- gstreamer-video/Cargo.toml | 3 ++- gstreamer-webrtc/Cargo.toml | 3 ++- gstreamer/Cargo.toml | 3 ++- gstreamer/src/subclass/plugin_1_14.rs | 17 +++++++++++------ 18 files changed, 45 insertions(+), 23 deletions(-) diff --git a/gstreamer-app/Cargo.toml b/gstreamer-app/Cargo.toml index ef493da3d..77d6efeae 100644 --- a/gstreamer-app/Cargo.toml +++ b/gstreamer-app/Cargo.toml @@ -38,9 +38,10 @@ v1_12 = ["gst/v1_12", "gst-base/v1_12", "ffi/v1_12", "v1_10"] v1_14 = ["gst/v1_14", "gst-base/v1_14", "ffi/v1_14", "v1_12"] v1_16 = ["gst/v1_16", "gst-base/v1_16", "ffi/v1_16", "v1_14"] v1_18 = ["gst/v1_18", "gst-base/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "gst-base/v1_20", "ffi/v1_20", "v1_18"] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] -dox = ["v1_18", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer-audio/Cargo.toml b/gstreamer-audio/Cargo.toml index ef1206604..5281a7327 100644 --- a/gstreamer-audio/Cargo.toml +++ b/gstreamer-audio/Cargo.toml @@ -36,9 +36,10 @@ v1_12 = ["gst/v1_12", "gst-base/v1_12", "ffi/v1_12", "v1_10"] v1_14 = ["gst/v1_14", "gst-base/v1_14", "ffi/v1_14", "v1_12"] v1_16 = ["gst/v1_16", "gst-base/v1_16", "ffi/v1_16", "v1_14"] v1_18 = ["gst/v1_18", "gst-base/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "gst-base/v1_20", "ffi/v1_20", "v1_18"] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] -dox = ["v1_18", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer-base/Cargo.toml b/gstreamer-base/Cargo.toml index da511bd55..e1fdbc42f 100644 --- a/gstreamer-base/Cargo.toml +++ b/gstreamer-base/Cargo.toml @@ -31,9 +31,10 @@ v1_14 = ["gst/v1_14", "ffi/v1_14", "v1_12"] v1_14_1 = ["gst/v1_14", "ffi/v1_14_1", "v1_14"] v1_16 = ["gst/v1_16", "ffi/v1_16", "v1_14_1"] v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] -dox = ["v1_18", "ffi/dox", "glib/dox", "gst/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gst/dox"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer-check/Cargo.toml b/gstreamer-check/Cargo.toml index cb1280440..143e2d9ad 100644 --- a/gstreamer-check/Cargo.toml +++ b/gstreamer-check/Cargo.toml @@ -29,9 +29,10 @@ v1_12 = ["gst/v1_12", "ffi/v1_12", "v1_10"] v1_14 = ["gst/v1_14", "ffi/v1_14", "v1_12"] v1_16 = ["gst/v1_16", "ffi/v1_16", "v1_14"] v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] -dox = ["v1_18", "ffi/dox", "glib/dox", "gst/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gst/dox"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer-controller/Cargo.toml b/gstreamer-controller/Cargo.toml index 2f668438d..e1b42ad69 100644 --- a/gstreamer-controller/Cargo.toml +++ b/gstreamer-controller/Cargo.toml @@ -31,9 +31,10 @@ v1_12 = ["gst/v1_12", "ffi/v1_12", "v1_10"] v1_14 = ["gst/v1_14", "ffi/v1_14", "v1_12"] v1_16 = ["gst/v1_16", "ffi/v1_16", "v1_14"] v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"] embed-lgpl-docs = ["rustdoc-stripper"] purge-lgpl-docs = ["rustdoc-stripper"] -dox = ["v1_18", "ffi/dox", "glib/dox", "gst/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gst/dox"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer-editing-services/Cargo.toml b/gstreamer-editing-services/Cargo.toml index fba856500..6356f0b37 100644 --- a/gstreamer-editing-services/Cargo.toml +++ b/gstreamer-editing-services/Cargo.toml @@ -32,9 +32,10 @@ v1_12 = ["gst/v1_12", "gst-base/v1_12", "gst-pbutils/v1_12", "ffi/v1_12", "v1_10 v1_14 = ["gst/v1_14", "gst-base/v1_14", "gst-pbutils/v1_14", "ffi/v1_14", "v1_12"] v1_16 = ["gst/v1_16", "gst-base/v1_16", "gst-pbutils/v1_16", "ffi/v1_16", "v1_14"] v1_18 = ["gst/v1_18", "gst-base/v1_18", "gst-pbutils/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "gst-base/v1_20", "gst-pbutils/v1_20", "ffi/v1_20", "v1_18"] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] -dox = ["v1_18", "ffi/dox", "glib/dox", "gio/dox", "gst/dox", "gst-base/dox", "gst-pbutils/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gio/dox", "gst/dox", "gst-base/dox", "gst-pbutils/dox"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer-gl/Cargo.toml b/gstreamer-gl/Cargo.toml index b64ac5c09..31ea470bb 100644 --- a/gstreamer-gl/Cargo.toml +++ b/gstreamer-gl/Cargo.toml @@ -30,11 +30,12 @@ gstreamer-rs-lgpl-docs = { path = "../docs", optional = true } [features] default = [] -dox = ["v1_18", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox", "gst-video/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox", "gst-video/dox"] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] v1_16 = ["gst/v1_16", "gst-base/v1_16", "gst-video/v1_16", "ffi/v1_16"] v1_18 = ["gst/v1_18", "gst-base/v1_18", "gst-video/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "gst-base/v1_20", "gst-video/v1_20", "ffi/v1_20", "v1_18"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer-net/Cargo.toml b/gstreamer-net/Cargo.toml index 760d15ba6..348ee21ca 100644 --- a/gstreamer-net/Cargo.toml +++ b/gstreamer-net/Cargo.toml @@ -29,9 +29,10 @@ v1_12 = ["gst/v1_12", "ffi/v1_12", "v1_10"] v1_14 = ["gst/v1_14", "ffi/v1_14", "v1_12"] v1_16 = ["gst/v1_16", "ffi/v1_16", "v1_14"] v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] -dox = ["v1_18", "ffi/dox", "glib/dox", "gio/dox", "gst/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gio/dox", "gst/dox"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer-pbutils/Cargo.toml b/gstreamer-pbutils/Cargo.toml index ccfface63..e2b04069d 100644 --- a/gstreamer-pbutils/Cargo.toml +++ b/gstreamer-pbutils/Cargo.toml @@ -31,9 +31,10 @@ v1_12 = ["gst/v1_12", "ffi/v1_12", "v1_10"] v1_14 = ["gst/v1_14", "ffi/v1_14", "v1_12"] v1_16 = ["gst/v1_16", "ffi/v1_16", "v1_14"] v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] -dox = ["v1_18", "ffi/dox", "glib/dox", "gst/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gst/dox"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer-player/Cargo.toml b/gstreamer-player/Cargo.toml index 0d16f1d2e..b920b902b 100644 --- a/gstreamer-player/Cargo.toml +++ b/gstreamer-player/Cargo.toml @@ -29,9 +29,10 @@ default = [] v1_14 = ["gst/v1_14", "gst-video/v1_14", "ffi/v1_14"] v1_16 = ["gst/v1_16", "gst-video/v1_16", "ffi/v1_16", "v1_14"] v1_18 = ["gst/v1_18", "gst-video/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "gst-video/v1_20", "ffi/v1_20", "v1_18"] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] -dox = ["v1_18", "ffi/dox", "glib/dox", "gst/dox", "gst-video/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gst/dox", "gst-video/dox"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer-rtp/Cargo.toml b/gstreamer-rtp/Cargo.toml index 0eccf5bfb..789a9024a 100644 --- a/gstreamer-rtp/Cargo.toml +++ b/gstreamer-rtp/Cargo.toml @@ -30,9 +30,10 @@ v1_12 = ["gst/v1_12", "ffi/v1_12", "v1_10"] v1_14 = ["gst/v1_14", "ffi/v1_14", "v1_12"] v1_16 = ["gst/v1_16", "ffi/v1_16", "v1_14"] v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] -dox = ["v1_18", "ffi/dox", "glib/dox", "gst/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gst/dox"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer-rtsp-server/Cargo.toml b/gstreamer-rtsp-server/Cargo.toml index 5847a21b4..f66bef640 100644 --- a/gstreamer-rtsp-server/Cargo.toml +++ b/gstreamer-rtsp-server/Cargo.toml @@ -35,9 +35,10 @@ v1_12 = ["gst/v1_12", "gst-sdp/v1_12", "gst-rtsp/v1_12", "gst-net/v1_12", "ffi/v v1_14 = ["gst/v1_14", "gst-sdp/v1_14", "gst-rtsp/v1_14", "gst-net/v1_14", "ffi/v1_14", "v1_12"] v1_16 = ["gst/v1_16", "gst-sdp/v1_16", "gst-rtsp/v1_16", "gst-net/v1_16", "ffi/v1_16", "v1_14"] v1_18 = ["gst/v1_18", "gst-sdp/v1_18", "gst-rtsp/v1_18", "gst-net/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "gst-sdp/v1_20", "gst-rtsp/v1_20", "gst-net/v1_20", "ffi/v1_20", "v1_18"] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] -dox = ["v1_18", "ffi/dox", "glib/dox", "gio/dox", "gst/dox", "gst-sdp/dox", "gst-rtsp/dox", "gst-net/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gio/dox", "gst/dox", "gst-sdp/dox", "gst-rtsp/dox", "gst-net/dox"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer-rtsp/Cargo.toml b/gstreamer-rtsp/Cargo.toml index 576e8da89..764701505 100644 --- a/gstreamer-rtsp/Cargo.toml +++ b/gstreamer-rtsp/Cargo.toml @@ -31,9 +31,10 @@ v1_12 = ["gst/v1_12", "gst-sdp/v1_12", "ffi/v1_12", "v1_10"] v1_14 = ["gst/v1_14", "gst-sdp/v1_14", "ffi/v1_14", "v1_12"] v1_16 = ["gst/v1_16", "gst-sdp/v1_16", "ffi/v1_16", "v1_14"] v1_18 = ["gst/v1_18", "gst-sdp/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "gst-sdp/v1_20", "ffi/v1_20", "v1_18"] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] -dox = ["v1_18", "ffi/dox", "glib/dox", "gst/dox", "gst-sdp/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gst/dox", "gst-sdp/dox"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer-sdp/Cargo.toml b/gstreamer-sdp/Cargo.toml index a88391c1e..4bfc2cdef 100644 --- a/gstreamer-sdp/Cargo.toml +++ b/gstreamer-sdp/Cargo.toml @@ -29,9 +29,10 @@ v1_12 = ["gst/v1_12", "ffi/v1_12", "v1_10"] v1_14 = ["gst/v1_14", "ffi/v1_14", "v1_12"] v1_16 = ["gst/v1_16", "ffi/v1_16", "v1_14"] v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] -dox = ["v1_18", "ffi/dox", "glib/dox", "gst/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gst/dox"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer-video/Cargo.toml b/gstreamer-video/Cargo.toml index 8f9afdc6f..28c4b072f 100644 --- a/gstreamer-video/Cargo.toml +++ b/gstreamer-video/Cargo.toml @@ -38,9 +38,10 @@ v1_12 = ["gst/v1_12", "gst-base/v1_12", "ffi/v1_12", "v1_10"] v1_14 = ["gst/v1_14", "gst-base/v1_14", "ffi/v1_14", "v1_12"] v1_16 = ["gst/v1_16", "gst-base/v1_16", "ffi/v1_16", "v1_14"] v1_18 = ["gst/v1_18", "gst-base/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "gst-base/v1_20", "ffi/v1_20", "v1_18"] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] -dox = ["v1_18", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer-webrtc/Cargo.toml b/gstreamer-webrtc/Cargo.toml index d381ba88d..47b4fa70b 100644 --- a/gstreamer-webrtc/Cargo.toml +++ b/gstreamer-webrtc/Cargo.toml @@ -27,9 +27,10 @@ gstreamer-rs-lgpl-docs = { path = "../docs", optional = true } default = [] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] -dox = ["v1_18", "ffi/dox", "glib/dox", "gst/dox", "gst-sdp/dox"] +dox = ["v1_20", "ffi/dox", "glib/dox", "gst/dox", "gst-sdp/dox"] v1_16 = ["gst/v1_16", "gst-sdp/v1_16", "ffi/v1_16"] v1_18 = ["gst/v1_18", "gst-sdp/v1_18", "ffi/v1_18", "v1_16"] +v1_20 = ["gst/v1_20", "gst-sdp/v1_20", "ffi/v1_20", "v1_18"] [package.metadata.docs.rs] features = ["dox", "embed-lgpl-docs"] diff --git a/gstreamer/Cargo.toml b/gstreamer/Cargo.toml index 7b8736a28..46712a691 100644 --- a/gstreamer/Cargo.toml +++ b/gstreamer/Cargo.toml @@ -47,9 +47,10 @@ v1_12 = ["ffi/v1_12", "v1_10"] v1_14 = ["ffi/v1_14", "v1_12"] v1_16 = ["ffi/v1_16", "v1_14"] v1_18 = ["ffi/v1_18", "v1_16"] +v1_20 = ["ffi/v1_20", "v1_18"] embed-lgpl-docs = ["gstreamer-rs-lgpl-docs"] purge-lgpl-docs = ["gstreamer-rs-lgpl-docs"] -dox = ["v1_18", "ffi/dox", "glib/dox", "ser_de"] +dox = ["v1_20", "ffi/dox", "glib/dox", "ser_de"] ser_de = ["num-rational/serde", "serde", "serde_bytes", "serde_derive"] [package.metadata.docs.rs] diff --git a/gstreamer/src/subclass/plugin_1_14.rs b/gstreamer/src/subclass/plugin_1_14.rs index 3e6d94071..60ca2d720 100644 --- a/gstreamer/src/subclass/plugin_1_14.rs +++ b/gstreamer/src/subclass/plugin_1_14.rs @@ -8,12 +8,17 @@ pub const MAJOR_VERSION: i32 = 1; -#[cfg(all(feature = "v1_14", not(feature = "v1_16")))] -pub const MINOR_VERSION: i32 = 14; -#[cfg(all(feature = "v1_16", not(feature = "v1_18")))] -pub const MINOR_VERSION: i32 = 16; -#[cfg(all(feature = "v1_18", not(feature = "v1_20")))] -pub const MINOR_VERSION: i32 = 18; +cfg_if::cfg_if! { + if #[cfg(feature = "v1_20")] { + pub const MINOR_VERSION: i32 = 20; + } else if #[cfg(feature = "v1_18")] { + pub const MINOR_VERSION: i32 = 18; + } else if #[cfg(feature = "v1_16")] { + pub const MINOR_VERSION: i32 = 16; + } else if #[cfg(feature = "v1_14")] { + pub const MINOR_VERSION: i32 = 14; + } +} #[macro_export] macro_rules! gst_plugin_define(