From: Ross Burton <ross.burton@intel.com>
Date: Fri, 26 May 2017 13:37:13 +0000 (+0100)
Subject: gstreamer1.0-omx: delete broken m4 files
X-Git-Tag: uninative-1.7~745
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4292886ee3b2311902af2b5aaa5f53c5b36c6bee;p=openembedded-core.git

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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
index 05562b11a7..5d9235104e 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"