From ee6810244211e6226cde0d2433e79461ae89b750 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Thu, 16 Apr 2020 13:22:17 +0800 Subject: 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 Signed-off-by: Anuj Mittal --- conf/layer.conf | 4 ++++ conf/machine/include/meta-intel.inc | 4 ++++ recipes-multimedia/libva/libva-utils-intel_2.7.1.bb | 13 +++++++++++++ recipes-multimedia/libva/libva-utils_2.7.1.bb | 8 -------- 4 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 recipes-multimedia/libva/libva-utils-intel_2.7.1.bb delete mode 100644 recipes-multimedia/libva/libva-utils_2.7.1.bb 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-intel_2.7.1.bb b/recipes-multimedia/libva/libva-utils-intel_2.7.1.bb new file mode 100644 index 00000000..3a0d278e --- /dev/null +++ b/recipes-multimedia/libva/libva-utils-intel_2.7.1.bb @@ -0,0 +1,13 @@ +# Latest upgrades for media components depend upon libva-utils v2.7.1 +# So need this upgrade + +require recipes-graphics/libva/libva-utils_2.6.0.bb + +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" diff --git a/recipes-multimedia/libva/libva-utils_2.7.1.bb b/recipes-multimedia/libva/libva-utils_2.7.1.bb deleted file mode 100644 index d25b27d1..00000000 --- a/recipes-multimedia/libva/libva-utils_2.7.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -# Latest upgrades for media components depend upon libva-utils v2.7.1 -# So need this upgrade - -require recipes-graphics/libva/libva-utils_2.6.0.bb - -SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.7-branch" -SRCREV = "5a24c635f6fb2b9ac31cab3360afca50e1860812" -S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf