1 files changed, 12 insertions, 4 deletions

diff --git a/common/recipes-multimedia/libva/va-intel.bb b/common/recipes-multimedia/libva/va-intel.bb
index fc4a28e2..ce642feb 100644
--- a/common/recipes-multimedia/libva/va-intel.bb
+++ b/common/recipes-multimedia/libva/va-intel.bb
@@ -3,11 +3,19 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-PR = "r0"
+PR = "r1"
 
-VA_IMPL = "${@base_contains('MACHINE_FEATURES', 'gst-va-mixvideo', \
-          'libva libva-x11 libva-tpi libva-glx libva-egl', \
-          'libva libva-intel-driver', d)}"
+def map_valibs(d):
+    # The emgd mixvideo implementation requires libva-x11/tpi/glx/egl
+    if base_contains('MACHINE_FEATURES', 'va-impl-mixvideo', "1", "0", d) == "1":
+       return "libva libva-x11 libva-tpi libva-glx libva-egl"
+    # The intel implementation requires the libva-intel-driver package
+    if base_contains('MACHINE_FEATURES', 'va-impl-intel', "1", "0", d) == "1":
+       return "libva libva-intel-driver"
+    # All meta-intel video acceleration requires libva
+    return "libva"
+
+VA_IMPL = "${@map_valibs(d)}"
 
 PACKAGES = "\
     va-intel \