diff --git a/gstreamer-allocators/src/auto/versions.txt b/gstreamer-allocators/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-allocators/src/auto/versions.txt
+++ b/gstreamer-allocators/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-allocators/sys/build.rs b/gstreamer-allocators/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-allocators/sys/build.rs
+++ b/gstreamer-allocators/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-allocators/sys/src/lib.rs b/gstreamer-allocators/sys/src/lib.rs
index 71a4c6e65..29a84daac 100644
--- a/gstreamer-allocators/sys/src/lib.rs
+++ b/gstreamer-allocators/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-allocators/sys/tests/abi.rs b/gstreamer-allocators/sys/tests/abi.rs
index d32c17120..f47b6d1d6 100644
--- a/gstreamer-allocators/sys/tests/abi.rs
+++ b/gstreamer-allocators/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_allocators_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-allocators/sys/tests/constant.c b/gstreamer-allocators/sys/tests/constant.c
index 12509f2b2..fab0ff3e1 100644
--- a/gstreamer-allocators/sys/tests/constant.c
+++ b/gstreamer-allocators/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-allocators/sys/tests/layout.c b/gstreamer-allocators/sys/tests/layout.c
index c7d37bdd2..a02ed9e35 100644
--- a/gstreamer-allocators/sys/tests/layout.c
+++ b/gstreamer-allocators/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-app/src/auto/versions.txt b/gstreamer-app/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-app/src/auto/versions.txt
+++ b/gstreamer-app/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-app/sys/build.rs b/gstreamer-app/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-app/sys/build.rs
+++ b/gstreamer-app/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-app/sys/src/lib.rs b/gstreamer-app/sys/src/lib.rs
index c68fb6655..cf3b40af9 100644
--- a/gstreamer-app/sys/src/lib.rs
+++ b/gstreamer-app/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-app/sys/tests/abi.rs b/gstreamer-app/sys/tests/abi.rs
index 36f23134c..f980ba768 100644
--- a/gstreamer-app/sys/tests/abi.rs
+++ b/gstreamer-app/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_app_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-app/sys/tests/constant.c b/gstreamer-app/sys/tests/constant.c
index 75c35df7e..c1da953d8 100644
--- a/gstreamer-app/sys/tests/constant.c
+++ b/gstreamer-app/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-app/sys/tests/layout.c b/gstreamer-app/sys/tests/layout.c
index 1f5afb53e..223fdd16a 100644
--- a/gstreamer-app/sys/tests/layout.c
+++ b/gstreamer-app/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-audio/src/auto/versions.txt b/gstreamer-audio/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-audio/src/auto/versions.txt
+++ b/gstreamer-audio/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-audio/sys/build.rs b/gstreamer-audio/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-audio/sys/build.rs
+++ b/gstreamer-audio/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-audio/sys/src/lib.rs b/gstreamer-audio/sys/src/lib.rs
index c737847a2..4aa9b2372 100644
--- a/gstreamer-audio/sys/src/lib.rs
+++ b/gstreamer-audio/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-audio/sys/tests/abi.rs b/gstreamer-audio/sys/tests/abi.rs
index 6b82a5551..e0dc3a14b 100644
--- a/gstreamer-audio/sys/tests/abi.rs
+++ b/gstreamer-audio/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_audio_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-audio/sys/tests/constant.c b/gstreamer-audio/sys/tests/constant.c
index 614298c42..fadd8a3ae 100644
--- a/gstreamer-audio/sys/tests/constant.c
+++ b/gstreamer-audio/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-audio/sys/tests/layout.c b/gstreamer-audio/sys/tests/layout.c
index 50235872d..58a99a7f1 100644
--- a/gstreamer-audio/sys/tests/layout.c
+++ b/gstreamer-audio/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-base/src/auto/versions.txt b/gstreamer-base/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-base/src/auto/versions.txt
+++ b/gstreamer-base/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-base/sys/build.rs b/gstreamer-base/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-base/sys/build.rs
+++ b/gstreamer-base/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-base/sys/src/lib.rs b/gstreamer-base/sys/src/lib.rs
index b4c910a51..af99f9ac9 100644
--- a/gstreamer-base/sys/src/lib.rs
+++ b/gstreamer-base/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-base/sys/tests/abi.rs b/gstreamer-base/sys/tests/abi.rs
index df931b733..0fba212bb 100644
--- a/gstreamer-base/sys/tests/abi.rs
+++ b/gstreamer-base/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_base_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-base/sys/tests/constant.c b/gstreamer-base/sys/tests/constant.c
index 21b54da4d..876be7ef1 100644
--- a/gstreamer-base/sys/tests/constant.c
+++ b/gstreamer-base/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-base/sys/tests/layout.c b/gstreamer-base/sys/tests/layout.c
index 293e1285d..450307c1f 100644
--- a/gstreamer-base/sys/tests/layout.c
+++ b/gstreamer-base/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-check/src/auto/versions.txt b/gstreamer-check/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-check/src/auto/versions.txt
+++ b/gstreamer-check/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-check/sys/build.rs b/gstreamer-check/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-check/sys/build.rs
+++ b/gstreamer-check/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-check/sys/src/lib.rs b/gstreamer-check/sys/src/lib.rs
index a0cdbea27..b1ead1143 100644
--- a/gstreamer-check/sys/src/lib.rs
+++ b/gstreamer-check/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-check/sys/tests/abi.rs b/gstreamer-check/sys/tests/abi.rs
index 0e307e74d..b0e838cd4 100644
--- a/gstreamer-check/sys/tests/abi.rs
+++ b/gstreamer-check/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_check_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-check/sys/tests/constant.c b/gstreamer-check/sys/tests/constant.c
index c7638b378..f6a334d23 100644
--- a/gstreamer-check/sys/tests/constant.c
+++ b/gstreamer-check/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-check/sys/tests/layout.c b/gstreamer-check/sys/tests/layout.c
index 0e454e3e8..95a3710f3 100644
--- a/gstreamer-check/sys/tests/layout.c
+++ b/gstreamer-check/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-controller/src/auto/versions.txt b/gstreamer-controller/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-controller/src/auto/versions.txt
+++ b/gstreamer-controller/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-controller/sys/build.rs b/gstreamer-controller/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-controller/sys/build.rs
+++ b/gstreamer-controller/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-controller/sys/src/lib.rs b/gstreamer-controller/sys/src/lib.rs
index 0473bcbbd..8b951efd7 100644
--- a/gstreamer-controller/sys/src/lib.rs
+++ b/gstreamer-controller/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-controller/sys/tests/abi.rs b/gstreamer-controller/sys/tests/abi.rs
index 0b5de144a..c27296b7d 100644
--- a/gstreamer-controller/sys/tests/abi.rs
+++ b/gstreamer-controller/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_controller_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-controller/sys/tests/constant.c b/gstreamer-controller/sys/tests/constant.c
index 1cbef0046..105bdb45f 100644
--- a/gstreamer-controller/sys/tests/constant.c
+++ b/gstreamer-controller/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-controller/sys/tests/layout.c b/gstreamer-controller/sys/tests/layout.c
index 2abad6a73..3fa00e673 100644
--- a/gstreamer-controller/sys/tests/layout.c
+++ b/gstreamer-controller/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-editing-services/src/auto/group.rs b/gstreamer-editing-services/src/auto/group.rs
index 92ae6ae67..63f70c767 100644
--- a/gstreamer-editing-services/src/auto/group.rs
+++ b/gstreamer-editing-services/src/auto/group.rs
@@ -7,15 +7,7 @@ use crate::Container;
 use crate::Extractable;
 use crate::MetaContainer;
 use crate::TimelineElement;
