Adds recipes to support building X servers based on the xfree86 DDX instead

of kdrive and building mesa. It's a big commit and it's still rather rough
around the edges, but there is a desire to get this in early so people can
review the work and help polish the changes.

Some of the notable bits:
• DRI support in mesa and the X server. (configured in machine conf via
  MACHINE_DRI_MODULES variable)
• XCB backend for xlib
• A fairly lite X server build with lots of legacy modules disabled.

I'm sure there is plenty of other fairly low hanging fruit if we want to
put more effort into reducing the size of the xserver build. Currently the
server build comes in @ ~2.3MB vs a kdrive fbdev server build @ ~1MB. E.g
xaa could be made conditional to save ~320K. Of course the kdrive server
doesn't include glx stuff, which is a pretty big chunk.

Also thanks to hrw, since I nabbed a some patches from him for this, and RP,
for various bits of Poky style advice.


git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5205 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 19 insertions, 6 deletions

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 7266609e1..259f098b5 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -19,8 +19,8 @@ PREFERRED_VERSION_fontsproto-native = "2.0.2"
 PREFERRED_VERSION_gccmakedep = "1.0.2"
 PREFERRED_VERSION_glproto = "1.4.9"
 PREFERRED_VERSION_imake = "1.0.2"
-PREFERRED_VERSION_inputproto = "1.4.3"
-PREFERRED_VERSION_inputproto-native = "1.4.3"
+PREFERRED_VERSION_inputproto = "1.4.4"
+PREFERRED_VERSION_inputproto-native = "1.4.4"
 PREFERRED_VERSION_inputproto-sdk = "1.4.3"
 PREFERRED_VERSION_kbproto = "1.0.3"
 PREFERRED_VERSION_kbproto-native = "1.0.3"
@@ -36,9 +36,10 @@ PREFERRED_VERSION_liboldx = "1.0.1"
 PREFERRED_VERSION_libsm = "1.0.3"
 PREFERRED_VERSION_libwindowswm = "1.0.0"
 PREFERRED_VERSION_libx11 = "1.1.4"
+PREFERRED_VERSION_libx11-trim = "1.1.5"
 PREFERRED_VERSION_libx11-native = "1.1.4"
 PREFERRED_VERSION_libx11-sdk = "1.1.4"
-PREFERRED_VERSION_libxau = "1.0.3"
+PREFERRED_VERSION_libxau = "1.0.4"
 PREFERRED_VERSION_libxau-native = "1.0.3"
 PREFERRED_VERSION_libxau-sdk = "1.0.3"
 PREFERRED_VERSION_libxaw = "1.0.4"
@@ -52,7 +53,7 @@ PREFERRED_VERSION_libxevie = "1.0.2"
 PREFERRED_VERSION_libxext = "1.0.4"
 PREFERRED_VERSION_libxext-sdk = "1.0.4"
 PREFERRED_VERSION_libxfixes = "4.0.3"
-PREFERRED_VERSION_libxfont = "1.3.2"
+PREFERRED_VERSION_libxfont = "1.3.3"
 PREFERRED_VERSION_libxfont-native = "1.3.2"
 PREFERRED_VERSION_libxfontcache = "1.0.4"
 PREFERRED_VERSION_libxft = "2.1.12"
@@ -127,10 +128,21 @@ PREFERRED_VERSION_xproxymanagementprotocol = "1.0.2"
 PREFERRED_VERSION_xrandr = "1.2.3"
 PREFERRED_VERSION_xrdb = "1.0.5"
 PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
-PREFERRED_VERSION_xserver-xorg = "1.3.0.0"
+PREFERRED_VERSION_xserver-xf86-dri-lite = "1.5.0"
 PREFERRED_VERSION_xset = "1.0.4"
-PREFERRED_VERSION_xtrans = "1.0.4"
+PREFERRED_VERSION_xtrans = "1.2.1"
 PREFERRED_VERSION_xtrans-native = "1.0.4"
 PREFERRED_VERSION_xtrans-sdk = "1.0.4"
 PREFERRED_VERSION_xvinfo = "1.0.2"
 PREFERRED_VERSION_xwininfo = "1.0.3"
+PREFERRED_VERSION_mesa-dri = "7.1"
+PREFERRED_VERSION_libdrm = "2.3.1"
+PREFERRED_VERSION_xcb-proto = "1.0"
+PREFERRED_VERSION_libxcb = "1.0"
+PREFERRED_VERSION_libpciaccess = "0.10.3"
+PREFERRED_VERSION_xf86-input-evdev = "2.0.4"
+PREFERRED_VERSION_xf86-input-mouse = "1.3.0"
+PREFERRED_VERSION_xf86-input-keyboard = "1.3.1"
+PREFERRED_VERSION_xf86-input-synaptics = "0.15.0"
+PREFERRED_VERSION_xf86-video-intel = "2.4.2"
+
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index ab05ed707..87ee7ce4f 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -65,6 +65,7 @@ CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar
 PREFERRED_PROVIDER_virtual/db ?= "db"
 PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
 PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
 PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
 PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"