From b7376a36a3beb36131a791d79d66eb0110b7b954 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 20 Dec 2017 13:03:03 +0000 Subject: gstreamer: use a patch instead of sed to fix gtk-doc makefiles seds can get stale without warning and repeated application can cause problems, so move the gtk-doc seds into a patch. (From OE-Core rev: a704411ab0f1e5f8cbf57ff54b36d60ccaf0d223) (From OE-Core rev: e0a4e78b879eeacff8ef6803c1345056abf018e7) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0-plugins.inc | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc') diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc index 3f6d4c3703..5906e4ad36 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc @@ -5,6 +5,8 @@ SECTION = "multimedia" DEPENDS = "gstreamer1.0 glib-2.0-native" +SRC_URI_append = " file://gtk-doc-tweaks.patch" + inherit autotools pkgconfig upstream-version-is-even gobject-introspection gtk-doc acpaths = "-I ${S}/common/m4 -I ${S}/m4" @@ -34,18 +36,6 @@ delete_pkg_m4_file() { rm -f "${S}/common/m4/gtk-doc.m4" } -# gstreamer is not using system-wide makefiles (which we patch in gtkdoc recipe, -# but its own custom ones, which we have to patch here -patch_gtk_doc_makefiles() { - # Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient binaries - # instead of libtool wrapper or running them directly - # Also substitute a bogus plugin scanner, as trying to run the real one is causing issues during build on x86_64. - sed -i \ - -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \ - -e "s|\$(GTKDOC_EXTRA_ENVIRONMENT)|\$(GTKDOC_EXTRA_ENVIRONMENT) GST_PLUGIN_SCANNER_1_0=\$(top_builddir)/libs/gst/helpers/gst-plugin-scanner-dummy|" \ - ${S}/common/gtk-doc*mak -} - -do_configure[prefuncs] += " delete_pkg_m4_file patch_gtk_doc_makefiles" +do_configure[prefuncs] += " delete_pkg_m4_file" PACKAGES_DYNAMIC = "^${PN}-.*" -- cgit v1.2.3-54-g00ecf