From: Sebastian Dröge <sebastian@centricular.com>
Date: Fri, 2 Oct 2015 19:17:04 +0000 (+0300)
Subject: Update GLib dependency to 2.40.0
X-Git-Tag: 1.12.0~1007
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e8ef4cf5a41e26836f0a5a8cb3ddaa5e55f1524;p=platform%2Fupstream%2Fgstreamer.git

Update GLib dependency to 2.40.0
---

diff --git a/configure.ac b/configure.ac
index e086e3a51c..0c6e603919 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/gst/gst.c b/gst/gst.c
index fcd966c768..e28dd92d01 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -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");
diff --git a/gst/gsturi.c b/gst/gsturi.c
index 3efaae3418..8c0e0c6a5d 100644
--- a/gst/gsturi.c
+++ b/gst/gsturi.c
@@ -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)
 {
diff --git a/gst/gstvalue.c b/gst/gstvalue.c
index 37a59bff80..f876be0afd 100644
--- a/gst/gstvalue.c
+++ b/gst/gstvalue.c
@@ -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 }