From: Oleksij Rempel (Alexey Fisher) <bug-track@fisher-privat.net>
Date: Sun, 4 Mar 2012 09:28:49 +0000 (+0100)
Subject: pango: don't use deprecated pango_cairo_font_map_create_context()
X-Git-Tag: 1.19.3~511^2~6555^2~67
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c2f2a64c5a3cde94326950c6b64e04120fe24d7;p=platform%2Fupstream%2Fgstreamer.git

pango: don't use deprecated pango_cairo_font_map_create_context()

https://bugzilla.gnome.org/show_bug.cgi?id=671300
---

diff --git a/configure.ac b/configure.ac
index 8c35b5b..13bfb8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -789,7 +789,7 @@ AG_GST_CHECK_FEATURE(OGG, [Xiph Ogg library], ogg, [
 dnl *** pango ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_PANGO, true)
 AG_GST_CHECK_FEATURE(PANGO, [Pango font rendering], pango, [
-  AG_GST_PKG_CHECK_MODULES(PANGO, pango >= 1.16.0  pangocairo >= 1.16.0)
+  AG_GST_PKG_CHECK_MODULES(PANGO, pango >= 1.22.0  pangocairo >= 1.22.0)
 ])
 
 dnl *** theora ***
diff --git a/ext/pango/gsttextoverlay.c b/ext/pango/gsttextoverlay.c
index a92659f..0096d94 100644
--- a/ext/pango/gsttextoverlay.c
+++ b/ext/pango/gsttextoverlay.c
@@ -375,7 +375,7 @@ gst_text_overlay_base_init (gpointer g_class)
     g_mutex_lock (klass->pango_lock);
   fontmap = pango_cairo_font_map_get_default ();
   klass->pango_context =
-      pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (fontmap));
+      pango_font_map_create_context (PANGO_FONT_MAP (fontmap));
   if (klass->pango_lock)
     g_mutex_unlock (klass->pango_lock);
 }
diff --git a/ext/pango/gsttextrender.c b/ext/pango/gsttextrender.c
index 38ea44a..6a9a29b 100644
--- a/ext/pango/gsttextrender.c
+++ b/ext/pango/gsttextrender.c
@@ -203,7 +203,7 @@ gst_text_render_class_init (GstTextRenderClass * klass)
 
   fontmap = pango_cairo_font_map_get_default ();
   klass->pango_context =
-      pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (fontmap));
+      pango_font_map_create_context (PANGO_FONT_MAP (fontmap));
   g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_FONT_DESC,
       g_param_spec_string ("font-desc", "font description",
           "Pango font description of font "