[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2405/8267] gstreamer: remove packaged copy of gtk-doc.m4

[Emmanuele Bassi <ebassi src gnome org>]

commit 5041e6811f8d30ec6a4940a45b3b552d993e7a50
Author: Ross Burton <ross burton intel com>
Date:   Mon Sep 5 22:25:17 2016 +0100

    gstreamer: remove packaged copy of gtk-doc.m4
    
    The gstreamer common module ships a copy of gtk-doc.m4 that will be used in
    preference to our patched form, so delete it before configure is executed.
    
    (From OE-Core rev: 50768af29ce8524f7bae387996aaed657a1ff80f)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../gstreamer/gstreamer1.0-plugins.inc             |    1 +
 meta/recipes-multimedia/gstreamer/gstreamer1.0.inc |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
index 5a61ca0..9cfcec3 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
@@ -33,6 +33,7 @@ SRC_URI_append = " file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_
 delete_pkg_m4_file() {
        # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for 
introspection
        rm "${S}/common/m4/pkg.m4" || true
+       rm -f "${S}/common/m4/gtk-doc.m4"
 }
 
 # gstreamer is not using system-wide makefiles (which we patch in gtkdoc recipe,
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
index e6bd2dd..cb0bd82 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
@@ -49,6 +49,7 @@ RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-raw
 delete_pkg_m4_file() {
         # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for 
introspection
         rm "${S}/common/m4/pkg.m4" || true
+        rm -f "${S}/common/m4/gtk-doc.m4"
 }
 
 # gstreamer is not using system-wide makefiles (which we patch in gtkdoc recipe,