Commit 3e8ef4cf authored by Sebastian Dröge's avatar Sebastian Dröge 🍵

Update GLib dependency to 2.40.0

parent 215cfcf9
......@@ -768,7 +768,7 @@ fi
dnl *** checks for dependency libraries ***
dnl GLib
GLIB_REQ=2.32.0
GLIB_REQ=2.40.0
AG_GST_GLIB_CHECK([$GLIB_REQ])
dnl Check for documentation xrefs
......
......@@ -475,10 +475,6 @@ init_pre (GOptionContext * context, GOptionGroup * group, gpointer data,
GST_DEBUG ("already initialized");
return TRUE;
}
#if !GLIB_CHECK_VERSION(2, 35, 0)
g_type_init ();
#endif
#ifndef GST_DISABLE_GST_DEBUG
_priv_gst_debug_init ();
priv_gst_dump_dot_dir = g_getenv ("GST_DEBUG_DUMP_DOT_DIR");
......
......@@ -118,25 +118,6 @@ _gst_ascii_strcasestr (const gchar * s, const gchar * find)
}
#endif
#if !GLIB_CHECK_VERSION (2, 33, 4)
#define g_list_copy_deep gst_g_list_copy_deep
static GList *
gst_g_list_copy_deep (GList * list, GCopyFunc func, gpointer user_data)
{
list = g_list_copy (list);
if (func != NULL) {
GList *l;
for (l = list; l != NULL; l = l->next) {
l->data = func (l->data, user_data);
}
}
return list;
}
#endif
GType
gst_uri_handler_get_type (void)
{
......
......@@ -6568,20 +6568,7 @@ FUNC_VALUE_GET_TYPE_CLASSED (flagset, "GstFlagSet",
GType
gst_g_thread_get_type (void)
{
#if GLIB_CHECK_VERSION(2,35,3)
return G_TYPE_THREAD;
#else
static volatile gsize type_id = 0;
if (g_once_init_enter (&type_id)) {
GType tmp =
g_boxed_type_register_static (g_intern_static_string ("GstGThread"),
(GBoxedCopyFunc) g_thread_ref, (GBoxedFreeFunc) g_thread_unref);
g_once_init_leave (&type_id, tmp);
}
return type_id;
#endif
}
#define SERIAL_VTABLE(t,c,s,d) { t, c, s, d }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment