From 3228c36ef75136eaf96cd2529d1c00958d23d3e2 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Mon, 28 Aug 2023 19:03:27 +0200
Subject: [PATCH] Adapt to no longer re-exported auto functions

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1307>
---
 gstreamer-base/src/functions.rs    | 1 +
 gstreamer-base/src/lib.rs          | 2 +-
 gstreamer-gl/src/functions.rs      | 1 +
 gstreamer-gl/src/lib.rs            | 2 +-
 gstreamer-pbutils/src/functions.rs | 1 +
 gstreamer-pbutils/src/lib.rs       | 2 +-
 gstreamer-rtp/src/lib.rs           | 6 +++++-
 gstreamer/src/functions.rs         | 6 +++---
 gstreamer/src/lib.rs               | 2 +-
 9 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/gstreamer-base/src/functions.rs b/gstreamer-base/src/functions.rs
index 6668e4fe9..ef0493dac 100644
--- a/gstreamer-base/src/functions.rs
+++ b/gstreamer-base/src/functions.rs
@@ -2,6 +2,7 @@
 
 use std::mem;
 
+pub use crate::auto::functions::*;
 use glib::{prelude::*, translate::*};
 
 #[doc(alias = "gst_type_find_helper_for_data")]
diff --git a/gstreamer-base/src/lib.rs b/gstreamer-base/src/lib.rs
index a0ddf799c..465b3f476 100644
--- a/gstreamer-base/src/lib.rs
+++ b/gstreamer-base/src/lib.rs
@@ -21,7 +21,7 @@ macro_rules! skip_assert_initialized {
 }
 
 mod auto;
-pub use crate::auto::{functions::*, *};
+pub use crate::auto::*;
 
 pub mod functions;
 pub use crate::functions::*;
diff --git a/gstreamer-gl/src/functions.rs b/gstreamer-gl/src/functions.rs
index ab9c17718..800559244 100644
--- a/gstreamer-gl/src/functions.rs
+++ b/gstreamer-gl/src/functions.rs
@@ -2,6 +2,7 @@ use std::ptr;
 
 use glib::{object::IsA, translate::*};
 
+pub use crate::auto::functions::*;
 use crate::{GLContext, GLDisplay};
 
 #[doc(alias = "gst_gl_handle_context_query")]
diff --git a/gstreamer-gl/src/lib.rs b/gstreamer-gl/src/lib.rs
index e635597f8..ccc9e3513 100644
--- a/gstreamer-gl/src/lib.rs
+++ b/gstreamer-gl/src/lib.rs
@@ -23,7 +23,7 @@ macro_rules! skip_assert_initialized {
 }
 
 mod auto;
-pub use crate::auto::{functions::*, *};
+pub use crate::auto::*;
 
 #[cfg(feature = "serde")]
 mod flag_serde;
diff --git a/gstreamer-pbutils/src/functions.rs b/gstreamer-pbutils/src/functions.rs
index 694b5c4ad..376b097ba 100644
--- a/gstreamer-pbutils/src/functions.rs
+++ b/gstreamer-pbutils/src/functions.rs
@@ -2,6 +2,7 @@
 
 use std::{mem, ptr};
 
+pub use crate::auto::functions::*;
 use glib::translate::*;
 
 pub unsafe trait CodecTag<'a>: gst::Tag<'a, TagType = &'a str> {}
diff --git a/gstreamer-pbutils/src/lib.rs b/gstreamer-pbutils/src/lib.rs
index 4004106f4..5da7a592f 100644
--- a/gstreamer-pbutils/src/lib.rs
+++ b/gstreamer-pbutils/src/lib.rs
@@ -28,7 +28,7 @@ macro_rules! skip_assert_initialized {
 }
 
 mod auto;
-pub use crate::auto::{functions::*, *};
+pub use crate::auto::*;
 
 #[cfg(feature = "v1_20")]
 mod element_properties;
diff --git a/gstreamer-rtp/src/lib.rs b/gstreamer-rtp/src/lib.rs
index ba394e99a..9c7a492ef 100644
--- a/gstreamer-rtp/src/lib.rs
+++ b/gstreamer-rtp/src/lib.rs
@@ -21,7 +21,7 @@ macro_rules! skip_assert_initialized {
 }
 
 mod auto;
-pub use crate::auto::{functions::*, *};
+pub use crate::auto::*;
 
 #[cfg(feature = "serde")]
 mod flag_serde;
@@ -58,3 +58,7 @@ pub mod prelude {
         auto::traits::*, rtp_base_depayload::RTPBaseDepayloadExtManual, rtp_buffer::RTPBufferExt,
     };
 }
+
+pub mod functions {
+    pub use super::auto::functions::*;
+}
diff --git a/gstreamer/src/functions.rs b/gstreamer/src/functions.rs
index 226e76ff2..08274f318 100644
--- a/gstreamer/src/functions.rs
+++ b/gstreamer/src/functions.rs
@@ -7,9 +7,9 @@ use glib::{prelude::*, translate::*};
 #[cfg(feature = "v1_18")]
 #[cfg_attr(docsrs, doc(cfg(feature = "v1_18")))]
 use crate::Tracer;
-use crate::{
-    auto::functions::parse_bin_from_description, Bin, Element, Object, ParseContext, ParseFlags,
-};
+use crate::{Bin, Element, Object, ParseContext, ParseFlags};
+
+pub use crate::auto::functions::*;
 
 pub fn parse_bin_from_description_with_name(
     bin_description: &str,
diff --git a/gstreamer/src/lib.rs b/gstreamer/src/lib.rs
index d64f7ed49..bd7a4aa56 100644
--- a/gstreamer/src/lib.rs
+++ b/gstreamer/src/lib.rs
@@ -41,7 +41,7 @@ macro_rules! skip_assert_initialized {
 #[allow(clippy::needless_borrow)]
 #[allow(clippy::let_unit_value)]
 mod auto;
-pub use crate::auto::{functions::*, *};
+pub use crate::auto::*;
 
 #[macro_use]
 #[cfg(feature = "serde")]