From 67f781be8924983e9d1230974c8d722ee63d0153 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Thu, 16 Apr 2020 13:22:16 +0800 Subject: libva-intel: keep upgraded libva version to meta-intel MACHINE specific Make sure that we use the upgraded version of libva only when using MACHINE value from meta-intel. For all other cases, libva from oe-core should be used. Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- conf/layer.conf | 4 ++++ conf/machine/include/meta-intel.inc | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'conf') diff --git a/conf/layer.conf b/conf/layer.conf index 7a7283ca..99b6b211 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -36,3 +36,7 @@ require ${LAYERDIR}/conf/include/maintainers.inc PREFERRED_PROVIDER_zlib ?= "zlib" PREFERRED_PROVIDER_zlib-native ?= "zlib-native" PREFERRED_PROVIDER_nativesdk-zlib ?= "nativesdk-zlib" + +PREFERRED_PROVIDER_libva ?= "libva" +PREFERRED_PROVIDER_libva-native ?= "libva-native" +PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva" diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index 27d7a70f..6b26125b 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc @@ -12,6 +12,10 @@ PREFERRED_PROVIDER_zlib = "zlib-intel" PREFERRED_PROVIDER_zlib-native = "zlib-native" PREFERRED_PROVIDER_nativesdk-zlib = "nativesdk-zlib" +PREFERRED_PROVIDER_libva = "libva-intel" +PREFERRED_PROVIDER_libva-native = "libva-intel-native" +PREFERRED_PROVIDER_nativesdk-libva = "nativesdk-libva-intel" + PREFERRED_VERSION_linux-intel ?= "5.4%" PREFERRED_VERSION_linux-intel-rt ?= "5.4%" PREFERRED_VERSION_linux-intel_poky-altcfg ?= "4.19%" -- cgit v1.2.3-54-g00ecf