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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 54c90d3292e163a6ca4e3874c5c7db3a01299f67..28d2f8eac7bd1309a3e6f965b934111012208e10 100644 (file)
--- 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"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
 PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"

diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 998ef60401b283cd8bde07787f84b1d65300e8bd..285054ab3da8709df14b43958f665d37329e2086 100644 (file)
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -4,6 +4,8 @@
 
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
 
 require conf/machine/include/tune-x86_64.inc
 

diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 57e480c8515c091dee80541dc43d71eded60a499..c81afe565702c778eddf2451bedbd5496f6a092d 100644 (file)
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -4,6 +4,8 @@
 
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
 
 require conf/machine/include/tune-i586.inc