2 files changed, 11 insertions, 0 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index fcfdf2a7..6e9d86e8 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -34,3 +34,9 @@ require ${LAYERDIR}/conf/include/maintainers.inc
 PREFERRED_PROVIDER_zlib ?= "zlib"
 PREFERRED_PROVIDER_zlib-native ?= "zlib-native"
 PREFERRED_PROVIDER_nativesdk-zlib ?= "nativesdk-zlib"
+
+# Use the libva from OE-Core when layer is included but no MACHINE
+# from meta-intel is being used.
+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 932c0cc1..86c94878 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -17,6 +17,11 @@ PREFERRED_VERSION_linux-intel-rt ?= "5.4%"
 PREFERRED_VERSION_linux-intel_poky-altcfg ?= "5.4%"
 PREFERRED_VERSION_linux-intel-rt_poky-altcfg ?= "5.4%"
 
+# Need to point to latest version of libva needed for media components
+PREFERRED_PROVIDER_libva = "libva-intel"
+PREFERRED_PROVIDER_libva-native = "libva-intel-native"
+PREFERRED_PROVIDER_nativesdk-libva = "nativesdk-libva-intel"
+
 XSERVER_X86_ASPEED_AST = "xf86-video-ast \
            "