mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-05-19 00:38:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'gespitiviformatter-deprecation' into 'main'

Browse source 
ges: ignore deprecated PitiviFormatter & PitiviFormatterClass

See merge request gstreamer/gstreamer-rs!1434
This commit is contained in:
François Laignel 2024-04-30 08:07:47 +00:00
parent b7b5352353 dc04a53207
commit 8691e8ba12
5 changed files with 16 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ci/run-sys-cargo-test.sh
View file

@ -18,6 +18,7 @@ for crate in gstreamer/sys \
gstreamer-base/sys \
gstreamer-check/sys \
gstreamer-controller/sys \
gstreamer-editing-services/sys \
gstreamer-gl/sys \
gstreamer-gl/egl/sys \
gstreamer-gl/wayland/sys \

15
gstreamer-editing-services/sys/Gir.toml
View file

@ -37,3 +37,18 @@ status = "generate"
[[object.function]]
name = "frame_composition_meta_api_get_type"
version = "1.24"
[[object]]
name = "GES.PitiviFormatter"
# Deprecated since GStreamer 1.0 & causes ABI test failures
# See: https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1425#note_2380648
status = "ignore"
[[object.function]]
pattern = ".+"
ignore = true
[[object]]
name = "GES.PitiviFormatterClass"
# Deprecated since GStreamer 1.0 & causes ABI test failures
# See: https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1425#note_2380648
status = "ignore"

32
gstreamer-editing-services/sys/src/lib.rs
View file

@ -1138,20 +1138,6 @@ pub struct _GESPipelinePrivate {
pub type GESPipelinePrivate = _GESPipelinePrivate;
#[derive(Copy, Clone)]
#[repr(C)]
pub struct GESPitiviFormatterClass {
pub parent_class: GESFormatterClass,
pub _ges_reserved: [gpointer; 4],
}
impl ::std::fmt::Debug for GESPitiviFormatterClass {
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
f.debug_struct(&format!("GESPitiviFormatterClass @ {self:p}"))
.finish()
}
}
#[repr(C)]
pub struct _GESPitiviFormatterPrivate {
_data: [u8; 0],
@ -2392,22 +2378,6 @@ impl ::std::fmt::Debug for GESPipeline {
}
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct GESPitiviFormatter {
pub parent: GESFormatter,
pub priv_: *mut GESPitiviFormatterPrivate,
pub _ges_reserved: [gpointer; 4],
}
impl ::std::fmt::Debug for GESPitiviFormatter {
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
f.debug_struct(&format!("GESPitiviFormatter @ {self:p}"))
.field("parent", &self.parent)
.finish()
}
}
#[derive(Copy, Clone)]
#[repr(C)]
pub struct GESProject {
@ -3469,8 +3439,6 @@ extern "C" {
//=========================================================================
// GESPitiviFormatter
//=========================================================================
pub fn ges_pitivi_formatter_get_type() -> GType;
pub fn ges_pitivi_formatter_new() -> *mut GESPitiviFormatter;
//=========================================================================
// GESProject

14
gstreamer-editing-services/sys/tests/abi.rs
View file

@ -671,20 +671,6 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
alignment: align_of::<GESPipelineFlags>(),
},
),
(
"GESPitiviFormatter",
Layout {
size: size_of::<GESPitiviFormatter>(),
alignment: align_of::<GESPitiviFormatter>(),
},
),
(
"GESPitiviFormatterClass",
Layout {
size: size_of::<GESPitiviFormatterClass>(),
alignment: align_of::<GESPitiviFormatterClass>(),
},
),
(
"GESProject",
Layout {

2
gstreamer-editing-services/sys/tests/layout.c
View file

@ -75,8 +75,6 @@ int main() {
printf("%s;%zu;%zu\n", "GESPipeline", sizeof(GESPipeline), alignof(GESPipeline));
printf("%s;%zu;%zu\n", "GESPipelineClass", sizeof(GESPipelineClass), alignof(GESPipelineClass));
printf("%s;%zu;%zu\n", "GESPipelineFlags", sizeof(GESPipelineFlags), alignof(GESPipelineFlags));
printf("%s;%zu;%zu\n", "GESPitiviFormatter", sizeof(GESPitiviFormatter), alignof(GESPitiviFormatter));
printf("%s;%zu;%zu\n", "GESPitiviFormatterClass", sizeof(GESPitiviFormatterClass), alignof(GESPitiviFormatterClass));
printf("%s;%zu;%zu\n", "GESProject", sizeof(GESProject), alignof(GESProject));
printf("%s;%zu;%zu\n", "GESProjectClass", sizeof(GESProjectClass), alignof(GESProjectClass));
printf("%s;%zu;%zu\n", "GESSource", sizeof(GESSource), alignof(GESSource));