From 67f781be8924983e9d1230974c8d722ee63d0153 Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Thu, 16 Apr 2020 13:22:16 +0800
Subject: [PATCH] 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 <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 conf/layer.conf                                           | 4 ++++
 conf/machine/include/meta-intel.inc                       | 4 ++++
 .../libva/{libva_2.7.0.bb => libva-intel_2.7.0.bb}        | 8 ++++++++
 3 files changed, 16 insertions(+)
 rename recipes-multimedia/libva/{libva_2.7.0.bb => libva-intel_2.7.0.bb} (51%)

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%"
diff --git a/recipes-multimedia/libva/libva_2.7.0.bb b/recipes-multimedia/libva/libva-intel_2.7.0.bb
similarity index 51%
rename from recipes-multimedia/libva/libva_2.7.0.bb
rename to recipes-multimedia/libva/libva-intel_2.7.0.bb
index 7ce65f02..3c71e1ac 100644
--- a/recipes-multimedia/libva/libva_2.7.0.bb
+++ b/recipes-multimedia/libva/libva-intel_2.7.0.bb
@@ -3,5 +3,13 @@
 
 require recipes-graphics/libva/libva_2.6.1.bb
 
+SRC_URI_remove = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2"
+SRC_URI_prepend = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2 "
+
 SRC_URI[md5sum] = "bd5052569520e734eb8aeb0f503cfcae"
 SRC_URI[sha256sum] = "b75be416615dea75c74314fae8919dd72ca46d06b4e009e029661c2c51d87d70"
+
+S = "${WORKDIR}/libva-${PV}"
+
+PROVIDES = "libva"
+RPROVIDES_${PN} += "libva"