summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2012-07-30 14:51:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-19 10:45:57 +0100
commit3ea5c742c825574b7e475d6d12060b1b6429ef6b (patch)
tree791845e0ddb2cbccf731abce17b15d056967c350
parentaef0371ebafe1b0befe1ad96cc45aa46daba32b3 (diff)
downloadpoky-3ea5c742c825574b7e475d6d12060b1b6429ef6b.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 OE-Core rev: 9f83d93c65942f9ed1b25a24976f92ae06c425c8) 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--meta/conf/distro/include/default-providers.inc2
-rw-r--r--meta/conf/machine/qemux86-64.conf2
-rw-r--r--meta/conf/machine/qemux86.conf2
3 files changed, 6 insertions, 0 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 54c90d3292..28d2f8eac7 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -6,6 +6,8 @@ PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
6PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 6PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
7PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" 7PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
8PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 8PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
9PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
10PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
9PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" 11PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
10PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" 12PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
11PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 13PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 998ef60401..285054ab3d 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -4,6 +4,8 @@
4 4
5PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 5PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
6PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 6PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
7PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
8PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
7 9
8require conf/machine/include/tune-x86_64.inc 10require conf/machine/include/tune-x86_64.inc
9 11
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 57e480c851..c81afe5657 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -4,6 +4,8 @@
4 4
5PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 5PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
6PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 6PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
7PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
8PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
7 9
8require conf/machine/include/tune-i586.inc 10require conf/machine/include/tune-i586.inc
9 11