From 7c2aa0001eed1c0dbc15d5eaeef78a5d92be3d4e Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 21 Oct 2008 14:16:32 +0100
Subject: om-gta02.conf : preliminary switch to xorg from Xglamo

---
 conf/machine/om-gta02.conf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 9876ebecbd..6098f47f9f 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -17,7 +17,11 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
-XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-fbdev \
+           xf86-input-keyboard"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
-- 
cgit v1.2.3


From c3b150f9b649a3e9d60f18f71f9f864ce2f11526 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 10:43:59 +0000
Subject: xwd_1.0.2.bb : new version for X11R7.4

---
 packages/xorg-app/xwd_1.0.2.bb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/xorg-app/xwd_1.0.2.bb

diff --git a/packages/xorg-app/xwd_1.0.2.bb b/packages/xorg-app/xwd_1.0.2.bb
new file mode 100644
index 0000000000..7b712390c6
--- /dev/null
+++ b/packages/xorg-app/xwd_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxmu virtual/libx11"
+
-- 
cgit v1.2.3


From fe57f804af1f62c2882dc833b20e6216d2f10ee5 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 10:44:23 +0000
Subject: xwininfo_1.0.4.bb : new version for X11R7.4

---
 packages/xorg-app/xwininfo_1.0.4.bb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/xorg-app/xwininfo_1.0.4.bb

diff --git a/packages/xorg-app/xwininfo_1.0.4.bb b/packages/xorg-app/xwininfo_1.0.4.bb
new file mode 100644
index 0000000000..069dd30aa8
--- /dev/null
+++ b/packages/xorg-app/xwininfo_1.0.4.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxmu libxext virtual/libx11"
+
-- 
cgit v1.2.3


From d85576bcaced88ed82fe6a4752bc0d12a74db1c5 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 10:44:44 +0000
Subject: xserver-xorg_1.5.1.bb : new version for X11R7.4

drmfix.patch was refreshed for this version, problem still there though
---
 packages/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch | 13 +++++++++++++
 packages/xorg-xserver/xserver-xorg_1.5.1.bb           | 15 +++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 packages/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
 create mode 100644 packages/xorg-xserver/xserver-xorg_1.5.1.bb

diff --git a/packages/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch b/packages/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
new file mode 100644
index 0000000000..e0f633bc24
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am	2008-09-23 19:24:59.000000000 +0100
++++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am	2008-10-27 13:27:40.000000000 +0000
+@@ -40,7 +40,7 @@
+ 
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+ 
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
+ 
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SRCS = \
diff --git a/packages/xorg-xserver/xserver-xorg_1.5.1.bb b/packages/xorg-xserver/xserver-xorg_1.5.1.bb
new file mode 100644
index 0000000000..087692d700
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg_1.5.1.bb
@@ -0,0 +1,15 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess"
+PE = "1"
+PR = "r0"
+
+SRC_URI += "file://drmfix.patch;patch=1 \
+            file://sysroot_fix.patch;patch=1"
+
+MESA_VER = "7.2"
+
+EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
+
+export LDFLAGS += " -ldl "
-- 
cgit v1.2.3


From 48a174c26d7992075f954f39a2c2046246616290 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 10:46:10 +0000
Subject: angstrom-2008.1.conf : move to using X11R7.4

---
 conf/distro/angstrom-2008.1.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 33349fcde1..9bc0273466 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -116,7 +116,7 @@ PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}"
 
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
 require conf/distro/include/preferred-e-versions.inc
-require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
 
 #avr32 only has patches for binutils 2.17 in OE
 PREFERRED_VERSION_binutils_avr32 = "2.17"
-- 
cgit v1.2.3


From 959024bb7e1db6c0066bcf83f7bca199db764010 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 10:46:31 +0000
Subject: angstrom-2008-preferred-versions.inc : update xserver-xorg to 1.5.1
 for X11R7.4

---
 conf/distro/include/angstrom-2008-preferred-versions.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index bd47256322..c1dc088ead 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -28,4 +28,4 @@ PREFERRED_VERSION_pulseaudio 	= "0.9.10"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 PREFERRED_VERSION_udev 		= "124"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
-PREFERRED_VERSION_xserver-xorg  = "1.4.2"
+PREFERRED_VERSION_xserver-xorg  = "1.5.1"
-- 
cgit v1.2.3


From ad07edb1dde8005c726c0931ef98e3d221542f26 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 10:49:21 +0000
Subject: checksums.ini : add some new checksums for X11R7.4 stuff

---
 conf/checksums.ini | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index c5d1359063..2e3a800e09 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -17594,6 +17594,10 @@ sha256=51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
 md5=9a817e5f7374d45b4dbe64b21bc0fb61
 sha256=9a0687812eaceaccc21d55dead47f1fbecf8300a28604bd2c08aae6ff7874cd0
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.5.1.tar.bz2]
+md5=d16f5a033f001c9069b4141194614da2
+sha256=2f36880bffaee0a5b2b704376a02b22066b6842445e1d77da698854e5973eb21
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
 md5=0e7527480fb845a3c2e333bd0f47ff50
 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
@@ -17942,6 +17946,10 @@ sha256=126e2a612ac723f9688904fcfa612688d62e520ce55c56eb34eb5390074cf150
 md5=39d79590345bed51da6df838f6490cbf
 sha256=5b52a7241aef8e3372fb15f58f2276e043e19a87269aa6a0330b5823bc3697f6
 
+[http://xorg.freedesktop.org/releases/individual/app/xwd-1.0.2.tar.bz2]
+md5=0a6ef08a2ac08ad5c4dd1522eb3788a3
+sha256=ab8974e010c1957a9a65a54656215463dea324adcaa9954147ecdcc6e9307f61
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xwd-X11R7.0-1.0.1.tar.bz2]
 md5=596c443465ab9ab67c59c794261d4571
 sha256=8ec0abf34ec88f3681666c7727749bac1ccf3f935c1c7f78c009a764f7f0fb11
@@ -17950,6 +17958,10 @@ sha256=8ec0abf34ec88f3681666c7727749bac1ccf3f935c1c7f78c009a764f7f0fb11
 md5=721f84332c98c33152460bb22ba9ded6
 sha256=fbe3a1aafbc6fa113e58971ff2a82605a7e106af8b810eea4b7512de58a5478a
 
+[http://xorg.freedesktop.org/releases/individual/app/xwininfo-1.0.4.tar.bz2]
+md5=e2a9bf5ab7f2a0866700a3b49dd8c6bf
+sha256=df9a52788632cd3338e7bd7107ac732b11b8e2c367d4600578cd77e350428ee4
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xwininfo-X11R7.0-1.0.1.tar.bz2]
 md5=3ec67e4e1b9f5a1fe7e56b56ab931893
 sha256=75bc03d2eafd4c7139d707fb86b023376d5a5ad2e9315dad53b250cb19e8bce1
-- 
cgit v1.2.3


From c2187973adcacda45f2c44aed1f054d2cd4c4969 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 10:49:45 +0000
Subject: preferred-xorg-versions-X11R7.4.inc : update some versions to be
 correct for this release

---
 .../include/preferred-xorg-versions-X11R7.4.inc    | 46 +++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
index d6cdc13d5d..1a24297d03 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -56,7 +56,7 @@ PREFERRED_VERSION_proxymngr ?= "1.0.1"
 PREFERRED_VERSION_rgb ?= "1.0.3"
 PREFERRED_VERSION_rstart ?= "1.0.2"
 PREFERRED_VERSION_scripts ?= "1.0.1"
-PREFERRED_VERSION_sessreg ?= "1.0.3"
+PREFERRED_VERSION_sessreg ?= "1.0.4"
 PREFERRED_VERSION_setxkbmap ?= "1.0.4"
 PREFERRED_VERSION_showfont ?= "1.0.2"
 PREFERRED_VERSION_smproxy ?= "1.0.2"
@@ -118,7 +118,7 @@ PREFERRED_VERSION_xrandr ?= "1.2.3"
 PREFERRED_VERSION_xrdb ?= "1.0.5"
 PREFERRED_VERSION_xrefresh ?= "1.0.2"
 PREFERRED_VERSION_xrx ?= "1.0.1"
-PREFERRED_VERSION_xset ?= "1.0.4"
+PREFERRED_VERSION_set ?= "1.0.4"
 PREFERRED_VERSION_xsetmode ?= "1.0.0"
 PREFERRED_VERSION_xsetpointer ?= "1.0.1"
 PREFERRED_VERSION_xsetroot ?= "1.0.2"
@@ -127,8 +127,8 @@ PREFERRED_VERSION_xstdcmap ?= "1.0.1"
 PREFERRED_VERSION_xtrap ?= "1.0.2"
 PREFERRED_VERSION_xvidtune ?= "1.0.1"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
