new file mode 100644
@@ -0,0 +1,25 @@
+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.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+--- a/common/gtk-doc.mak.orig 2017-12-20 12:43:20.586474397 +0000
++++ b/common/gtk-doc.mak 2017-12-20 12:45:20.758874995 +0000
+@@ -8,3 +8,3 @@
+ GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+-GTKDOC_RUN = $(LIBTOOL) --mode=execute
++GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper
+ else
+@@ -12,3 +12,3 @@
+ GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+-GTKDOC_RUN =
++GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper
+ endif
+@@ -99,2 +99,3 @@
+ fi; \
++ GST_PLUGIN_SCANNER_1_0="$(top_builddir)/libs/gst/helpers/gst-plugin-scanner-dummy" \
+ GST_PLUGIN_SYSTEM_PATH_1_0=`cd $(top_builddir) && pwd` \
@@ -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,19 +36,7 @@ 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}-.*"
@@ -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,17 +25,7 @@ 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"
# Needs to be disable due to a dependency on gstreamer-plugins introspection files
EXTRA_OECONF_append_mips64 = " --disable-introspection "
@@ -16,6 +16,7 @@ acpaths = "-I ${S}/common/m4 -I ${S}/m4"
SRC_URI_append = " \
file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
+ file://gtk-doc-tweaks.patch \
"
PACKAGECONFIG ??= ""
@@ -52,19 +53,7 @@ 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"
do_compile_prepend() {
export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs"
seds can get stale without warning and repeated application can cause problems, so move the gtk-doc seds into a patch. Signed-off-by: Ross Burton <ross.burton@intel.com> --- .../gstreamer/files/gtk-doc-tweaks.patch | 25 ++++++++++++++++++++++ .../gstreamer/gstreamer1.0-plugins.inc | 16 +++----------- .../gstreamer/gstreamer1.0-rtsp-server.inc | 15 +++---------- meta/recipes-multimedia/gstreamer/gstreamer1.0.inc | 15 ++----------- 4 files changed, 33 insertions(+), 38 deletions(-) create mode 100644 meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core