-use glib::object::Cast;
-use glib::object::IsA;
-use glib::signal::connect_raw;
-use glib::signal::SignalHandlerId;
 use glib::translate::*;
-use glib::StaticType;
-use glib::ToValue;
-use std::boxed::Box as Box_;
-use std::mem::transmute;
 
 glib::wrapper! {
     #[doc(alias = "GESGroup")]
@@ -41,196 +33,3 @@ impl Default for Group {
         Self::new()
     }
 }
-
-pub trait GroupExt: 'static {
-    fn duration(&self) -> u64;
-
-    fn set_duration(&self, duration: u64);
-
-    #[doc(alias = "in-point")]
-    fn in_point(&self) -> u64;
-
-    #[doc(alias = "in-point")]
-    fn set_in_point(&self, in_point: u64);
-
-    #[doc(alias = "max-duration")]
-    fn max_duration(&self) -> u64;
-
-    #[doc(alias = "max-duration")]
-    fn set_max_duration(&self, max_duration: u64);
-
-    fn priority(&self) -> u32;
-
-    fn set_priority(&self, priority: u32);
-
-    fn start(&self) -> u64;
-
-    fn set_start(&self, start: u64);
-
-    #[doc(alias = "duration")]
-    fn connect_duration_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
-
-    #[doc(alias = "in-point")]
-    fn connect_in_point_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
-
-    #[doc(alias = "max-duration")]
-    fn connect_max_duration_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
-
-    #[doc(alias = "priority")]
-    fn connect_priority_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
-
-    #[doc(alias = "start")]
-    fn connect_start_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
-}
-
-impl<O: IsA<Group>> GroupExt for O {
-    fn duration(&self) -> u64 {
-        glib::ObjectExt::property(self.as_ref(), "duration")
-    }
-
-    fn set_duration(&self, duration: u64) {
-        glib::ObjectExt::set_property(self.as_ref(), "duration", &duration)
-    }
-
-    fn in_point(&self) -> u64 {
-        glib::ObjectExt::property(self.as_ref(), "in-point")
-    }
-
-    fn set_in_point(&self, in_point: u64) {
-        glib::ObjectExt::set_property(self.as_ref(), "in-point", &in_point)
-    }
-
-    fn max_duration(&self) -> u64 {
-        glib::ObjectExt::property(self.as_ref(), "max-duration")
-    }
-
-    fn set_max_duration(&self, max_duration: u64) {
-        glib::ObjectExt::set_property(self.as_ref(), "max-duration", &max_duration)
-    }
-
-    fn priority(&self) -> u32 {
-        glib::ObjectExt::property(self.as_ref(), "priority")
-    }
-
-    fn set_priority(&self, priority: u32) {
-        glib::ObjectExt::set_property(self.as_ref(), "priority", &priority)
-    }
-
-    fn start(&self) -> u64 {
-        glib::ObjectExt::property(self.as_ref(), "start")
-    }
-
-    fn set_start(&self, start: u64) {
-        glib::ObjectExt::set_property(self.as_ref(), "start", &start)
-    }
-
-    fn connect_duration_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_duration_trampoline<P: IsA<Group>, F: Fn(&P) + 'static>(
-            this: *mut ffi::GESGroup,
-            _param_spec: glib::ffi::gpointer,
-            f: glib::ffi::gpointer,
-        ) {
-            let f: &F = &*(f as *const F);
-            f(Group::from_glib_borrow(this).unsafe_cast_ref())
-        }
-        unsafe {
-            let f: Box_<F> = Box_::new(f);
-            connect_raw(
-                self.as_ptr() as *mut _,
-                b"notify::duration\0".as_ptr() as *const _,
-                Some(transmute::<_, unsafe extern "C" fn()>(
-                    notify_duration_trampoline::<Self, F> as *const (),
-                )),
-                Box_::into_raw(f),
-            )
-        }
-    }
-
-    fn connect_in_point_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_in_point_trampoline<P: IsA<Group>, F: Fn(&P) + 'static>(
-            this: *mut ffi::GESGroup,
-            _param_spec: glib::ffi::gpointer,
-            f: glib::ffi::gpointer,
-        ) {
-            let f: &F = &*(f as *const F);
-            f(Group::from_glib_borrow(this).unsafe_cast_ref())
-        }
-        unsafe {
-            let f: Box_<F> = Box_::new(f);
-            connect_raw(
-                self.as_ptr() as *mut _,
-                b"notify::in-point\0".as_ptr() as *const _,
-                Some(transmute::<_, unsafe extern "C" fn()>(
-                    notify_in_point_trampoline::<Self, F> as *const (),
-                )),
-                Box_::into_raw(f),
-            )
-        }
-    }
-
-    fn connect_max_duration_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_max_duration_trampoline<P: IsA<Group>, F: Fn(&P) + 'static>(
-            this: *mut ffi::GESGroup,
-            _param_spec: glib::ffi::gpointer,
-            f: glib::ffi::gpointer,
-        ) {
-            let f: &F = &*(f as *const F);
-            f(Group::from_glib_borrow(this).unsafe_cast_ref())
-        }
-        unsafe {
-            let f: Box_<F> = Box_::new(f);
-            connect_raw(
-                self.as_ptr() as *mut _,
-                b"notify::max-duration\0".as_ptr() as *const _,
-                Some(transmute::<_, unsafe extern "C" fn()>(
-                    notify_max_duration_trampoline::<Self, F> as *const (),
-                )),
-                Box_::into_raw(f),
-            )
-        }
-    }
-
-    fn connect_priority_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_priority_trampoline<P: IsA<Group>, F: Fn(&P) + 'static>(
-            this: *mut ffi::GESGroup,
-            _param_spec: glib::ffi::gpointer,
-            f: glib::ffi::gpointer,
-        ) {
-            let f: &F = &*(f as *const F);
-            f(Group::from_glib_borrow(this).unsafe_cast_ref())
-        }
-        unsafe {
-            let f: Box_<F> = Box_::new(f);
-            connect_raw(
-                self.as_ptr() as *mut _,
-                b"notify::priority\0".as_ptr() as *const _,
-                Some(transmute::<_, unsafe extern "C" fn()>(
-                    notify_priority_trampoline::<Self, F> as *const (),
-                )),
-                Box_::into_raw(f),
-            )
-        }
-    }
-
-    fn connect_start_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_start_trampoline<P: IsA<Group>, F: Fn(&P) + 'static>(
-            this: *mut ffi::GESGroup,
-            _param_spec: glib::ffi::gpointer,
-            f: glib::ffi::gpointer,
-        ) {
-            let f: &F = &*(f as *const F);
-            f(Group::from_glib_borrow(this).unsafe_cast_ref())
-        }
-        unsafe {
-            let f: Box_<F> = Box_::new(f);
-            connect_raw(
-                self.as_ptr() as *mut _,
-                b"notify::start\0".as_ptr() as *const _,
-                Some(transmute::<_, unsafe extern "C" fn()>(
-                    notify_start_trampoline::<Self, F> as *const (),
-                )),
-                Box_::into_raw(f),
-            )
-        }
-    }
-}
diff --git a/gstreamer-editing-services/src/auto/mod.rs b/gstreamer-editing-services/src/auto/mod.rs
index 384d89477..e0753151a 100644
--- a/gstreamer-editing-services/src/auto/mod.rs
+++ b/gstreamer-editing-services/src/auto/mod.rs
@@ -219,7 +219,6 @@ pub mod traits {
     pub use super::effect_clip::EffectClipExt;
     pub use super::extractable::ExtractableExt;
     pub use super::formatter::FormatterExt;
-    pub use super::group::GroupExt;
     #[cfg_attr(feature = "v1_18", deprecated = "Since 1.18")]
     pub use super::image_source::ImageSourceExt;
     pub use super::layer::LayerExt;
diff --git a/gstreamer-editing-services/src/auto/uri_clip.rs b/gstreamer-editing-services/src/auto/uri_clip.rs
index 9ecda9fbf..c35367e27 100644
--- a/gstreamer-editing-services/src/auto/uri_clip.rs
+++ b/gstreamer-editing-services/src/auto/uri_clip.rs
@@ -61,9 +61,6 @@ pub trait UriClipExt: 'static {
 
     #[doc(alias = "mute")]
     fn connect_mute_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
-
-    #[doc(alias = "supported-formats")]
-    fn connect_supported_formats_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 }
 
 impl<O: IsA<UriClip>> UriClipExt for O {
@@ -134,29 +131,4 @@ impl<O: IsA<UriClip>> UriClipExt for O {
             )
         }
     }
