From 600c8a342c7465772bda5fd69fa7736a83669e91 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Tue, 4 Apr 2017 11:45:56 +0200 Subject: meta-intel: support distro without OpenGL When a distro disables OpenGL or using meta-intel without any distro set, a world build fails for all recipes depending directly or indirectly on libva, because libva is disables unless opengl is in DISTRO_FEATURES. "opengl" must be checked for in all those recipes. The specific use case was testing of meta-intel with yocto-compat-layer.py against just OE-core with the local.conf.sample from OE-core, i.e. DISTRO unset. Without this change, that failed with: ERROR: Nothing PROVIDES 'libva' (but /fast/work/meta-intel/common/recipes-multimedia/libyami/libyami-utils_1.1.0.bb, /fast/work/meta-intel/common/recipes-multimedia/libyami/libyami_1.1.0.bb, /fast/work/meta-intel/common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb DEPENDS on or otherwise requires it) ERROR: libva was skipped: missing required distro feature 'opengl' (not in DISTRO_FEATURES) ERROR: Nothing RPROVIDES 'libyami-dev' (but /fast/work/meta-intel/common/recipes-multimedia/libyami/libyami_1.1.0.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'libyami-dev' NOTE: Runtime target 'libyami-dev' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libyami-dev'] ERROR: Nothing RPROVIDES 'libva' (but /fast/work/meta-intel/common/recipes-multimedia/libva/va-intel.bb RDEPENDS on or otherwise requires it) ERROR: libva was skipped: missing required distro feature 'opengl' (not in DISTRO_FEATURES) NOTE: Runtime target 'libva' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libva'] ERROR: Nothing RPROVIDES 'libva-intel-driver' (but /fast/work/meta-intel/common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'libva-intel-driver' NOTE: Runtime target 'libva-intel-driver' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libva-intel-driver'] ERROR: Nothing RPROVIDES 'libyami-utils' (but /fast/work/meta-intel/common/recipes-multimedia/libyami/libyami-utils_1.1.0.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'libyami-utils' NOTE: Runtime target 'libyami-utils' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libyami-utils'] ERROR: Nothing RPROVIDES 'libyami-utils-dev' (but /fast/work/meta-intel/common/recipes-multimedia/libyami/libyami-utils_1.1.0.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'libyami-utils-dev' NOTE: Runtime target 'libyami-utils-dev' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libyami-utils-dev'] ERROR: Nothing RPROVIDES 'libyami' (but /fast/work/meta-intel/common/recipes-multimedia/libyami/libyami_1.1.0.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'libyami' NOTE: Runtime target 'libyami' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libyami'] ERROR: Nothing RPROVIDES 'libva-intel-driver-dev' (but /fast/work/meta-intel/common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'libva-intel-driver-dev' NOTE: Runtime target 'libva-intel-driver-dev' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libva-intel-driver-dev'] Signed-off-by: Patrick Ohly Signed-off-by: Saul Wold --- common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb | 4 +++- common/recipes-multimedia/libva/va-intel.bb | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'common/recipes-multimedia/libva') diff --git a/common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb b/common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb index 3850d4d4..de294e51 100644 --- a/common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb +++ b/common/recipes-multimedia/libva/libva-intel-driver_1.7.3.bb @@ -19,7 +19,9 @@ SRCREV = "c747c3428cd862869b75e96b737fa61532d6f27f" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check + +REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "opengl wayland", "wayland", "", d)}" diff --git a/common/recipes-multimedia/libva/va-intel.bb b/common/recipes-multimedia/libva/va-intel.bb index 21a3d4d1..88539e25 100644 --- a/common/recipes-multimedia/libva/va-intel.bb +++ b/common/recipes-multimedia/libva/va-intel.bb @@ -26,3 +26,7 @@ RDEPENDS_va-intel = " \ " COMPATIBLE_HOST = '(i.86|x86_64).*-linux*' + +inherit distro_features_check + +REQUIRED_DISTRO_FEATURES = "opengl" -- cgit v1.2.3-54-g00ecf