meta-yocto: Sync with mesa/xserver changes and fix machines

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 10 insertions, 6 deletions

diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf
index 734e5b5469..4bab4c8899 100644
--- a/meta-yocto/conf/machine/atom-pc.conf
+++ b/meta-yocto/conf/machine/atom-pc.conf
@@ -15,9 +15,13 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
 #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg-lite"
-XSERVER ?= "xserver-xorg-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
+           xserver-xorg-extension-dri2 \
+           xserver-xorg-extension-glx \
+           xserver-xorg-extension-extmod \
+           xserver-xorg-extension-dbe \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index 1b89c43563..03e6e394a5 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -2,8 +2,8 @@
 #@NAME: Beagleboard machine
 #@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board 
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-lite"
-XSERVER = "xserver-xf86-lite \
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg-lite"
+XSERVER = "xserver-xorg-lite \
            xf86-input-evdev \
            xf86-input-mouse \
            xf86-video-omapfb \
diff --git a/meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend b/meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend
index 61d3891663..7e8e7732db 100644
--- a/meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend
+++ b/meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend
@@ -1,3 +1,3 @@
 # Atom PCs have DRI support so use mesa-dri by default
-DEFAULT_PREFERENCE_atom-pc = "1"
+DEFAULT_PREFERENCE_atom-pc = "2"