From a49ea94d14a9c563ff0f1c00259651df90b67b2c Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Sun, 2 May 2021 21:29:44 +0200 Subject: [PATCH] audio,ges,rtsp-server: Define GstObjectExt trait rename for docs The generator does not read Gir.toml from dependencies, missing out on trait renames like `ObjectExt` turning into GstObjectExt` (to prevent clashes with `glib`'s `ObjectExt`). Renaming through `trait_name` is now taken into account in `gir` thanks to [1], but the renames still need to be availble to all crates referencing this type. Fortunately only `Gst.Object` is affected - other renamed traits are not extended in any of the other crates. [1]: https://github.com/gtk-rs/gir/pull/1108 --- gstreamer-audio/Gir.toml | 7 ++++++- gstreamer-editing-services/Gir.toml | 7 ++++++- gstreamer-rtsp-server/Gir.toml | 6 ++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gstreamer-audio/Gir.toml b/gstreamer-audio/Gir.toml index b73727327..1bd948546 100644 --- a/gstreamer-audio/Gir.toml +++ b/gstreamer-audio/Gir.toml @@ -33,7 +33,6 @@ generate = [ manual = [ "GObject.Object", - "Gst.Object", "Gst.Element", "Gst.Allocator", "Gst.AllocationParams", @@ -45,6 +44,12 @@ manual = [ "GstAudio.AudioFormatInfo", ] +[[object]] +name = "Gst.Object" +# For renaming the trait... +status = "manual" +trait_name = "GstObjectExt" + [[object]] name = "Gst.Caps" status = "manual" diff --git a/gstreamer-editing-services/Gir.toml b/gstreamer-editing-services/Gir.toml index f7131ddef..2b9fbd721 100644 --- a/gstreamer-editing-services/Gir.toml +++ b/gstreamer-editing-services/Gir.toml @@ -29,7 +29,6 @@ manual = [ "GstPbutils.EncodingProfile", "GstPbutils.DiscovererInfo", "GstPbutils.DiscovererStreamInfo", - "Gst.Object", "Gst.Element", "Gst.Pad", "Gst.Pipeline", @@ -47,6 +46,12 @@ generate = [ "GES.VideoStandardTransitionType", ] +[[object]] +name = "Gst.Object" +# For renaming the trait... +status = "manual" +trait_name = "GstObjectExt" + [[object]] name = "Gst.Structure" status = "manual" diff --git a/gstreamer-rtsp-server/Gir.toml b/gstreamer-rtsp-server/Gir.toml index 6a3489e7f..1d1809d9e 100644 --- a/gstreamer-rtsp-server/Gir.toml +++ b/gstreamer-rtsp-server/Gir.toml @@ -63,6 +63,12 @@ manual = [ "GstRtsp.RTSPLowerTrans" ] +[[object]] +name = "Gst.Object" +# For renaming the trait... +status = "manual" +trait_name = "GstObjectExt" + [[object]] name = "Gst.Message" status = "manual"