summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-01-16 16:57:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-18 12:50:36 +0000
commit21fa4714f25a80e6e2879234ba8a3434304a013c (patch)
tree4768adbdfb1744e7a404ca5f3cad0c34793d06ff
parentf0cb5fe07c3989d6bdd7ed9d6d051f5b38501572 (diff)
downloadpoky-21fa4714f25a80e6e2879234ba8a3434304a013c.tar.gz
gstreamer: correctly set GST_PLUGIN_SCANNER_1_0
The order was wrong: GST_PLUGIN_SCANNER_1_0 was previously set before GTKDOC_EXTRA_ENVIRONMENT and so was overriden by upstream setting it from there. This changes the location of GST_PLUGIN_SCANNER_1_0 setting to come after GTKDOC_EXTRA_ENVIRONMENT. (From OE-Core rev: 62e12a4c81e57f955d9e631e27bd64368058da6c) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch36
1 files changed, 29 insertions, 7 deletions
diff --git a/meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch b/meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch
index 593d5bb043..d86c78d793 100644
--- a/meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch
+++ b/meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch
@@ -1,3 +1,8 @@
1From 7018ca1c4bf26c8317e7fcd2e7e4e648195f42ca Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 20 Dec 2017 13:03:03 +0000
4Subject: [PATCH] gstreamer: use a patch instead of sed to fix gtk-doc
5
1Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient 6Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient
2binaries instead of libtool wrapper or running them directly. 7binaries instead of libtool wrapper or running them directly.
3 8
@@ -7,19 +12,36 @@ issues during build on x86_64.
7Upstream-Status: Inappropriate 12Upstream-Status: Inappropriate
8Signed-off-by: Ross Burton <ross.burton@intel.com> 13Signed-off-by: Ross Burton <ross.burton@intel.com>
9 14
10--- a/common/gtk-doc.mak.orig 2017-12-20 12:43:20.586474397 +0000 15---
11+++ b/common/gtk-doc.mak 2017-12-20 12:45:20.758874995 +0000 16 common/gtk-doc.mak | 5 +++--
12@@ -8,3 +8,3 @@ 17 1 file changed, 3 insertions(+), 2 deletions(-)
18
19diff --git a/common/gtk-doc.mak b/common/gtk-doc.mak
20index 3f83491..e5cb0d1 100644
21--- a/common/gtk-doc.mak
22+++ b/common/gtk-doc.mak
23@@ -6,11 +6,11 @@
24 if GTK_DOC_USE_LIBTOOL
25 GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
13 GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) 26 GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
14-GTKDOC_RUN = $(LIBTOOL) --mode=execute 27-GTKDOC_RUN = $(LIBTOOL) --mode=execute
15+GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper 28+GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper
16 else 29 else
17@@ -12,3 +12,3 @@ 30 GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
18 GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) 31 GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
19-GTKDOC_RUN = 32-GTKDOC_RUN =
20+GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper 33+GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper
21 endif 34 endif
22@@ -99,2 +99,3 @@ 35
23 fi; \ 36 # We set GPATH here; this gives us semantics for GNU make
37@@ -101,6 +101,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
38 GST_PLUGIN_PATH_1_0= \
39 GST_REGISTRY_1_0=doc-registry.xml \
40 $(GTKDOC_EXTRA_ENVIRONMENT) \
24+ GST_PLUGIN_SCANNER_1_0="$(top_builddir)/libs/gst/helpers/gst-plugin-scanner-dummy" \ 41+ GST_PLUGIN_SCANNER_1_0="$(top_builddir)/libs/gst/helpers/gst-plugin-scanner-dummy" \
25 GST_PLUGIN_SYSTEM_PATH_1_0=`cd $(top_builddir) && pwd` \ 42 CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" \
43 CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" \
44 LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
45--
462.15.1
47