-PREFERRED_VERSION_xwd ?= "1.0.1"
-PREFERRED_VERSION_xwininfo ?= "1.0.3"
+PREFERRED_VERSION_xwd ?= "1.0.2"
+PREFERRED_VERSION_xwininfo ?= "1.0.4"
 PREFERRED_VERSION_xwud ?= "1.0.1"
 
 # data
@@ -149,11 +149,11 @@ PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2"
 PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2"
 PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2"
 PREFERRED_VERSION_xf86-input-elographics ?= "1.2.2"
-PREFERRED_VERSION_xf86-input-evdev ?= "1.99.4"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
 PREFERRED_VERSION_xf86-input-fpit ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-hyperpen ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-joystick ?= "1.3.1"
+PREFERRED_VERSION_xf86-input-joystick ?= "1.3.2"
 PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1"
 PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
@@ -171,25 +171,25 @@ PREFERRED_VERSION_xf86-input-void ?= "1.1.1"
 PREFERRED_VERSION_xf86-video-apm ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-ark ?= "0.7.0"
 PREFERRED_VERSION_xf86-video-ast ?= "0.85.0"
-PREFERRED_VERSION_xf86-video-ati ?= "6.8.0"
+PREFERRED_VERSION_xf86-video-ati ?= "6.9.0"
 PREFERRED_VERSION_xf86-video-chips ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-cirrus ?= "1.2.1"
 PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0"
 PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0"
-PREFERRED_VERSION_xf86-video-geode ?= "2.9.0"
-PREFERRED_VERSION_xf86-video-glide ?= "1.0.0"
-PREFERRED_VERSION_xf86-video-glint ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-i128 ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-geode ?= "2.10.1"
+PREFERRED_VERSION_xf86-video-glide ?= "1.0.1"
+PREFERRED_VERSION_xf86-video-glint ?= "1.2.1"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.3.1"
 PREFERRED_VERSION_xf86-video-i740 ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
 PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-intel ?= "2.2.1"
-PREFERRED_VERSION_xf86-video-mga ?= "1.4.8"
+PREFERRED_VERSION_xf86-video-intel ?= "2.4.2"
+PREFERRED_VERSION_xf86-video-mga ?= "1.4.9"
 PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.1"
 PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
 PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
-PREFERRED_VERSION_xf86-video-nv ?= "2.1.9"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.12"
 PREFERRED_VERSION_xf86-video-radeonhd ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-rendition ?= "4.2.0"
 PREFERRED_VERSION_xf86-video-s3 ?= "0.6.0"
@@ -198,7 +198,7 @@ PREFERRED_VERSION_xf86-video-savage ?= "2.2.1"
 PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.6.0"
 PREFERRED_VERSION_xf86-video-sis ?= "0.10.0"
 PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.0"
-PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0"
@@ -206,15 +206,15 @@ PREFERRED_VERSION_xf86-video-sunffb ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-sunleo ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.0"
-PREFERRED_VERSION_xf86-video-tga ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-tga ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-trident ?= "1.3.0"
 PREFERRED_VERSION_xf86-video-tseng ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0"
-PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.0"
-PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1"
+PREFERRED_VERSION_xf86-video-vesa ?= "2.0.0"
 PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
 PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
-PREFERRED_VERSION_xf86-video-vmware ?= "10.16.1"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.16.5"
 PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.3"
 
@@ -226,14 +226,14 @@ PREFERRED_VERSION_font-util ?= "1.0.1"
 PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.1"
 
 # lib
-PREFERRED_VERSION_diet-x11 ?= "1.1.3"
+PREFERRED_VERSION_diet-x11 ?= "1.1.5"
 PREFERRED_VERSION_libdmx ?= "1.0.2"
 PREFERRED_VERSION_libfs ?= "1.0.1"
 PREFERRED_VERSION_libfontenc ?= "1.0.4"
 PREFERRED_VERSION_libice ?= "1.0.4"
 PREFERRED_VERSION_liblbxutil ?= "1.0.1"
 PREFERRED_VERSION_libsm ?= "1.0.3"
-PREFERRED_VERSION_libx11 ?= "1.1.4"
+PREFERRED_VERSION_libx11 ?= "1.1.5"
 PREFERRED_VERSION_libx11-native ?= "1.1.1"
 PREFERRED_VERSION_libxau ?= "1.0.3"
 PREFERRED_VERSION_libxaw ?= "1.0.4"
@@ -265,7 +265,7 @@ PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
 PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
 PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
 PREFERRED_VERSION_pixman ?= "0.10.0"
-PREFERRED_VERSION_xtrans ?= "1.2"
+PREFERRED_VERSION_xtrans ?= "1.2.1"
 
 # proto
 PREFERRED_VERSION_compositeproto ?= "0.4"
@@ -292,7 +292,7 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
 
 # xserver
 PREFERRED_VERSION_xserver-kdrive ?= "1.4"
-PREFERRED_VERSION_xserver-xorg ?= "1.4"
+PREFERRED_VERSION_xserver-xorg ?= "1.5.1"
 
 # Unreleased packages
 SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
-- 
cgit v1.2.3


From 78aea95c4966bdb65f0a2f499ea971bc3d0e9042 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 11:44:07 +0000
Subject: libx11_1.1.5.bb : add new version for X11R7.4, keysymdef patch had to
 be refreshed for this version.

---
 packages/xorg-lib/libx11/keysymdef_include.patch | 29 ++++++++++++++++++++++
 packages/xorg-lib/libx11_1.1.5.bb                | 31 ++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 packages/xorg-lib/libx11/keysymdef_include.patch
 create mode 100644 packages/xorg-lib/libx11_1.1.5.bb

diff --git a/packages/xorg-lib/libx11/keysymdef_include.patch b/packages/xorg-lib/libx11/keysymdef_include.patch
new file mode 100644
index 0000000000..07487b6b2e
--- /dev/null
+++ b/packages/xorg-lib/libx11/keysymdef_include.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.1.5/configure.ac
+===================================================================
+--- libX11-1.1.5.orig/configure.ac	2008-10-28 11:36:49.000000000 +0000
++++ libX11-1.1.5/configure.ac	2008-10-28 11:40:05.000000000 +0000
+@@ -221,13 +221,21 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++	AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++	KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++	dir=`pkg-config --variable=includedir xproto`
++	KEYSYMDEF="$dir/X11/keysymdef.h"
++fi
++
+ if test -f "$KEYSYMDEF"; then
+-        AC_MSG_RESULT([$KEYSYMDEF])
++	AC_MSG_RESULT([$KEYSYMDEF])
+ else
+ 	AC_MSG_ERROR([Cannot find keysymdef.h])
+ fi
++
+ AC_SUBST(KEYSYMDEF)
+ 
+ AM_CONDITIONAL(UDC, test xfalse = xtrue)
diff --git a/packages/xorg-lib/libx11_1.1.5.bb b/packages/xorg-lib/libx11_1.1.5.bb
new file mode 100644
index 0000000000..a22b7a0158
--- /dev/null
+++ b/packages/xorg-lib/libx11_1.1.5.bb
@@ -0,0 +1,31 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
+PROVIDES = "virtual/libx11"
+PE = "1"
+PR = "r3"
+
+XORG_PN = "libX11"
+
+SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
+            file://keysymdef_include.patch;patch=1"
+
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+		cd src/util; 
+		mv makekeys.c.orig makekeys.c || true
+		touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
+		# mv to stop it getting rebuilt
+		mv makekeys.c makekeys.c.orig
+		cd ../../
+	) || exit 1
+	oe_runmake
+}
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
-- 
cgit v1.2.3


From 7dd85f96a988b90f9aeb1fcdcd9ae855e41f26d5 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 11:50:40 +0000
Subject: diet-x11_1.1.5.bb : new version for X11R7.4

---
 packages/xorg-lib/diet-x11_1.1.5.bb | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/xorg-lib/diet-x11_1.1.5.bb

diff --git a/packages/xorg-lib/diet-x11_1.1.5.bb b/packages/xorg-lib/diet-x11_1.1.5.bb
new file mode 100644
index 0000000000..19a9efecbf
--- /dev/null
+++ b/packages/xorg-lib/diet-x11_1.1.5.bb
@@ -0,0 +1,10 @@
+require libx11_${PV}.bb
+
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+            file://fix-disable-xlocale.diff;patch=1 \
+            file://fix-utf8-wrong-define.patch;patch=1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
-- 
cgit v1.2.3


From 3a037b5f5846049ad7d6027d4434507fc103d472 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 13:11:06 +0000
Subject: xf86-input-evdev_2.0.4.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-input-evdev_2.0.4.bb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-input-evdev_2.0.4.bb

diff --git a/packages/xorg-driver/xf86-input-evdev_2.0.4.bb b/packages/xorg-driver/xf86-input-evdev_2.0.4.bb
new file mode 100644
index 0000000000..792909621a
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-evdev_2.0.4.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
-- 
cgit v1.2.3


From ca5131cbe726af49a5d7e8b30043ee65f7bd7361 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 16:27:56 +0000
Subject: checksums.ini : add xinit checksum for X11R7.4

