diff options
| author | Denys Dmytriyenko <denys@ti.com> | 2019-11-14 19:40:07 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-21 23:08:19 +0000 |
| commit | 9702544b3e75d761d86cae7e8b36f3f2625b68ce (patch) | |
| tree | b8db1573283245d3f7d7c8d9fc32b9bd67c76f14 /meta/recipes-graphics/clutter | |
| parent | a616ffebdc6f761635f351432461010de1890b7d (diff) | |
| download | poky-9702544b3e75d761d86cae7e8b36f3f2625b68ce.tar.gz | |
distro_features_check: expand with MACHINE_FEATURES and COMBINED_FEATURES, rename
Besides checking DISTRO_FEATURES for required or conflicting features,
being able to check MACHINE_FEATURES and/or COMBINED_FEATURES may also
be useful at times.
Temporarily support the old class name with a warning about future
deprecation.
(From OE-Core rev: 5f4875b950ce199e91f99c8e945a0c709166dc14)
Signed-off-by: Denys Dmytriyenko <denys@ti.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-1.0.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-gst-3.0.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc index 9ecdfd0a8c..5dc45ebf21 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc | |||
| @@ -5,7 +5,7 @@ box UIs, presentations, kiosk style applications and so on." | |||
| 5 | HOMEPAGE = "http://www.clutter-project.org/" | 5 | HOMEPAGE = "http://www.clutter-project.org/" |
| 6 | LICENSE = "LGPLv2.1+" | 6 | LICENSE = "LGPLv2.1+" |
| 7 | 7 | ||
| 8 | inherit clutter ptest-gnome distro_features_check upstream-version-is-even gobject-introspection | 8 | inherit clutter ptest-gnome features_check upstream-version-is-even gobject-introspection |
| 9 | # depends on cogl-1.0 which needs opengl | 9 | # depends on cogl-1.0 which needs opengl |
| 10 | REQUIRED_DISTRO_FEATURES ?= "opengl" | 10 | REQUIRED_DISTRO_FEATURES ?= "opengl" |
| 11 | 11 | ||
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc b/meta/recipes-graphics/clutter/clutter-gst-3.0.inc index 4c877982b7..fc3eade886 100644 --- a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc +++ b/meta/recipes-graphics/clutter/clutter-gst-3.0.inc | |||
| @@ -2,7 +2,7 @@ SUMMARY = "GStreamer integration library for Clutter" | |||
| 2 | HOMEPAGE = "http://www.clutter-project.org/" | 2 | HOMEPAGE = "http://www.clutter-project.org/" |
| 3 | LICENSE = "LGPLv2+" | 3 | LICENSE = "LGPLv2+" |
| 4 | 4 | ||
| 5 | inherit clutter distro_features_check upstream-version-is-even gobject-introspection | 5 | inherit clutter features_check upstream-version-is-even gobject-introspection |
| 6 | # depends on clutter-1.0 which depends on cogl-1.0 | 6 | # depends on clutter-1.0 which depends on cogl-1.0 |
| 7 | REQUIRED_DISTRO_FEATURES ?= "opengl" | 7 | REQUIRED_DISTRO_FEATURES ?= "opengl" |
| 8 | 8 | ||
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc index 11826a6f0c..7bf2278555 100644 --- a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.clutter-project.org/" | |||
| 3 | LICENSE = "LGPLv2+" | 3 | LICENSE = "LGPLv2+" |
| 4 | 4 | ||
| 5 | CLUTTERBASEBUILDCLASS = "meson" | 5 | CLUTTERBASEBUILDCLASS = "meson" |
| 6 | inherit clutter distro_features_check upstream-version-is-even gobject-introspection gtk-doc | 6 | inherit clutter features_check upstream-version-is-even gobject-introspection gtk-doc |
| 7 | 7 | ||
| 8 | # depends on clutter-1.0 which depends on cogl-1.0 | 8 | # depends on clutter-1.0 which depends on cogl-1.0 |
| 9 | REQUIRED_DISTRO_FEATURES ?= "opengl" | 9 | REQUIRED_DISTRO_FEATURES ?= "opengl" |