diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-02-18 13:41:01 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-19 16:14:57 +0000 |
commit | 85a4d9f53be0f2f17f51f90caa9dfafa3b83ac13 (patch) | |
tree | 3034bebe8ddae0b9ba69c43710858ea2dbd002e2 /meta/recipes-graphics/clutter/clutter-gtk-1.0 | |
parent | 4972d5dbd94a5a1fe9848e20730245f0f715501f (diff) | |
download | poky-85a4d9f53be0f2f17f51f90caa9dfafa3b83ac13.tar.gz |
clutter-gtk-1.0: convert to meson
This required adding an option to control gobject introspection
via a custom patch, and tweaking clutter.bbclass to not enforce
autotools.
(From OE-Core rev: 9b9c12268bf9365101da4a985f70c06740dfeb8f)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/clutter/clutter-gtk-1.0')
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch b/meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch new file mode 100644 index 0000000000..e21c6fd903 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 7233883c6bd4e80c0e91b29b5c76fe798023e9fe Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 11 Feb 2019 16:41:13 +0100 | ||
4 | Subject: [PATCH] Add a config variable for enabling/disabling introspection | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | clutter-gtk/meson.build | 2 +- | ||
10 | meson_options.txt | 4 ++++ | ||
11 | 2 files changed, 5 insertions(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/clutter-gtk/meson.build b/clutter-gtk/meson.build | ||
14 | index 5d6847d..5d934b6 100644 | ||
15 | --- a/clutter-gtk/meson.build | ||
16 | +++ b/clutter-gtk/meson.build | ||
17 | @@ -49,7 +49,7 @@ clutter_gtk_dep = declare_dependency(link_with: clutter_gtk, | ||
18 | dependencies: [ mathlib_dep, clutter_dep, gtk_dep ], | ||
19 | include_directories: include_directories('.')) | ||
20 | |||
21 | -if not meson.is_cross_build() | ||
22 | +if get_option('enable_gi') | ||
23 | gnome.generate_gir(clutter_gtk, | ||
24 | sources: clutter_gtk_headers + clutter_gtk_sources, | ||
25 | namespace: 'GtkClutter', | ||
26 | diff --git a/meson_options.txt b/meson_options.txt | ||
27 | index aaf59f1..b7e51c3 100644 | ||
28 | --- a/meson_options.txt | ||
29 | +++ b/meson_options.txt | ||
30 | @@ -2,3 +2,7 @@ option('enable_docs', | ||
31 | type: 'boolean', | ||
32 | value: false, | ||
33 | description: 'Enable generating the API reference (depends on GTK-Doc)') | ||
34 | +option('enable_gi', | ||
35 | + type: 'boolean', | ||
36 | + value: false, | ||
37 | + description: 'Enable gobject introspection') | ||