From f9ff027a64350d9c86eba14b6f2d5132703b05d3 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Tue, 30 Oct 2018 14:42:25 +0200 Subject: [PATCH] gir: Ignore VERSION constants --- Gir_Gst.toml | 7 +++++++ Gir_GstPbutils.toml | 7 +++++++ gstreamer-pbutils-sys/src/lib.rs | 4 ---- gstreamer-pbutils-sys/tests/abi.rs | 4 ---- gstreamer-sys/src/lib.rs | 4 ---- gstreamer-sys/tests/abi.rs | 4 ---- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Gir_Gst.toml b/Gir_Gst.toml index 0de5038de..21468e4a6 100644 --- a/Gir_Gst.toml +++ b/Gir_Gst.toml @@ -6,6 +6,13 @@ min_cfg_version = "1.0" target_path = "gstreamer-sys" work_mode = "sys" +ignore = [ + "Gst.VERSION_MAJOR", + "Gst.VERSION_MINOR", + "Gst.VERSION_MICRO", + "Gst.VERSION_NANO", +] + external_libraries = [ "GLib", "GObject", diff --git a/Gir_GstPbutils.toml b/Gir_GstPbutils.toml index cd556da18..af47176d1 100644 --- a/Gir_GstPbutils.toml +++ b/Gir_GstPbutils.toml @@ -6,6 +6,13 @@ min_cfg_version = "1.0" target_path = "gstreamer-pbutils-sys" work_mode = "sys" +ignore = [ + "GstPbutils.PLUGINS_BASE_VERSION_MAJOR", + "GstPbutils.PLUGINS_BASE_VERSION_MINOR", + "GstPbutils.PLUGINS_BASE_VERSION_MICRO", + "GstPbutils.PLUGINS_BASE_VERSION_NANO" +] + external_libraries = [ "GLib", "GObject", diff --git a/gstreamer-pbutils-sys/src/lib.rs b/gstreamer-pbutils-sys/src/lib.rs index b22ab9a0c..f3af403ca 100644 --- a/gstreamer-pbutils-sys/src/lib.rs +++ b/gstreamer-pbutils-sys/src/lib.rs @@ -69,10 +69,6 @@ pub const GST_ENCODING_CATEGORY_DEVICE: *const c_char = b"device\0" as *const u8 pub const GST_ENCODING_CATEGORY_FILE_EXTENSION: *const c_char = b"file-extension\0" as *const u8 as *const c_char; pub const GST_ENCODING_CATEGORY_ONLINE_SERVICE: *const c_char = b"online-service\0" as *const u8 as *const c_char; pub const GST_ENCODING_CATEGORY_STORAGE_EDITING: *const c_char = b"storage-editing\0" as *const u8 as *const c_char; -pub const GST_PLUGINS_BASE_VERSION_MAJOR: c_int = 1; -pub const GST_PLUGINS_BASE_VERSION_MICRO: c_int = 2; -pub const GST_PLUGINS_BASE_VERSION_MINOR: c_int = 14; -pub const GST_PLUGINS_BASE_VERSION_NANO: c_int = 0; // Flags pub type GstDiscovererSerializeFlags = c_uint; diff --git a/gstreamer-pbutils-sys/tests/abi.rs b/gstreamer-pbutils-sys/tests/abi.rs index 76b7c5eb0..6ccb1fcd9 100644 --- a/gstreamer-pbutils-sys/tests/abi.rs +++ b/gstreamer-pbutils-sys/tests/abi.rs @@ -286,10 +286,6 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("GST_INSTALL_PLUGINS_STARTED_OK", "200"), ("GST_INSTALL_PLUGINS_SUCCESS", "0"), ("GST_INSTALL_PLUGINS_USER_ABORT", "4"), - ("GST_PLUGINS_BASE_VERSION_MAJOR", "1"), - ("GST_PLUGINS_BASE_VERSION_MICRO", "2"), - ("GST_PLUGINS_BASE_VERSION_MINOR", "14"), - ("GST_PLUGINS_BASE_VERSION_NANO", "0"), ]; diff --git a/gstreamer-sys/src/lib.rs b/gstreamer-sys/src/lib.rs index 9ac3ed07d..a4f42d0e3 100644 --- a/gstreamer-sys/src/lib.rs +++ b/gstreamer-sys/src/lib.rs @@ -588,10 +588,6 @@ pub const GST_VALUE_EQUAL: c_int = 0; pub const GST_VALUE_GREATER_THAN: c_int = 1; pub const GST_VALUE_LESS_THAN: c_int = -1; pub const GST_VALUE_UNORDERED: c_int = 2; -pub const GST_VERSION_MAJOR: c_int = 1; -pub const GST_VERSION_MICRO: c_int = 1; -pub const GST_VERSION_MINOR: c_int = 14; -pub const GST_VERSION_NANO: c_int = 0; // Flags pub type GstAllocatorFlags = c_uint; diff --git a/gstreamer-sys/tests/abi.rs b/gstreamer-sys/tests/abi.rs index 414478ee7..4f32784f6 100644 --- a/gstreamer-sys/tests/abi.rs +++ b/gstreamer-sys/tests/abi.rs @@ -1115,10 +1115,6 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[ ("GST_VALUE_GREATER_THAN", "1"), ("GST_VALUE_LESS_THAN", "-1"), ("GST_VALUE_UNORDERED", "2"), - ("GST_VERSION_MAJOR", "1"), - ("GST_VERSION_MICRO", "1"), - ("GST_VERSION_MINOR", "14"), - ("GST_VERSION_NANO", "0"), ];