summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-08-11 17:21:55 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-09 12:12:22 +0100
commit3878dacc3824908c6805e53fcb179ae99d53f0e3 (patch)
treee2c89a40e05edd0920f55249f85dc57148846d52
parente1aad9e8a151643b2644fdcc24f1bdaa90138d86 (diff)
downloadpoky-3878dacc3824908c6805e53fcb179ae99d53f0e3.tar.gz
gstreamer1.0: enable gtk-doc support
check support is no longer disabled by default because it is a requirement of gtk-doc support in gstreamer. (From OE-Core rev: 628a849ff14e165b8c00c6649d042225f5a35732) 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/gstreamer1.0-libav.inc2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc16
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc14
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0.inc18
5 files changed, 42 insertions, 10 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
index 363101e1a4..b24de6258e 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
@@ -7,7 +7,7 @@ LICENSE_FLAGS = "commercial"
7 7
8DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz" 8DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz"
9 9
10inherit autotools pkgconfig upstream-version-is-even 10inherit autotools pkgconfig upstream-version-is-even gtk-doc
11 11
12# CAUTION: Using the system libav is not recommended. Since the libav API is changing all the time, 12# CAUTION: Using the system libav is not recommended. Since the libav API is changing all the time,
13# compilation errors (and other, more subtle bugs) can happen. It is usually better to rely on the 13# compilation errors (and other, more subtle bugs) can happen. It is usually better to rely on the
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
index aa3e8200f2..644b2cd78b 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
@@ -7,7 +7,7 @@ LICENSE_FLAGS = "commercial"
7 7
8DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" 8DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
9 9
10inherit autotools pkgconfig gettext 10inherit autotools pkgconfig gettext gtk-doc
11 11
12acpaths = "-I ${S}/common/m4 -I ${S}/m4" 12acpaths = "-I ${S}/common/m4 -I ${S}/m4"
13 13
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
index 2dcec509d9..5a61ca0ecc 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
@@ -5,7 +5,7 @@ SECTION = "multimedia"
5 5
6DEPENDS = "gstreamer1.0 glib-2.0-native" 6DEPENDS = "gstreamer1.0 glib-2.0-native"
7 7
8inherit autotools pkgconfig upstream-version-is-even gobject-introspection 8inherit autotools pkgconfig upstream-version-is-even gobject-introspection gtk-doc
9 9
10acpaths = "-I ${S}/common/m4 -I ${S}/m4" 10acpaths = "-I ${S}/common/m4 -I ${S}/m4"
11 11
@@ -35,6 +35,18 @@ delete_pkg_m4_file() {
35 rm "${S}/common/m4/pkg.m4" || true 35 rm "${S}/common/m4/pkg.m4" || true
36} 36}
37 37
38do_configure[prefuncs] += " delete_pkg_m4_file" 38# gstreamer is not using system-wide makefiles (which we patch in gtkdoc recipe,
39# but its own custom ones, which we have to patch here
40patch_gtk_doc_makefiles() {
41 # Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient binaries
42 # instead of libtool wrapper or running them directly
43 # Also substitute a bogus plugin scanner, as trying to run the real one is causing issues during build on x86_64.
44 sed -i \
45 -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \
46 -e "s|\$(GTKDOC_EXTRA_ENVIRONMENT)|\$(GTKDOC_EXTRA_ENVIRONMENT) GST_PLUGIN_SCANNER_1_0=\$(top_builddir)/libs/gst/helpers/gst-plugin-scanner-dummy|" \
47 ${S}/common/gtk-doc*mak
48}
49
50do_configure[prefuncs] += " delete_pkg_m4_file patch_gtk_doc_makefiles"
39 51
40PACKAGES_DYNAMIC = "^${PN}-.*" 52PACKAGES_DYNAMIC = "^${PN}-.*"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
index 8fc90f1d26..13ba40d3da 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
@@ -13,7 +13,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz
13 13
14S = "${WORKDIR}/${PNREAL}-${PV}" 14S = "${WORKDIR}/${PNREAL}-${PV}"
15 15
16inherit autotools pkgconfig upstream-version-is-even gobject-introspection 16inherit autotools pkgconfig upstream-version-is-even gobject-introspection gtk-doc
17 17
18# Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well 18# Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well
19LIBV = "1.0" 19LIBV = "1.0"
@@ -24,5 +24,15 @@ delete_pkg_m4_file() {
24 rm "${S}/common/m4/pkg.m4" || true 24 rm "${S}/common/m4/pkg.m4" || true
25} 25}
26 26
27do_configure[prefuncs] += " delete_pkg_m4_file" 27# gstreamer is not using system-wide makefiles (which we patch in gtkdoc recipe,
28# but its own custom ones, which we have to patch here
29patch_gtk_doc_makefiles() {
30 # Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient binaries
31 # instead of libtool wrapper or running them directly
32 sed -i \
33 -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \
34 ${S}/common/gtk-doc*mak
35}
36
37do_configure[prefuncs] += " delete_pkg_m4_file patch_gtk_doc_makefiles"
28 38
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
index 86ac10c84e..e6bd2dd5b2 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
@@ -8,7 +8,7 @@ LICENSE = "LGPLv2+"
8 8
9DEPENDS = "glib-2.0 glib-2.0-native libcap libxml2 bison-native flex-native" 9DEPENDS = "glib-2.0 glib-2.0-native libcap libxml2 bison-native flex-native"
10 10
11inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspection 11inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspection gtk-doc
12 12
13# This way common/m4/introspection.m4 will come first 13# This way common/m4/introspection.m4 will come first
14# (it has a custom INTROSPECTION_INIT macro, and so must be used instead of our common introspection.m4 file) 14# (it has a custom INTROSPECTION_INIT macro, and so must be used instead of our common introspection.m4 file)
@@ -20,7 +20,6 @@ SRC_URI_append = " \
20 20
21PACKAGECONFIG ??= "" 21PACKAGECONFIG ??= ""
22 22
23PACKAGECONFIG[check] = "--enable-check,--disable-check"
24PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" 23PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
25PACKAGECONFIG[tests] = "--enable-tests,--disable-tests" 24PACKAGECONFIG[tests] = "--enable-tests,--disable-tests"
26PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," 25PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind,"
@@ -31,7 +30,6 @@ EXTRA_OECONF = " \
31 --disable-dependency-tracking \ 30 --disable-dependency-tracking \
32 --disable-docbook \ 31 --disable-docbook \
33 --disable-examples \ 32 --disable-examples \
34 --disable-gtk-doc \
35" 33"
36 34
37CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no" 35CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no"
@@ -53,7 +51,19 @@ delete_pkg_m4_file() {
53 rm "${S}/common/m4/pkg.m4" || true 51 rm "${S}/common/m4/pkg.m4" || true
54} 52}
55 53
56do_configure[prefuncs] += " delete_pkg_m4_file" 54# gstreamer is not using system-wide makefiles (which we patch in gtkdoc recipe,
55# but its own custom ones, which we have to patch here
56patch_gtk_doc_makefiles() {
57 # Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient binaries
58 # instead of libtool wrapper or running them directly
59 # Also substitute a bogus plugin scanner, as trying to run the real one is causing issues during build on x86_64.
60 sed -i \
61 -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \
62 -e "s|\$(GTKDOC_EXTRA_ENVIRONMENT)|\$(GTKDOC_EXTRA_ENVIRONMENT) GST_PLUGIN_SCANNER_1_0=\$(top_builddir)/libs/gst/helpers/gst-plugin-scanner-dummy|" \
63 ${S}/common/gtk-doc*mak
64}
65
66do_configure[prefuncs] += " delete_pkg_m4_file patch_gtk_doc_makefiles"
57 67
58do_compile_prepend() { 68do_compile_prepend() {
59 export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs" 69 export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs"