gst-openmax: fix build with GLib 2.40 onwards

GLib 2.40 adds g_ptr_array_insert, but gst-openmax is definining that as a
static helper function.  Rename the static function so it doesn't conflict with
GLib's namespace.

(From OE-Core rev: f453cd989b47677b863acda7a4627636f66436f4)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2014-05-12 13:14:47 +01:00
committed by Richard Purdie
parent 4055185967
commit d5958a9d13
2 changed files with 47 additions and 0 deletions

View File

@@ -0,0 +1,46 @@
Rename static functions that use GLib naming conventions as one of them
(g_ptr_array_insert) has now been added to GLib.
Upstream-Status: Pending
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/omx/gstomx_util.c b/omx/gstomx_util.c
index 423e441..579dbf5 100644
--- a/omx/gstomx_util.c
+++ b/omx/gstomx_util.c
@@ -85,7 +85,7 @@ static gboolean initialized;
*/
static void
-g_ptr_array_clear (GPtrArray * array)
+omx_g_ptr_array_clear (GPtrArray * array)
{
guint index;
for (index = 0; index < array->len; index++)
@@ -93,7 +93,7 @@ g_ptr_array_clear (GPtrArray * array)
}
static void
-g_ptr_array_insert (GPtrArray * array, guint index, gpointer data)
+omx_g_ptr_array_insert (GPtrArray * array, guint index, gpointer data)
{
if (index + 1 > array->len) {
g_ptr_array_set_size (array, index + 1);
@@ -394,7 +394,7 @@ g_omx_core_unload (GOmxCore * core)
}
core_for_each_port (core, g_omx_port_free);
- g_ptr_array_clear (core->ports);
+ omx_g_ptr_array_clear (core->ports);
}
static inline GOmxPort *
@@ -418,7 +418,7 @@ g_omx_core_new_port (GOmxCore * core, guint index)
}
port = g_omx_port_new (core, index);
- g_ptr_array_insert (core->ports, index, port);
+ omx_g_ptr_array_insert (core->ports, index, port);
return port;
}

View File

@@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
SRC_URI = "http://gstreamer.freedesktop.org/src/gst-openmax/gst-openmax-${PV}.tar.bz2 \
file://gcc_4.6.patch \
file://ptr-array.patch \
"
inherit autotools