---
 conf/checksums.ini | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 2e3a800e09..e5434c7555 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -17374,6 +17374,10 @@ sha256=15781cf2b15af8a2535ecc49acce77cc16573571344a71dcbe198ec12e5bb774
 md5=521574088fbd688edbf91e6bae674265
 sha256=06c1049f6b63d1c368a1e03e2392097919b22ff24899e190de3577bffe6fe524
 
+[http://xorg.freedesktop.org/releases/individual/app/xinit-1.0.9.tar.bz2]
+md5=224c36057e4416205d4e421af01a2f15
+sha256=b4218fd4ca5e431bf69cba848c21e91235fda30504634b9f6b6cd011dcbd8999
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xinit-X11R7.0-1.0.1.tar.bz2]
 md5=6d2df59fa328cbc99c0de98bc2e14597
 sha256=e55c61ede6760ce0d8eaac6dc386850c7873311ab038c69338e35559ec0bbd02
-- 
cgit v1.2.3


From 1bc5dcac97e323e6073bdf3f459d04932a731ba2 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Oct 2008 16:28:50 +0000
Subject: om-gta02.conf : use tslib not evdev

---
 conf/machine/om-gta02.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 6098f47f9f..4a8abfacff 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -18,7 +18,7 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
 XSERVER = "xserver-xorg \
-           xf86-input-evdev \
+           xf86-input-tslib \
            xf86-input-mouse \
            xf86-video-fbdev \
            xf86-input-keyboard"
-- 
cgit v1.2.3


From dd54f3fc1febff6b0266bfd32ad0eb825509c4ad Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:34:47 +0000
Subject: preferred-xorg-versions-X11R7.4.inc : update some more versions for
 7.4

---
 .../include/preferred-xorg-versions-X11R7.4.inc    | 140 ++++++---------------
 1 file changed, 40 insertions(+), 100 deletions(-)

diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
index 1a24297d03..1f3d68d8ae 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -36,96 +36,41 @@ PREFERRED_VERSION_task-xorg ?= "X11R7.4"
 
 # app
 PREFERRED_VERSION_appres ?= "1.0.1"
-PREFERRED_VERSION_bdftopcf ?= "1.0.1"
-PREFERRED_VERSION_beforelight ?= "1.0.3"
 PREFERRED_VERSION_bitmap ?= "1.0.3"
-PREFERRED_VERSION_editres ?= "1.0.3"
-PREFERRED_VERSION_fontosfnt ?= "1.0.4"
-PREFERRED_VERSION_fslsfonts ?= "1.0.2"
-PREFERRED_VERSION_fstobdf ?= "1.0.3"
 PREFERRED_VERSION_iceauth ?= "1.0.2"
-PREFERRED_VERSION_ico ?= "1.0.2"
-PREFERRED_VERSION_lbxproxy ?= "1.0.1"
-PREFERRED_VERSION_listres ?= "1.0.1"
 PREFERRED_VERSION_luit ?= "1.0.3"
 PREFERRED_VERSION_mkfontdir-native ?= "1.0.4"
 PREFERRED_VERSION_mkfontdir ?= "1.0.4"
 PREFERRED_VERSION_mkfontscale ?= "1.0.5"
-PREFERRED_VERSION_oclock ?= "1.0.1"
-PREFERRED_VERSION_proxymngr ?= "1.0.1"
-PREFERRED_VERSION_rgb ?= "1.0.3"
-PREFERRED_VERSION_rstart ?= "1.0.2"
-PREFERRED_VERSION_scripts ?= "1.0.1"
 PREFERRED_VERSION_sessreg ?= "1.0.4"
 PREFERRED_VERSION_setxkbmap ?= "1.0.4"
-PREFERRED_VERSION_showfont ?= "1.0.2"
 PREFERRED_VERSION_smproxy ?= "1.0.2"
-PREFERRED_VERSION_twm ?= "1.0.4"
-PREFERRED_VERSION_viewres ?= "1.0.1"
 PREFERRED_VERSION_x11perf ?= "1.5"
 PREFERRED_VERSION_xauth ?= "1.0.3"
 PREFERRED_VERSION_xbacklight ?= "1.1"
-PREFERRED_VERSION_xbiff ?= "1.0.1"
-PREFERRED_VERSION_xcalc ?= "1.0.2"
-PREFERRED_VERSION_xclipboard ?= "1.0.1"
-PREFERRED_VERSION_xclock ?= "1.0.3"
-PREFERRED_VERSION_xcompmgr ?= "1.1.4"
 PREFERRED_VERSION_xcmsdb ?= "1.0.1"
-PREFERRED_VERSION_xconsole ?= "1.0.3"
 PREFERRED_VERSION_xcursorgen ?= "1.0.2"
-PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
-PREFERRED_VERSION_xditview ?= "1.0.1"
-PREFERRED_VERSION_xdm ?= "1.1.8"
 PREFERRED_VERSION_xdpyinfo ?= "1.0.3"
 PREFERRED_VERSION_xdriinfo ?= "1.0.2"
-PREFERRED_VERSION_xedit ?= "1.0.2"
 PREFERRED_VERSION_xev ?= "1.0.3"
-PREFERRED_VERSION_xeyes ?= "1.0.1"
-PREFERRED_VERSION_xxf86dga ?= "1.0.2"
-PREFERRED_VERSION_xfd ?= "1.0.1"
-PREFERRED_VERSION_xfindproxy ?= "1.0.1"
-PREFERRED_VERSION_xfontsel ?= "1.0.2"
-PREFERRED_VERSION_xfs ?= "1.0.8"
-PREFERRED_VERSION_xfsinfo ?= "1.0.2"
-PREFERRED_VERSION_xfwp ?= "1.0.1"
 PREFERRED_VERSION_xgamma ?= "1.0.2"
-PREFERRED_VERSION_xgc ?= "1.0.1"
 PREFERRED_VERSION_xhost ?= "1.0.2"
-PREFERRED_VERSION_xinit ?= "1.0.9"
 PREFERRED_VERSION_xinput ?= "1.3.0"
 PREFERRED_VERSION_xkbcomp ?= "1.0.5"
 PREFERRED_VERSION_xkbevd ?= "1.0.2"
-PREFERRED_VERSION_xkbprint ?= "1.0.1"
 PREFERRED_VERSION_xkbutils ?= "1.0.1"
 PREFERRED_VERSION_xkill ?= "1.0.1"
-PREFERRED_VERSION_xload ?= "1.0.2"
-PREFERRED_VERSION_xlogo ?= "1.0.1"
 PREFERRED_VERSION_xlsatoms ?= "1.0.1"
 PREFERRED_VERSION_xlsclients ?= "1.0.1"
-PREFERRED_VERSION_xlsfonts ?= "1.0.2"
-PREFERRED_VERSION_xmag ?= "1.0.2"
-PREFERRED_VERSION_xman ?= "1.0.3"
-PREFERRED_VERSION_xmessage ?= "1.0.2"
-PREFERRED_VERSION_xmh ?= "1.0.1"
 PREFERRED_VERSION_xmodmap ?= "1.0.3"
-PREFERRED_VERSION_xmore ?= "1.0.1"
-PREFERRED_VERSION_xphelloworld ?= "1.0.1"
-PREFERRED_VERSION_xplsprinters ?= "1.0.1"
 PREFERRED_VERSION_xpr ?= "1.0.2"
-PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1"
 PREFERRED_VERSION_xprop ?= "1.0.4"
 PREFERRED_VERSION_xrandr ?= "1.2.3"
 PREFERRED_VERSION_xrdb ?= "1.0.5"
 PREFERRED_VERSION_xrefresh ?= "1.0.2"
-PREFERRED_VERSION_xrx ?= "1.0.1"
-PREFERRED_VERSION_set ?= "1.0.4"
+PREFERRED_VERSION_xset ?= "1.0.4"
 PREFERRED_VERSION_xsetmode ?= "1.0.0"
-PREFERRED_VERSION_xsetpointer ?= "1.0.1"
 PREFERRED_VERSION_xsetroot ?= "1.0.2"
-PREFERRED_VERSION_xsm ?= "1.0.1"
-PREFERRED_VERSION_xstdcmap ?= "1.0.1"
-PREFERRED_VERSION_xtrap ?= "1.0.2"
-PREFERRED_VERSION_xvidtune ?= "1.0.1"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
 PREFERRED_VERSION_xwd ?= "1.0.2"
 PREFERRED_VERSION_xwininfo ?= "1.0.4"
@@ -142,30 +87,11 @@ PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
 # driver
 PREFERRED_VERSION_xf86-input-acecad ?= "1.2.2"
 PREFERRED_VERSION_xf86-input-aiptek ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-citron ?= "2.2.1"
-PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2"
-PREFERRED_VERSION_xf86-input-elographics ?= "1.2.2"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
-PREFERRED_VERSION_xf86-input-fpit ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-hyperpen ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-joystick ?= "1.3.2"
 PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1"
-PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
-PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0"
-PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-penmount ?= "1.3.0"
-PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-summa ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.0"
 PREFERRED_VERSION_xf86-input-vmmouse ?= "12.5.1"
 PREFERRED_VERSION_xf86-input-void ?= "1.1.1"
 PREFERRED_VERSION_xf86-video-apm ?= "1.2.0"
@@ -174,7 +100,6 @@ PREFERRED_VERSION_xf86-video-ast ?= "0.85.0"
 PREFERRED_VERSION_xf86-video-ati ?= "6.9.0"
 PREFERRED_VERSION_xf86-video-chips ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-cirrus ?= "1.2.1"
-PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0"
 PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0"
 PREFERRED_VERSION_xf86-video-geode ?= "2.10.1"
@@ -182,15 +107,15 @@ PREFERRED_VERSION_xf86-video-glide ?= "1.0.1"
 PREFERRED_VERSION_xf86-video-glint ?= "1.2.1"
 PREFERRED_VERSION_xf86-video-i128 ?= "1.3.1"
 PREFERRED_VERSION_xf86-video-i740 ?= "1.2.0"
-PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
-PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-impact ?= "0.2.0"
 PREFERRED_VERSION_xf86-video-intel ?= "2.4.2"
+PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.0"
 PREFERRED_VERSION_xf86-video-mga ?= "1.4.9"
 PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.1"
 PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
-PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
 PREFERRED_VERSION_xf86-video-nv ?= "2.1.12"
-PREFERRED_VERSION_xf86-video-radeonhd ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.903"
+PREFERRED_VERSION_xf86-video-r128 ?= "6.8.0"
 PREFERRED_VERSION_xf86-video-rendition ?= "4.2.0"
 PREFERRED_VERSION_xf86-video-s3 ?= "0.6.0"
 PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.1"
@@ -198,12 +123,12 @@ PREFERRED_VERSION_xf86-video-savage ?= "2.2.1"
 PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.6.0"
 PREFERRED_VERSION_xf86-video-sis ?= "0.10.0"
 PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.0"
-PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-sunffb ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-sunleo ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-sunffb ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-sunleo ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.0"
 PREFERRED_VERSION_xf86-video-tga ?= "1.2.0"
@@ -212,10 +137,10 @@ PREFERRED_VERSION_xf86-video-tseng ?= "1.2.0"
 PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0"
 PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1"
 PREFERRED_VERSION_xf86-video-vesa ?= "2.0.0"
-PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
-PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
 PREFERRED_VERSION_xf86-video-vmware ?= "10.16.5"
 PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-wsfb ?= "0.2.1"
+PREFERRED_VERSION_xf86-video-xgi ?= "1.5.0"
 PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.3"
 
 # font
@@ -227,33 +152,34 @@ PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.1"
 
 # lib
 PREFERRED_VERSION_diet-x11 ?= "1.1.5"
+PREFERRED_VERSION_libapplewm ?= "1.0.0"
 PREFERRED_VERSION_libdmx ?= "1.0.2"
 PREFERRED_VERSION_libfs ?= "1.0.1"
-PREFERRED_VERSION_libfontenc ?= "1.0.4"
 PREFERRED_VERSION_libice ?= "1.0.4"
-PREFERRED_VERSION_liblbxutil ?= "1.0.1"
-PREFERRED_VERSION_libsm ?= "1.0.3"
+PREFERRED_VERSION_libfontenc ?= "1.0.4"
+PREFERRED_VERSION_libsm ?= "1.1.0"
+PREFERRED_VERSION_libwindowswm ?= "1.0.0"
 PREFERRED_VERSION_libx11 ?= "1.1.5"
 PREFERRED_VERSION_libx11-native ?= "1.1.1"
-PREFERRED_VERSION_libxau ?= "1.0.3"
+PREFERRED_VERSION_libxau ?= "1.0.4"
 PREFERRED_VERSION_libxaw ?= "1.0.4"
 PREFERRED_VERSION_libxcomposite ?= "0.4.0"
 PREFERRED_VERSION_libxcursor ?= "1.1.9"
-PREFERRED_VERSION_libxdamage ?= "1.0.4"
+PREFERRED_VERSION_libxdamage ?= "1.1.1"
 PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
 PREFERRED_VERSION_libxdmcp ?= "1.0.2"
 PREFERRED_VERSION_libxevie ?= "1.0.2"
 PREFERRED_VERSION_libxext ?= "1.0.4"
 PREFERRED_VERSION_libxfixes ?= "4.0.3"
-PREFERRED_VERSION_libxfont ?= "1.3.2"
+PREFERRED_VERSION_libxfont ?= "1.3.3"
 PREFERRED_VERSION_libxfontcache ?= "1.0.4"
+PREFERRED_VERSION_libxft ?= "2.1.13"
 PREFERRED_VERSION_libxi ?= "1.1.3"
 PREFERRED_VERSION_libxinerama ?= "1.0.3"
 PREFERRED_VERSION_libxkbfile ?= "1.0.5"
-PREFERRED_VERSION_libxkbui ?= "1.0.2"
 PREFERRED_VERSION_libxmu ?= "1.0.4"
 PREFERRED_VERSION_libxpm ?= "3.5.7"
-PREFERRED_VERSION_libxrandr ?= "1.2.2"
+PREFERRED_VERSION_libxrandr ?= "1.2.3"
 PREFERRED_VERSION_libxrender ?= "0.9.4"
 PREFERRED_VERSION_libxres ?= "1.0.3"
 PREFERRED_VERSION_libxscrnsaver ?= "1.1.3"
@@ -263,24 +189,38 @@ PREFERRED_VERSION_libxv ?= "1.0.4"
 PREFERRED_VERSION_libxvmc ?= "1.0.4"
 PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
 PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
-PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
-PREFERRED_VERSION_pixman ?= "0.10.0"
+PREFERRED_VERSION_libxxf86vm ?= "1.0.2"
 PREFERRED_VERSION_xtrans ?= "1.2.1"
 
 # proto
+PREFERRED_VERSION_applewmproto ?= "1.0.3"
+PREFERRED_VERSION_bigreqsproto ?= "1.0.2"
 PREFERRED_VERSION_compositeproto ?= "0.4"
 PREFERRED_VERSION_damageproto ?= "1.1.0"
+PREFERRED_VERSION_dmxproto ?= "2.2.2"
 PREFERRED_VERSION_fixesproto ?= "4.0"
+PREFERRED_VERSION_fontcacheproto ?= "0.1.2"
+PREFERRED_VERSION_fontsproto ?= "2.0.2"
 PREFERRED_VERSION_glproto ?= "1.4.9"
-PREFERRED_VERSION_inputproto ?= "1.4.3"
+PREFERRED_VERSION_inputproto ?= "1.4.4"
 PREFERRED_VERSION_kbproto ?= "1.0.3"
-PREFERRED_VERSION_printproto ?= "1.0.4"
 PREFERRED_VERSION_randrproto ?= "1.2.1"
+PREFERRED_VERSION_recordproto ?= "1.13.2"
 PREFERRED_VERSION_renderproto ?= "0.9.3"
+PREFERRED_VERSION_resourceproto ?= "1.0.2"
 PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
+PREFERRED_VERSION_trapproto ?= "3.4.3"
+PREFERRED_VERSION_videoproto ?= "2.2.2"
+PREFERRED_VERSION_windowswmproto ?= "1.0.3"
+PREFERRED_VERSION_xmiscproto ?= "1.1.2"
+PREFERRED_VERSION_xextproto ?= "7.0.3"
 PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
-PREFERRED_VERSION_xproto-native ?= "7.0.12"
-PREFERRED_VERSION_xproto ?= "7.0.12"
+PREFERRED_VERSION_xf86driproto ?= "2.0.4"
+PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
+PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2"
+PREFERRED_VERSION_xinemaroproto ?= "1.1.2"
+PREFERRED_VERSION_xproto-native ?= "7.0.13"
+PREFERRED_VERSION_xproto ?= "7.0.13"
 
 # util
 PREFERRED_VERSION_gccmakedep ?= "1.0.2"
-- 
cgit v1.2.3


From 492c7a952aeb65a0ab2c89f32093c7c9fbf997ab Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:35:38 +0000
Subject: xproto_7.0.13.bb, xproto-native_7.0.13.bb : new versions for X11R7.4

---
 packages/xorg-proto/xproto-native_7.0.13.bb | 3 +++
 packages/xorg-proto/xproto_7.0.13.bb        | 6 ++++++
 2 files changed, 9 insertions(+)
 create mode 100644 packages/xorg-proto/xproto-native_7.0.13.bb
 create mode 100644 packages/xorg-proto/xproto_7.0.13.bb

