summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-10-22 11:39:44 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2012-10-22 14:09:28 (GMT)
commit71619f5ef05a3ca3a2a6b19764f6a8a93f011d67 (patch)
tree035858104847eaa4229b7040ce9b7576e8f8dd23
parent4e05f868bb8ab2fd80b510a6bee30795e634655d (diff)
downloadmeta-intel-71619f5ef05a3ca3a2a6b19764f6a8a93f011d67.tar.gz
meta-intel: don't require commercial licenses for gstreamer-vaapi
Now that gstreamer-vaapi doesn't depend on ffmpeg, it can always be recommended by the machine configuration. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-cedartrail/conf/machine/cedartrail.conf3
-rw-r--r--meta-chiefriver/conf/machine/chiefriver.conf3
-rw-r--r--meta-crownbay/conf/machine/crownbay.conf3
-rw-r--r--meta-fri2/conf/machine/fri2.conf3
-rw-r--r--meta-sugarbay/conf/machine/sugarbay.conf3
-rw-r--r--meta-sys940x/conf/machine/sys940x.conf3
6 files changed, 6 insertions, 12 deletions
diff --git a/meta-cedartrail/conf/machine/cedartrail.conf b/meta-cedartrail/conf/machine/cedartrail.conf
index ea50ea6..d8b6bc0 100644
--- a/meta-cedartrail/conf/machine/cedartrail.conf
+++ b/meta-cedartrail/conf/machine/cedartrail.conf
@@ -22,7 +22,6 @@ SYSLINUX_OPTS = "serial 0 115200"
22SERIAL_CONSOLE = "115200 ttyS0" 22SERIAL_CONSOLE = "115200 ttyS0"
23APPEND += "console=ttyS0,115200 console=tty0" 23APPEND += "console=ttyS0,115200 console=tty0"
24 24
25VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ 25VA_FEATURES = "gst-va-intel va-intel"
26 "commercial", "gst-va-intel va-intel", "", d)}"
27 26
28MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" 27MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"
diff --git a/meta-chiefriver/conf/machine/chiefriver.conf b/meta-chiefriver/conf/machine/chiefriver.conf
index a9c8e5a..b8b8754 100644
--- a/meta-chiefriver/conf/machine/chiefriver.conf
+++ b/meta-chiefriver/conf/machine/chiefriver.conf
@@ -15,7 +15,6 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
15 ${XSERVER_IA32_I965} \ 15 ${XSERVER_IA32_I965} \
16 " 16 "
17 17
18VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ 18VA_FEATURES = "gst-va-intel va-intel"
19 "commercial", "gst-va-intel va-intel", "", d)}"
20 19
21MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES} lms" 20MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES} lms"
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 72431de..d56ef64 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -23,7 +23,6 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
23 23
24APPEND += "video=vesafb vga=0x318 vmalloc=256MB" 24APPEND += "video=vesafb vga=0x318 vmalloc=256MB"
25 25
26VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ 26VA_FEATURES = "gst-va-intel va-intel"
27 "commercial", "gst-va-intel va-intel", "va-intel", d)}"
28 27
29MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" 28MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index dff11a8..587b976 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -8,8 +8,7 @@ require conf/machine/include/tune-atom.inc
8require conf/machine/include/ia32-base.inc 8require conf/machine/include/ia32-base.inc
9require conf/machine/include/meta-intel.inc 9require conf/machine/include/meta-intel.inc
10 10
11VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ 11VA_FEATURES = "gst-va-intel va-intel"
12 "commercial", "gst-va-intel va-intel", "va-intel", d)}"
13 12
14MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" 13MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo"
15MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" 14MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}"
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index 17cc15c..1d0e68d 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -16,7 +16,6 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
16 ${XSERVER_IA32_I965} \ 16 ${XSERVER_IA32_I965} \
17 " 17 "
18 18
19VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ 19VA_FEATURES = "gst-va-intel va-intel"
20 "commercial", "gst-va-intel va-intel", "", d)}"
21 20
22MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" 21MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf
index bdd655f..eefca59 100644
--- a/meta-sys940x/conf/machine/sys940x.conf
+++ b/meta-sys940x/conf/machine/sys940x.conf
@@ -26,7 +26,6 @@ PREFERRED_VERSION_emgd-driver-bin ?= "1.14"
26SERIAL_CONSOLE = "115200 ttyS0" 26SERIAL_CONSOLE = "115200 ttyS0"
27APPEND += "console=ttyS0,115200 console=tty0" 27APPEND += "console=ttyS0,115200 console=tty0"
28 28
29VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ 29VA_FEATURES = "gst-va-intel va-intel"
30 "commercial", "gst-va-intel va-intel", "va-intel", d)}"
31 30
32MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" 31MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"