summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-07-16 08:48:02 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2018-07-18 02:20:06 (GMT)
commit0eac762e3e06d77b10d17a6f0d375c1d7b980e05 (patch)
treecdcc68eeb2e9c92fec907368a13fcf5a550a2488
parentc12c16659203d677618871f660c1499152a555a8 (diff)
downloadmeta-intel-0eac762e3e06d77b10d17a6f0d375c1d7b980e05.tar.gz
va-intel: remove
Include intel vaapi driver directly as part of hwcodecs instead of going indirectly through a separate recipe. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--conf/include/maintainers.inc1
-rw-r--r--conf/machine/intel-core2-32.conf3
-rw-r--r--conf/machine/intel-corei7-64.conf3
-rw-r--r--recipes-multimedia/libva/va-intel.bb32
4 files changed, 2 insertions, 37 deletions
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@intel.com>"
15RECIPE_MAINTAINER_pn-lms7 = "Anuj Mittal <anuj.mittal@intel.com>" 15RECIPE_MAINTAINER_pn-lms7 = "Anuj Mittal <anuj.mittal@intel.com>"
16RECIPE_MAINTAINER_pn-lms8 = "Anuj Mittal <anuj.mittal@intel.com>" 16RECIPE_MAINTAINER_pn-lms8 = "Anuj Mittal <anuj.mittal@intel.com>"
17RECIPE_MAINTAINER_pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>" 17RECIPE_MAINTAINER_pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>"
18RECIPE_MAINTAINER_pn-va-intel = "Anuj Mittal <anuj.mittal@intel.com>"
19RECIPE_MAINTAINER_pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>" 18RECIPE_MAINTAINER_pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@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
8require conf/machine/include/intel-common-pkgarch.inc 8require conf/machine/include/intel-common-pkgarch.inc
9 9
10MACHINE_FEATURES += "pcbios efi" 10MACHINE_FEATURES += "pcbios efi"
11MACHINE_FEATURES += "va-impl-intel"
12MACHINE_FEATURES += "wifi 3g nfc" 11MACHINE_FEATURES += "wifi 3g nfc"
13MACHINE_FEATURES += "intel-ucode" 12MACHINE_FEATURES += "intel-ucode"
14 13
15MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi" 14MACHINE_HWCODECS ?= "intel-vaapi-driver gstreamer1.0-vaapi"
16 15
17MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check" 16MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check"
18 17
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
8require conf/machine/include/intel-common-pkgarch.inc 8require conf/machine/include/intel-common-pkgarch.inc
9 9
10MACHINE_FEATURES += "pcbios efi" 10MACHINE_FEATURES += "pcbios efi"
11MACHINE_FEATURES += "va-impl-intel"
12MACHINE_FEATURES += "wifi 3g nfc" 11MACHINE_FEATURES += "wifi 3g nfc"
13MACHINE_FEATURES += "intel-ucode" 12MACHINE_FEATURES += "intel-ucode"
14 13
15MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi" 14MACHINE_HWCODECS ?= "intel-vaapi-driver gstreamer1.0-vaapi"
16 15
17MACHINE_EXTRA_RRECOMMENDS += "lms8" 16MACHINE_EXTRA_RRECOMMENDS += "lms8"
18 17
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 @@
1DESCRIPTION = "Video Acceleration Add-ons for Intel BSPs"
2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4
5S = "${WORKDIR}"
6
7PR = "r1"
8
9def map_valibs(d):
10 # The intel implementation requires the intel-vaapi-driver package
11 if bb.utils.contains('MACHINE_FEATURES', 'va-impl-intel', "1", "0", d) == "1":
12 return "libva intel-vaapi-driver"
13 # All meta-intel video acceleration requires libva
14 return "libva"
15
16VA_IMPL = "${@map_valibs(d)}"
17
18PACKAGES = "\
19 va-intel \
20 "
21
22ALLOW_EMPTY_va-intel = "1"
23
24RDEPENDS_va-intel = " \
25 ${VA_IMPL} \
26 "
27
28COMPATIBLE_HOST = '(i.86|x86_64).*-linux*'
29
30inherit distro_features_check
31
32REQUIRED_DISTRO_FEATURES = "opengl"