From d3da00648ccd4b281871efdd1be7790fe77e5d1e Mon Sep 17 00:00:00 2001 From: Wenzong Fan Date: Wed, 21 Oct 2015 04:23:55 -0400 Subject: recipes: add distro_features_check for some packages * The packages that depends on gtk+3 require any of distro features from ${GTK3DISTROFEATURES} * The packages that depends on virtual/egl, virtual/libgl ... require distro feature 'opengl' (From OE-Core rev: 3edf08b38b0af93cef0933b061349264dc86d54c) Signed-off-by: Wenzong Fan Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/clutter/clutter-1.0.inc | 4 +++- meta/recipes-graphics/clutter/clutter-gst-3.0.inc | 4 +++- meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'meta/recipes-graphics/clutter') diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc index da21cee8b5..5d0f55c64d 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -2,7 +2,9 @@ SUMMARY = "Graphics library for creating hardware-accelerated user interfaces" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPLv2.1+" -inherit clutter ptest-gnome +inherit clutter ptest-gnome distro_features_check +# depends on cogl-1.0 which needs opengl +REQUIRED_DISTRO_FEATURES ?= "opengl" DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" PACKAGE_BEFORE_PN += "${PN}-examples" diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc b/meta/recipes-graphics/clutter/clutter-gst-3.0.inc index d4fed7127f..67c75902ef 100644 --- a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc +++ b/meta/recipes-graphics/clutter/clutter-gst-3.0.inc @@ -2,7 +2,9 @@ SUMMARY = "GStreamer integration library for Clutter" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPLv2+" -inherit clutter +inherit clutter distro_features_check +# depends on clutter-1.0 which depends on cogl-1.0 +REQUIRED_DISTRO_FEATURES ?= "opengl" SRC_URI += "file://0001-Install-example-binary-needed-for-core-image-clutter.patch" diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc index 45898b4d60..688eed2d91 100644 --- a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -2,7 +2,11 @@ SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPLv2+" -inherit clutter +inherit clutter distro_features_check +# depends on clutter-1.0 which depends on cogl-1.0 +REQUIRED_DISTRO_FEATURES ?= "opengl" +# depends on gtk+3 +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" DEPENDS = "clutter-1.0 gtk+3" PACKAGES =+ "${PN}-examples" -- cgit v1.2.3-54-g00ecf