[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6013/8267] gstreamer1.0-omx: delete broken m4 files

[Emmanuele Bassi <ebassi src gnome org>]

commit 8f1663c4573fd52434cb773c182751d53fe9782d
Author: Ross Burton <ross burton intel com>
Date:   Fri May 26 14:37:13 2017 +0100

    gstreamer1.0-omx: delete broken m4 files
    
    These m4 files need to be deleted so that the versions in the sysroot that we've
    patched are used.  Specifically, building documentation fails as the gtk-doc
    checks fail.
    
    (From OE-Core rev: 4292886ee3b2311902af2b5aaa5f53c5b36c6bee)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../gstreamer/gstreamer1.0-omx.inc                 |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
index 05562b1..5d92351 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
@@ -29,10 +29,17 @@ python __anonymous () {
         d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH"))
 }
 
+delete_pkg_m4_file() {
+    # Delete m4 files which we provide patched versions of but will be ignored
+    # if these exist
+       rm -f "${S}/common/m4/pkg.m4"
+       rm -f "${S}/common/m4/gtk-doc.m4"
+}
+do_configure[prefuncs] += "delete_pkg_m4_file"
+
 set_omx_core_name() {
        sed -i -e "s;^core-name=.*;core-name=${GSTREAMER_1_0_OMX_CORE_NAME};" 
"${D}${sysconfdir}/xdg/gstomx.conf"
 }
-
 do_install[postfuncs] += " set_omx_core_name "
 
 FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"