summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
diff options
context:
space:
mode:
authorCarlos Rafael Giani <crg7475@mailbox.org>2020-01-12 14:59:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-16 22:33:08 +0000
commite957fbc5d82368934f721e3773bf3942c5177ed7 (patch)
treea6dfbed85612a9aa387fd2011c710a922f7fc6de /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
parent3e71919b865433ca007bf23f9b4f9015e25ac04e (diff)
downloadpoky-e957fbc5d82368934f721e3773bf3942c5177ed7.tar.gz
gstreamer1.0-plugins-base: Transition to meson based builds
* OpenGL packageconfigs now work differently. There are separate ones for OpenGL API/platform/window system selection. The meson.build script expects the selected ones as comma separated lists. For example, like "-Dgl_api=opengl,gles2". The variables OPENGL_APIS / OPENGL_PLATFORMS / OPENGL_WINSYS are whitespace-separated lists (which is the OE norm) of the respective packageconfigs. .bbappend files can then extend these lists with additional possible configs. "Possible" means that the target can support those packageconfigs. This does not immediately add them to the PACKAGECONFIG variable - this still has to be done manually. The get_opengl_cmdline_list() goes through these lists, and for each entry, checks if it is contained in the PACKAGECONFIG variable. If so, they get added to the comma separated lists that are passed to meson. For example, a Raspberry Pi layer could add "dispmanx" to OPENGL_WINSYS. * The "ivorbis" packageconfig got renamed to "tremor", since that is the name of the OE recipe, and now also the name of the meson option. * 0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch and 0002-meson-Add-variables-for-gir-files.patch are backported fixes for GIR support in the meson.build files. * make-gio_unix_2_0-dependency-configurable.patch removed because it is no longer useful to have. * link-with-libvchostif.patch removed because the flags it changed are no longer present in the meson.build scripts. If the related issue reappears, a similar patch can be applied again. * 0003-riff-add-missing-include-directories-when-calling-in.patch removed since the entire gst riff library has been excluded from GObject introspection due to naming convention issues. * Removed a number of autotool/M4 related patches and recipe lines. * gtk-doc support is handled here, not in gstreamer1.0-plugins-common.inc, since unlike with autotools, only some plugin set packages use gtk-doc. * zlib is no longer optional, and glib anyway depends on zlib, therefore it gets added to the DEPENDS list. * gettext handling now part of gstreamer1.0-plugins-common.inc. (From OE-Core rev: 20614408dc4e0593f2cce2e342d5b8a15f182c14) 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-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
new file mode 100644
index 0000000000..49ab471414
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
@@ -0,0 +1,36 @@
1From 30672ba7d134553e59935ddc875104adba26f25c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
3Date: Thu, 17 Oct 2019 20:06:24 +0100
4Subject: [PATCH] meson: build gir even when cross-compiling if introspection
5 was enabled explicitly
6
7This can be made to work in certain circumstances when
8cross-compiling, so default to not building g-i stuff
9when cross-compiling, but allow it if introspection was
10enabled explicitly via -Dintrospection=enabled.
11
12See gstreamer/gstreamer#454 and gstreamer/gstreamer#381.
13
14Upstream-Status: Backport [30672ba7d134553e59935ddc875104adba26f25c]
15
16Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
17---
18 meson.build | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/meson.build b/meson.build
22index 264d84c9e..c8147c224 100644
23--- a/meson.build
24+++ b/meson.build
25@@ -372,7 +372,7 @@ endif
26
27 gir = find_program('g-ir-scanner', required : get_option('introspection'))
28 gnome = import('gnome')
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 gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
32 'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
33 'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
34--
352.17.1
36