diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch')
-rw-r--r-- | meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch deleted file mode 100644 index 5965bbafbb..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch +++ /dev/null @@ -1,46 +0,0 @@ -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; - } |