diff options
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0.inc')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0.inc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc index 329193486d..f523ef59f9 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc | |||
@@ -16,6 +16,7 @@ acpaths = "-I ${S}/common/m4 -I ${S}/m4" | |||
16 | 16 | ||
17 | SRC_URI_append = " \ | 17 | SRC_URI_append = " \ |
18 | file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ | 18 | file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ |
19 | file://gtk-doc-tweaks.patch \ | ||
19 | " | 20 | " |
20 | 21 | ||
21 | PACKAGECONFIG ??= "" | 22 | PACKAGECONFIG ??= "" |
@@ -52,19 +53,7 @@ delete_pkg_m4_file() { | |||
52 | rm -f "${S}/common/m4/gtk-doc.m4" | 53 | rm -f "${S}/common/m4/gtk-doc.m4" |
53 | } | 54 | } |
54 | 55 | ||
55 | # gstreamer is not using system-wide makefiles (which we patch in gtkdoc recipe, | 56 | do_configure[prefuncs] += "delete_pkg_m4_file" |
56 | # but its own custom ones, which we have to patch here | ||
57 | patch_gtk_doc_makefiles() { | ||
58 | # Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient binaries | ||
59 | # instead of libtool wrapper or running them directly | ||
60 | # Also substitute a bogus plugin scanner, as trying to run the real one is causing issues during build on x86_64. | ||
61 | sed -i \ | ||
62 | -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \ | ||
63 | -e "s|\$(GTKDOC_EXTRA_ENVIRONMENT)|\$(GTKDOC_EXTRA_ENVIRONMENT) GST_PLUGIN_SCANNER_1_0=\$(top_builddir)/libs/gst/helpers/gst-plugin-scanner-dummy|" \ | ||
64 | ${S}/common/gtk-doc*mak | ||
65 | } | ||
66 | |||
67 | do_configure[prefuncs] += " delete_pkg_m4_file patch_gtk_doc_makefiles" | ||
68 | 57 | ||
69 | do_compile_prepend() { | 58 | do_compile_prepend() { |
70 | export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs" | 59 | export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs" |