summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2012-07-30 13:51:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-19 10:46:00 +0100
commitd48235e3c26df8b8947e0b600ea33df47bf9682a (patch)
treeee24f2a84e54f4fb684edf492daacca7b5fd4769
parent2ea126818f3425f4cbaab66292552f469eca81bf (diff)
downloadpoky-d48235e3c26df8b8947e0b600ea33df47bf9682a.tar.gz
core: Prefer mesa-dri as virtual/libopengles1/2 provider
Wihtout it, you have both mesa-dri and mesa-xlib as providers. Let's prefer the accelerated version. (From meta-yocto rev: 13f847744aa842ef38b3f2adf3764425319b5507) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
index 1ab6e58af7..d1f50c1e7a 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
@@ -11,6 +11,8 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%"
11{{ if qemuarch == "i386" or qemuarch == "x86_64": }} 11{{ if qemuarch == "i386" or qemuarch == "x86_64": }}
12PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 12PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
13PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 13PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
14PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
15PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
14 16
15{{ input type:"choicelist" name:"qemuarch" prio:"5" msg:"Which qemu architecture would you like to use?" default:"i386" }} 17{{ input type:"choicelist" name:"qemuarch" prio:"5" msg:"Which qemu architecture would you like to use?" default:"i386" }}
16{{ input type:"choice" val:"i386" msg:"i386 (32-bit)" }} 18{{ input type:"choice" val:"i386" msg:"i386 (32-bit)" }}