[oe-commits] Martin Jansa : spitz: use xorg-xserver and mesa-dri

[git version control]

Module: openembedded.git
Branch: martin_jansa/xorg-7.5
Commit: 6f270287e00b26f157420a9812da93cb06c92aa7
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6f270287e00b26f157420a9812da93cb06c92aa7

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Oct 17 15:38:32 2009 +0200

spitz: use xorg-xserver and mesa-dri

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 conf/machine/include/zaurus-2.6.inc |    1 +
 conf/machine/spitz.conf             |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index cd83a7b..da46476 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -20,6 +20,7 @@ SERIAL_CONSOLE_collie = "115200 ttySA0"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon"
 PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev"
+PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index dde1bd1..b8e008e 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -29,5 +29,7 @@ UBOOT_ENTRYPOINT = "0xA1000000"
 UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
 
 # xserver-kdrive 1.3.0.0 is still the only working version:
-XSERVER = "xserver-kdrive-1300-fbdev"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
+#XSERVER = "xserver-kdrive-1300-fbdev"
+#PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
+XSERVER = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"