diff options
author | Carlos Rafael Giani <crg7475@mailbox.org> | 2020-01-12 14:59:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-16 22:33:08 +0000 |
commit | 3e71919b865433ca007bf23f9b4f9015e25ac04e (patch) | |
tree | 7c94763af8b80871f44c0628207a6a37096450c4 /meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch | |
parent | 01c1f63bdb779fe33df4b4409792f393eeee7cf9 (diff) | |
download | poky-3e71919b865433ca007bf23f9b4f9015e25ac04e.tar.gz |
gstreamer1.0: Transition to meson based builds
* Moved 0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
from files/ to gstreamer1.0/ since it is gstreamer1.0 recipe specific.
* Removed M4 specific patches:
- 0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch
- gtk-doc-tweaks.patch
- add-a-target-to-compile-tests.patch
* Added patches:
- 0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
Backport for enabling GIR support in meson based cross compilation
- 0002-meson-Add-valgrind-feature.patch
Make valgrind support configurable to be able to control it through
a "valgrind" packageconfig
- 0003-meson-Add-option-for-installed-tests.patch
Add support for installable tests and for generating .test and shell
scripts which can be used with the gnome-desktop-testing suite runner
* PTest support:
By default, GStreamer does not allow for installing tests, and requires
meson to run its unit tests. The 0003 patch fixes this by installing
the binaries themselves and by generating accompanying .test and shell
scripts. The scripts set up the required environment files and then
call the test binaries. The .test file list the shell scripts as
Exec= command line.
(From OE-Core rev: 0db7ba34ca41b107042306d13a6f0162885c123b)
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch new file mode 100644 index 0000000000..1ed7198a5c --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 35db4a2433fbdf8612cf98b5aab5b14aeb5372f8 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> | ||
3 | Date: Thu, 17 Oct 2019 12:13:35 +0100 | ||
4 | Subject: [PATCH] meson: build gir even when cross-compiling if introspection | ||
5 | was enabled explicitly | ||
6 | |||
7 | This can be made to work in certain circumstances when | ||
8 | cross-compiling, so default to not building g-i stuff | ||
9 | when cross-compiling, but allow it if introspection was | ||
10 | enabled explicitly via -Dintrospection=enabled. | ||
11 | |||
12 | Fixes #454 and #381. | ||
13 | |||
14 | Upstream-Status: Backport [35db4a2433fbdf8612cf98b5aab5b14aeb5372f8] | ||
15 | |||
16 | Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org> | ||
17 | --- | ||
18 | meson.build | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/meson.build b/meson.build | ||
22 | index 90d98d8eb..a47e7f34e 100644 | ||
23 | --- a/meson.build | ||
24 | +++ b/meson.build | ||
25 | @@ -466,7 +466,7 @@ rt_lib = cc.find_library('rt', required : false) | ||
26 | gir = find_program('g-ir-scanner', required : get_option('introspection')) | ||
27 | gnome = import('gnome') | ||
28 | |||
29 | -build_gir = gir.found() and not meson.is_cross_build() | ||
30 | +build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled()) | ||
31 | |||
32 | gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \ | ||
33 | 'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \ | ||
34 | -- | ||
35 | 2.17.1 | ||
36 | |||