diff --git a/packages/xorg-proto/xproto-native_7.0.13.bb b/packages/xorg-proto/xproto-native_7.0.13.bb
new file mode 100644
index 0000000000..5dde8a7d4a
--- /dev/null
+++ b/packages/xorg-proto/xproto-native_7.0.13.bb
@@ -0,0 +1,3 @@
+require xproto_${PV}.bb
+
+inherit native
diff --git a/packages/xorg-proto/xproto_7.0.13.bb b/packages/xorg-proto/xproto_7.0.13.bb
new file mode 100644
index 0000000000..b403ff5615
--- /dev/null
+++ b/packages/xorg-proto/xproto_7.0.13.bb
@@ -0,0 +1,6 @@
+require xorg-proto-common.inc
+
+PR = "r0"
+PE = "1"
+
+XORG_PN = "xproto"
-- 
cgit v1.2.3


From edd05a7791c19ab173c6a99a7d9813e4a05ad583 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:36:39 +0000
Subject: libsm_1.1.0.bb : new version for X11R7.4

---
 packages/xorg-lib/libsm_1.1.0.bb | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 packages/xorg-lib/libsm_1.1.0.bb

diff --git a/packages/xorg-lib/libsm_1.1.0.bb b/packages/xorg-lib/libsm_1.1.0.bb
new file mode 100644
index 0000000000..669b29c937
--- /dev/null
+++ b/packages/xorg-lib/libsm_1.1.0.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Session management library"
+DEPENDS += "libice xproto xtrans"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libSM"
-- 
cgit v1.2.3


From 77d762f34ed4f09d56929a77ddbdf32090efdbfe Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:37:14 +0000
Subject: libxft_2.1.13.bb : new version for X11R7.4

---
 packages/xorg-lib/libxft_2.1.13.bb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 packages/xorg-lib/libxft_2.1.13.bb

