diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-05-26 17:13:13 +0300 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-28 10:35:13 +0200 |
| commit | fa01c2614a4e58937cd73d0f5d8b17df935bc5b5 (patch) | |
| tree | f7396d3f5a6031632de8290d4006041ee2e59630 /meta-multimedia/recipes-multimedia/gstreamer/gst-openmax | |
| parent | 175406cdca39bf5b218bb4127a3e9c9bd11b653f (diff) | |
| download | meta-openembedded-fa01c2614a4e58937cd73d0f5d8b17df935bc5b5.tar.gz | |
gstreamear: rename directory to gstreamer-0.10
* gst-plugins-gl: fix the path to a required include
* so that it's clear that the recipes it contains are specific to the
obsolete, unmaintained version of gstreamer.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Diffstat (limited to 'meta-multimedia/recipes-multimedia/gstreamer/gst-openmax')
| -rw-r--r-- | meta-multimedia/recipes-multimedia/gstreamer/gst-openmax/gcc_4.6.patch | 18 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/gstreamer/gst-openmax/ptr-array.patch | 46 |
2 files changed, 0 insertions, 64 deletions
diff --git a/meta-multimedia/recipes-multimedia/gstreamer/gst-openmax/gcc_4.6.patch b/meta-multimedia/recipes-multimedia/gstreamer/gst-openmax/gcc_4.6.patch deleted file mode 100644 index 57a63b5a0f..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer/gst-openmax/gcc_4.6.patch +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
| 4 | |||
| 5 | Index: gst-openmax-0.10.1/omx/gstomx.c | ||
| 6 | =================================================================== | ||
| 7 | --- gst-openmax-0.10.1.orig/omx/gstomx.c 2010-09-30 18:00:24.000000000 -0700 | ||
| 8 | +++ gst-openmax-0.10.1/omx/gstomx.c 2011-05-17 23:08:08.794535872 -0700 | ||
| 9 | @@ -238,7 +238,8 @@ | ||
| 10 | const gchar *element_name = gst_structure_nth_field_name (element_table, i); | ||
| 11 | GstStructure *element = get_element_entry (element_name); | ||
| 12 | const gchar *type_name, *parent_type_name; | ||
| 13 | - const gchar *component_name, *component_role, *library_name; | ||
| 14 | + const gchar *component_name, *library_name; | ||
| 15 | + const gchar __attribute__((__unused__)) *component_role; | ||
| 16 | GType type; | ||
| 17 | gint rank; | ||
| 18 | |||
diff --git a/meta-multimedia/recipes-multimedia/gstreamer/gst-openmax/ptr-array.patch b/meta-multimedia/recipes-multimedia/gstreamer/gst-openmax/ptr-array.patch deleted file mode 100644 index 5965bbafbb..0000000000 --- a/meta-multimedia/recipes-multimedia/gstreamer/gst-openmax/ptr-array.patch +++ /dev/null | |||
| @@ -1,46 +0,0 @@ | |||
| 1 | Rename static functions that use GLib naming conventions as one of them | ||
| 2 | (g_ptr_array_insert) has now been added to GLib. | ||
| 3 | |||
| 4 | Upstream-Status: Pending | ||
| 5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 6 | |||
| 7 | diff --git a/omx/gstomx_util.c b/omx/gstomx_util.c | ||
| 8 | index 423e441..579dbf5 100644 | ||
| 9 | --- a/omx/gstomx_util.c | ||
| 10 | +++ b/omx/gstomx_util.c | ||
| 11 | @@ -85,7 +85,7 @@ static gboolean initialized; | ||
| 12 | */ | ||
| 13 | |||
| 14 | static void | ||
| 15 | -g_ptr_array_clear (GPtrArray * array) | ||
| 16 | +omx_g_ptr_array_clear (GPtrArray * array) | ||
| 17 | { | ||
| 18 | guint index; | ||
| 19 | for (index = 0; index < array->len; index++) | ||
| 20 | @@ -93,7 +93,7 @@ g_ptr_array_clear (GPtrArray * array) | ||
| 21 | } | ||
| 22 | |||
| 23 | static void | ||
| 24 | -g_ptr_array_insert (GPtrArray * array, guint index, gpointer data) | ||
| 25 | +omx_g_ptr_array_insert (GPtrArray * array, guint index, gpointer data) | ||
| 26 | { | ||
| 27 | if (index + 1 > array->len) { | ||
| 28 | g_ptr_array_set_size (array, index + 1); | ||
| 29 | @@ -394,7 +394,7 @@ g_omx_core_unload (GOmxCore * core) | ||
| 30 | } | ||
| 31 | |||
| 32 | core_for_each_port (core, g_omx_port_free); | ||
| 33 | - g_ptr_array_clear (core->ports); | ||
| 34 | + omx_g_ptr_array_clear (core->ports); | ||
| 35 | } | ||
| 36 | |||
| 37 | static inline GOmxPort * | ||
| 38 | @@ -418,7 +418,7 @@ g_omx_core_new_port (GOmxCore * core, guint index) | ||
| 39 | } | ||
| 40 | |||
| 41 | port = g_omx_port_new (core, index); | ||
| 42 | - g_ptr_array_insert (core->ports, index, port); | ||
| 43 | + omx_g_ptr_array_insert (core->ports, index, port); | ||
| 44 | |||
| 45 | return port; | ||
| 46 | } | ||
