aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Saini <naveen.kumar.saini@intel.com>2020-04-16 13:22:17 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2020-04-16 13:40:46 +0800
commitee6810244211e6226cde0d2433e79461ae89b750 (patch)
tree63f1cf0576c738c1cc04561320f492a14faf2f91
parent67f781be8924983e9d1230974c8d722ee63d0153 (diff)
downloadmeta-intel-ee6810244211e6226cde0d2433e79461ae89b750.tar.gz
meta-intel-ee6810244211e6226cde0d2433e79461ae89b750.tar.bz2
meta-intel-ee6810244211e6226cde0d2433e79461ae89b750.zip
libva-utils-intel: keep upgraded libva-utils version to meta-intel MACHINE specific
Make sure that we use the upgraded version of libva-utils only when using MACHINE value from meta-intel. For all other cases, libva-utils 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>
-rw-r--r--conf/layer.conf4
-rw-r--r--conf/machine/include/meta-intel.inc4
-rw-r--r--recipes-multimedia/libva/libva-utils-intel_2.7.1.bb (renamed from recipes-multimedia/libva/libva-utils_2.7.1.bb)7
3 files changed, 14 insertions, 1 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 99b6b211..0460930c 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -40,3 +40,7 @@ PREFERRED_PROVIDER_nativesdk-zlib ?= "nativesdk-zlib"
PREFERRED_PROVIDER_libva ?= "libva"
PREFERRED_PROVIDER_libva-native ?= "libva-native"
PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva"
+
+PREFERRED_PROVIDER_libva-utils ?= "libva-utils"
+PREFERRED_PROVIDER_libva-native ?= "libva-utils-native"
+PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils"
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
index 6b26125b..47976cde 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -16,6 +16,10 @@ PREFERRED_PROVIDER_libva = "libva-intel"
PREFERRED_PROVIDER_libva-native = "libva-intel-native"
PREFERRED_PROVIDER_nativesdk-libva = "nativesdk-libva-intel"
+PREFERRED_PROVIDER_libva-utils = "libva-utils-intel"
+PREFERRED_PROVIDER_libva-native = "libva-utils-intel-native"
+PREFERRED_PROVIDER_nativesdk-libva-utils = "nativesdk-libva-utils-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-utils_2.7.1.bb b/recipes-multimedia/libva/libva-utils-intel_2.7.1.bb
index d25b27d1..3a0d278e 100644
--- a/recipes-multimedia/libva/libva-utils_2.7.1.bb
+++ b/recipes-multimedia/libva/libva-utils-intel_2.7.1.bb
@@ -3,6 +3,11 @@
require recipes-graphics/libva/libva-utils_2.6.0.bb
-SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.7-branch"
+SRC_URI_remove = "git://github.com/intel/libva-utils.git;branch=v2.6-branch"
+SRC_URI_prepend = "git://github.com/intel/libva-utils.git;branch=v2.7-branch "
+
SRCREV = "5a24c635f6fb2b9ac31cab3360afca50e1860812"
S = "${WORKDIR}/git"
+
+PROVIDES = "libva-utils"
+RPROVIDES_${PN} += "libva-uitls"