[meta-intel] [PATCH] va-intel: remove

[Anuj Mittal]

Include intel vaapi driver directly as part of hwcodecs instead of going
indirectly through a separate recipe.

Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
---
 conf/include/maintainers.inc         |  1 -
 conf/machine/intel-core2-32.conf     |  3 +--
 conf/machine/intel-corei7-64.conf    |  3 +--
 recipes-multimedia/libva/va-intel.bb | 32 ----------------------------
 4 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 recipes-multimedia/libva/va-intel.bb

diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc
index 4bd4581..d71584b 100644
--- a/conf/include/maintainers.inc
+++ b/conf/include/maintainers.inc
@@ -15,5 +15,4 @@ RECIPE_MAINTAINER_pn-linux-intel-rt = "Anuj Mittal <anuj.mittal at intel.com>"
 RECIPE_MAINTAINER_pn-lms7 = "Anuj Mittal <anuj.mittal at intel.com>"
 RECIPE_MAINTAINER_pn-lms8 = "Anuj Mittal <anuj.mittal at intel.com>"
 RECIPE_MAINTAINER_pn-thermald = "Anuj Mittal <anuj.mittal at intel.com>"
-RECIPE_MAINTAINER_pn-va-intel = "Anuj Mittal <anuj.mittal at intel.com>"
 RECIPE_MAINTAINER_pn-xf86-video-ast = "Anuj Mittal <anuj.mittal at intel.com>"
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf
index 9a83fdf..570685a 100644
--- a/conf/machine/intel-core2-32.conf
+++ b/conf/machine/intel-core2-32.conf
@@ -8,11 +8,10 @@ require conf/machine/include/intel-core2-32-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
 
 MACHINE_FEATURES += "pcbios efi"
-MACHINE_FEATURES += "va-impl-intel"
 MACHINE_FEATURES += "wifi 3g nfc"
 MACHINE_FEATURES += "intel-ucode"
 
-MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi"
+MACHINE_HWCODECS ?= "intel-vaapi-driver gstreamer1.0-vaapi"
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check"
 
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 16006d3..e22181c 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -8,11 +8,10 @@ require conf/machine/include/intel-corei7-64-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
 
 MACHINE_FEATURES += "pcbios efi"
-MACHINE_FEATURES += "va-impl-intel"
 MACHINE_FEATURES += "wifi 3g nfc"
 MACHINE_FEATURES += "intel-ucode"
 
-MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi"
+MACHINE_HWCODECS ?= "intel-vaapi-driver gstreamer1.0-vaapi"
 
 MACHINE_EXTRA_RRECOMMENDS += "lms8"
 
diff --git a/recipes-multimedia/libva/va-intel.bb b/recipes-multimedia/libva/va-intel.bb
deleted file mode 100644
index 33b81a3..0000000
--- a/recipes-multimedia/libva/va-intel.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Video Acceleration Add-ons for Intel BSPs"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-S = "${WORKDIR}"
-
-PR = "r1"
-
-def map_valibs(d):
-    # The intel implementation requires the intel-vaapi-driver package
-    if bb.utils.contains('MACHINE_FEATURES', 'va-impl-intel', "1", "0", d) == "1":
-       return "libva intel-vaapi-driver"
-    # All meta-intel video acceleration requires libva
-    return "libva"
-
-VA_IMPL = "${@map_valibs(d)}"
-
-PACKAGES = "\
-    va-intel \
-    "
-
-ALLOW_EMPTY_va-intel = "1"
-
-RDEPENDS_va-intel = " \
-    ${VA_IMPL} \
-    "
-
-COMPATIBLE_HOST = '(i.86|x86_64).*-linux*'
-
-inherit distro_features_check
-
-REQUIRED_DISTRO_FEATURES = "opengl"
-- 
2.17.1