From 3ea5c742c825574b7e475d6d12060b1b6429ef6b Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Mon, 30 Jul 2012 14:51:14 +0100 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/conf/distro/include/default-providers.inc | 2 ++ meta/conf/machine/qemux86-64.conf | 2 ++ meta/conf/machine/qemux86.conf | 2 ++ 3 files changed, 6 insertions(+) (limited to 'meta/conf') 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" 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 998ef60401..285054ab3d 100644 --- 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 57e480c851..c81afe5657 100644 --- 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 -- cgit v1.2.3-54-g00ecf