summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/clutter
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-02-18 13:41:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-19 16:14:57 +0000
commit85a4d9f53be0f2f17f51f90caa9dfafa3b83ac13 (patch)
tree3034bebe8ddae0b9ba69c43710858ea2dbd002e2 /meta/recipes-graphics/clutter
parent4972d5dbd94a5a1fe9848e20730245f0f715501f (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk-1.0.inc20
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch37
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb1
3 files changed, 56 insertions, 2 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
index 05c4e5f5ca..4e82f56605 100644
--- a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
@@ -2,7 +2,9 @@ SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2+" 3LICENSE = "LGPLv2+"
4 4
5inherit clutter distro_features_check upstream-version-is-even gobject-introspection 5CLUTTERBASEBUILDCLASS = "meson"
6inherit clutter distro_features_check upstream-version-is-even gobject-introspection gtk-doc
7
6# depends on clutter-1.0 which depends on cogl-1.0 8# depends on clutter-1.0 which depends on cogl-1.0
7REQUIRED_DISTRO_FEATURES ?= "opengl" 9REQUIRED_DISTRO_FEATURES ?= "opengl"
8# depends on gtk+3 10# depends on gtk+3
@@ -10,6 +12,20 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
10 12
11DEPENDS = "clutter-1.0 gtk+3" 13DEPENDS = "clutter-1.0 gtk+3"
12PACKAGES =+ "${PN}-examples" 14PACKAGES =+ "${PN}-examples"
13AUTOTOOLS_AUXDIR = "${S}/build" 15
16GTKDOC_ENABLE_FLAG = "-Denable_docs=true"
17GTKDOC_DISABLE_FLAG = "-Denable_docs=false"
18
19GI_ENABLE_FLAG = "-Denable_gi=true"
20GI_DISABLE_FLAG = "-Denable_gi=false"
21
22EXTRA_OEMESON_append_class-nativesdk = " ${GI_DISABLE_FLAG}"
23
24EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
25 '${GI_DISABLE_FLAG}', d)} "
26
27EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
28 '${GTKDOC_DISABLE_FLAG}', d)} "
29
14 30
15 31
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 @@
1From 7233883c6bd4e80c0e91b29b5c76fe798023e9fe Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 11 Feb 2019 16:41:13 +0100
4Subject: [PATCH] Add a config variable for enabling/disabling introspection
5
6Upstream-Status: Pending
7Signed-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
13diff --git a/clutter-gtk/meson.build b/clutter-gtk/meson.build
14index 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',
26diff --git a/meson_options.txt b/meson_options.txt
27index 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')
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb
index f0300c7164..53948c8944 100644
--- a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb
@@ -2,5 +2,6 @@ require clutter-gtk-1.0.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" 3LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
4 4
5SRC_URI += " file://0001-Add-a-config-variable-for-enabling-disabling-introsp.patch"
5SRC_URI[archive.md5sum] = "b363ac9878e2337be887b8ee9e1da00e" 6SRC_URI[archive.md5sum] = "b363ac9878e2337be887b8ee9e1da00e"
6SRC_URI[archive.sha256sum] = "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06" 7SRC_URI[archive.sha256sum] = "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06"