-
-    fn connect_supported_formats_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
-        unsafe extern "C" fn notify_supported_formats_trampoline<
-            P: IsA<UriClip>,
-            F: Fn(&P) + 'static,
-        >(
-            this: *mut ffi::GESUriClip,
-            _param_spec: glib::ffi::gpointer,
-            f: glib::ffi::gpointer,
-        ) {
-            let f: &F = &*(f as *const F);
-            f(UriClip::from_glib_borrow(this).unsafe_cast_ref())
-        }
-        unsafe {
-            let f: Box_<F> = Box_::new(f);
-            connect_raw(
-                self.as_ptr() as *mut _,
-                b"notify::supported-formats\0".as_ptr() as *const _,
-                Some(transmute::<_, unsafe extern "C" fn()>(
-                    notify_supported_formats_trampoline::<Self, F> as *const (),
-                )),
-                Box_::into_raw(f),
-            )
-        }
-    }
 }
diff --git a/gstreamer-editing-services/src/auto/versions.txt b/gstreamer-editing-services/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-editing-services/src/auto/versions.txt
+++ b/gstreamer-editing-services/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-editing-services/sys/build.rs b/gstreamer-editing-services/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-editing-services/sys/build.rs
+++ b/gstreamer-editing-services/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-editing-services/sys/src/lib.rs b/gstreamer-editing-services/sys/src/lib.rs
index d510d9dc6..b1f2c1b4a 100644
--- a/gstreamer-editing-services/sys/src/lib.rs
+++ b/gstreamer-editing-services/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-editing-services/sys/tests/abi.rs b/gstreamer-editing-services/sys/tests/abi.rs
index 31e911931..57976e449 100644
--- a/gstreamer-editing-services/sys/tests/abi.rs
+++ b/gstreamer-editing-services/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_editing_services_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-editing-services/sys/tests/constant.c b/gstreamer-editing-services/sys/tests/constant.c
index 63d4db551..5d656ed2e 100644
--- a/gstreamer-editing-services/sys/tests/constant.c
+++ b/gstreamer-editing-services/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-editing-services/sys/tests/layout.c b/gstreamer-editing-services/sys/tests/layout.c
index 38c959703..1545654a2 100644
--- a/gstreamer-editing-services/sys/tests/layout.c
+++ b/gstreamer-editing-services/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-gl/egl/src/auto/versions.txt b/gstreamer-gl/egl/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-gl/egl/src/auto/versions.txt
+++ b/gstreamer-gl/egl/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-gl/egl/sys/build.rs b/gstreamer-gl/egl/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-gl/egl/sys/build.rs
+++ b/gstreamer-gl/egl/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-gl/egl/sys/src/lib.rs b/gstreamer-gl/egl/sys/src/lib.rs
index 287a94b49..4b57395c5 100644
--- a/gstreamer-gl/egl/sys/src/lib.rs
+++ b/gstreamer-gl/egl/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-gl/egl/sys/tests/abi.rs b/gstreamer-gl/egl/sys/tests/abi.rs
index 57cb40f4a..2c0621209 100644
--- a/gstreamer-gl/egl/sys/tests/abi.rs
+++ b/gstreamer-gl/egl/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_gl_egl_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-gl/egl/sys/tests/constant.c b/gstreamer-gl/egl/sys/tests/constant.c
index 93a9bfc88..561afa3d2 100644
--- a/gstreamer-gl/egl/sys/tests/constant.c
+++ b/gstreamer-gl/egl/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-gl/egl/sys/tests/layout.c b/gstreamer-gl/egl/sys/tests/layout.c
index 319c9184c..81c0d3b5a 100644
--- a/gstreamer-gl/egl/sys/tests/layout.c
+++ b/gstreamer-gl/egl/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-gl/src/auto/versions.txt b/gstreamer-gl/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-gl/src/auto/versions.txt
+++ b/gstreamer-gl/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-gl/sys/build.rs b/gstreamer-gl/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-gl/sys/build.rs
+++ b/gstreamer-gl/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-gl/sys/src/lib.rs b/gstreamer-gl/sys/src/lib.rs
index 38f0b343e..bb2e5e294 100644
--- a/gstreamer-gl/sys/src/lib.rs
+++ b/gstreamer-gl/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-gl/sys/tests/abi.rs b/gstreamer-gl/sys/tests/abi.rs
index 70441198d..487ca6750 100644
--- a/gstreamer-gl/sys/tests/abi.rs
+++ b/gstreamer-gl/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_gl_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-gl/sys/tests/constant.c b/gstreamer-gl/sys/tests/constant.c
index 857f0edd8..ba29c81ed 100644
--- a/gstreamer-gl/sys/tests/constant.c
+++ b/gstreamer-gl/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-gl/sys/tests/layout.c b/gstreamer-gl/sys/tests/layout.c
index e7d527417..9ea8e69fe 100644
--- a/gstreamer-gl/sys/tests/layout.c
+++ b/gstreamer-gl/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-gl/wayland/src/auto/versions.txt b/gstreamer-gl/wayland/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-gl/wayland/src/auto/versions.txt
+++ b/gstreamer-gl/wayland/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-gl/wayland/sys/build.rs b/gstreamer-gl/wayland/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-gl/wayland/sys/build.rs
+++ b/gstreamer-gl/wayland/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-gl/wayland/sys/src/lib.rs b/gstreamer-gl/wayland/sys/src/lib.rs
index 70fc44d90..b78b8760d 100644
--- a/gstreamer-gl/wayland/sys/src/lib.rs
+++ b/gstreamer-gl/wayland/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-gl/wayland/sys/tests/abi.rs b/gstreamer-gl/wayland/sys/tests/abi.rs
index 482964981..cc90afaa8 100644
--- a/gstreamer-gl/wayland/sys/tests/abi.rs
+++ b/gstreamer-gl/wayland/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_gl_wayland_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-gl/wayland/sys/tests/constant.c b/gstreamer-gl/wayland/sys/tests/constant.c
index c7638b378..f6a334d23 100644
--- a/gstreamer-gl/wayland/sys/tests/constant.c
+++ b/gstreamer-gl/wayland/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-gl/wayland/sys/tests/layout.c b/gstreamer-gl/wayland/sys/tests/layout.c
index 597c88433..d8e7ca2e5 100644
--- a/gstreamer-gl/wayland/sys/tests/layout.c
+++ b/gstreamer-gl/wayland/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-gl/x11/src/auto/versions.txt b/gstreamer-gl/x11/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-gl/x11/src/auto/versions.txt
+++ b/gstreamer-gl/x11/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-gl/x11/sys/build.rs b/gstreamer-gl/x11/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-gl/x11/sys/build.rs
+++ b/gstreamer-gl/x11/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-gl/x11/sys/src/lib.rs b/gstreamer-gl/x11/sys/src/lib.rs
index f31dbbd51..df3847516 100644
--- a/gstreamer-gl/x11/sys/src/lib.rs
+++ b/gstreamer-gl/x11/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-gl/x11/sys/tests/abi.rs b/gstreamer-gl/x11/sys/tests/abi.rs
index fb6e6d5bb..2864563af 100644
--- a/gstreamer-gl/x11/sys/tests/abi.rs
+++ b/gstreamer-gl/x11/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_gl_x11_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-gl/x11/sys/tests/constant.c b/gstreamer-gl/x11/sys/tests/constant.c
index c7638b378..f6a334d23 100644
--- a/gstreamer-gl/x11/sys/tests/constant.c
+++ b/gstreamer-gl/x11/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-gl/x11/sys/tests/layout.c b/gstreamer-gl/x11/sys/tests/layout.c
index 61cc24969..d10a2a1e1 100644
--- a/gstreamer-gl/x11/sys/tests/layout.c
+++ b/gstreamer-gl/x11/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-mpegts/sys/build.rs b/gstreamer-mpegts/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-mpegts/sys/build.rs
+++ b/gstreamer-mpegts/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-mpegts/sys/src/lib.rs b/gstreamer-mpegts/sys/src/lib.rs
index b847962a3..af79fd9b4 100644
--- a/gstreamer-mpegts/sys/src/lib.rs
+++ b/gstreamer-mpegts/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-mpegts/sys/tests/abi.rs b/gstreamer-mpegts/sys/tests/abi.rs
index 1e9cd57a1..290f541d0 100644
--- a/gstreamer-mpegts/sys/tests/abi.rs
+++ b/gstreamer-mpegts/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_mpegts_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-mpegts/sys/tests/constant.c b/gstreamer-mpegts/sys/tests/constant.c
index 16bdd80d0..1bade6ef9 100644
--- a/gstreamer-mpegts/sys/tests/constant.c
+++ b/gstreamer-mpegts/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-mpegts/sys/tests/layout.c b/gstreamer-mpegts/sys/tests/layout.c
index fd01f9969..da8f05cc2 100644
--- a/gstreamer-mpegts/sys/tests/layout.c
+++ b/gstreamer-mpegts/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-net/src/auto/versions.txt b/gstreamer-net/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-net/src/auto/versions.txt
+++ b/gstreamer-net/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-net/sys/build.rs b/gstreamer-net/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-net/sys/build.rs
+++ b/gstreamer-net/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-net/sys/src/lib.rs b/gstreamer-net/sys/src/lib.rs
index 9e6ac512f..0471f4895 100644
--- a/gstreamer-net/sys/src/lib.rs
+++ b/gstreamer-net/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-net/sys/tests/abi.rs b/gstreamer-net/sys/tests/abi.rs
index f02595865..0728059ff 100644
--- a/gstreamer-net/sys/tests/abi.rs
+++ b/gstreamer-net/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_net_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-net/sys/tests/constant.c b/gstreamer-net/sys/tests/constant.c
index 8658815c1..3de3e991a 100644
--- a/gstreamer-net/sys/tests/constant.c
+++ b/gstreamer-net/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-net/sys/tests/layout.c b/gstreamer-net/sys/tests/layout.c
index 5468e4bc3..37b39abed 100644
--- a/gstreamer-net/sys/tests/layout.c
+++ b/gstreamer-net/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-pbutils/src/auto/versions.txt b/gstreamer-pbutils/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-pbutils/src/auto/versions.txt
+++ b/gstreamer-pbutils/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-pbutils/sys/build.rs b/gstreamer-pbutils/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-pbutils/sys/build.rs
+++ b/gstreamer-pbutils/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-pbutils/sys/src/lib.rs b/gstreamer-pbutils/sys/src/lib.rs
index 64cde50f0..0e90ac30d 100644
--- a/gstreamer-pbutils/sys/src/lib.rs
+++ b/gstreamer-pbutils/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-pbutils/sys/tests/abi.rs b/gstreamer-pbutils/sys/tests/abi.rs
index c5fac18f4..af78ad44e 100644
--- a/gstreamer-pbutils/sys/tests/abi.rs
+++ b/gstreamer-pbutils/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_pbutils_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-pbutils/sys/tests/constant.c b/gstreamer-pbutils/sys/tests/constant.c
index 017b5a144..5bdc5466c 100644
--- a/gstreamer-pbutils/sys/tests/constant.c
+++ b/gstreamer-pbutils/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-pbutils/sys/tests/layout.c b/gstreamer-pbutils/sys/tests/layout.c
index cd3d57071..69a6cac0b 100644
--- a/gstreamer-pbutils/sys/tests/layout.c
+++ b/gstreamer-pbutils/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-play/src/auto/versions.txt b/gstreamer-play/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-play/src/auto/versions.txt
+++ b/gstreamer-play/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-play/sys/build.rs b/gstreamer-play/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-play/sys/build.rs
+++ b/gstreamer-play/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-play/sys/src/lib.rs b/gstreamer-play/sys/src/lib.rs
index 91b520435..573606b95 100644
--- a/gstreamer-play/sys/src/lib.rs
+++ b/gstreamer-play/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-play/sys/tests/abi.rs b/gstreamer-play/sys/tests/abi.rs
index 9aafb566f..e70f8a4e4 100644
--- a/gstreamer-play/sys/tests/abi.rs
+++ b/gstreamer-play/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_play_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-play/sys/tests/constant.c b/gstreamer-play/sys/tests/constant.c
index 4af8be1cc..aef37a4a3 100644
--- a/gstreamer-play/sys/tests/constant.c
+++ b/gstreamer-play/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-play/sys/tests/layout.c b/gstreamer-play/sys/tests/layout.c
index 112bec264..f20a36877 100644
--- a/gstreamer-play/sys/tests/layout.c
+++ b/gstreamer-play/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-player/src/auto/versions.txt b/gstreamer-player/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-player/src/auto/versions.txt
+++ b/gstreamer-player/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-player/sys/build.rs b/gstreamer-player/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-player/sys/build.rs
+++ b/gstreamer-player/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-player/sys/src/lib.rs b/gstreamer-player/sys/src/lib.rs
index de9faf6e8..f191829c3 100644
--- a/gstreamer-player/sys/src/lib.rs
+++ b/gstreamer-player/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-player/sys/tests/abi.rs b/gstreamer-player/sys/tests/abi.rs
index 11c363f57..970b500f3 100644
--- a/gstreamer-player/sys/tests/abi.rs
+++ b/gstreamer-player/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_player_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-player/sys/tests/constant.c b/gstreamer-player/sys/tests/constant.c
index c56b054b4..e8b0a9467 100644
--- a/gstreamer-player/sys/tests/constant.c
+++ b/gstreamer-player/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-player/sys/tests/layout.c b/gstreamer-player/sys/tests/layout.c
index 39cf5fd2f..aaa8ac00d 100644
--- a/gstreamer-player/sys/tests/layout.c
+++ b/gstreamer-player/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-rtp/src/auto/versions.txt b/gstreamer-rtp/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-rtp/src/auto/versions.txt
+++ b/gstreamer-rtp/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-rtp/sys/build.rs b/gstreamer-rtp/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-rtp/sys/build.rs
+++ b/gstreamer-rtp/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-rtp/sys/src/lib.rs b/gstreamer-rtp/sys/src/lib.rs
index 0ff59daa1..5bad20d08 100644
--- a/gstreamer-rtp/sys/src/lib.rs
+++ b/gstreamer-rtp/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-rtp/sys/tests/abi.rs b/gstreamer-rtp/sys/tests/abi.rs
index dc1b68177..8314e0937 100644
--- a/gstreamer-rtp/sys/tests/abi.rs
+++ b/gstreamer-rtp/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_rtp_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-rtp/sys/tests/constant.c b/gstreamer-rtp/sys/tests/constant.c
index 31180cbde..ef0bd39f3 100644
--- a/gstreamer-rtp/sys/tests/constant.c
+++ b/gstreamer-rtp/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-rtp/sys/tests/layout.c b/gstreamer-rtp/sys/tests/layout.c
index 5875afa36..bdbdf5b3c 100644
--- a/gstreamer-rtp/sys/tests/layout.c
+++ b/gstreamer-rtp/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-rtsp-server/src/auto/versions.txt b/gstreamer-rtsp-server/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-rtsp-server/src/auto/versions.txt
+++ b/gstreamer-rtsp-server/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-rtsp-server/sys/build.rs b/gstreamer-rtsp-server/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-rtsp-server/sys/build.rs
+++ b/gstreamer-rtsp-server/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-rtsp-server/sys/src/lib.rs b/gstreamer-rtsp-server/sys/src/lib.rs
index 8865c6174..c81c1fcfc 100644
--- a/gstreamer-rtsp-server/sys/src/lib.rs
+++ b/gstreamer-rtsp-server/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-rtsp-server/sys/tests/abi.rs b/gstreamer-rtsp-server/sys/tests/abi.rs
index f6e1cc034..3a36ad6c2 100644
--- a/gstreamer-rtsp-server/sys/tests/abi.rs
+++ b/gstreamer-rtsp-server/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_rtsp_server_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-rtsp-server/sys/tests/constant.c b/gstreamer-rtsp-server/sys/tests/constant.c
index 00e8004cb..d05c2b95c 100644
--- a/gstreamer-rtsp-server/sys/tests/constant.c
+++ b/gstreamer-rtsp-server/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-rtsp-server/sys/tests/layout.c b/gstreamer-rtsp-server/sys/tests/layout.c
index 309bb275e..90b6d4ace 100644
--- a/gstreamer-rtsp-server/sys/tests/layout.c
+++ b/gstreamer-rtsp-server/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-rtsp/src/auto/versions.txt b/gstreamer-rtsp/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-rtsp/src/auto/versions.txt
+++ b/gstreamer-rtsp/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-rtsp/sys/build.rs b/gstreamer-rtsp/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-rtsp/sys/build.rs
+++ b/gstreamer-rtsp/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-rtsp/sys/src/lib.rs b/gstreamer-rtsp/sys/src/lib.rs
index 587db4b88..757e388cf 100644
--- a/gstreamer-rtsp/sys/src/lib.rs
+++ b/gstreamer-rtsp/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-rtsp/sys/tests/abi.rs b/gstreamer-rtsp/sys/tests/abi.rs
index d0331762d..352b3dade 100644
--- a/gstreamer-rtsp/sys/tests/abi.rs
+++ b/gstreamer-rtsp/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_rtsp_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-rtsp/sys/tests/constant.c b/gstreamer-rtsp/sys/tests/constant.c
index db62d1dde..351b99615 100644
--- a/gstreamer-rtsp/sys/tests/constant.c
+++ b/gstreamer-rtsp/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-rtsp/sys/tests/layout.c b/gstreamer-rtsp/sys/tests/layout.c
index 22519b043..96b63c18b 100644
--- a/gstreamer-rtsp/sys/tests/layout.c
+++ b/gstreamer-rtsp/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-sdp/src/auto/versions.txt b/gstreamer-sdp/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-sdp/src/auto/versions.txt
+++ b/gstreamer-sdp/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-sdp/sys/build.rs b/gstreamer-sdp/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-sdp/sys/build.rs
+++ b/gstreamer-sdp/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-sdp/sys/src/lib.rs b/gstreamer-sdp/sys/src/lib.rs
index ebcb7f287..2e7c65cb3 100644
--- a/gstreamer-sdp/sys/src/lib.rs
+++ b/gstreamer-sdp/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-sdp/sys/tests/abi.rs b/gstreamer-sdp/sys/tests/abi.rs
index dcb71e159..d90764ee5 100644
--- a/gstreamer-sdp/sys/tests/abi.rs
+++ b/gstreamer-sdp/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_sdp_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-sdp/sys/tests/constant.c b/gstreamer-sdp/sys/tests/constant.c
index d76d8d3f8..45a56a166 100644
--- a/gstreamer-sdp/sys/tests/constant.c
+++ b/gstreamer-sdp/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-sdp/sys/tests/layout.c b/gstreamer-sdp/sys/tests/layout.c
index a6f7e4ead..0cdd954b2 100644
--- a/gstreamer-sdp/sys/tests/layout.c
+++ b/gstreamer-sdp/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-tag/sys/build.rs b/gstreamer-tag/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-tag/sys/build.rs
+++ b/gstreamer-tag/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-tag/sys/src/lib.rs b/gstreamer-tag/sys/src/lib.rs
index 769bd4f87..9e65453cb 100644
--- a/gstreamer-tag/sys/src/lib.rs
+++ b/gstreamer-tag/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-tag/sys/tests/abi.rs b/gstreamer-tag/sys/tests/abi.rs
index 17bac4034..5287bed1f 100644
--- a/gstreamer-tag/sys/tests/abi.rs
+++ b/gstreamer-tag/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_tag_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-tag/sys/tests/constant.c b/gstreamer-tag/sys/tests/constant.c
index 368a4b18b..ff39a8b50 100644
--- a/gstreamer-tag/sys/tests/constant.c
+++ b/gstreamer-tag/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-tag/sys/tests/layout.c b/gstreamer-tag/sys/tests/layout.c
index 8f4bbad1b..4d4c6db91 100644
--- a/gstreamer-tag/sys/tests/layout.c
+++ b/gstreamer-tag/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-video/src/auto/enums.rs b/gstreamer-video/src/auto/enums.rs
index e6434623d..e162a4106 100644
--- a/gstreamer-video/src/auto/enums.rs
+++ b/gstreamer-video/src/auto/enums.rs
@@ -1135,6 +1135,19 @@ impl VideoColorPrimaries {
     //    unsafe { TODO: call ffi:gst_video_color_primaries_get_info() }
     //}
 
+    #[cfg(any(feature = "v1_22", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_22")))]
+    #[doc(alias = "gst_video_color_primaries_is_equivalent")]
+    pub fn is_equivalent(self, other: VideoColorPrimaries) -> bool {
+        assert_initialized_main_thread!();
+        unsafe {
+            from_glib(ffi::gst_video_color_primaries_is_equivalent(
+                self.into_glib(),
+                other.into_glib(),
+            ))
+        }
+    }
+
     #[cfg(any(feature = "v1_18", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))]
     #[doc(alias = "gst_video_color_primaries_to_iso")]
diff --git a/gstreamer-video/src/auto/versions.txt b/gstreamer-video/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-video/src/auto/versions.txt
+++ b/gstreamer-video/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-video/sys/build.rs b/gstreamer-video/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-video/sys/build.rs
+++ b/gstreamer-video/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-video/sys/src/lib.rs b/gstreamer-video/sys/src/lib.rs
index 999eb5a71..e320660fe 100644
--- a/gstreamer-video/sys/src/lib.rs
+++ b/gstreamer-video/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -2549,6 +2549,12 @@ extern "C" {
     pub fn gst_video_color_primaries_get_info(
         primaries: GstVideoColorPrimaries,
     ) -> *const GstVideoColorPrimariesInfo;
+    #[cfg(any(feature = "v1_22", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_22")))]
+    pub fn gst_video_color_primaries_is_equivalent(
+        primaries: GstVideoColorPrimaries,
+        other: GstVideoColorPrimaries,
+    ) -> gboolean;
     #[cfg(any(feature = "v1_18", feature = "dox"))]
     #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))]
     pub fn gst_video_color_primaries_to_iso(primaries: GstVideoColorPrimaries) -> c_uint;
@@ -2899,6 +2905,14 @@ extern "C" {
         cinfo: *const GstVideoColorimetry,
         other: *const GstVideoColorimetry,
     ) -> gboolean;
+    #[cfg(any(feature = "v1_22", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_22")))]
+    pub fn gst_video_colorimetry_is_equivalent(
+        cinfo: *const GstVideoColorimetry,
+        bitdepth: c_uint,
+        other: *const GstVideoColorimetry,
+        other_bitdepth: c_uint,
+    ) -> gboolean;
     pub fn gst_video_colorimetry_matches(
         cinfo: *const GstVideoColorimetry,
         color: *const c_char,
diff --git a/gstreamer-video/sys/tests/abi.rs b/gstreamer-video/sys/tests/abi.rs
index 2086dcb20..d13efd486 100644
--- a/gstreamer-video/sys/tests/abi.rs
+++ b/gstreamer-video/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_video_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-video/sys/tests/constant.c b/gstreamer-video/sys/tests/constant.c
index fa3f789ae..4a2083064 100644
--- a/gstreamer-video/sys/tests/constant.c
+++ b/gstreamer-video/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-video/sys/tests/layout.c b/gstreamer-video/sys/tests/layout.c
index 2a23449a3..5fa48f4b8 100644
--- a/gstreamer-video/sys/tests/layout.c
+++ b/gstreamer-video/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-webrtc/src/auto/versions.txt b/gstreamer-webrtc/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer-webrtc/src/auto/versions.txt
+++ b/gstreamer-webrtc/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer-webrtc/sys/build.rs b/gstreamer-webrtc/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer-webrtc/sys/build.rs
+++ b/gstreamer-webrtc/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer-webrtc/sys/src/lib.rs b/gstreamer-webrtc/sys/src/lib.rs
index f8ee2b172..a1eef2918 100644
--- a/gstreamer-webrtc/sys/src/lib.rs
+++ b/gstreamer-webrtc/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer-webrtc/sys/tests/abi.rs b/gstreamer-webrtc/sys/tests/abi.rs
index 2518da150..59649681b 100644
--- a/gstreamer-webrtc/sys/tests/abi.rs
+++ b/gstreamer-webrtc/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_webrtc_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer-webrtc/sys/tests/constant.c b/gstreamer-webrtc/sys/tests/constant.c
index 3ee94292b..c6431020d 100644
--- a/gstreamer-webrtc/sys/tests/constant.c
+++ b/gstreamer-webrtc/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-webrtc/sys/tests/layout.c b/gstreamer-webrtc/sys/tests/layout.c
index 7b7e3460b..1c72f73ff 100644
--- a/gstreamer-webrtc/sys/tests/layout.c
+++ b/gstreamer-webrtc/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer/src/auto/versions.txt b/gstreamer/src/auto/versions.txt
index cdd3a568d..655f598e1 100644
--- a/gstreamer/src/auto/versions.txt
+++ b/gstreamer/src/auto/versions.txt
@@ -1,3 +1,3 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
diff --git a/gstreamer/sys/build.rs b/gstreamer/sys/build.rs
index 5ab8625b2..d65a73e3c 100644
--- a/gstreamer/sys/build.rs
+++ b/gstreamer/sys/build.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #[cfg(not(feature = "dox"))]
diff --git a/gstreamer/sys/src/lib.rs b/gstreamer/sys/src/lib.rs
index 9dca1733d..157bd1268 100644
--- a/gstreamer/sys/src/lib.rs
+++ b/gstreamer/sys/src/lib.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
diff --git a/gstreamer/sys/tests/abi.rs b/gstreamer/sys/tests/abi.rs
index ac2d796d6..2f49dafa7 100644
--- a/gstreamer/sys/tests/abi.rs
+++ b/gstreamer/sys/tests/abi.rs
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 use gstreamer_sys::*;
@@ -116,13 +116,8 @@ fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
     for l in get_c_output("constant").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let value = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse value");
-        c_constants.push((name, value));
+        let (name, value) = l.split_once(';').expect("Missing ';' separator");
+        c_constants.push((name.to_owned(), value.to_owned()));
     }
 
     let mut results = Results::default();
@@ -157,17 +152,11 @@ fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 
     for l in get_c_output("layout").unwrap().lines() {
-        let mut words = l.trim().split(';');
-        let name = words.next().expect("Failed to parse name").to_owned();
-        let size = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse size");
-        let alignment = words
-            .next()
-            .and_then(|s| s.parse().ok())
-            .expect("Failed to parse alignment");
-        c_layouts.push((name, Layout { size, alignment }));
+        let (name, value) = l.split_once(';').expect("Missing first ';' separator");
+        let (size, alignment) = value.split_once(';').expect("Missing second ';' separator");
+        let size = size.parse().expect("Failed to parse size");
+        let alignment = alignment.parse().expect("Failed to parse alignment");
+        c_layouts.push((name.to_owned(), Layout { size, alignment }));
     }
 
     let mut results = Results::default();
diff --git a/gstreamer/sys/tests/constant.c b/gstreamer/sys/tests/constant.c
index 171beef2f..925bc1d41 100644
--- a/gstreamer/sys/tests/constant.c
+++ b/gstreamer/sys/tests/constant.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer/sys/tests/layout.c b/gstreamer/sys/tests/layout.c
index cbe04f061..47f17780f 100644
--- a/gstreamer/sys/tests/layout.c
+++ b/gstreamer/sys/tests/layout.c
@@ -1,6 +1,6 @@
-// Generated by gir (https://github.com/gtk-rs/gir @ 1201a74cd03e)
-// from gir-files (https://github.com/gtk-rs/gir-files @ faebfb303ca6)
-// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 51549a4f39c8)
+// Generated by gir (https://github.com/gtk-rs/gir @ 74b6e47217b7)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 9e945716ad4c)
+// from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ d031d210fe4e)
 // DO NOT EDIT
 
 #include "manual.h"