Fix various new 1.78 clippy warnings

Quite a bit of API was accidentally not exported but apparently nobody
was using it.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1437>

.gitignore

@@ -1,3 +1,2 @@
 target/
 **/*.rs.bk
-Cargo.lock

.gitlab-ci.yml

@@ -56,7 +56,7 @@ variables:
   # latest release must be at the top
   # (only relevant on main branch)
   RELEASES:
-    0.21=0.21
+    0.22=0.22
 
 stages:
   - "trigger"
@@ -73,6 +73,7 @@ trigger:
   stage: 'trigger'
   variables:
     GIT_STRATEGY: none
+  tags: [ 'placeholder-job' ]
   script:
     - echo "Trigger job done, now running the pipeline."
   rules:
@@ -141,6 +142,7 @@ trigger:
       libpango1.0-dev libcairo2-dev libjson-glib-dev libgdk-pixbuf-2.0-dev
       libtiff-dev libpng-dev libjpeg-dev libepoxy-dev libsass-dev sassc
       libcsound64-dev llvm clang nasm libsodium-dev libwebp-dev
+      libflac-dev
     FDO_DISTRIBUTION_EXEC: >-
       bash ci/install-gst.sh &&
       bash ci/install-dav1d.sh &&
@@ -311,6 +313,7 @@ test nightly sys:
 rustfmt:
   extends: .img-stable
   stage: "lint"
+  tags: [ 'placeholder-job' ]
   script:
     - cargo fmt --version
     - cargo fmt -- --color=always --check
@@ -321,6 +324,7 @@ rustfmt:
 check commits:
   extends: .img-stable
   stage: "lint"
+  tags: [ 'placeholder-job' ]
   script:
     - ci-fairy check-commits --textwidth 0 --no-signed-off-by
   needs:
@@ -330,6 +334,7 @@ check commits:
 typos:
   extends: .img-stable
   stage: "lint"
+  tags: [ 'placeholder-job' ]
   script:
     - typos
   needs:
@@ -366,6 +371,7 @@ gir-checks:
     GIT_SUBMODULE_STRATEGY: recursive
   extends: .img-stable
   stage: 'extras'
+  tags: [ 'placeholder-job' ]
   needs:
     - job: 'build-stable'
       artifacts: false
@@ -508,7 +514,6 @@ pages:
     # We also don't need a CONTEXT_DIR var as its also
     # hardcoded to be windows-docker/
     DOCKERFILE: 'ci/windows-docker/Dockerfile'
-    GST_UPSTREAM_BRANCH: 'main'
   tags:
     - 'windows'
     - 'shell'

Cargo.toml

@@ -107,7 +107,7 @@ members = [
 exclude = ["gir"]
 
 [workspace.package]
-version = "0.22.0"
+version = "0.23.0"
 categories = ["api-bindings", "multimedia"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 homepage = "https://gstreamer.freedesktop.org"

ci/images_template.yml

@@ -1,4 +1,7 @@
 variables:
-  GST_RS_IMG_TAG: "2024-02-07.0"
-  GST_RS_STABLE: "1.75.0"
+  GST_RS_IMG_TAG: "2024-04-30.0"
+  GST_RS_STABLE: "1.78.0"
   GST_RS_MSRV: "1.70.0"
+  # The branch we use to build GStreamer from in the docker images
+  # Ex. main, 1.24, my-test-branch
+  GST_UPSTREAM_BRANCH: 'main'

ci/install-dav1d.sh

@@ -1,6 +1,6 @@
 set -e
 
-RELEASE=1.1.0
+RELEASE=1.4.1
 
 git clone https://code.videolan.org/videolan/dav1d.git --branch $RELEASE
 cd dav1d

ci/install-gst.sh

@@ -2,6 +2,8 @@
 
 set -e
 
+DEFAULT_BRANCH="$GST_UPSTREAM_BRANCH"
+
 pip3 install meson==1.1.1 --break-system-packages
 
 # gstreamer-rs already has a 'gstreamer' directory so don't clone there
@@ -9,7 +11,7 @@ pushd .
 cd ..
 git clone https://gitlab.freedesktop.org/gstreamer/gstreamer.git \
     --depth 1 \
-    --branch main
+    --branch "$DEFAULT_BRANCH"
 
 cd gstreamer
 

ci/install-rust.sh

@@ -28,7 +28,7 @@ if [ "$RUST_IMAGE_FULL" = "1" ]; then
 
   cargo install --locked --force cargo-deny
   cargo install --locked --force cargo-outdated
-  cargo install --locked --force typos-cli
+  cargo install --locked --force typos-cli --version "1.19.0"
 
   # Coverage tools
   rustup component add llvm-tools-preview

ci/run-clippy.sh

@@ -11,13 +11,10 @@ get_features() {
     crate=$1
     case "$crate" in
         gstreamer-audio|gstreamer-editing-services|gstreamer-gl|gstreamer-pbutils|gstreamer-rtp|gstreamer-rtsp|gstreamer-video|gstreamer)
-            echo "--features=serde,v1_24"
-            ;;
-        gstreamer-analytics)
-            echo ""
+            echo "--features=serde,v1_26"
             ;;
         *)
-            echo "--features=v1_24"
+            echo "--features=v1_26"
             ;;
     esac
 }

ci/run-sys-cargo-test.sh

@@ -13,11 +13,14 @@ for crate in gstreamer*/sys gstreamer-gl/*/sys; do
 done
 
 for crate in gstreamer/sys \
+             gstreamer-allocators/sys \
+             gstreamer-analytics/sys \
              gstreamer-app/sys \
              gstreamer-audio/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 \
@@ -25,11 +28,14 @@ for crate in gstreamer/sys \
              gstreamer-mpegts/sys \
              gstreamer-net/sys \
              gstreamer-pbutils/sys \
+             gstreamer-play/sys \
              gstreamer-player/sys \
+             gstreamer-rtp/sys \
              gstreamer-rtsp-server/sys \
              gstreamer-rtsp/sys \
              gstreamer-sdp/sys \
              gstreamer-tag/sys \
+             gstreamer-validate/sys \
              gstreamer-video/sys \
              gstreamer-webrtc/sys; do
     echo "Testing $crate with --all-features)"

ci/run_windows_tests.ps1

@@ -16,8 +16,7 @@
     # 'gstreamer-gl/egl',
     # 'gstreamer-gl/wayland',
     # 'gstreamer-gl/x11',
-    # only has sys
-    # 'gstreamer-mpegts',
+    'gstreamer-mpegts',
     'gstreamer-mpegts/sys',
     'gstreamer-net',
     'gstreamer-pbutils',
@@ -26,8 +25,7 @@
     'gstreamer-rtsp',
     'gstreamer-rtsp-server',
     'gstreamer-sdp',
-    # only has sys
-    # 'gstreamer-tag',
+    'gstreamer-tag',
     'gstreamer-tag/sys',
     'gstreamer-video',
     'gstreamer-webrtc',

ci/windows-docker/Dockerfile

@@ -4,7 +4,7 @@ FROM "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2023-07-17.0-ma
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ARG DEFAULT_BRANCH="main"
+ARG DEFAULT_BRANCH="1.24"
 ARG RUST_VERSION="invalid"
 
 RUN choco install -y pkgconfiglite nasm llvm openssl

ci/windows-docker/install_dav1d.ps1

@@ -1,7 +1,7 @@
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
 
 # Download gstreamer and all its subprojects
-git clone -b 1.1.0 --depth 1 https://code.videolan.org/videolan/dav1d.git C:\dav1d
+git clone -b 1.4.1 --depth 1 https://code.videolan.org/videolan/dav1d.git C:\dav1d
 if (!$?) {
   Write-Host "Failed to clone dav1d"
   Exit 1

examples/Cargo.toml

@@ -45,7 +45,7 @@ data-encoding = "2.0"
 once_cell = "1"
 
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.52", features=["Win32_Graphics_Direct3D11",
+windows = { version = "0.56", features=["Win32_Graphics_Direct3D11",
     "Win32_Foundation", "Win32_Graphics_Direct3D", "Win32_Graphics_Dxgi",
     "Win32_Graphics_Dxgi_Common", "Win32_Graphics_Direct2D",
     "Win32_Graphics_Direct2D_Common", "Win32_Graphics_DirectWrite",
@@ -204,3 +204,6 @@ required-features = ["cairo-rs", "gst-video/v1_18"]
 [[bin]]
 name = "d3d11videosink"
 required-features = ["windows"]
+
+[[bin]]
+name = "audio_multichannel_interleave"

examples/src/bin/audio_multichannel_interleave.rs

@@ -0,0 +1,153 @@
+// This example demonstrates how to mix multiple audio
+// streams into a single output using the audiomixer element.
+// In this case, we're mixing 4 stereo streams into a single 8 channel output.
+
+use gst::prelude::*;
+use std::env;
+
+#[path = "../examples-common.rs"]
+mod examples_common;
+
+const TRACKS: i32 = 4;
+
+fn create_source_and_link(pipeline: &gst::Pipeline, mixer: &gst::Element, track_number: i32) {
+    let freq = ((track_number + 1) * 1000) as f64;
+    let audiosrc = gst::ElementFactory::make("audiotestsrc")
+        .property("freq", freq)
+        .property("num-buffers", 2000)
+        .build()
+        .unwrap();
+    let caps = gst_audio::AudioCapsBuilder::new().channels(2).build();
+    let capsfilter = gst::ElementFactory::make("capsfilter")
+        .property("caps", &caps)
+        .build()
+        .unwrap();
+
+    pipeline.add_many([&audiosrc, &capsfilter]).unwrap();
+    gst::Element::link_many([&audiosrc, &capsfilter]).unwrap();
+
+    let src_pad = capsfilter.static_pad("src").unwrap();
+    let mixer_pad = mixer.request_pad_simple("sink_%u").unwrap();
+
+    // audiomixer expects a mix-matrix set on each input pad,
+    // indicating which output channels our input should appear in.
+    // Rows => input channels, columns => output channels.
+    // Here each input channel will appear in exactly one output channel.
+    let mut mix_matrix: Vec<Vec<f32>> = vec![];
+    for i in 0..TRACKS {
+        if i == track_number {
+            mix_matrix.push(vec![1.0, 0.0]);
+            mix_matrix.push(vec![0.0, 1.0]);
+        } else {
+            mix_matrix.push(vec![0.0, 0.0]);
+            mix_matrix.push(vec![0.0, 0.0]);
+        }
+    }
+    let mut audiomixer_config = gst_audio::AudioConverterConfig::new();
+    audiomixer_config.set_mix_matrix(&mix_matrix);
+    mixer_pad.set_property("converter-config", audiomixer_config);
+
+    src_pad.link(&mixer_pad).unwrap();
+}
+
+fn example_main() {
+    gst::init().unwrap();
+
+    let args: Vec<_> = env::args().collect();
+    let output_file = if args.len() == 2 {
+        &args[1]
+    } else {
+        println!("Usage: audiomixer <output file>");
+        std::process::exit(-1);
+    };
+
+    let pipeline = gst::Pipeline::new();
+    let audiomixer = gst::ElementFactory::make("audiomixer").build().unwrap();
+
+    // Using an arbitrary layout of 4 stereo pairs.
+    let positions = [
+        gst_audio::AudioChannelPosition::FrontLeft,
+        gst_audio::AudioChannelPosition::FrontRight,
+        gst_audio::AudioChannelPosition::RearLeft,
+        gst_audio::AudioChannelPosition::RearRight,
+        gst_audio::AudioChannelPosition::SideLeft,
+        gst_audio::AudioChannelPosition::SideRight,
+        gst_audio::AudioChannelPosition::TopFrontLeft,
+        gst_audio::AudioChannelPosition::TopFrontRight,
+    ];
+
+    let mask = gst_audio::AudioChannelPosition::positions_to_mask(&positions, true).unwrap();
+    let caps = gst_audio::AudioCapsBuilder::new()
+        .channels(positions.len() as i32)
+        .channel_mask(mask)
+        .build();
+    let capsfilter = gst::ElementFactory::make("capsfilter")
+        .property("caps", &caps)
+        .build()
+        .unwrap();
+
+    let audioconvert = gst::ElementFactory::make("audioconvert").build().unwrap();
+    let audioresample = gst::ElementFactory::make("audioresample").build().unwrap();
+    let wavenc = gst::ElementFactory::make("wavenc").build().unwrap();
+    let sink = gst::ElementFactory::make("filesink")
+        .property("location", output_file)
+        .build()
+        .unwrap();
+
+    pipeline
+        .add_many([
+            &audiomixer,
+            &capsfilter,
+            &audioconvert,
+            &audioresample,
+            &wavenc,
+            &sink,
+        ])
+        .unwrap();
+    gst::Element::link_many([
+        &audiomixer,
+        &capsfilter,
+        &audioconvert,
+        &audioresample,
+        &wavenc,
+        &sink,
+    ])
+    .unwrap();
+
+    for i in 0..TRACKS {
+        create_source_and_link(&pipeline, &audiomixer, i);
+    }
+
+    let bus = pipeline.bus().expect("Pipeline without bus");
+
+    pipeline
+        .set_state(gst::State::Playing)
+        .expect("Unable to start pipeline");
+
+    for msg in bus.iter_timed(gst::ClockTime::NONE) {
+        use gst::MessageView;
+        match msg.view() {
+            MessageView::Eos(..) => break,
+            MessageView::Error(err) => {
+                eprintln!(
+                    "Error from {:?}: {} ({:?})",
+                    msg.src().map(|s| s.path_string()),
+                    err.error(),
+                    err.debug()
+                );
+                break;
+            }
+            _ => (),
+        }
+    }
+
+    pipeline
+        .set_state(gst::State::Null)
+        .expect("Unable to change pipeline state to NULL");
+}
+
+fn main() {
+    // tutorials_common::run is only required to set up the application environment on macOS
+    // (but not necessary in normal Cocoa applications where this is set up automatically)
+    examples_common::run(example_main);
+}

examples/src/bin/d3d11videosink.rs

@@ -194,7 +194,7 @@ fn main() -> Result<()> {
                             let mut metrics = DWRITE_TEXT_METRICS::default();
                             layout.GetMetrics(&mut metrics).unwrap();
                             layout
-                                .GetFontSize2(0, &mut font_size, Some(&mut range))
+                                .GetFontSize(0, &mut font_size, Some(&mut range))
                                 .unwrap();
 
                             if metrics.widthIncludingTrailingWhitespace >= desc.Width as f32 {

examples/src/bin/rtsp-server-custom-auth.rs

@@ -138,7 +138,11 @@ mod auth {
                     if let Some(authorization) = auth_credentials.authorization() {
                         if let Some(user) = self.external_auth(authorization) {
                             // Update context token with authenticated username
-                            ctx.set_token(gst_rtsp_server::RTSPToken::new(&[("user", &user)]));
+                            ctx.set_token(
+                                gst_rtsp_server::RTSPToken::builder()
+                                    .field("user", user)
+                                    .build(),
+                            );
                             return true;
                         }
                     }

examples/src/bin/rtsp-server-record.rs

@@ -4,11 +4,10 @@
 // send to the server. For this, the launch syntax pipeline, that is passed
 // to this example's cli is spawned and the client's media is streamed into it.
 
-use std::{env, ptr};
+use std::env;
 
 use anyhow::Error;
 use derive_more::{Display, Error};
-use glib::translate::*;
 use gst_rtsp_server::prelude::*;
 
 #[path = "../examples-common.rs"]
@@ -45,10 +44,9 @@ fn main_loop() -> Result<(), Error> {
     // Here we configure a method of authentication that we want the
     // server to require from clients.
     let auth = gst_rtsp_server::RTSPAuth::new();
-    let token = gst_rtsp_server::RTSPToken::new(&[(
-        gst_rtsp_server::RTSP_TOKEN_MEDIA_FACTORY_ROLE,
-        &"user",
-    )]);
+    let token = gst_rtsp_server::RTSPToken::builder()
+        .field(gst_rtsp_server::RTSP_TOKEN_MEDIA_FACTORY_ROLE, "user")
+        .build();
     let basic = gst_rtsp_server::RTSPAuth::make_basic("user", "password");
     // For proper authentication, we want to use encryption. And there's no
     // encryption without a certificate!
@@ -78,24 +76,14 @@ fn main_loop() -> Result<(), Error> {
          W535W8UBbEg=-----END PRIVATE KEY-----",
     )?;
 
-    // Bindable versions were added in b1f515178a363df0322d7adbd5754e1f6e2083c9
     // This declares that the user "user" (once authenticated) has a role that
     // allows them to access and construct media factories.
-    unsafe {
-        gst_rtsp_server::ffi::gst_rtsp_media_factory_add_role(
-            factory.to_glib_none().0,
-            "user".to_glib_none().0,
-            gst_rtsp_server::RTSP_PERM_MEDIA_FACTORY_ACCESS
-                .to_glib_none()
-                .0,
-            <bool as StaticType>::static_type().into_glib() as *const u8,
-            true.into_glib() as *const u8,
-            gst_rtsp_server::RTSP_PERM_MEDIA_FACTORY_CONSTRUCT.as_ptr() as *const u8,
-            <bool as StaticType>::static_type().into_glib() as *const u8,
-            true.into_glib() as *const u8,
-            ptr::null_mut::<u8>(),
-        );
-    }
+    factory.add_role_from_structure(
+        &gst::Structure::builder("user")
+            .field(gst_rtsp_server::RTSP_PERM_MEDIA_FACTORY_ACCESS, true)
+            .field(gst_rtsp_server::RTSP_PERM_MEDIA_FACTORY_CONSTRUCT, true)
+            .build(),
+    );
 
     auth.set_tls_certificate(Some(&cert));
     auth.add_basic(basic.as_str(), &token);

examples/src/bin/rtsp-server-subclass.rs

@@ -19,10 +19,6 @@ mod examples_common;
 #[display(fmt = "Could not get mount points")]
 struct NoMountPoints;
 
-#[derive(Debug, Display, Error)]
-#[display(fmt = "Usage: {_0} LAUNCH_LINE")]
-struct UsageError(#[error(not(source))] String);
-
 fn main_loop() -> Result<(), Error> {
     let main_loop = glib::MainLoop::new(None, false);
     let server = server::Server::default();

gir

@@ -1 +1 @@
-Subproject commit 5975266da3b0fa1195e53213502a8c9bc5d9b1ac
+Subproject commit 5223ce91b97a833b09d6cbd04bbeab1bf18112b7

gir-files

@@ -1 +1 @@
-Subproject commit fe8258109e602dcb000890197b62f832006c715a
+Subproject commit 65efc10e710972dc43f91266d0f98c5e39390af4

gst-gir-files

@@ -1 +1 @@
-Subproject commit 63e90a30193bf8d228057c4570a50a0a2b40f2bd
+Subproject commit ef822845ed2446232dfb1e709f0d4438ac0d15f5

gstreamer-allocators/Cargo.toml

@@ -30,6 +30,7 @@ v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "ffi/v1_22", "v1_20"]
 v1_24 = ["gst/v1_24", "ffi/v1_24", "v1_22"]
+v1_26 = ["gst/v1_26", "ffi/v1_26", "v1_24"]
 
 [package.metadata.docs.rs]
 all-features = true

gstreamer-allocators/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-allocators/src/lib.rs

@@ -56,6 +56,8 @@ pub use phys_memory::*;
 pub mod prelude {
     #[doc(hidden)]
     pub use gst::prelude::*;
+
+    pub use crate::auto::traits::*;
 }
 
 pub mod subclass;

gstreamer-allocators/sys/Cargo.toml

@@ -23,6 +23,7 @@ v1_18 = ["v1_16"]
 v1_20 = ["v1_18"]
 v1_22 = ["v1_20"]
 v1_24 = ["v1_22"]
+v1_26 = ["v1_24"]
 
 [lib]
 name = "gstreamer_allocators_sys"
@@ -77,4 +78,7 @@ version = "1.20"
 version = "1.22"
 
 [package.metadata.system-deps.gstreamer_allocators_1_0.v1_24]
-version = "1.23"
+version = "1.24"
+
+[package.metadata.system-deps.gstreamer_allocators_1_0.v1_26]
+version = "1.25"

gstreamer-allocators/sys/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-allocators/sys/src/lib.rs

@@ -19,8 +19,11 @@ use gstreamer_sys as gst;
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
-    intptr_t, size_t, ssize_t, uintptr_t, FILE,
+    intptr_t, off_t, size_t, ssize_t, time_t, uintptr_t, FILE,
 };
+#[cfg(unix)]
+#[allow(unused_imports)]
+use libc::{dev_t, gid_t, pid_t, socklen_t, uid_t};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType};

gstreamer-analytics/Cargo.toml

@@ -24,6 +24,7 @@ gir-format-check = "0.1"
 
 [features]
 default = []
+v1_26 = ["gst/v1_26", "ffi/v1_26"]
 
 [package.metadata.docs.rs]
 all-features = true

gstreamer-analytics/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-analytics/src/object_detection.rs

@@ -60,13 +60,13 @@ impl<'a> AnalyticsRelationMetaODExt
     }
 }
 
-#[derive(Default, Debug)]
+#[derive(Clone, Copy, Default, Debug)]
 pub struct AnalyticsODLocation {
-    x: i32,
-    y: i32,
-    w: i32,
-    h: i32,
-    loc_conf_lvl: f32,
+    pub x: i32,
+    pub y: i32,
+    pub w: i32,
+    pub h: i32,
+    pub loc_conf_lvl: f32,
 }
 
 unsafe impl AnalyticsMtd for AnalyticsODMtd {
@@ -82,11 +82,15 @@ unsafe fn from(t: ffi::GstAnalyticsMtd) -> ffi::GstAnalyticsODMtd {
 
 impl<'a> AnalyticsMtdRef<'a, AnalyticsODMtd> {
     #[doc(alias = "gst_analytics_od_mtd_get_obj_type")]
-    pub fn obj_type(&self) -> glib::Quark {
+    pub fn obj_type(&self) -> Option<glib::Quark> {
         unsafe {
             let mut mtd = from(ffi::GstAnalyticsMtd::unsafe_from(self));
             let type_ = ffi::gst_analytics_od_mtd_get_obj_type(&mut mtd);
-            glib::Quark::from_glib(type_)
+            if type_ == 0 {
+                None
+            } else {
+                Some(glib::Quark::from_glib(type_))
+            }
         }
     }
 
@@ -143,7 +147,7 @@ mod tests {
             .add_od_mtd(glib::Quark::from_str("blb"), 0, 1, 10, 20, 0.8)
             .unwrap();
 
-        assert_eq!(od.obj_type(), glib::Quark::from_str("blb"));
+        assert_eq!(od.obj_type().unwrap(), glib::Quark::from_str("blb"));
 
         let loc = od.location().unwrap();
 
@@ -159,7 +163,7 @@ mod tests {
         let meta2 = buf.meta::<AnalyticsRelationMeta>().unwrap();
         let od2 = meta2.mtd::<AnalyticsODMtd>(0).unwrap();
 
-        assert_eq!(od2.obj_type(), glib::Quark::from_str("blb"));
+        assert_eq!(od2.obj_type().unwrap(), glib::Quark::from_str("blb"));
         let loc = od2.location().unwrap();
 
         assert_eq!(loc.x, 0);

gstreamer-analytics/src/relation_meta.rs

@@ -652,13 +652,13 @@ mod tests {
         assert_eq!(meta.len(), meta.iter::<AnalyticsAnyMtd>().count());
         assert_eq!(meta.len(), meta.iter::<AnalyticsODMtd>().count());
         for mtd in meta.iter::<AnalyticsODMtd>() {
-            assert_eq!(mtd.obj_type(), glib::Quark::from_str("blb"))
+            assert_eq!(mtd.obj_type().unwrap(), glib::Quark::from_str("blb"))
         }
 
         assert_eq!(meta.len(), meta.iter::<AnalyticsAnyMtd>().count());
         for mtd in meta.iter::<AnalyticsAnyMtd>() {
             if let Ok(mtd) = mtd.downcast::<AnalyticsODMtd>() {
-                assert_eq!(mtd.obj_type(), glib::Quark::from_str("blb"))
+                assert_eq!(mtd.obj_type().unwrap(), glib::Quark::from_str("blb"))
             }
         }
 
@@ -689,7 +689,7 @@ mod tests {
             0
         );
         for mtd in meta.iter_direct_related::<AnalyticsODMtd>(od1_id, crate::RelTypes::IS_PART_OF) {
-            assert_eq!(mtd.obj_type(), glib::Quark::from_str("blb"))
+            assert_eq!(mtd.obj_type().unwrap(), glib::Quark::from_str("blb"))
         }
 
         let mut meta = buf.make_mut().meta_mut::<AnalyticsRelationMeta>().unwrap();

gstreamer-analytics/sys/Cargo.toml

@@ -52,6 +52,10 @@ rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
 
 [package.metadata.system-deps.gstreamer_analytics_1_0]
 name = "gstreamer-analytics-1.0"
-version = "1.23"
+version = "1.24"
+
+[package.metadata.system-deps.gstreamer_analytics_1_0.v1_26]
+version = "1.25"
 
 [features]
+v1_26 = []

gstreamer-analytics/sys/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-analytics/sys/src/lib.rs

@@ -18,8 +18,11 @@ use gstreamer_sys as gst;
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
-    intptr_t, size_t, ssize_t, uintptr_t, FILE,
+    intptr_t, off_t, size_t, ssize_t, time_t, uintptr_t, FILE,
 };
+#[cfg(unix)]
+#[allow(unused_imports)]
+use libc::{dev_t, gid_t, pid_t, socklen_t, uid_t};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType};
@@ -28,7 +31,6 @@ use glib::{gboolean, gconstpointer, gpointer, GType};
 pub type GstAnalyticsMtdType = uintptr_t;
 
 // Constants
-pub const GST_AN_RELATION_META_TAG: &[u8] = b"GST-ANALYSIS-RELATION-META-TAG\0";
 pub const GST_INF_RELATION_SPAN: c_int = -1;
 pub const GST_ANALYTICS_MTD_TYPE_ANY: c_int = 0;
 
@@ -95,7 +97,6 @@ impl ::std::fmt::Debug for GstAnalyticsMtdImpl {
         f.debug_struct(&format!("GstAnalyticsMtdImpl @ {self:p}"))
             .field("name", &self.name)
             .field("mtd_meta_transform", &self.mtd_meta_transform)
-            .field("_reserved", &self._reserved)
             .finish()
     }
 }

gstreamer-analytics/sys/tests/abi.rs

@@ -268,6 +268,5 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("(guint) GST_ANALYTICS_REL_TYPE_LAST", "16"),
     ("(guint) GST_ANALYTICS_REL_TYPE_NONE", "0"),
     ("(guint) GST_ANALYTICS_REL_TYPE_RELATE_TO", "8"),
-    ("GST_AN_RELATION_META_TAG", "GST-ANALYSIS-RELATION-META-TAG"),
     ("GST_INF_RELATION_SPAN", "-1"),
 ];

gstreamer-analytics/sys/tests/constant.c

@@ -36,7 +36,6 @@ int main() {
     PRINT_CONSTANT((guint) GST_ANALYTICS_REL_TYPE_LAST);
     PRINT_CONSTANT((guint) GST_ANALYTICS_REL_TYPE_NONE);
     PRINT_CONSTANT((guint) GST_ANALYTICS_REL_TYPE_RELATE_TO);
-    PRINT_CONSTANT(GST_AN_RELATION_META_TAG);
     PRINT_CONSTANT(GST_INF_RELATION_SPAN);
     return 0;
 }

gstreamer-app/Cargo.toml

@@ -34,6 +34,7 @@ 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"]
 v1_22 = ["gst/v1_22", "gst-base/v1_22", "ffi/v1_22", "v1_20"]
 v1_24 = ["gst/v1_24", "gst-base/v1_24", "ffi/v1_24", "v1_22"]
+v1_26 = ["gst/v1_26", "gst-base/v1_26", "ffi/v1_26", "v1_24"]
 
 [package.metadata.docs.rs]
 all-features = true

gstreamer-app/src/app_sink.rs

@@ -71,6 +71,14 @@ impl AppSinkCallbacksBuilder {
         }
     }
 
+    pub fn eos_if_some<F: FnMut(&AppSink) + Send + 'static>(self, eos: Option<F>) -> Self {
+        if let Some(eos) = eos {
+            self.eos(eos)
+        } else {
+            self
+        }
+    }
+
     pub fn new_preroll<
         F: FnMut(&AppSink) -> Result<gst::FlowSuccess, gst::FlowError> + Send + 'static,
     >(
@@ -83,6 +91,19 @@ impl AppSinkCallbacksBuilder {
         }
     }
 
+    pub fn new_preroll_if_some<
+        F: FnMut(&AppSink) -> Result<gst::FlowSuccess, gst::FlowError> + Send + 'static,
+    >(
+        self,
+        new_preroll: Option<F>,
+    ) -> Self {
+        if let Some(new_preroll) = new_preroll {
+            self.new_preroll(new_preroll)
+        } else {
+            self
+        }
+    }
+
     pub fn new_sample<
         F: FnMut(&AppSink) -> Result<gst::FlowSuccess, gst::FlowError> + Send + 'static,
     >(
@@ -95,6 +116,19 @@ impl AppSinkCallbacksBuilder {
         }
     }
 
+    pub fn new_sample_if_some<
+        F: FnMut(&AppSink) -> Result<gst::FlowSuccess, gst::FlowError> + Send + 'static,
+    >(
+        self,
+        new_sample: Option<F>,
+    ) -> Self {
+        if let Some(new_sample) = new_sample {
+            self.new_sample(new_sample)
+        } else {
+            self
+        }
+    }
+
     #[cfg(feature = "v1_20")]
     #[cfg_attr(docsrs, doc(cfg(feature = "v1_20")))]
     pub fn new_event<F: FnMut(&AppSink) -> bool + Send + 'static>(self, new_event: F) -> Self {
@@ -104,6 +138,19 @@ impl AppSinkCallbacksBuilder {
         }
     }
 
+    #[cfg(feature = "v1_20")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "v1_20")))]
+    pub fn new_event_if_some<F: FnMut(&AppSink) -> bool + Send + 'static>(
+        self,
+        new_event: Option<F>,
+    ) -> Self {
+        if let Some(new_event) = new_event {
+            self.new_event(new_event)
+        } else {
+            self
+        }
+    }
+
     #[cfg(feature = "v1_24")]
     #[cfg_attr(docsrs, doc(cfg(feature = "v1_24")))]
     pub fn propose_allocation<
@@ -118,6 +165,21 @@ impl AppSinkCallbacksBuilder {
         }
     }
 
+    #[cfg(feature = "v1_24")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "v1_24")))]
+    pub fn propose_allocation_if_some<
+        F: FnMut(&AppSink, &mut gst::query::Allocation) -> bool + Send + 'static,
+    >(
+        self,
+        propose_allocation: Option<F>,
+    ) -> Self {
+        if let Some(propose_allocation) = propose_allocation {
+            self.propose_allocation(propose_allocation)
+        } else {
+            self
+        }
+    }
+
     #[must_use = "Building the callbacks without using them has no effect"]
     pub fn build(self) -> AppSinkCallbacks {
         let have_eos = self.eos.is_some();

gstreamer-app/src/app_src.rs

@@ -60,6 +60,17 @@ impl AppSrcCallbacksBuilder {
         }
     }
 
+    pub fn need_data_if_some<F: FnMut(&AppSrc, u32) + Send + 'static>(
+        self,
+        need_data: Option<F>,
+    ) -> Self {
+        if let Some(need_data) = need_data {
+            self.need_data(need_data)
+        } else {
+            self
+        }
+    }
+
     pub fn enough_data<F: Fn(&AppSrc) + Send + Sync + 'static>(self, enough_data: F) -> Self {
         Self {
             enough_data: Some(Box::new(enough_data)),
@@ -67,6 +78,17 @@ impl AppSrcCallbacksBuilder {
         }
     }
 
+    pub fn enough_data_if_some<F: Fn(&AppSrc) + Send + Sync + 'static>(
+        self,
+        enough_data: Option<F>,
+    ) -> Self {
+        if let Some(enough_data) = enough_data {
+            self.enough_data(enough_data)
+        } else {
+            self
+        }
+    }
+
     pub fn seek_data<F: Fn(&AppSrc, u64) -> bool + Send + Sync + 'static>(
         self,
         seek_data: F,
@@ -77,6 +99,17 @@ impl AppSrcCallbacksBuilder {
         }
     }
 
+    pub fn seek_data_if_some<F: Fn(&AppSrc, u64) -> bool + Send + Sync + 'static>(
+        self,
+        seek_data: Option<F>,
+    ) -> Self {
+        if let Some(seek_data) = seek_data {
+            self.seek_data(seek_data)
+        } else {
+            self
+        }
+    }
+
     #[must_use = "Building the callbacks without using them has no effect"]
     pub fn build(self) -> AppSrcCallbacks {
         let have_need_data = self.need_data.is_some();

gstreamer-app/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-app/sys/Cargo.toml

@@ -23,6 +23,7 @@ v1_18 = ["v1_16"]
 v1_20 = ["v1_18"]
 v1_22 = ["v1_20"]
 v1_24 = ["v1_22"]
+v1_26 = ["v1_24"]
 
 [lib]
 name = "gstreamer_app_sys"
@@ -77,4 +78,7 @@ version = "1.20"
 version = "1.22"
 
 [package.metadata.system-deps.gstreamer_app_1_0.v1_24]
-version = "1.23"
+version = "1.24"
+
+[package.metadata.system-deps.gstreamer_app_1_0.v1_26]
+version = "1.25"

gstreamer-app/sys/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-app/sys/src/lib.rs

@@ -19,8 +19,11 @@ use gstreamer_sys as gst;
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
-    intptr_t, size_t, ssize_t, uintptr_t, FILE,
+    intptr_t, off_t, size_t, ssize_t, time_t, uintptr_t, FILE,
 };
+#[cfg(unix)]
+#[allow(unused_imports)]
+use libc::{dev_t, gid_t, pid_t, socklen_t, uid_t};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType};

gstreamer-audio/Cargo.toml

@@ -36,6 +36,7 @@ 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"]
 v1_22 = ["gst/v1_22", "gst-base/v1_22", "ffi/v1_22", "v1_20"]
 v1_24 = ["gst/v1_24", "gst-base/v1_24", "ffi/v1_24", "v1_22"]
+v1_26 = ["gst/v1_26", "gst-base/v1_26", "ffi/v1_26", "v1_24"]
 serde = ["dep:serde", "gst/serde"]
 
 [package.metadata.docs.rs]

gstreamer-audio/Gir.toml

@@ -327,6 +327,10 @@ status = "generate"
     # Platform dependant
     manual = true
 
+    [[object.member]]
+    name = "last"
+    ignore = true
+
     [[object.function]]
     name = "to_string"
     # This has an Unknown field that may return NULL or "UNKNOWN"

gstreamer-audio/src/audio_converter.rs

@@ -73,6 +73,30 @@ impl From<AudioConverterConfig> for gst::Structure {
     }
 }
 
+impl glib::value::ToValue for AudioConverterConfig {
+    fn to_value(&self) -> glib::Value {
+        self.0.to_value()
+    }
+
+    fn value_type(&self) -> glib::Type {
+        self.0.value_type()
+    }
+}
+
+impl glib::value::ToValueOptional for AudioConverterConfig {
+    fn to_value_optional(s: Option<&Self>) -> glib::Value {
+        skip_assert_initialized!();
+        s.map(|s| &s.0).to_value()
+    }
+}
+
+impl From<AudioConverterConfig> for glib::Value {
+    fn from(s: AudioConverterConfig) -> glib::Value {
+        skip_assert_initialized!();
+        s.0.into()
+    }
+}
+
 impl AudioConverterConfig {
     pub fn new() -> Self {
         Self(gst::Structure::new_empty("GstAudioConverter"))

gstreamer-audio/src/audio_format.rs

@@ -364,7 +364,8 @@ mod tests {
     fn test_display() {
         gst::init().unwrap();
 
-        format!("{}", crate::AudioFormat::S16be);
+        assert_eq!(format!("{}", crate::AudioFormat::S16be), "S16BE");
+        assert_eq!(format!("{:?}", crate::AudioFormat::S16be), "S16be");
     }
 
     #[test]

gstreamer-audio/src/audio_info.rs

@@ -96,6 +96,17 @@ impl<'a> AudioInfoBuilder<'a> {
         }
     }
 
+    pub fn positions_if_some(
+        self,
+        positions: Option<&'a [crate::AudioChannelPosition]>,
+    ) -> AudioInfoBuilder<'a> {
+        if let Some(positions) = positions {
+            self.positions(positions)
+        } else {
+            self
+        }
+    }
+
     pub fn flags(self, flags: crate::AudioFlags) -> Self {
         Self {
             flags: Some(flags),
@@ -103,12 +114,28 @@ impl<'a> AudioInfoBuilder<'a> {
         }
     }
 
+    pub fn flags_if_some(self, flags: Option<crate::AudioFlags>) -> Self {
+        if let Some(flags) = flags {
+            self.flags(flags)
+        } else {
+            self
+        }
+    }
+
     pub fn layout(self, layout: crate::AudioLayout) -> Self {
         Self {
             layout: Some(layout),
             ..self
         }
     }
+
+    pub fn layout_if_some(self, layout: Option<crate::AudioLayout>) -> Self {
+        if let Some(layout) = layout {
+            self.layout(layout)
+        } else {
+            self
+        }
+    }
 }
 
 impl AudioInfo {

gstreamer-audio/src/audio_meta.rs

@@ -294,6 +294,14 @@ impl fmt::Debug for AudioLevelMeta {
     }
 }
 
+pub mod tags {
+    gst::impl_meta_tag!(Audio, GST_META_TAG_AUDIO_STR);
+    gst::impl_meta_tag!(Channels, GST_META_TAG_AUDIO_CHANNELS_STR);
+    gst::impl_meta_tag!(Rate, GST_META_TAG_AUDIO_RATE_STR);
+    #[cfg(feature = "v1_24")]
+    gst::impl_meta_tag!(DSDPlaneOffsets, GST_META_TAG_DSD_PLANE_OFFSETS_STR);
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -319,6 +327,8 @@ mod tests {
             let cmeta = buffer.meta::<AudioClippingMeta>().unwrap();
             assert_eq!(cmeta.start().try_into(), Ok(Some(start)));
             assert_eq!(cmeta.end().try_into(), Ok(Some(stop)));
+
+            assert!(cmeta.has_tag::<tags::Audio>());
         }
     }
 

gstreamer-audio/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-audio/src/caps.rs

@@ -90,6 +90,14 @@ impl<T> AudioCapsBuilder<T> {
         }
     }
 
+    pub fn format_if_some(self, format: Option<AudioFormat>) -> Self {
+        if let Some(format) = format {
+            self.format(format)
+        } else {
+            self
+        }
+    }
+
     pub fn format_list(self, formats: impl IntoIterator<Item = AudioFormat>) -> Self {
         Self {
             builder: self.builder.field(
@@ -99,12 +107,31 @@ impl<T> AudioCapsBuilder<T> {
         }
     }
 
+    pub fn format_list_if_some(
+        self,
+        formats: Option<impl IntoIterator<Item = AudioFormat>>,
+    ) -> Self {
+        if let Some(formats) = formats {
+            self.format_list(formats)
+        } else {
+            self
+        }
+    }
+
     pub fn rate(self, rate: i32) -> Self {
         Self {
             builder: self.builder.field(glib::gstr!("rate"), rate),
         }
     }
 
+    pub fn rate_if_some(self, rate: Option<i32>) -> Self {
+        if let Some(rate) = rate {
+            self.rate(rate)
+        } else {
+            self
+        }
+    }
+
     pub fn rate_range(self, rates: impl RangeBounds<i32>) -> Self {
         let (start, end) = range_bounds_i32_start_end(rates);
         let gst_rates = gst::IntRange::<i32>::new(start, end);
@@ -113,6 +140,14 @@ impl<T> AudioCapsBuilder<T> {
         }
     }
 
+    pub fn rate_range_if_some(self, rates: Option<impl RangeBounds<i32>>) -> Self {
+        if let Some(rates) = rates {
+            self.rate_range(rates)
+        } else {
+            self
+        }
+    }
+
     pub fn rate_list(self, rates: impl IntoIterator<Item = i32>) -> Self {
         Self {
             builder: self
@@ -121,12 +156,28 @@ impl<T> AudioCapsBuilder<T> {
         }
     }
 
+    pub fn rate_list_if_some(self, rates: Option<impl IntoIterator<Item = i32>>) -> Self {
+        if let Some(rates) = rates {
+            self.rate_list(rates)
+        } else {
+            self
+        }
+    }
+
     pub fn channels(self, channels: i32) -> Self {
         Self {
             builder: self.builder.field(glib::gstr!("channels"), channels),
         }
     }
 
+    pub fn channels_if_some(self, channels: Option<i32>) -> Self {
+        if let Some(channels) = channels {
+            self.channels(channels)
+        } else {
+            self
+        }
+    }
+
     pub fn channels_range(self, channels: impl RangeBounds<i32>) -> Self {
         let (start, end) = range_bounds_i32_start_end(channels);
         let gst_channels: gst::IntRange<i32> = gst::IntRange::new(start, end);
@@ -135,6 +186,14 @@ impl<T> AudioCapsBuilder<T> {
         }
     }
 
+    pub fn channels_range_if_some(self, channels: Option<impl RangeBounds<i32>>) -> Self {
+        if let Some(channels) = channels {
+            self.channels_range(channels)
+        } else {
+            self
+        }
+    }
+
     pub fn channels_list(self, channels: impl IntoIterator<Item = i32>) -> Self {
         Self {
             builder: self
@@ -143,6 +202,14 @@ impl<T> AudioCapsBuilder<T> {
         }
     }
 
+    pub fn channels_list_if_some(self, channels: Option<impl IntoIterator<Item = i32>>) -> Self {
+        if let Some(channels) = channels {
+            self.channels_list(channels)
+        } else {
+            self
+        }
+    }
+
     pub fn layout(self, layout: AudioLayout) -> Self {
         Self {
             builder: self
@@ -151,6 +218,14 @@ impl<T> AudioCapsBuilder<T> {
         }
     }
 
+    pub fn layout_if_some(self, layout: Option<AudioLayout>) -> Self {
+        if let Some(layout) = layout {
+            self.layout(layout)
+        } else {
+            self
+        }
+    }
+
     pub fn layout_list(self, layouts: impl IntoIterator<Item = AudioLayout>) -> Self {
         Self {
             builder: self.builder.field(
@@ -160,6 +235,17 @@ impl<T> AudioCapsBuilder<T> {
         }
     }
 
+    pub fn layout_list_if_some(
+        self,
+        layouts: Option<impl IntoIterator<Item = AudioLayout>>,
+    ) -> Self {
+        if let Some(layouts) = layouts {
+            self.layout_list(layouts)
+        } else {
+            self
+        }
+    }
+
     pub fn channel_mask(self, channel_mask: u64) -> Self {
         Self {
             builder: self
@@ -168,6 +254,14 @@ impl<T> AudioCapsBuilder<T> {
         }
     }
 
+    pub fn channel_mask_if_some(self, channel_mask: Option<u64>) -> Self {
+        if let Some(channel_mask) = channel_mask {
+            self.channel_mask(channel_mask)
+        } else {
+            self
+        }
+    }
+
     pub fn fallback_channel_mask(self) -> Self {
         let channels = self.builder.structure().get::<i32>(glib::gstr!("channels"));
         match channels {
@@ -187,6 +281,14 @@ impl<T> AudioCapsBuilder<T> {
         }
     }
 
+    pub fn field_if_some(self, name: &str, value: Option<impl Into<glib::Value> + Send>) -> Self {
+        if let Some(value) = value {
+            self.field(name, value)
+        } else {
+            self
+        }
+    }
+
     #[must_use]
     pub fn build(self) -> gst::Caps {
         self.builder.build()

gstreamer-audio/sys/Cargo.toml

@@ -26,6 +26,7 @@ v1_18 = ["v1_16"]
 v1_20 = ["v1_18"]
 v1_22 = ["v1_20"]
 v1_24 = ["v1_22"]
+v1_26 = ["v1_24"]
 
 [lib]
 name = "gstreamer_audio_sys"
@@ -80,4 +81,7 @@ version = "1.20"
 version = "1.22"
 
 [package.metadata.system-deps.gstreamer_audio_1_0.v1_24]
-version = "1.23"
+version = "1.24"
+
+[package.metadata.system-deps.gstreamer_audio_1_0.v1_26]
+version = "1.25"

gstreamer-audio/sys/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-audio/sys/src/lib.rs

@@ -20,8 +20,11 @@ use gstreamer_sys as gst;
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
-    intptr_t, size_t, ssize_t, uintptr_t, FILE,
+    intptr_t, off_t, size_t, ssize_t, time_t, uintptr_t, FILE,
 };
+#[cfg(unix)]
+#[allow(unused_imports)]
+use libc::{dev_t, gid_t, pid_t, socklen_t, uid_t};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType};
@@ -209,6 +212,7 @@ pub const GST_AUDIO_DEF_FORMAT: &[u8] = b"S16LE\0";
 pub const GST_AUDIO_DEF_RATE: c_int = 44100;
 pub const GST_AUDIO_ENCODER_SINK_NAME: &[u8] = b"sink\0";
 pub const GST_AUDIO_ENCODER_SRC_NAME: &[u8] = b"src\0";
+pub const GST_AUDIO_FORMAT_LAST: c_int = 32;
 pub const GST_AUDIO_RATE_RANGE: &[u8] = b"(int) [ 1, max ]\0";
 pub const GST_AUDIO_RESAMPLER_OPT_CUBIC_B: &[u8] = b"GstAudioResampler.cubic-b\0";
 pub const GST_AUDIO_RESAMPLER_OPT_CUBIC_C: &[u8] = b"GstAudioResampler.cubic-c\0";

gstreamer-audio/sys/tests/abi.rs

@@ -769,6 +769,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("(guint) GST_AUDIO_FORMAT_FLAG_INTEGER", "1"),
     ("(guint) GST_AUDIO_FORMAT_FLAG_SIGNED", "4"),
     ("(guint) GST_AUDIO_FORMAT_FLAG_UNPACK", "32"),
+    ("GST_AUDIO_FORMAT_LAST", "32"),
     ("(gint) GST_AUDIO_FORMAT_S16", "4"),
     ("(gint) GST_AUDIO_FORMAT_S16BE", "5"),
     ("(gint) GST_AUDIO_FORMAT_S16LE", "4"),

gstreamer-audio/sys/tests/constant.c

@@ -117,6 +117,7 @@ int main() {
     PRINT_CONSTANT((guint) GST_AUDIO_FORMAT_FLAG_INTEGER);
     PRINT_CONSTANT((guint) GST_AUDIO_FORMAT_FLAG_SIGNED);
     PRINT_CONSTANT((guint) GST_AUDIO_FORMAT_FLAG_UNPACK);
+    PRINT_CONSTANT(GST_AUDIO_FORMAT_LAST);
     PRINT_CONSTANT((gint) GST_AUDIO_FORMAT_S16);
     PRINT_CONSTANT((gint) GST_AUDIO_FORMAT_S16BE);
     PRINT_CONSTANT((gint) GST_AUDIO_FORMAT_S16LE);

gstreamer-base/Cargo.toml

@@ -32,6 +32,7 @@ v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "ffi/v1_22", "v1_20"]
 v1_24 = ["gst/v1_24", "ffi/v1_24", "v1_22"]
+v1_26 = ["gst/v1_26", "ffi/v1_26", "v1_24"]
 
 [package.metadata.docs.rs]
 all-features = true

gstreamer-base/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-base/sys/Cargo.toml

@@ -25,6 +25,7 @@ v1_18 = ["v1_16"]
 v1_20 = ["v1_18"]
 v1_22 = ["v1_20"]
 v1_24 = ["v1_22"]
+v1_26 = ["v1_24"]
 
 [lib]
 name = "gstreamer_base_sys"
@@ -85,4 +86,7 @@ version = "1.20"
 version = "1.22"
 
 [package.metadata.system-deps.gstreamer_base_1_0.v1_24]
-version = "1.23"
+version = "1.24"
+
+[package.metadata.system-deps.gstreamer_base_1_0.v1_26]
+version = "1.25"

gstreamer-base/sys/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-base/sys/src/lib.rs

@@ -19,8 +19,11 @@ use gstreamer_sys as gst;
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
-    intptr_t, size_t, ssize_t, uintptr_t, FILE,
+    intptr_t, off_t, size_t, ssize_t, time_t, uintptr_t, FILE,
 };
+#[cfg(unix)]
+#[allow(unused_imports)]
+use libc::{dev_t, gid_t, pid_t, socklen_t, uid_t};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType};

gstreamer-check/Cargo.toml

@@ -28,6 +28,7 @@ v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "ffi/v1_22", "v1_20"]
 v1_24 = ["gst/v1_24", "ffi/v1_24", "v1_22"]
+v1_26 = ["gst/v1_26", "ffi/v1_26", "v1_24"]
 
 [package.metadata.docs.rs]
 all-features = true

gstreamer-check/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-check/sys/Cargo.toml

@@ -23,6 +23,7 @@ v1_18 = ["v1_16"]
 v1_20 = ["v1_18"]
 v1_22 = ["v1_20"]
 v1_24 = ["v1_22"]
+v1_26 = ["v1_24"]
 
 [lib]
 name = "gstreamer_check_sys"
@@ -77,4 +78,7 @@ version = "1.20"
 version = "1.22"
 
 [package.metadata.system-deps.gstreamer_check_1_0.v1_24]
-version = "1.23"
+version = "1.24"
+
+[package.metadata.system-deps.gstreamer_check_1_0.v1_26]
+version = "1.25"

gstreamer-check/sys/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-check/sys/src/lib.rs

@@ -19,8 +19,11 @@ use gstreamer_sys as gst;
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
-    intptr_t, size_t, ssize_t, uintptr_t, FILE,
+    intptr_t, off_t, size_t, ssize_t, time_t, uintptr_t, FILE,
 };
+#[cfg(unix)]
+#[allow(unused_imports)]
+use libc::{dev_t, gid_t, pid_t, socklen_t, uid_t};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType};

gstreamer-controller/Cargo.toml

@@ -28,6 +28,7 @@ v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "ffi/v1_22", "v1_20"]
 v1_24 = ["gst/v1_24", "ffi/v1_24", "v1_22"]
+v1_26 = ["gst/v1_26", "ffi/v1_26", "v1_24"]
 
 [package.metadata.docs.rs]
 all-features = true

gstreamer-controller/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-controller/sys/Cargo.toml

@@ -24,6 +24,7 @@ v1_18 = ["v1_16"]
 v1_20 = ["v1_18"]
 v1_22 = ["v1_20"]
 v1_24 = ["v1_22"]
+v1_26 = ["v1_24"]
 
 [lib]
 name = "gstreamer_controller_sys"
@@ -78,4 +79,7 @@ version = "1.20"
 version = "1.22"
 
 [package.metadata.system-deps.gstreamer_controller_1_0.v1_24]
-version = "1.23"
+version = "1.24"
+
+[package.metadata.system-deps.gstreamer_controller_1_0.v1_26]
+version = "1.25"

gstreamer-controller/sys/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-controller/sys/src/lib.rs

@@ -19,8 +19,11 @@ use gstreamer_sys as gst;
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
-    intptr_t, size_t, ssize_t, uintptr_t, FILE,
+    intptr_t, off_t, size_t, ssize_t, time_t, uintptr_t, FILE,
 };
+#[cfg(unix)]
+#[allow(unused_imports)]
+use libc::{dev_t, gid_t, pid_t, socklen_t, uid_t};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType};

gstreamer-editing-services/Cargo.toml

@@ -33,6 +33,7 @@ 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"]
 v1_22 = ["gst/v1_22", "gst-base/v1_22", "gst-pbutils/v1_22", "ffi/v1_22", "v1_20"]
 v1_24 = ["gst/v1_24", "gst-base/v1_24", "gst-pbutils/v1_24", "ffi/v1_24", "v1_22"]
+v1_26 = ["gst/v1_26", "gst-base/v1_26", "gst-pbutils/v1_26", "ffi/v1_26", "v1_24"]
 serde = ["dep:serde", "gst/serde", "gst-pbutils/serde"]
 
 [package.metadata.docs.rs]

gstreamer-editing-services/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-editing-services/src/composition_meta.rs

@@ -20,32 +20,32 @@ impl FrameCompositionMeta {
     }
 
     #[inline]
-    pub fn position(&self) -> (i32, i32) {
+    pub fn position(&self) -> (f64, f64) {
         (self.0.posx, self.0.posy)
     }
 
     #[inline]
-    pub fn pos_x(&self) -> i32 {
+    pub fn pos_x(&self) -> f64 {
         self.0.posx
     }
 
     #[inline]
-    pub fn pos_y(&self) -> i32 {
+    pub fn pos_y(&self) -> f64 {
         self.0.posy
     }
 
     #[inline]
-    pub fn size(&self) -> (i32, i32) {
+    pub fn size(&self) -> (f64, f64) {
         (self.0.width, self.0.height)
     }
 
     #[inline]
-    pub fn width(&self) -> i32 {
+    pub fn width(&self) -> f64 {
         self.0.width
     }
 
     #[inline]
-    pub fn height(&self) -> i32 {
+    pub fn height(&self) -> f64 {
         self.0.height
     }
 
@@ -90,8 +90,8 @@ mod tests {
 
     fn add_composition_meta(
         buffer: &mut gst::BufferRef,
-        position: (i32, i32),
-        size: (i32, i32),
+        position: (f64, f64),
+        size: (f64, f64),
         alpha: f64,
         zorder: u32,
         operator: i32,
@@ -124,15 +124,21 @@ mod tests {
 
         let mut buffer = gst::Buffer::with_size(320 * 240 * 4).unwrap();
         {
-            let _meta =
-                add_composition_meta(buffer.get_mut().unwrap(), (42, 42), (20, 22), 0.42, 2, 42)
-                    .unwrap();
+            let _meta = add_composition_meta(
+                buffer.get_mut().unwrap(),
+                (42., 42.),
+                (20., 22.),
+                0.42,
+                2,
+                42,
+            )
+            .unwrap();
         }
 
         {
             let meta = buffer.meta::<FrameCompositionMeta>().unwrap();
-            assert_eq!(meta.position(), (42, 42));
-            assert_eq!(meta.size(), (20, 22));
+            assert_eq!(meta.position(), (42., 42.));
+            assert_eq!(meta.size(), (20., 22.));
             assert_eq!(meta.alpha(), 0.42);
             assert_eq!(meta.zorder(), 2);
             assert_eq!(meta.operator(), 42);

gstreamer-editing-services/sys/Cargo.toml

@@ -29,6 +29,7 @@ v1_18 = ["v1_16"]
 v1_20 = ["v1_18"]
 v1_22 = ["v1_20"]
 v1_24 = ["v1_22"]
+v1_26 = ["v1_24"]
 
 [lib]
 name = "gstreamer_editing_services_sys"
@@ -83,4 +84,7 @@ version = "1.20"
 version = "1.22"
 
 [package.metadata.system-deps.gst_editing_services_1_0.v1_24]
-version = "1.23"
+version = "1.24"
+
+[package.metadata.system-deps.gst_editing_services_1_0.v1_26]
+version = "1.25"

gstreamer-editing-services/sys/Gir.toml

@@ -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"

gstreamer-editing-services/sys/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-editing-services/sys/src/lib.rs

@@ -21,8 +21,11 @@ use gstreamer_sys as gst;
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
-    intptr_t, size_t, ssize_t, uintptr_t, FILE,
+    intptr_t, off_t, size_t, ssize_t, time_t, uintptr_t, FILE,
 };
+#[cfg(unix)]
+#[allow(unused_imports)]
+use libc::{dev_t, gid_t, pid_t, socklen_t, uid_t};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType};
@@ -879,10 +882,10 @@ pub type GESFormatterPrivate = _GESFormatterPrivate;
 pub struct GESFrameCompositionMeta {
     pub meta: gst::GstMeta,
     pub alpha: c_double,
-    pub posx: c_int,
-    pub posy: c_int,
-    pub height: c_int,
-    pub width: c_int,
+    pub posx: c_double,
+    pub posy: c_double,
+    pub height: c_double,
+    pub width: c_double,
     pub zorder: c_uint,
     pub operator: c_int,
 }
@@ -1135,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],
@@ -2389,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 {
@@ -3466,8 +3439,6 @@ extern "C" {
     //=========================================================================
     // GESPitiviFormatter
     //=========================================================================
-    pub fn ges_pitivi_formatter_get_type() -> GType;
-    pub fn ges_pitivi_formatter_new() -> *mut GESPitiviFormatter;
 
     //=========================================================================
     // GESProject

gstreamer-editing-services/sys/tests/abi.rs

@@ -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 {

gstreamer-editing-services/sys/tests/layout.c

@@ -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));

gstreamer-gl/Cargo.toml

@@ -37,6 +37,7 @@ 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"]
 v1_22 = ["gst/v1_22", "gst-base/v1_22", "gst-video/v1_22", "ffi/v1_22", "v1_20"]
 v1_24 = ["gst/v1_24", "gst-base/v1_24", "gst-video/v1_24", "ffi/v1_24", "v1_22"]
+v1_26 = ["gst/v1_26", "gst-base/v1_26", "gst-video/v1_26", "ffi/v1_26", "v1_24"]
 serde = ["dep:serde", "gst/serde", "gst-video/serde"]
 
 [package.metadata.docs.rs]

gstreamer-gl/egl/Cargo.toml

@@ -32,6 +32,7 @@ v1_18 = ["gst/v1_18", "gst-gl/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "gst-gl/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "gst-gl/v1_22", "ffi/v1_22", "v1_20"]
 v1_24 = ["gst/v1_24", "gst-gl/v1_24", "ffi/v1_24", "v1_22"]
+v1_26 = ["gst/v1_26", "gst-gl/v1_26", "ffi/v1_26", "v1_24"]
 
 [package.metadata.docs.rs]
 all-features = true

gstreamer-gl/egl/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-gl/egl/sys/Cargo.toml

@@ -44,7 +44,10 @@ version = "1.20"
 version = "1.22"
 
 [package.metadata.system-deps.gstreamer_gl_egl_1_0.v1_24]
-version = "1.23"
+version = "1.24"
+
+[package.metadata.system-deps.gstreamer_gl_egl_1_0.v1_26]
+version = "1.25"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -76,3 +79,4 @@ v1_18 = ["v1_16"]
 v1_20 = ["v1_18"]
 v1_22 = ["v1_20"]
 v1_24 = ["v1_22"]
+v1_26 = ["v1_24"]

gstreamer-gl/egl/sys/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-gl/egl/sys/src/lib.rs

@@ -18,8 +18,11 @@ use gstreamer_gl_sys as gst_gl;
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
-    intptr_t, size_t, ssize_t, uintptr_t, FILE,
+    intptr_t, off_t, size_t, ssize_t, time_t, uintptr_t, FILE,
 };
+#[cfg(unix)]
+#[allow(unused_imports)]
+use libc::{dev_t, gid_t, pid_t, socklen_t, uid_t};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType};

gstreamer-gl/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-gl/sys/Cargo.toml

@@ -29,6 +29,7 @@ v1_18 = ["v1_16"]
 v1_20 = ["v1_18"]
 v1_22 = ["v1_20"]
 v1_24 = ["v1_22"]
+v1_26 = ["v1_24"]
 
 [lib]
 name = "gstreamer_gl_sys"
@@ -83,4 +84,7 @@ version = "1.20"
 version = "1.22"
 
 [package.metadata.system-deps.gstreamer_gl_1_0.v1_24]
-version = "1.23"
+version = "1.24"
+
+[package.metadata.system-deps.gstreamer_gl_1_0.v1_26]
+version = "1.25"

gstreamer-gl/sys/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-gl/sys/src/lib.rs

@@ -25,8 +25,11 @@ pub use manual::*;
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
-    intptr_t, size_t, ssize_t, uintptr_t, FILE,
+    intptr_t, off_t, size_t, ssize_t, time_t, uintptr_t, FILE,
 };
+#[cfg(unix)]
+#[allow(unused_imports)]
+use libc::{dev_t, gid_t, pid_t, socklen_t, uid_t};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType};

gstreamer-gl/wayland/Cargo.toml

@@ -33,6 +33,7 @@ v1_18 = ["gst/v1_18", "gst-gl/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "gst-gl/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "gst-gl/v1_22", "ffi/v1_22", "v1_20"]
 v1_24 = ["gst/v1_24", "gst-gl/v1_24", "ffi/v1_24", "v1_22"]
+v1_26 = ["gst/v1_26", "gst-gl/v1_26", "ffi/v1_26", "v1_24"]
 
 [package.metadata.docs.rs]
 all-features = true

gstreamer-gl/wayland/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-gl/wayland/sys/Cargo.toml

@@ -44,7 +44,10 @@ version = "1.20"
 version = "1.22"
 
 [package.metadata.system-deps.gstreamer_gl_wayland_1_0.v1_24]
-version = "1.23"
+version = "1.24"
+
+[package.metadata.system-deps.gstreamer_gl_wayland_1_0.v1_26]
+version = "1.25"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -76,3 +79,4 @@ v1_18 = ["v1_16"]
 v1_20 = ["v1_18"]
 v1_22 = ["v1_20"]
 v1_24 = ["v1_22"]
+v1_26 = ["v1_24"]

gstreamer-gl/wayland/sys/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-gl/wayland/sys/src/lib.rs

@@ -18,8 +18,11 @@ use gstreamer_gl_sys as gst_gl;
 #[allow(unused_imports)]
 use libc::{
     c_char, c_double, c_float, c_int, c_long, c_short, c_uchar, c_uint, c_ulong, c_ushort, c_void,
-    intptr_t, size_t, ssize_t, uintptr_t, FILE,
+    intptr_t, off_t, size_t, ssize_t, time_t, uintptr_t, FILE,
 };
+#[cfg(unix)]
+#[allow(unused_imports)]
+use libc::{dev_t, gid_t, pid_t, socklen_t, uid_t};
 
 #[allow(unused_imports)]
 use glib::{gboolean, gconstpointer, gpointer, GType};

gstreamer-gl/x11/Cargo.toml

@@ -33,6 +33,7 @@ v1_18 = ["gst/v1_18", "gst-gl/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "gst-gl/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "gst-gl/v1_22", "ffi/v1_22", "v1_20"]
 v1_24 = ["gst/v1_24", "gst-gl/v1_24", "ffi/v1_24", "v1_22"]
+v1_26 = ["gst/v1_26", "gst-gl/v1_26", "ffi/v1_26", "v1_24"]
 
 [package.metadata.docs.rs]
 all-features = true

gstreamer-gl/x11/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)

gstreamer-gl/x11/sys/Cargo.toml

@@ -44,7 +44,10 @@ version = "1.20"
 version = "1.22"
 
 [package.metadata.system-deps.gstreamer_gl_x11_1_0.v1_24]
-version = "1.23"
+version = "1.24"
+
+[package.metadata.system-deps.gstreamer_gl_x11_1_0.v1_26]
+version = "1.25"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -76,3 +79,4 @@ v1_18 = ["v1_16"]
 v1_20 = ["v1_18"]
 v1_22 = ["v1_20"]
 v1_24 = ["v1_22"]
+v1_26 = ["v1_24"]

gstreamer-gl/x11/sys/src/auto/versions.txt

@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 5975266da3b0)
-from gir-files (https://github.com/gtk-rs/gir-files @ fe8258109e60)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 63e90a30193b)
+Generated by gir (https://github.com/gtk-rs/gir @ 5223ce91b97a)
+from gir-files (https://github.com/gtk-rs/gir-files @ 65efc10e7109)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ef822845ed24)