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-rtsp-server.inc | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc') diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc index 7191f9892d..70e90b8ba6 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc @@ -9,7 +9,8 @@ PNREAL = "gst-rtsp-server" SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \ file://0001-Don-t-hardcode-libtool-name-when-using-introspection.patch \ - file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch" + file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ + file://gtk-doc-tweaks.patch" S = "${WORKDIR}/${PNREAL}-${PV}" @@ -24,15 +25,5 @@ delete_pkg_m4_file() { rm "${S}/common/m4/pkg.m4" || true } -# 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 - sed -i \ - -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \ - ${S}/common/gtk-doc*mak -} - -do_configure[prefuncs] += " delete_pkg_m4_file patch_gtk_doc_makefiles" +do_configure[prefuncs] += " delete_pkg_m4_file" -- cgit v1.2.3-54-g00ecf