mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-19 13:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

gstreamer: correctly set GST_PLUGIN_SCANNER_1_0

Browse Source 
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>
This commit is contained in:
Alexander Kanavin
2018-01-16 16:57:49 +02:00
committed by Richard Purdie
parent f0cb5fe07c
commit 21fa4714f2
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch
View File

@@ -1,3 +1,8 @@
From 7018ca1c4bf26c8317e7fcd2e7e4e648195f42ca Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Wed, 20 Dec 2017 13:03:03 +0000
Subject: [PATCH] gstreamer: use a patch instead of sed to fix gtk-doc
Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient
binaries instead of libtool wrapper or running them directly.
@@ -7,19 +12,36 @@ 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 @@
---
common/gtk-doc.mak | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/gtk-doc.mak b/common/gtk-doc.mak
index 3f83491..e5cb0d1 100644
--- a/common/gtk-doc.mak
+++ b/common/gtk-doc.mak
@@ -6,11 +6,11 @@
if GTK_DOC_USE_LIBTOOL
GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
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_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
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; \
# We set GPATH here; this gives us semantics for GNU make
@@ -101,6 +101,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
GST_PLUGIN_PATH_1_0= \
GST_REGISTRY_1_0=doc-registry.xml \
$(GTKDOC_EXTRA_ENVIRONMENT) \
+ GST_PLUGIN_SCANNER_1_0="$(top_builddir)/libs/gst/helpers/gst-plugin-scanner-dummy" \
GST_PLUGIN_SYSTEM_PATH_1_0=`cd $(top_builddir) && pwd` \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" \
CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" \
LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
--
2.15.1