diff --git a/packages/xorg-lib/libxft_2.1.13.bb b/packages/xorg-lib/libxft_2.1.13.bb
new file mode 100644
index 0000000000..84d0cc2cbe
--- /dev/null
+++ b/packages/xorg-lib/libxft_2.1.13.bb
@@ -0,0 +1,20 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "FreeType-based font drawing library for X"
+DEPENDS += "libxrender freetype fontconfig"
+PROVIDES = "xft"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libXft"
+
+python do_package() {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+            bb.data.setVar('PKG_${PN}', 'libxft2', d)
+        bb.build.exec_func('package_do_package', d)
+}
+
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
+		${libdir}/*.a ${libdir}/pkgconfig \
+		${datadir}/aclocal ${bindir} ${sbindir}"
-- 
cgit v1.2.3


From 5c8db19a138ca178ecfec43c7eac2b275ea2f5fd Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:37:45 +0000
Subject: libxrandr_1.2.3.bb : new version for X11R7.4

---
 packages/xorg-lib/libxrandr_1.2.3.bb | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 packages/xorg-lib/libxrandr_1.2.3.bb

diff --git a/packages/xorg-lib/libxrandr_1.2.3.bb b/packages/xorg-lib/libxrandr_1.2.3.bb
new file mode 100644
index 0000000000..f6d7623bca
--- /dev/null
+++ b/packages/xorg-lib/libxrandr_1.2.3.bb
@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 Resize and Rotate extension library"
+LICENSE = "BSD-X"
+DEPENDS += "randrproto libxrender libxext"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libXrandr"
-- 
cgit v1.2.3


From 48b29041deae4053038d13fd81f52e04610b61f9 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:38:10 +0000
Subject: libxxf86vm_1.0.2.bb : new version for X11R7.4

---
 packages/xorg-lib/libxxf86vm_1.0.2.bb | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 packages/xorg-lib/libxxf86vm_1.0.2.bb

diff --git a/packages/xorg-lib/libxxf86vm_1.0.2.bb b/packages/xorg-lib/libxxf86vm_1.0.2.bb
new file mode 100644
index 0000000000..2d1af9c9aa
--- /dev/null
+++ b/packages/xorg-lib/libxxf86vm_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 XFree86 video mode extension library"
+DEPENDS += "libxext xf86vidmodeproto"
+PR = "r0"
+PE = "1"
+
+XORG_PN = "libXxf86vm"
-- 
cgit v1.2.3


From 00cccdc8f03f15fd2dc05225ab6df273e53c18cb Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:41:36 +0000
Subject: xcursorgen-native_1.0.2.bb : add a native version for X11R7.4

---
 packages/xorg-app/xcursorgen-native_1.0.2.bb | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 packages/xorg-app/xcursorgen-native_1.0.2.bb

diff --git a/packages/xorg-app/xcursorgen-native_1.0.2.bb b/packages/xorg-app/xcursorgen-native_1.0.2.bb
new file mode 100644
index 0000000000..0cbf9fc716
--- /dev/null
+++ b/packages/xorg-app/xcursorgen-native_1.0.2.bb
@@ -0,0 +1,7 @@
+inherit native
+require xcursorgen_${PV}.bb
+
+DEPENDS = "libx11-native libpng-native"
+
+S="${WORKDIR}/xcursorgen-${PV}"
+XORG_PN="xcursorgen"
-- 
cgit v1.2.3


From bed1dbef158b811628c1eb4dd69b2bdd404a73b7 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:42:02 +0000
Subject: libxcursor-native_1.1.9.bb : add a native version for X11R7.4

---
 packages/xorg-lib/libxcursor-native_1.1.9.bb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 packages/xorg-lib/libxcursor-native_1.1.9.bb

diff --git a/packages/xorg-lib/libxcursor-native_1.1.9.bb b/packages/xorg-lib/libxcursor-native_1.1.9.bb
new file mode 100644
index 0000000000..403030e93d
--- /dev/null
+++ b/packages/xorg-lib/libxcursor-native_1.1.9.bb
@@ -0,0 +1,6 @@
+require libxcursor_${PV}.bb
+
+DEPENDS = "libx11-native fixesproto-native libxfixes-native"
+PE = "1"
+
+inherit native
-- 
cgit v1.2.3


From 64362c68460ae8bda83b9c45948060d13c1d85ea Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:42:25 +0000
Subject: libxfixes-native_4.0.3.bb : add a native version for X11R7.4

---
 packages/xorg-lib/libxfixes-native_4.0.3.bb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 packages/xorg-lib/libxfixes-native_4.0.3.bb

diff --git a/packages/xorg-lib/libxfixes-native_4.0.3.bb b/packages/xorg-lib/libxfixes-native_4.0.3.bb
new file mode 100644
index 0000000000..5ef6ded80a
--- /dev/null
+++ b/packages/xorg-lib/libxfixes-native_4.0.3.bb
@@ -0,0 +1,6 @@
+require libxfixes_${PV}.bb
+
+DEPENDS = "libx11-native"
+PE = "1"
+
+inherit native
-- 
cgit v1.2.3


From b6b736a45eaa2bb61a36d6056d3c99e4abf1b241 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:42:54 +0000
Subject: libxrender-native_0.9.4.bb : add a native version for X11R7.4

---
 packages/xorg-lib/libxrender-native_0.9.4.bb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 packages/xorg-lib/libxrender-native_0.9.4.bb

diff --git a/packages/xorg-lib/libxrender-native_0.9.4.bb b/packages/xorg-lib/libxrender-native_0.9.4.bb
new file mode 100644
index 0000000000..a4f4ba9e36
--- /dev/null
+++ b/packages/xorg-lib/libxrender-native_0.9.4.bb
@@ -0,0 +1,6 @@
+require libxrender_${PV}.bb
+
+DEPENDS = "libx11-native renderproto-native"
+PE = "1"
+
+inherit native
-- 
cgit v1.2.3


From 3b5532e4e606cc069273b044be1eb752cd6f0ca2 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:43:18 +0000
Subject: fixesproto-native_4.0.bb : add native version for X11R7.4

---
 packages/xorg-proto/fixesproto-native_4.0.bb | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 packages/xorg-proto/fixesproto-native_4.0.bb

diff --git a/packages/xorg-proto/fixesproto-native_4.0.bb b/packages/xorg-proto/fixesproto-native_4.0.bb
new file mode 100644
index 0000000000..927e004437
--- /dev/null
+++ b/packages/xorg-proto/fixesproto-native_4.0.bb
@@ -0,0 +1,7 @@
+require fixesproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "fixesproto"
+
+inherit native
-- 
cgit v1.2.3


From c8dc1e0d8602c8032cb70d70b43a0d28a903c3c1 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:43:50 +0000
Subject: renderproto-native_0.9.3.bb : add native version for X11R7.4

---
 packages/xorg-proto/renderproto-native_0.9.3.bb | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 packages/xorg-proto/renderproto-native_0.9.3.bb

diff --git a/packages/xorg-proto/renderproto-native_0.9.3.bb b/packages/xorg-proto/renderproto-native_0.9.3.bb
new file mode 100644
index 0000000000..8d83c99774
--- /dev/null
+++ b/packages/xorg-proto/renderproto-native_0.9.3.bb
@@ -0,0 +1,7 @@
+require renderproto_${PV}.bb
+
+PR = "r1"
+
+XORG_PN = "renderproto"
+
+inherit native
-- 
cgit v1.2.3


From 4bd704a989dcadd905da9027821c4088792f8a2a Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:44:23 +0000
Subject: xcursor-themes_1.0.1.bb : needs xcursorgen-native which has now been
 added

---
 packages/xorg-data/xcursor-themes_1.0.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/xorg-data/xcursor-themes_1.0.1.bb b/packages/xorg-data/xcursor-themes_1.0.1.bb
index 8cf822e56f..1107d08da9 100644
--- a/packages/xorg-data/xcursor-themes_1.0.1.bb
+++ b/packages/xorg-data/xcursor-themes_1.0.1.bb
@@ -1,5 +1,7 @@
 require xorg-data-common.inc
 PE = "1"
 
-DEPENDS += " libxcursor"
+DEPENDS += " libxcursor xcursorgen-native"
+
+FILES_${PN} += "${datadir}/icons"
 
-- 
cgit v1.2.3


From ccbe682909220330a8b6bd1a95147a656a60ca95 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 11:45:42 +0000
Subject: checksums.ini : add more checksums for X11R7.4

---
 conf/checksums.ini | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index e5434c7555..a999b53f05 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1654,6 +1654,10 @@ sha256=a226f7b37694669aa6efe6c30462e2d44f5881ca70604dac15c23fce66992872
 md5=0e0dacaae704aed08a940389250e61e9
 sha256=fd8a9e9e916314f9385f497d1f9b81d0885487f7741ad7be790972f44fc68b25
 
+[http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.3.tar.bz2]
+md5=98200c358e5401d648b980564d9ae39d
+sha256=863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/bitmap-X11R7.0-1.0.1.tar.bz2]
 md5=bbb3df097821d3edb4d5a4b2ae731de6
 sha256=ac6a5c3f4aa88f39e8f04fe43f00972f0235674ac3edb994c70ac802a1ed0219
@@ -4014,6 +4018,10 @@ sha256=4ea7d0a314b6c7ec65c92f44a3dad39ac9535b1bb9f54768573f60b69902e5cd
 md5=0259436c430034f24f3b239113c9630e
 sha256=80094cd7060a08bda61eef0e481800e8f94d4bbb08b8297dcf6aecea99a09a07
 
+[http://xorg.freedesktop.org/releases/individual/font/font-util-1.0.1.tar.bz2]
+md5=b81535f78fe05732931f02841e5ca37b
+sha256=048c23b17ea32ee3abb341f0b1105ad07517b2e78efe2e95a4a8218089600612
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-util-X11R7.0-1.0.0.tar.bz2]
 md5=73cc445cb20a658037ad3a7ac571f525
 sha256=02eefdacc36d5df3707b3e454f5842d06c9c2eb9591e4cae93ccd3d66c78368f
@@ -7666,6 +7674,10 @@ sha256=66d5b9d53816cc158a0f241772cbde60a52aa0a722e28d3ef76a5eb6c82840d5
 md5=dfd5de47e232db0891410bec8ee6707b
 sha256=2f18f9fa0e18a3eab3c154ba820ad64b5c6ee364e147524055a553a130ccfdde
 
+[http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.1.tar.bz2]
+md5=81521249353fa33be7a4bb0062c2fbb9
+sha256=9bf92ffdb51e69e07682cd1a6c0101f2a833b16b9bfa5d601491ff46a35a2cf5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libFS-X11R7.0-1.0.0.tar.bz2]
 md5=12d2d89e7eb6ab0eb5823c3296f4e7a5
 sha256=15bedd7f892fbb130e2b9c17d4f927c4904362a7be5b73d07d56d8aa7025f6f1
@@ -7710,6 +7722,10 @@ sha256=e290614797bd626c1b92bac8f83e8954b99bd66e6ecdaa1e935e176df099eba8
 md5=184cbf502b3cd5d7ba5f9d1290a99606
 sha256=57f42d3557effe452cd348362977ff90fa61009885c23b3aca8cb0219b5dec04
 
+[http://xorg.freedesktop.org/releases/individual/lib/libSM-1.1.0.tar.bz2]
+md5=05a04c2b6382fb0054f6c70494e22733
+sha256=7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libSM-X11R7.0-1.0.0.tar.bz2]
 md5=8a4eec299e8f14e26200718af7b2dcfc
 sha256=df219b7d5c2fac93bc7c8eb411ed365492eaeb3727ecbb04999890fd694d4e80
@@ -7966,6 +7982,10 @@ sha256=9a1d1c4c494203fcc64e697c7d341ccd12ecfcf2983b09746f8a7113443fe3a4
 md5=1309301e2d979bd475dc58325cb8c056
 sha256=68b46f85caaf0b30c876bd983abe144c25755bee7532e8738ab7ebe29a428986
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXft-2.1.13.tar.bz2]
+md5=bc8881851f3bd8dcc625fac37350a1c6
+sha256=ce7688258af34c14af421bcfb306d4310245b727d2417ac968b7f6b2facfde8c
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXft-X11R7.0-2.1.8.2.tar.bz2]
 md5=c42292b35325a9eeb24eb0f8d3a6ec52
 sha256=0473d1db21968f05b39ff9832b18545ba6b93be76d2e61b04a14208c515680f3
@@ -8070,6 +8090,10 @@ sha256=2d2df642eb8e0527936cdf4ed1c096f69df53e9b95e2532c8ed0cabd06a45407
 md5=1b244b5d19f0ccab01d7083436cd3558
 sha256=206f8dc850f12b1213fb73dbef09fafa1bb8fb8c3ddfe4d39721c1e2dec12a98
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.2.3.tar.bz2]
+md5=5cd67cc02a50c9644ba0a1846ea3b08e
+sha256=f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXrandr-X11R7.0-1.1.0.2.tar.bz2]
 md5=e10aed44c2e1e5d9e6848a62ff2c90c7
 sha256=6b6a3fcf44621bf163ba2db6dbcc518bff4e8cf74695d1b86595387a3ff3c6fb
@@ -8194,6 +8218,10 @@ sha256=4adbde13bbb3109897fc7b5d05bdab4709c4dd1aa7313f47b8093f52f10e617c
 md5=8de1ca6c55aaad7d8cae19b4f0b3da32
 sha256=e08fc2c1611c422f751ed02810491b45bf7faa4207d762a11f11815263c9285a
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.0.2.tar.bz2]
+md5=304d37bd0a10d9b58aa9b64469ad73e5
+sha256=3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXxf86vm-X11R7.0-1.0.0.tar.bz2]
 md5=ed59db622581b33ec2a62e12b2f9c274
 sha256=f972bbd632cf9047a28b4c467a2f7c2c72f9b36959a98649b3dfef6bf898b8df
@@ -10442,6 +10470,10 @@ sha256=b3dd85e34b22cf757eafb6ef15c5505d5ec5e71803caef4b69ddc7fd5d46fabe
 md5=aacda46598ce3af8ca16e2a8132db1b2
 sha256=c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c
 
+[http://xorg.freedesktop.org/releases/individual/app/luit-1.0.3.tar.bz2]
+md5=b01e4f71c20fc1c79ed727759c1df40c
+sha256=2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/luit-X11R7.0-1.0.1.tar.bz2]
 md5=30428b8ff783a0cfd61dab05a17cfaa7
 sha256=fb423dc3ae75e64a256172c873732fe869ae482409cf1f3e7d980d222f070cee
@@ -14118,6 +14150,10 @@ sha256=3a8b96d7955a022045c781c1b8ac266fa8cdd47295744d60e7c00a6e88abbb3d
 md5=bee5d87d40615e67c84ab0b0c65049ba
 sha256=c23c12259854c7cec6d19bf397afff4a542a22170b14de73b321aa8cafcf3a86
 
+[http://xorg.freedesktop.org/releases/individual/app/sessreg-1.0.4.tar.bz2]
+md5=839e968d7197b9563f0fd8a5a3aac2e3
+sha256=23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/sessreg-X11R7.0-1.0.0.tar.bz2]
 md5=8289a5b947165449c23bdfad9af02b4c
 sha256=3769ad5059a2841a8ee28fc8a7d3a3ca8eb59f4fd46d0bd629829f3841202734
@@ -14326,6 +14362,10 @@ sha256=2984645b207c52ea9b8ef3951af8bd0c5aab469607fabf63ade05f8fe87309c1
 md5=a282846532ecbd6b4a28072373b3a70b
 sha256=b2097320a1fca4851f1377a14f4cc14a46e27d2a44ca017c40a6cb618b2f31e8
 
+[http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.2.tar.bz2]
+md5=31da204a0255ba8c6a65386e65dc1c90
+sha256=76d22f0cf07c8c4386a15c5c935b58319bd747befb940a0f03f652d59c4f67d2
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/smproxy-X11R7.0-1.0.1.tar.bz2]
 md5=60f54881b6fb27a8ba238629e4097c4d
 sha256=c56617fd511eac4bdcff5b9b171be0aeacb7d8ddfe48615aa61295cf90b62888
@@ -16114,10 +16154,18 @@ sha256=cbb271f6c3586210f31953933c4d06bd34272df9c596f5e26124ca3caf8529be
 md5=8d2731e6e95f173f41a0ddc875d55804
 sha256=d5e333bc74c0a534bf96f40ea89b7e700f137d46f1fdbaea13fa552ad6227af8
 
+[http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.1.tar.bz2]
+md5=51b4a1c0ae2b3bd77417306fd78a3e94
+sha256=c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xbiff-X11R7.0-1.0.1.tar.bz2]
 md5=c4eb71a3187586d02365a67fc1445e54
 sha256=c9c899fddcb5053d6cf2a00a933b6e6b0429af547efbe85f89ad3bb35176bbec
 
+[http://xorg.freedesktop.org/releases/individual/data/xbitmaps-1.0.1.tar.bz2]
+md5=b28a9840cde3c38d7c09716372fea257
+sha256=5aa5be594e77f772b85d39f0c25f61a61c7f6fa02ba940e614c5ee386deeb867
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/data/xbitmaps-X11R7.0-1.0.1.tar.bz2]
 md5=22c6f4a17220cd6b41d9799905f8e357
 sha256=3d7b78cf588871caa00ef79f5f66657803cf9a07350ac5dcf56fbe5ca2a794a8
@@ -16186,6 +16234,10 @@ sha256=b2807e96a9d632b7bbf1782a43095de51f3feae3d2e25374d3df00c6c68792ab
 md5=77f3ba0cbef119e0230d235507a1d916
 sha256=f28e8f6baaaa590ed991314c98f16d114e4668b93c5c6e7fb1bf51f3cc7bf6c0
 
+[http://xorg.freedesktop.org/releases/individual/app/xcmsdb-1.0.1.tar.bz2]
+md5=8579d5f50ba7f0c4a5bf16b9670fea01
+sha256=e275a39f41ffae854db77b2c5decfad2cac32afbcd158842032dc9ca04efe92e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xcmsdb-X11R7.0-1.0.1.tar.bz2]
 md5=1c8396ed5c416e3a6658394ff6c415ad
 sha256=6e1cdf207ca998acd4e1cc991bde47fcf9d01d24ba733f9d3afe3c64843ef838
@@ -16198,6 +16250,10 @@ sha256=f62bd7916589515d338055cf977b544d031883659f0ec97cbbd08441256f1059
 md5=dd817a0fabe11b1b463492b37247b013
 sha256=be246df3bb5b5ed6bcc3d527f7b6015b3c3f2035090f52729ec4c796f5da20e9
 
+[http://xorg.freedesktop.org/releases/individual/data/xcursor-themes-1.0.1.tar.bz2]
+md5=014bad415e64c49994679cdb71a97e37
+sha256=4e7dcd402cd045ce1bd1a3de496270e78d6ead2478a0bcb3404072b33c5c9ea0
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/data/xcursor-themes-X11R7.0-1.0.1.tar.bz2]
 md5=c39afeae55a7d330297b2fec3d113634
 sha256=730029a4f23661094f0d246595041e51ec0b55e7405fcd5affee1ec7f9aba813
@@ -16210,6 +16266,10 @@ sha256=b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4
 md5=7b0c623049d4aab20600d6473f8aab23
 sha256=b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4
 
+[http://xorg.freedesktop.org/releases/individual/app/xcursorgen-1.0.2.tar.bz2]
+md5=6fc90896b8c786cb1a2100b4167f7874
+sha256=e009322bd2afef8d4ad91bcb6b17874e1cd00b1aaf397e7019a82cc44f3c174e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xcursorgen-X11R7.0-1.0.0.tar.bz2]
 md5=4d7b26dbb4442e89ec65c4147b31a5f7
 sha256=8290616302932e72d4224cbe27d872efa5f44b0b8553ded0bbfb3537abe76907
-- 
cgit v1.2.3


From a2267085ab6a2d2e04f70794cba393ed3b6cad1c Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 17:24:07 +0000
Subject: xorg-driver-common.inc : fix the header file detections now we are
 using sysroot. Seems to actually work in use, but maybe there is a better
 way!

---
 packages/xorg-driver/xorg-driver-common.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc
index a75e409c8c..7126b8be83 100644
--- a/packages/xorg-driver/xorg-driver-common.inc
+++ b/packages/xorg-driver/xorg-driver-common.inc
@@ -25,10 +25,10 @@ do_stage() {
 # Of course this will blow up when cross compiling.
 
 do_configure_prepend() {
-	incdir=${STAGING_INCDIR}/xorg
+	incdir=${layout_includedir}/xorg
 	for f in dri.h sarea.h dristruct.h exa.h damage.h; do
 		path="$incdir/$f"
-		if [ -f "$path" ]; then
+		if [ -f "${STAGING_DIR_HOST}/$path" ]; then
 			p=`echo "$path" | sed 'y%*+%pp%;s%[^_[:alnum:]]%_%g'`
 			eval "export ac_cv_file_$p=yes"
 		fi
-- 
cgit v1.2.3


From f1ce3d73d57b4d0b57cd56175c489ff2a0d2f3cf Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 17:25:00 +0000
Subject: xf86-input-joystick_1.3.2.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-input-joystick_1.3.2.bb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-input-joystick_1.3.2.bb

diff --git a/packages/xorg-driver/xf86-input-joystick_1.3.2.bb b/packages/xorg-driver/xf86-input-joystick_1.3.2.bb
new file mode 100644
index 0000000000..a53297fd8a
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-joystick_1.3.2.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- joystick input driver"
+PE = "1"
-- 
cgit v1.2.3


From caa50b894e8dcd8eec45b3db7a1864931794f8e9 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 17:25:32 +0000
Subject: xf86-input-synaptics_0.15.0.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-input-synaptics_0.15.0.bb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-input-synaptics_0.15.0.bb

diff --git a/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb b/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb
new file mode 100644
index 0000000000..e6325675f8
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
-- 
cgit v1.2.3


From efb56de6034d9d711ab652b1320ca539e746d2be Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 17:26:10 +0000
Subject: xf86-video-geode_2.10.1.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-geode_2.10.1.bb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-geode_2.10.1.bb

diff --git a/packages/xorg-driver/xf86-video-geode_2.10.1.bb b/packages/xorg-driver/xf86-video-geode_2.10.1.bb
new file mode 100644
index 0000000000..380ce2ea0b
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-geode_2.10.1.bb
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+PE = "1"
+
+COMPATIBLE_HOST = 'i.86.*-linux'
+DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
-- 
cgit v1.2.3


From 3c916ebbef9d39275c5406824acea4af5e4b5010 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 17:26:46 +0000
Subject: xf86-video-glint_1.2.1.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-glint_1.2.1.bb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-glint_1.2.1.bb

diff --git a/packages/xorg-driver/xf86-video-glint_1.2.1.bb b/packages/xorg-driver/xf86-video-glint_1.2.1.bb
new file mode 100644
index 0000000000..eac23c74d9
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-glint_1.2.1.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- Glint display driver"
+
+DEPENDS += " xf86dgaproto drm xf86driproto"
+
-- 
cgit v1.2.3


From adbbbdb1dd01e19f003734544b119bf5b6e41d6c Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 17:27:19 +0000
Subject: xf86-video-i128_1.3.1.bb : new version for X11R7.4

---
 packages/xorg-driver/xf86-video-i128_1.3.1.bb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-i128_1.3.1.bb

diff --git a/packages/xorg-driver/xf86-video-i128_1.3.1.bb b/packages/xorg-driver/xf86-video-i128_1.3.1.bb
new file mode 100644
index 0000000000..78d5eda810
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-i128_1.3.1.bb
@@ -0,0 +1,4 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- i128 display driver"
+PE = "1"
-- 
cgit v1.2.3


From 10810c3fdc63b86badd5d7f38003d8395f55e7c6 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Nov 2008 17:28:28 +0000
Subject: checksums.ini : more new checksums for X11R7.4

---
 conf/checksums.ini | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index a999b53f05..51fde89eea 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -16322,6 +16322,10 @@ sha256=4294768751bd4ffb47e5ebacfc7b5b9f95a1a2f4d221d8af64474382473e1962
 md5=2b08e9ca783e3aa91d7fb84fdd716e93
 sha256=d97f2872f5400f7fb5c0ad9442eced4bea55ab523de27417bd479db0071e3fed
 
+[http://xorg.freedesktop.org/releases/individual/app/xdriinfo-1.0.2.tar.bz2]
+md5=a5ec51ed9f0a55dc3462d90d52ff899c
+sha256=7b03ac095b6c79688c20ad61e3576d4698e3f16c09a7f3f1e7c50826814e7265
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xdriinfo-X11R7.0-1.0.0.tar.bz2]
 md5=75b8b53e29bb295f7fbae7909e0e9770
 sha256=84753f1c33be507ed9c1cc9d5e78565cc61e60d1403e499d7f25603d9a3b4f6b
@@ -16382,6 +16386,10 @@ sha256=530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029
 md5=3ffafa7f222ea799bcd9fcd85c60ab98
 sha256=e93bb322fe96ceabd0581bb70101aaa1001b0b8f894b3ae0e1fa2e4b38f41af2
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-acecad-1.2.2.tar.bz2]
+md5=2d6596b2b0cfa527b5ed4df2014684bf
+sha256=953ebb7d7ed579ce648dd6f6a25307c37ad8230a0336ec6fc58247732835f26e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-acecad-X11R7.0-1.0.0.5.tar.bz2]
 md5=b35b1756579ebe296801622bdf063ab1
 sha256=699ba1716f74db0aaa66aa510ebf195560ff09f88001f98bde9275d2826f30ea
@@ -16390,6 +16398,10 @@ sha256=699ba1716f74db0aaa66aa510ebf195560ff09f88001f98bde9275d2826f30ea
 md5=7ed47ca8feb1fbbe305f3a6732181550
 sha256=b2bcdb4ef8cb9645e476afcedeadbb9d1688f8e8f7bd010f6718a15f1673556b
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-1.1.1.tar.bz2]
+md5=2aa75313ea5652a8cf93581c65ee6493
+sha256=219116b0275b93333b8471fc94d97320a116d695c4249837fd97763f00a85d77
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-aiptek-X11R7.0-1.0.0.5.tar.bz2]
 md5=9ee5109ef33e281ce0784ad077f26cee
 sha256=62d1dfdc2f902d016999861ec3fd58b4630341e8f4df45e65c7bee730b51fd8e
@@ -16494,6 +16506,14 @@ sha256=ed5c17b702a43192710b7476f3a8540d04bc800554fd05e348be4f510f651dfa
 md5=ca01cca63fa57600c1cf6b307bb9aa8c
 sha256=cacc590ac4e57f3374e18b9898c6fa8992f31db6e1cf985391fe42c33a29fe15
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.3.1.tar.bz2]
+md5=ff25ea697cfa1570cc28f4b9cf9c761f
+sha256=1d33b9668e039ea9adc0680c1f2971785508cfd74b2215749db23af23ef8f9ce
+
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.3.2.tar.bz2]
+md5=e48b99e55093525ebb7811a014391a0b
+sha256=6cad238e0a54dec75c5224f9c0774b4fce2a03b06f1c61b404e9ea97d4941d4b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-joystick-X11R7.0-1.0.0.5.tar.bz2]
 md5=9e3ba60836f4c1d2e4cebc63a28321b4
 sha256=9b69192a4368bafeaf94432ec50025dd3f60340290ef2500f6032159870ed489
@@ -16610,6 +16630,10 @@ sha256=6456ddecc0e1b962b5f14b98b81d2e936cb48dcdacdd871dfa0e24c0d252498c
 md5=56765c5ee99f67802bca8a1134ad7fc1
 sha256=57460dfa0429c58d598f192aa65661300dd104953073d977ad4f4b15a596eda8
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-0.15.0.tar.bz2]
+md5=939f1c831c5cd3a6f027e982592dfc5b
+sha256=e7d481c375a11df55eb8f12390c329c2bfda3258c689cec11cfec27cb5895c8b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-tek4957-X11R7.0-1.0.0.5.tar.bz2]
 md5=df633403c91a48c6a316c6a5f48e53e2
 sha256=1cc4a964e2b407d2b9ebbac0bf38787e572d9bd88759fc0b229f588ac90ed139
@@ -16634,6 +16658,10 @@ sha256=f06dea24204c6f3f42c29d1a89f51da801082094e393a716d592d638fa9ddb66
 md5=f253663de03e0fbb377ce085947412b1
 sha256=973a51a442d0c97eb3f76af3b148194de8a4187e74f4a68033b0480c6408db42
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-void-1.1.1.tar.bz2]
+md5=862c230f5f6e0c545f232b4c0fa9537a
+sha256=dde062d6267a3fd9d51b0daee88fd84fceea52a6019de51dece46e92012dbc4f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-void-X11R7.0-1.0.0.5.tar.bz2]
 md5=c7ae53dee1f3e95fa5ce9659b34d8446
 sha256=ca90a522b78114d72748164c7a99274634cd2b50953f9c52f91b31746c790b5e
@@ -16642,6 +16670,10 @@ sha256=ca90a522b78114d72748164c7a99274634cd2b50953f9c52f91b31746c790b5e
 md5=3683affae738de5ef130b6720bdfd6dd
 sha256=4612a45a90fb1aec8cabd36abeaf04f202ecc45d2074427bfa9f368f95514e43
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-1.2.0.tar.bz2]
+md5=4f78650d79656dc803a720049d65682e
+sha256=f0fe020f892e6e3a696a490c86312a1b32672bffb7dead153c24f103540a6185
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-apm-X11R7.0-1.0.1.5.tar.bz2]
 md5=323911ab16a6147d3cabceff9336a3d2
 sha256=ceaf4a611b8ee8bc31bc784f1012b0d6be6380e8823f6bf03a9a1ee737264a78
@@ -16650,6 +16682,10 @@ sha256=ceaf4a611b8ee8bc31bc784f1012b0d6be6380e8823f6bf03a9a1ee737264a78
 md5=a5320411ba92e637ffb233e9cbb80d13
 sha256=1e43d482e570328abcb8a1e03c62f8c3e3fcaf3eb09dc885503a1add158be0a2
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-0.7.0.tar.bz2]
+md5=6826c556ebe9a1248cbc7f7edd44f956
+sha256=8e65e73045fabe37c15f6d4895baa09346bdac2f7537607b523aacd7bcf57594
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-ark-X11R7.0-0.5.0.5.tar.bz2]
 md5=342937e275dbc92f437417a3186a8222
 sha256=47aa2ecf4129e72e049796571e3125ff3bc8dae7fe31e27d361470d4a3b8d548
@@ -16658,6 +16694,10 @@ sha256=47aa2ecf4129e72e049796571e3125ff3bc8dae7fe31e27d361470d4a3b8d548
 md5=a5bed67815b9e650182806da301b488c
 sha256=06c2462dfa65c32e31a972292531bf686c56c3f9cf21baf814ab0eda5cf26653
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ast-0.85.0.tar.bz2]
+md5=b415bf3259ad0acdaf62e3dde76e3289
+sha256=9018ff84e4866d895c037aad33fb31c79d5f47d3f54707600cc3fe6076485b28
+
 [http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-ast-X11R7.1-0.81.0.tar.bz2]
 md5=ac1595de8397efd740038994b1e9ef67
 sha256=f0020c88ca3f86b4826c556888b476f081b80010ba78239f95e5349835ad8811
@@ -16670,6 +16710,10 @@ sha256=9b0899694000cb91d5643e2482376af24bd495cb01b4c9dcdd6ee3545b0aefae
 md5=f6d559f9d20f61567d381916b376590f
 sha256=d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.8.0.tar.bz2]
+md5=3c97c7925ebf4162eeb3463e23adc0e3
+sha256=3863851e3c85d25cc38941eec63e866656806821b028519ae32ab8b276664fba
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-ati-X11R7.0-6.5.7.3.tar.bz2]
 md5=92525195a7a36f5ffbffcb4e6a564e50
 sha256=094da5eae789e50d1ebc4d7823d4c8ac701e3bbe387c0ff63285e2ab32aad1f8
@@ -16678,6 +16722,10 @@ sha256=094da5eae789e50d1ebc4d7823d4c8ac701e3bbe387c0ff63285e2ab32aad1f8
 md5=c490366e7a663b4d05acb45713be45ee
 sha256=4f471f90fcedd164c5e550afbe2dd3f7247b38c19e3d44b0b8941bbcdf0f1a10
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-chips-1.2.0.tar.bz2]
+md5=0fec6bee65383790485d917247a61629
+sha256=05f38c49b23be36afa68b738faf520b8dbf05b92c769107039426651801d4f99
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-chips-X11R7.0-1.0.1.3.tar.bz2]
 md5=90f23505faceac30d3f46ab94f7293e1
 sha256=2df2e34dc61907fb3c41b4590f51d39f951d2d74422d84f1f7d53ef6f5b25352
@@ -16690,6 +16738,10 @@ sha256=e851ff555f177ebe6b4d8f961e088a1e2f5947ba739e5b891eb5b3ff4cdd652b
 md5=66344e315def275605dafb314ce59851
 sha256=5988962199d5013274f6a6952939e4f405df658bb6616ebf9954c993b1179b1b
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-1.2.1.tar.bz2]
+md5=bc28fdedaee9059180e2534f9dbcd2f