From c8bbb9983bcc7cfc5332e89c3e8148505b4ca83f Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Tue, 19 Mar 2013 18:23:56 +0200 Subject: mesa: rename mesa-dri recipe to just mesa Rename mesa-dri recipes to just mesa. Also, replace all references to mesa-dri in all recipes/configs. The reason for this renaming (quote from bugzilla): "mesa-dri is a artefact of mesa-xlib existing, which doesn't anymore. mesa-dri should be renamed to mesa." [YOCTO #3385] Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- meta/conf/machine/include/ia32-base.inc | 4 ++-- meta/conf/machine/include/qemu.inc | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/conf/machine/include') diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/ia32-base.inc index 0798bf88c1..921c740772 100644 --- a/meta/conf/machine/include/ia32-base.inc +++ b/meta/conf/machine/include/ia32-base.inc @@ -39,11 +39,11 @@ XSERVER_IA32_EXT = " \ " XSERVER_IA32_I915 = "xf86-video-intel \ - mesa-dri-driver-i915 \ + mesa-driver-i915 \ " XSERVER_IA32_I965 = "xf86-video-intel \ - mesa-dri-driver-i965 \ + mesa-driver-i965 \ " XSERVER_IA32_VESA = "xf86-video-vesa" diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 52215b3930..29caec9559 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -1,10 +1,10 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" -PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri" -PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa" +PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" +PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" XSERVER ?= "xserver-xorg \ - mesa-dri-driver-swrast \ + mesa-driver-swrast \ xf86-input-evdev \ xf86-input-mouse \ xf86-video-fbdev \ -- cgit v1.2.3