summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-05-26 14:37:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-29 15:15:20 +0100
commit8f1663c4573fd52434cb773c182751d53fe9782d (patch)
tree283735fc02fde211bfbfb446a472903f8b2ab514 /meta
parent298dd9baab2217f03907a8e1f92f92aec7893ac5 (diff)
downloadpoky-8f1663c4573fd52434cb773c182751d53fe9782d.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc9
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 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 () {
29 d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH")) 29 d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH"))
30} 30}
31 31
32delete_pkg_m4_file() {
33 # Delete m4 files which we provide patched versions of but will be ignored
34 # if these exist
35 rm -f "${S}/common/m4/pkg.m4"
36 rm -f "${S}/common/m4/gtk-doc.m4"
37}
38do_configure[prefuncs] += "delete_pkg_m4_file"
39
32set_omx_core_name() { 40set_omx_core_name() {
33 sed -i -e "s;^core-name=.*;core-name=${GSTREAMER_1_0_OMX_CORE_NAME};" "${D}${sysconfdir}/xdg/gstomx.conf" 41 sed -i -e "s;^core-name=.*;core-name=${GSTREAMER_1_0_OMX_CORE_NAME};" "${D}${sysconfdir}/xdg/gstomx.conf"
34} 42}
35
36do_install[postfuncs] += " set_omx_core_name " 43do_install[postfuncs] += " set_omx_core_name "
37 44
38FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" 45FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"