summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Saini <naveen.kumar.saini@intel.com>2020-04-16 05:22:16 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2020-04-16 05:40:46 (GMT)
commit67f781be8924983e9d1230974c8d722ee63d0153 (patch)
tree8133ae553d2e647cb044961ae5ada92a847fa5b9
parenteaf525c08706e4525dac4cf0a77eb7b2b8da7cda (diff)
downloadmeta-intel-67f781be8924983e9d1230974c8d722ee63d0153.tar.gz
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>
-rw-r--r--conf/layer.conf4
-rw-r--r--conf/machine/include/meta-intel.inc4
-rw-r--r--recipes-multimedia/libva/libva-intel_2.7.0.bb (renamed from recipes-multimedia/libva/libva_2.7.0.bb)8
3 files changed, 16 insertions, 0 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 7a7283c..99b6b21 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -36,3 +36,7 @@ require ${LAYERDIR}/conf/include/maintainers.inc
36PREFERRED_PROVIDER_zlib ?= "zlib" 36PREFERRED_PROVIDER_zlib ?= "zlib"
37PREFERRED_PROVIDER_zlib-native ?= "zlib-native" 37PREFERRED_PROVIDER_zlib-native ?= "zlib-native"
38PREFERRED_PROVIDER_nativesdk-zlib ?= "nativesdk-zlib" 38PREFERRED_PROVIDER_nativesdk-zlib ?= "nativesdk-zlib"
39
40PREFERRED_PROVIDER_libva ?= "libva"
41PREFERRED_PROVIDER_libva-native ?= "libva-native"
42PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva"
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
index 27d7a70..6b26125 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -12,6 +12,10 @@ PREFERRED_PROVIDER_zlib = "zlib-intel"
12PREFERRED_PROVIDER_zlib-native = "zlib-native" 12PREFERRED_PROVIDER_zlib-native = "zlib-native"
13PREFERRED_PROVIDER_nativesdk-zlib = "nativesdk-zlib" 13PREFERRED_PROVIDER_nativesdk-zlib = "nativesdk-zlib"
14 14
15PREFERRED_PROVIDER_libva = "libva-intel"
16PREFERRED_PROVIDER_libva-native = "libva-intel-native"
17PREFERRED_PROVIDER_nativesdk-libva = "nativesdk-libva-intel"
18
15PREFERRED_VERSION_linux-intel ?= "5.4%" 19PREFERRED_VERSION_linux-intel ?= "5.4%"
16PREFERRED_VERSION_linux-intel-rt ?= "5.4%" 20PREFERRED_VERSION_linux-intel-rt ?= "5.4%"
17PREFERRED_VERSION_linux-intel_poky-altcfg ?= "4.19%" 21PREFERRED_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
index 7ce65f0..3c71e1a 100644
--- a/recipes-multimedia/libva/libva_2.7.0.bb
+++ b/recipes-multimedia/libva/libva-intel_2.7.0.bb
@@ -3,5 +3,13 @@
3 3
4require recipes-graphics/libva/libva_2.6.1.bb 4require recipes-graphics/libva/libva_2.6.1.bb
5 5
6SRC_URI_remove = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2"
7SRC_URI_prepend = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2 "
8
6SRC_URI[md5sum] = "bd5052569520e734eb8aeb0f503cfcae" 9SRC_URI[md5sum] = "bd5052569520e734eb8aeb0f503cfcae"
7SRC_URI[sha256sum] = "b75be416615dea75c74314fae8919dd72ca46d06b4e009e029661c2c51d87d70" 10SRC_URI[sha256sum] = "b75be416615dea75c74314fae8919dd72ca46d06b4e009e029661c2c51d87d70"
11
12S = "${WORKDIR}/libva-${PV}"
13
14PROVIDES = "libva"
15RPROVIDES_${PN} += "libva"