104 files changed, 1218 insertions, 138 deletions

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 4efeb75fe2..c7bde00fe6 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -624,6 +624,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS ?= "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320"
 MACHINE_DISPLAY_ORIENTATION ?= "0"
 MACHINE_DISPLAY_BPP ?= "16"
+MACHINE_DRI_MODULES ?= "auto"
 
 DISTRO_EXTRA_RDEPENDS ?= ""
 DISTRO_EXTRA_RRECOMMENDS ?= ""
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 7266609e15..259f098b5a 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 ab05ed707d..87ee7ce4f0 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"
diff --git a/meta/conf/machine/eee901.conf b/meta/conf/machine/eee901.conf
index d5e0e29306..0fe7e06ce6 100644
--- a/meta/conf/machine/eee901.conf
+++ b/meta/conf/machine/eee901.conf
@@ -1,3 +1,8 @@
+#@TYPE: Machine
+#@NAME: Asus EEE 901 PC
+
+#@DESCRIPTION: Machine configuration for the Asus EEE 901 PC
+
 TARGET_ARCH = "i586"
 PACKAGE_EXTRA_ARCHS = "x86"
 
@@ -8,6 +13,14 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi"
 KERNEL_IMAGETYPE = "bzImage"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-moblin2"
+PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-dri-lite"
+XSERVER = "xserver-xf86-dri-lite \
+           xf86-input-mouse \
+           xf86-input-keyboard \
+           xf86-input-synaptics \
+           xf86-video-intel"
+MACHINE_DRI_MODULES = "i915"
 
 MACHINE_EXTRA_RDEPENDS = "rt2860"
 
@@ -15,9 +28,6 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
 GUI_MACHINE_CLASS = "bigscreen"
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-XSERVER="xserver-kdrive-fbdev"
-
 IMAGE_ROOTFS_SIZE_ext3 = "250000"
 
 IMAGE_FSTYPES += "ext3 jffs2 cpio.gz"
diff --git a/meta/packages/drm/libdrm_2.3.1.bb b/meta/packages/drm/libdrm_2.3.1.bb
new file mode 100644
index 0000000000..9caf9b4bea
--- /dev/null
+++ b/meta/packages/drm/libdrm_2.3.1.bb
@@ -0,0 +1,10 @@
+SECTION = "x11/base"
+LICENSE = "MIT"
+SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
+PROVIDES = "drm"
+
+inherit autotools pkgconfig
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/libxslt/libxslt-native_1.1.22.bb b/meta/packages/libxslt/libxslt-native_1.1.22.bb
new file mode 100644
index 0000000000..5157aaacbf
--- /dev/null
+++ b/meta/packages/libxslt/libxslt-native_1.1.22.bb
@@ -0,0 +1,4 @@
+require libxslt_${PV}.bb
+inherit native
+
+DEPENDS = "libxml2-native (>=2.6.27)"
diff --git a/meta/packages/mesa/mesa-common.inc b/meta/packages/mesa/mesa-common.inc
index 18e9b4ebed..51b8f4644a 100644
--- a/meta/packages/mesa/mesa-common.inc
+++ b/meta/packages/mesa/mesa-common.inc
@@ -1,9 +1,21 @@
 SECTION = "x11"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
-        file://mklib-rpath-link.patch;patch=1"
+DESCRIPTION = "An open source implementation of the OpenGL spec"
+HOMEPAGE = "http://mesa3d.org"
+LICENSE = "MIT"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2"
 S = "${WORKDIR}/Mesa-${PV}"
 
-LICENSE = "LGPL"
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-glu \
+                --disable-glw \
+                --disable-glut \
+                --enable-glx-tls"
+
+do_stage() {
+        autotools_stage_all
+}
+
 
-DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice"
diff --git a/meta/packages/mesa/mesa-dri_7.1.bb b/meta/packages/mesa/mesa-dri_7.1.bb
new file mode 100644
index 0000000000..608bac0857
--- /dev/null
+++ b/meta/packages/mesa/mesa-dri_7.1.bb
@@ -0,0 +1,15 @@
+include mesa-common.inc
+
+PROTO_DEPS = "xf86driproto glproto"
+LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+
+DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
+
+PE = "1"
+PR = "r0"
+
+FILES_${PN} += "${libdir}/dri/*.so"
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+
+EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}"
+
diff --git a/meta/packages/mesa/mesa-dri_git.bb b/meta/packages/mesa/mesa-dri_git.bb
new file mode 100644
index 0000000000..137e1d4a33
--- /dev/null
+++ b/meta/packages/mesa/mesa-dri_git.bb
@@ -0,0 +1,20 @@
+include mesa-common.inc
+
+PROTO_DEPS = "xf86driproto glproto"
+LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+
+DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
+
+PV = "7.1+git${SRCREV}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
+S = "${WORKDIR}/git"
+
+FILES_${PN} += "${libdir}/dri/*.so"
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+
+EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}"
+
diff --git a/meta/packages/mesa/mesa-mesa.inc b/meta/packages/mesa/mesa-mesa.inc
deleted file mode 100644
index d794f0c097..0000000000
--- a/meta/packages/mesa/mesa-mesa.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-include mesa-common.inc
-
-PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
-
-FILES_libgl = "${libdir}/libGL.so.*"
-FILES_libglu = "${libdir}/libGLU.so.*"
-FILES_libosmesa = "${libdir}/libOSMesa.so.*"
-
-FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
-FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
-FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
-
-do_configure() {
-        cd configs
-
-        cp linux current
-        sed -e "s%CC *= *.*%CC = ${CC}%" -i current
-        sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current
-        sed -e "s%LD *= *.*%LD = ${LD}%" -i current
-        sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current
-        sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current
-        sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current
-        sed -i s:\$\(CC\):gcc:g  ../src/mesa/x86/Makefile
-        echo "SRC_DIRS = mesa glu glut/glx" >> current
-}
-
-do_compile() {
-        oe_runmake default
-}
-
-do_install() {
-        install -d ${D}${libdir}
-        cp -pP lib/* ${D}${libdir}/
-        install -d ${D}${includedir}
-        cp -R include/GL ${D}${includedir}/
-}
-
-do_stage() {
-        cp -pP lib/* ${STAGING_LIBDIR}/
-        cp -R include/GL ${STAGING_INCDIR}/
-}
diff --git a/meta/packages/mesa/mesa_7.0.2.bb b/meta/packages/mesa/mesa_7.0.2.bb
index 3eb1fbef8b..a6cbef07d4 100644
--- a/meta/packages/mesa/mesa_7.0.2.bb
+++ b/meta/packages/mesa/mesa_7.0.2.bb
@@ -1,6 +1,50 @@
-include mesa-mesa.inc
+# Note: we don't require mesa-common.inc since going forward mesa will
+# be autotool based.
 
-SRC_URI_append = " file://fix-host-compile.patch;patch=1 "
+SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
+           file://mklib-rpath-link.patch;patch=1 \
+           file://fix-host-compile.patch;patch=1 "
+S = "${WORKDIR}/Mesa-${PV}"
 
+DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice"
 
+PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+
+FILES_libgl = "${libdir}/libGL.so.*"
+FILES_libglu = "${libdir}/libGLU.so.*"
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+
+FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
+FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
+
+do_configure() {
+        cd configs
+
+        cp linux current
+        sed -e "s%CC *= *.*%CC = ${CC}%" -i current
+        sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current
+        sed -e "s%LD *= *.*%LD = ${LD}%" -i current
+        sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current
+        sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current
+        sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current
+        sed -i s:\$\(CC\):gcc:g  ../src/mesa/x86/Makefile
+        echo "SRC_DIRS = mesa glu glut/glx" >> current
+}
+
+do_compile() {
+        oe_runmake default
+}
+
+do_install() {
+        install -d ${D}${libdir}
+        cp -pP lib/* ${D}${libdir}/
+        install -d ${D}${includedir}
+        cp -R include/GL ${D}${includedir}/
+}
+
+do_stage() {
+        cp -pP lib/* ${STAGING_LIBDIR}/
+        cp -R include/GL ${STAGING_INCDIR}/
+}
 
diff --git a/meta/packages/tasks/task-poky.bb b/meta/packages/tasks/task-poky.bb
index 8a7a1164a5..5afea383c9 100644
--- a/meta/packages/tasks/task-poky.bb
+++ b/meta/packages/tasks/task-poky.bb
@@ -46,7 +46,7 @@ RDEPENDS_task-poky-x11-base = "\
     matchbox-desktop \
     matchbox-session \
     ${XSERVER} \
-    xserver-kdrive-common \
+    x11-common \
     xserver-nodm-init \
     liberation-fonts \
     xauth \
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults b/meta/packages/x11-common/x11-common/etc/X11/Xdefaults
index f5b69dd516..f5b69dd516 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults
+++ b/meta/packages/x11-common/x11-common/etc/X11/Xdefaults
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit b/meta/packages/x11-common/x11-common/etc/X11/Xinit
index f566ffe5be..f566ffe5be 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit
+++ b/meta/packages/x11-common/x11-common/etc/X11/Xinit
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xserver b/meta/packages/x11-common/x11-common/etc/X11/Xserver
new file mode 100644
index 0000000000..689d522d09
--- /dev/null
+++ b/meta/packages/x11-common/x11-common/etc/X11/Xserver
@@ -0,0 +1,83 @@
+#!/bin/sh
+#
+
+. /etc/formfactor/config
+
+# note xinit needs full server path
+XSERVER=/usr/bin/Xipaq
+if [ -f /usr/bin/Xfbdev ]; then
+  XSERVER=/usr/bin/Xfbdev
+fi
+if [ -f /usr/bin/Xepson ]; then
+  XSERVER=/usr/bin/Xepson
+fi
+if [ -f /usr/bin/Xorg ]; then
+  XSERVER=/usr/bin/Xorg
+fi
+if [ -f /usr/bin/Xomap ]; then
+  XSERVER=/usr/bin/Xomap
+fi
+
+. /etc/profile
+
+module_id() {
+    ## used to read from assets, but sometimes assets is corrupted
+    # grep "Module ID" /proc/hal/assets | sed "s/.*://"
+    ## used to read from /proc/hal/model, but that is removed in 2.6
+    # echo ' iPAQ' `cat /proc/hal/model`
+    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+}
+
+export USER=root
+
+ARGS=" -br -pn"
+
+if [ "$XSERVER" != "/usr/bin/Xorg" ]; then
+
+        # use ucb 1x00 touchscreen if present
+        if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
+          ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
+        fi
+
+        # use usb mouse if present
+        if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ]; then
+          ARGS="$ARGS -mouse /dev/input/mice"
+        fi
+
+        # kdrive 1.4 onwards needs -mouse args
+        if [ -n "$TSLIB_TSDEVICE" ]; then
+          ARGS="$ARGS -mouse tslib"
+        fi
+
+        # start off server in conventional location.
+        case `module_id` in
+                "Generic OMAP1510/1610/1710")
+                        ARGS="$ARGS -mouse /dev/input/event0" ;;
+                "Compulab CM-x270")
+                        #modprobe mbxfb
+                        #ARGS="$ARGS -fb /dev/fb1"
+                        ;;
+                "Nokia N800")
+                        ARGS="$ARGS -mouse tslib" ;;
+                "Nokia 770")
+                        ARGS="$ARGS -mouse tslib" ;;
+                *)
+                        ;;
+        esac
+
+        ARGS="$ARGS -screen ${DISPLAY_WIDTH_PIXELS}x${DISPLAY_HEIGHT_PIXELS}@${DISPLAY_ORIENTATION}x${DISPLAY_BPP}"
+
+        if [ ! -z "$DISPLAY_DPI" ]; then
+                ARGS="$ARGS -dpi $DISPLAY_DPI"
+        fi
+
+        if [ ! -z "$DISPLAY_SUBPIXEL_ORDER" ]; then
+                ARGS="$ARGS -rgba $DISPLAY_SUBPIXEL_ORDER"
+        fi
+
+fi
+
+DISPLAY=':0'
+
+exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
+
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession b/meta/packages/x11-common/x11-common/etc/X11/Xsession
index 8f3e5edd7d..8f3e5edd7d 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
+++ b/meta/packages/x11-common/x11-common/etc/X11/Xsession
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap.sh b/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh
index a9d102c746..a9d102c746 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap.sh
+++ b/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90XWindowManager.sh b/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh
index b936dedf3b..b936dedf3b 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90XWindowManager.sh
+++ b/meta/packages/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/default.xmodmap b/meta/packages/x11-common/x11-common/etc/X11/default.xmodmap
index 05a13fa3c8..05a13fa3c8 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/default.xmodmap
+++ b/meta/packages/x11-common/x11-common/etc/X11/default.xmodmap
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/meta/packages/x11-common/x11-common_0.1.bb
index 67e62ad99d..a4cef9c49a 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/meta/packages/x11-common/x11-common_0.1.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor"
-PR = "r32"
+RDEPENDS_${PN} = "xmodmap xdpyinfo xtscal xinit formfactor"
+PR = "r34"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb b/meta/packages/x11-common/xserver-nodm-init.bb
index 46cb164a51..46cb164a51 100644
--- a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb
+++ b/meta/packages/x11-common/xserver-nodm-init.bb
diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/meta/packages/x11-common/xserver-nodm-init/xserver-nodm
index f6399fc1fa..f6399fc1fa 100755
--- a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/meta/packages/x11-common/xserver-nodm-init/xserver-nodm
diff --git a/meta/packages/xcb/libpthread-stubs_0.1.bb b/meta/packages/xcb/libpthread-stubs_0.1.bb
new file mode 100644
index 0000000000..9614a74a68
--- /dev/null
+++ b/meta/packages/xcb/libpthread-stubs_0.1.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "This library provides weak aliases for pthread functions \
+not provided in libc or otherwise available by default."
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+HOMEPAGE = "http://xcb.freedesktop.org"
+
+PARALLEL_MAKE = ""
+#DEPENDS = "xcb-proto xproto libxau libxslt-native"
+# DEPENDS += "xsltproc-native gperf-native"
+
+SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xcb/libxcb.inc b/meta/packages/xcb/libxcb.inc
new file mode 100644
index 0000000000..99356a1eb0
--- /dev/null
+++ b/meta/packages/xcb/libxcb.inc
@@ -0,0 +1,55 @@
+DESCRIPTION = "XCB: an X protocol C binding"
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+HOMEPAGE = "http://xcb.freedesktop.org"
+
+PARALLEL_MAKE = ""
+DEPENDS = "xcb-proto xproto libxau libxslt-native"
+# DEPENDS += "xsltproc-native gperf-native"
+
+SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2"
+#           file://xcbincludedir.patch;patch=1"
+
+PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \
+             libxcb-randr libxcb-record libxcb-render libxcb-res \
+             libxcb-screensaver libxcb-shape libxcb-shm libxcb-sync \
+             libxcb-xevie libxcb-xf86dri libxcb-xfixes libxcb-xlib \
+             libxcb-xprint libxcb-xtest libxcb-xv libxcb-xvmc"
+
+FILES_${PN} = "${libdir}/libxcb.so.*"
+#FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h"
+FILES_libxcb-composite = "${libdir}/libxcb-composite.so.*"
+FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*"
+FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*"
+FILES_libxcb-glx = "${libdir}/libxcb-glx.so.*"
+FILES_libxcb-randr = "${libdir}/libxcb-randr.so.*"
+FILES_libxcb-record = "${libdir}/libxcb-record.so.*"
+FILES_libxcb-render = "${libdir}/libxcb-render.so.*"
+FILES_libxcb-res = "${libdir}/libxcb-res.so.*"
+FILES_libxcb-screensaver = "${libdir}/libxcb-screensaver.so.*"
+FILES_libxcb-shape = "${libdir}/libxcb-shape.so.*"
+FILES_libxcb-shm = "${libdir}/libxcb-shm.so.*"
+FILES_libxcb-sync = "${libdir}/libxcb-sync.so.*"
+FILES_libxcb-xevie = "${libdir}/libxcb-xevie.so.*"
+FILES_libxcb-xf86dri = "${libdir}/libxcb-xf86dri.so.*"
+FILES_libxcb-xfixes = "${libdir}/libxcb-xfixes.so.*"
+FILES_libxcb-xinerama = "${libdir}/libxcb-xinerama.so.*"
+FILES_libxcb-xlib = "${libdir}/libxcb-xlib.so.*"
+FILES_libxcb-xprint = "${libdir}/libxcb-xprint.so.*"
+FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*"
+FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*"
+FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*"
+
+inherit autotools pkgconfig
+
+# XCBPROTO_XCBINCLUDEDIR is setup based on `pkg-config --variable=xcbincludedir xcb-proto`
+# but the xcbincludedir variable doesn't point into the staging area, so it needs some
+# tweeking here:
+do_configure_prepend () {
+    sed -i "s|XCBPROTO_XCBINCLUDEDIR=|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR}/${HOST_SYS}/|" \
+        ${S}/configure.ac
+}
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta/packages/xcb/libxcb/xcbincludedir.patch b/meta/packages/xcb/libxcb/xcbincludedir.patch
new file mode 100644
index 0000000000..cef635096e
--- /dev/null
+++ b/meta/packages/xcb/libxcb/xcbincludedir.patch
@@ -0,0 +1,11 @@
+--- libxcb-1.0.orig/configure.ac        2006-11-23 15:33:01.000000000 +0000
++++ libxcb-1.0/configure.ac     2008-09-10 20:29:12.000000000 +0100
+@@ -50,7 +50,7 @@
+ 
+ # Find the xcb-proto protocol descriptions
+ AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)
+-XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
++XCBPROTO_XCBINCLUDEDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
+ AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR)
+ AC_SUBST(XCBPROTO_XCBINCLUDEDIR)
+ 
diff --git a/meta/packages/xcb/libxcb_1.0.bb b/meta/packages/xcb/libxcb_1.0.bb
new file mode 100644
index 0000000000..dd88a5390f
--- /dev/null
+++ b/meta/packages/xcb/libxcb_1.0.bb
@@ -0,0 +1,6 @@
+include libxcb.inc
+PR = "r0"
+
+DEPENDS += "libpthread-stubs"
+
+PACKAGES =+ "libxcb-xinerama"
diff --git a/meta/packages/xcb/libxcb_git.bb b/meta/packages/xcb/libxcb_git.bb
new file mode 100644
index 0000000000..cb7326efa0
--- /dev/null
+++ b/meta/packages/xcb/libxcb_git.bb
@@ -0,0 +1,12 @@
+DEFAULT_PREFERENCE = "-1"
+
+include libxcb.inc
+PV = "1.0+git"
+PR = "r0"
+
+DEPENDS += "libpthread-stubs"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git"
+S = "${WORKDIR}/git/xcb"
+
+PACKAGES =+ "libxcb-xinerama"
diff --git a/meta/packages/xcb/xcb-proto.inc b/meta/packages/xcb/xcb-proto.inc
new file mode 100644
index 0000000000..115a71ec3e
--- /dev/null
+++ b/meta/packages/xcb/xcb-proto.inc
@@ -0,0 +1,19 @@
+DESCRIPTION = "XCB: an X protocol C binding"
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+HOMEPAGE = "http://xcb.freedesktop.org"
+
+SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+FILES_${PN}-dev += "${datadir}/xcb/*.xml"
+
+do_stage() {
+        oe_runmake DESTDIR="${D}" install
+        mkdir -p ${STAGING_LIBDIR}/pkgconfig
+        install ${D}${libdir}/pkgconfig/xcb-proto.pc ${STAGING_LIBDIR}/pkgconfig
+        mkdir -p ${STAGING_DATADIR}/xcb
+        install ${D}${datadir}/xcb/*.xml ${STAGING_DATADIR}/xcb
+}
+
diff --git a/meta/packages/xcb/xcb-proto_1.0.bb b/meta/packages/xcb/xcb-proto_1.0.bb
new file mode 100644
index 0000000000..7ca4463402
--- /dev/null
+++ b/meta/packages/xcb/xcb-proto_1.0.bb
@@ -0,0 +1,2 @@
+include xcb-proto.inc
+PR = "r0"
diff --git a/meta/packages/xcb/xcb-proto_git.bb b/meta/packages/xcb/xcb-proto_git.bb
new file mode 100644
index 0000000000..26b6ce7d01
--- /dev/null
+++ b/meta/packages/xcb/xcb-proto_git.bb
@@ -0,0 +1,13 @@
+DEFAULT_PREFERENCE = "-1"
+
+include xcb-proto.inc
+PV = "1.0+git"
+PR = "r0"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git"
+S = "${WORKDIR}/git/xcb-proto"
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/meta/packages/xorg-driver/xf86-driver-common.inc b/meta/packages/xorg-driver/xf86-driver-common.inc
new file mode 100644
index 0000000000..308d06e0b1
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-driver-common.inc
@@ -0,0 +1,32 @@
+DESCRIPTION = "X driver"
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/drivers"
+LICENSE = "MIT-X"
+
+PE = "1"
+PR = "r0"
+
+DEPENDS = "virtual/xserver-xf86 xproto randrproto"
+
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/individual/driver/${XORG_PN}-${PV}.tar.bz2"
+
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
+FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
+
+inherit autotools pkgconfig
+
+do_stage() {
+        autotools_stage_all
+}
+
+# AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement
+# macro that simply assumes the test succeeds. 
+do_configure_prepend () {
+    echo 'AC_DEFUN(CC_AC_CHECK_FILE, $2)' > configure.ac.new
+    sed 's/AC_CHECK_FILE/CC_AC_CHECK_FILE/g' configure.ac >> configure.ac.new
+    mv configure.ac.new configure.ac
+}
+
diff --git a/meta/packages/xorg-driver/xf86-input-common.inc b/meta/packages/xorg-driver/xf86-input-common.inc
new file mode 100644
index 0000000000..6fc88cf9d0
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-input-common.inc
@@ -0,0 +1,7 @@
+include xf86-driver-common.inc
+
+DEPENDS += "inputproto kbproto "
+
+FILES_${PN} += " ${libdir}/xorg/modules/input/*.so"
+FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug"
+
diff --git a/meta/packages/xorg-driver/xf86-input-evdev_2.0.4.bb b/meta/packages/xorg-driver/xf86-input-evdev_2.0.4.bb
new file mode 100644
index 0000000000..d1fb0f000d
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-input-evdev_2.0.4.bb
@@ -0,0 +1,4 @@
+require xf86-input-common.inc
+
+DESCRIPTION = "X.Org X server -- evdev input driver"
+
diff --git a/meta/packages/xorg-driver/xf86-input-keyboard_1.3.1.bb b/meta/packages/xorg-driver/xf86-input-keyboard_1.3.1.bb
new file mode 100644
index 0000000000..f554141c97
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-input-keyboard_1.3.1.bb
@@ -0,0 +1,4 @@
+require xf86-input-common.inc
+
+DESCRIPTION = "X.Org X server -- keyboard input driver"
+
diff --git a/meta/packages/xorg-driver/xf86-input-mouse_1.3.0.bb b/meta/packages/xorg-driver/xf86-input-mouse_1.3.0.bb
new file mode 100644
index 0000000000..39c2e05daf
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-input-mouse_1.3.0.bb
@@ -0,0 +1,4 @@
+require xf86-input-common.inc
+
+DESCRIPTION = "X.Org X server -- mouse input driver"
+
diff --git a/meta/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb b/meta/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb
new file mode 100644
index 0000000000..f554141c97
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb
@@ -0,0 +1,4 @@
+require xf86-input-common.inc
+
+DESCRIPTION = "X.Org X server -- keyboard input driver"
+
diff --git a/meta/packages/xorg-driver/xf86-video-common.inc b/meta/packages/xorg-driver/xf86-video-common.inc
new file mode 100644
index 0000000000..4bf9c1b3b6
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-video-common.inc
@@ -0,0 +1,4 @@
+include xf86-driver-common.inc
+
+DEPENDS = "renderproto videoproto xextproto fontsproto"
+
diff --git a/meta/packages/xorg-driver/xf86-video-intel_2.4.2.bb b/meta/packages/xorg-driver/xf86-video-intel_2.4.2.bb
new file mode 100644
index 0000000000..4362baa15f
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-video-intel_2.4.2.bb
@@ -0,0 +1,5 @@
+require xf86-video-common.inc
+
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts.bb b/meta/packages/xorg-font/xorg-minimal-fonts.bb
new file mode 100644
index 0000000000..2262f03e84
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts.bb
@@ -0,0 +1,21 @@
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/fonts"
+LICENSE = "MIT-X"
+
+SRC_URI = "file://misc"
+
+PE = "1"
+PR = "r0"
+
+PACKAGES = "${PN}"
+PACKAGE_ARCH = "all"
+FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/"
+
+do_install() {
+        install -d ${D}/${datadir}/fonts/X11/misc
+        install -m 0644 ${WORKDIR}/misc/* ${D}/${datadir}/fonts/X11/misc/
+        install -d ${D}/${libdir}/X11
+        ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s
+}
+
+
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/.mtn2git_empty b/meta/packages/xorg-font/xorg-minimal-fonts/misc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/.mtn2git_empty
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz
new file mode 100644
index 0000000000..8bc8570a4a
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz
new file mode 100644
index 0000000000..8fa8290152
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz
new file mode 100644
index 0000000000..bb1c5e138d
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz
new file mode 100644
index 0000000000..842fa1b41a
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz
new file mode 100644
index 0000000000..cd119b66da
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz
new file mode 100644
index 0000000000..25fe84a0ed
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz
new file mode 100644
index 0000000000..e362c70cea
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz
new file mode 100644
index 0000000000..176a7591cc
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz
new file mode 100644
index 0000000000..a4faf1a6cc
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz
new file mode 100644
index 0000000000..96ddd15255
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz
new file mode 100644
index 0000000000..541a2ad2c7
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz
new file mode 100644
index 0000000000..a4986f4066
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz
new file mode 100644
index 0000000000..3f89abe774
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz
new file mode 100644
index 0000000000..432b536222
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz
new file mode 100644
index 0000000000..e7fcb898e1
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz
new file mode 100644
index 0000000000..2df6355374
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz
new file mode 100644
index 0000000000..a263c5dd38
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz
new file mode 100644
index 0000000000..a1a7d37e62
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz
new file mode 100644
index 0000000000..a148e99bce
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz
new file mode 100644
index 0000000000..8791b8ca34
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz
new file mode 100644
index 0000000000..8604508684
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz
new file mode 100644
index 0000000000..f28b1f1c4a
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz
new file mode 100644
index 0000000000..fd1e6cfe9f
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz
new file mode 100644
index 0000000000..672b759421
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz
new file mode 100644
index 0000000000..d90a4330d6
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz
new file mode 100644
index 0000000000..775e7c18b4
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz
new file mode 100644
index 0000000000..ac12fd98a2
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz
new file mode 100644
index 0000000000..42bbd52217
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz
new file mode 100644
index 0000000000..690d31f860
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz
new file mode 100644
index 0000000000..d4c3184c72
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz
new file mode 100644
index 0000000000..884b5130c5
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz
new file mode 100644
index 0000000000..cbb1a9d704
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz
new file mode 100644
index 0000000000..78c8580cfe
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz
new file mode 100644
index 0000000000..0e90f3ee16
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz
new file mode 100644
index 0000000000..bd1273e1ff
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz
new file mode 100644
index 0000000000..5100b429ac
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz
new file mode 100644
index 0000000000..ec5bbed297
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz
new file mode 100644
index 0000000000..06c835ee68
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz
new file mode 100644
index 0000000000..478541c2af
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz
new file mode 100644
index 0000000000..1c593ce0cf
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz
new file mode 100644
index 0000000000..335cf5fc3e
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz
new file mode 100644
index 0000000000..099423e640
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz
new file mode 100644
index 0000000000..4a546ddb1a
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz b/meta/packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz
new file mode 100644
index 0000000000..72eb72bbec
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/fonts.alias b/meta/packages/xorg-font/xorg-minimal-fonts/misc/fonts.alias
new file mode 100644
index 0000000000..3900036739
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/fonts.alias
@@ -0,0 +1,80 @@
+!! fonts.alias -- automatically generated file.  DO NOT EDIT.
+!! To modify, see update-fonts-alias(8).
+!! /etc/X11/fonts/misc/xfonts-base.alias
+! $Xorg: fonts.alias,v 1.3 2000/08/21 16:42:31 coskrey Exp $
+fixed        -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
+variable     -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
+5x7          -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
+5x8          -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1
+6x9          -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1
+6x10         -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1
+6x12         -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1
+6x13         -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
+6x13bold     -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1
+7x13         -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1
+7x13bold     -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1
+7x13euro     -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-15
+7x13eurobold -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-15
+7x14         -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
+7x14bold     -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1
+8x13         -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1
+8x13bold     -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1
+8x16         -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1
+9x15         -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1
+9x15bold     -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1
+10x20        -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
+12x24        -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1
+nil2         -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific
+
+heb6x13      -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8
+heb8x13      -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
+
+k14          -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-0
+a14          -misc-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1
+r14          -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0
+rk14         -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0
+r16          -sony-fixed-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0
+rk16         -sony-fixed-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0
+r24          -sony-fixed-medium-r-normal--24-*-*-*-*-*-jisx0201.1976-0
+rk24         -sony-fixed-medium-r-normal--24-*-*-*-*-*-jisx0201.1976-0
+kana14       -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0
+8x16kana     -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0
+8x16romankana -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0
+12x24kana     -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
+12x24romankana -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
+kanji16      -jis-fixed-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0
+kanji24      -jis-fixed-medium-r-normal--24-*-*-*-*-*-jisx0208.1983-0
+
+hanzigb16st "-isas-song ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0"
+hanzigb24st "-isas-song ti-medium-r-normal--24-240-72-72-c-240-gb2312.1980-0"
+hanzigb16fs "-isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0"
+
+olcursor   "-sun-open look cursor-----12-120-75-75-p-160-sunolcursor-1"
+olglyph-10 "-sun-open look glyph-----10-100-75-75-p-101-sunolglyph-1"
+olglyph-12 "-sun-open look glyph-----12-120-75-75-p-113-sunolglyph-1"
+olglyph-14 "-sun-open look glyph-----14-140-75-75-p-128-sunolglyph-1"
+olglyph-19 "-sun-open look glyph-----19-190-75-75-p-154-sunolglyph-1"
+
+-misc-fixed-medium-r-normal--7-50-100-100-c-50-iso8859-1 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
+-misc-fixed-medium-r-normal--8-60-100-100-c-50-iso8859-1 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1
+-misc-fixed-medium-r-normal--9-80-100-100-c-60-iso8859-1 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1
+-misc-fixed-medium-r-normal--10-70-100-100-c-60-iso8859-1 -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1
+-misc-fixed-medium-r-semicondensed--12-90-100-100-c-60-iso8859-1 -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1
+-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-1 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
+-misc-fixed-bold-r-semicondensed--13-100-100-100-c-60-iso8859-1 -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1
+-misc-fixed-medium-r-normal--13-100-100-100-c-70-iso8859-1 -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1
+-misc-fixed-bold-r-normal--13-100-100-100-c-70-iso8859-1 -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1
+-misc-fixed-medium-r-normal--13-100-100-100-c-80-iso8859-1 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1
+-misc-fixed-bold-r-normal--13-100-100-100-c-80-iso8859-1 -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1
+-misc-fixed-medium-r-normal--14-110-100-100-c-70-iso8859-1 -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
+-misc-fixed-medium-r-normal--15-120-100-100-c-90-iso8859-1 -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1
+-misc-fixed-bold-r-normal--15-120-100-100-c-90-iso8859-1 -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1
+-misc-fixed-medium-r-normal--20-140-100-100-c-100-iso8859-1 -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
+-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-8 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8
+-misc-fixed-medium-r-normal--13-100-100-100-c-80-iso8859-8 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
+-sony-fixed-medium-r-normal--16-150-75-75-c-80-iso8859-1 -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1
+-sony-fixed-medium-r-normal--16-150-75-75-c-80-jisx0201.1976-0 -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0
+-sony-fixed-medium-r-normal--24-230-75-75-c-120-iso8859-1 -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1
+-sony-fixed-medium-r-normal--24-230-75-75-c-120-jisx0201.1976-0 -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
+-jis-fixed-medium-r-normal--16-110-100-100-c-160-jisx0208.1983-0 -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0
+-jis-fixed-medium-r-normal--24-170-100-100-c-240-jisx0208.1983-0 -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
diff --git a/meta/packages/xorg-font/xorg-minimal-fonts/misc/fonts.dir b/meta/packages/xorg-font/xorg-minimal-fonts/misc/fonts.dir
new file mode 100644
index 0000000000..0a2718f7ba
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-minimal-fonts/misc/fonts.dir
@@ -0,0 +1,410 @@
+409
+10x20-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
+10x20-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-10
+10x20-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-11
+10x20-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-13
+10x20-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-14
+10x20-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-15
+10x20-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-16
+10x20-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-2
+10x20-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-3
+10x20-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-4
+10x20-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-5
+10x20-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-7
+10x20-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-8
+10x20-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-9
+10x20-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r
+10x20.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1
+12x13ja.pcf.gz -misc-fixed-medium-r-normal-ja-13-120-75-75-c-120-iso10646-1
+12x24.pcf.gz -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1
+12x24rk.pcf.gz -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
+18x18ja.pcf.gz -misc-fixed-medium-r-normal-ja-18-120-100-100-c-180-iso10646-1
+18x18ko.pcf.gz -misc-fixed-medium-r-normal-ko-18-120-100-100-c-180-iso10646-1
+4x6-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-1
+4x6-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-10
+4x6-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-13
+4x6-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-14
+4x6-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-15
+4x6-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-16
+4x6-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-2
+4x6-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-3
+4x6-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-4
+4x6-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-5
+4x6-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-7
+4x6-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-8
+4x6-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-9
+4x6-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-koi8-r
+4x6.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso10646-1
+5x7-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
+5x7-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-10
+5x7-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-13
+5x7-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-14
+5x7-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-15
+5x7-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-16
+5x7-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-2
+5x7-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-3
+5x7-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-4
+5x7-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-5
+5x7-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-7
+5x7-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-8
+5x7-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-9
+5x7-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-koi8-r
+5x7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1
+5x8-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1
+5x8-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-10
+5x8-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-13
+5x8-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-14
+5x8-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-15
+5x8-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-16
+5x8-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-2
+5x8-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-3
+5x8-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-4
+5x8-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-5
+5x8-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-7
+5x8-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-8
+5x8-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-9
+5x8-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r
+5x8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1
+6x10-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1
+6x10-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-10
+6x10-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-13
+6x10-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-14
+6x10-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-15
+6x10-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-16
+6x10-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-2
+6x10-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-3
+6x10-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-4
+6x10-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-5
+6x10-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-7
+6x10-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-8
+6x10-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-9
+6x10-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r
+6x10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1
+6x12-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1
+6x12-ISO8859-10.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-10
+6x12-ISO8859-13.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-13
+6x12-ISO8859-14.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-14
+6x12-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-15
+6x12-ISO8859-16.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-16
+6x12-ISO8859-2.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-2
+6x12-ISO8859-3.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-3
+6x12-ISO8859-4.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-4
+6x12-ISO8859-5.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-5
+6x12-ISO8859-7.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-7
+6x12-ISO8859-8.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-8
+6x12-ISO8859-9.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-9
+6x12-KOI8-R.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-koi8-r
+6x12.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso10646-1
+6x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
+6x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-10
+6x13-ISO8859-11.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-11
+6x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-13
+6x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-14
+6x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-15
+6x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-16
+6x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-2
+6x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-3
+6x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-4
+6x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-5
+6x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-7
+6x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8
+6x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-9
+6x13-KOI8-R.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r
+6x13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
+6x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1
+6x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-10
+6x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-13
+6x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-14
+6x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-15
+6x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-16
+6x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-2
+6x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-3
+6x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-4
+6x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-5
+6x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-7
+6x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-8
+6x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-9
+6x13B.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso10646-1
+6x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-1
+6x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-10
+6x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-13
+6x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-14
+6x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-15
+6x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-16
+6x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-2
+6x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-3
+6x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-4
+6x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-5
+6x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-7
+6x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-9
+6x13O.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso10646-1
+6x9-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1
+6x9-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-10
+6x9-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-13
+6x9-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-14
+6x9-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-15
+6x9-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-16
+6x9-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-2
+6x9-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-3
+6x9-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-4
+6x9-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-5
+6x9-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-7
+6x9-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-8
+6x9-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-9
+6x9-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r
+6x9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso10646-1
+7x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1
+7x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-10
+7x13-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-11
+7x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-13
+7x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-14
+7x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-15
+7x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-16
+7x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-2
+7x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-3
+7x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-4
+7x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-5
+7x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-7
+7x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-8
+7x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-9
+7x13-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-koi8-r
+7x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso10646-1
+7x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1
+7x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-10
+7x13B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-11
+7x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-13
+7x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-14
+7x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-15
+7x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-16
+7x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-2
+7x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-3
+7x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-4
+7x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-5
+7x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-7
+7x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-8
+7x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-9
+7x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso10646-1
+7x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-1
+7x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-10
+7x13O-ISO8859-11.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-11
+7x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-13
+7x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-14
+7x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-15
+7x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-16
+7x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-2
+7x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-3
+7x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-4
+7x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-5
+7x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-7
+7x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-9
+7x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso10646-1
+7x14-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
+7x14-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-10
+7x14-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-11
+7x14-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-13
+7x14-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-14
+7x14-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-15
+7x14-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-16
+7x14-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-2
+7x14-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-3
+7x14-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-4
+7x14-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-5
+7x14-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-7
+7x14-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-8
+7x14-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-9
+7x14-JISX0201.1976-0.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0
+7x14-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r
+7x14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
+7x14B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1
+7x14B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-10
+7x14B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-11
+7x14B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-13
+7x14B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-14
+7x14B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-15
+7x14B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-16
+7x14B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-2
+7x14B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-3
+7x14B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-4
+7x14B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-5
+7x14B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-7
+7x14B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-8
+7x14B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-9
+7x14B.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso10646-1
+8x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1
+8x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-10
+8x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-13
+8x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-14
+8x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-15
+8x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-16
+8x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-2
+8x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-3
+8x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-4
+8x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-5
+8x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-7
+8x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
+8x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-9
+8x13-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r
+8x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1
+8x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1
+8x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-10
+8x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-13
+8x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-14
+8x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-15
+8x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-16
+8x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-2
+8x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-3
+8x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-4
+8x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-5
+8x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-7
+8x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-8
+8x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-9
+8x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso10646-1
+8x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-1
+8x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-10
+8x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-13
+8x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-14
+8x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-15
+8x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-16
+8x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-2
+8x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-3
+8x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-4
+8x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-5
+8x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-7
+8x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-9
+8x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso10646-1
+8x16.pcf.gz -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1
+8x16rk.pcf.gz -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0
+9x15-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1
+9x15-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-10
+9x15-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-11
+9x15-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-13
+9x15-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-14
+9x15-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-15
+9x15-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-16
+9x15-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-2
+9x15-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-3
+9x15-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-4
+9x15-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-5
+9x15-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-7
+9x15-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-8
+9x15-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-9
+9x15-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r
+9x15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1
+9x15B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1
+9x15B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-10
+9x15B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-11
+9x15B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-13
+9x15B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-14
+9x15B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-15
+9x15B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-16
+9x15B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-2
+9x15B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-3
+9x15B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-4
+9x15B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-5
+9x15B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-7
+9x15B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-8
+9x15B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-9
+9x15B.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1
+9x18-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1
+9x18-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-10
+9x18-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-11
+9x18-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-13
+9x18-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-14
+9x18-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-15
+9x18-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-16
+9x18-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-2
+9x18-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-3
+9x18-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-4
+9x18-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-5
+9x18-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-7
+9x18-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-8
+9x18-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-9
+9x18-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r
+9x18.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
+9x18B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-1
+9x18B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-10
+9x18B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-13
+9x18B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-14
+9x18B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-15
+9x18B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-16
+9x18B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-2
+9x18B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-3
+9x18B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-4
+9x18B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-5
+9x18B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-7
+9x18B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-8
+9x18B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-9
+9x18B.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso10646-1
+arabic24.pcf.gz -arabic-newspaper-medium-r-normal--32-246-100-100-p-137-iso10646-1
+clB6x10.pcf.gz -schumacher-clean-bold-r-normal--10-100-75-75-c-60-iso646.1991-irv
+clB6x12.pcf.gz -schumacher-clean-bold-r-normal--12-120-75-75-c-60-iso646.1991-irv
+clB8x10.pcf.gz -schumacher-clean-bold-r-normal--10-100-75-75-c-80-iso646.1991-irv
+clB8x12.pcf.gz -schumacher-clean-bold-r-normal--12-120-75-75-c-80-iso646.1991-irv
+clB8x13.pcf.gz -schumacher-clean-bold-r-normal--13-130-75-75-c-80-iso646.1991-irv
+clB8x14.pcf.gz -schumacher-clean-bold-r-normal--14-140-75-75-c-80-iso646.1991-irv
+clB8x16.pcf.gz -schumacher-clean-bold-r-normal--16-160-75-75-c-80-iso646.1991-irv
+clB8x8.pcf.gz -schumacher-clean-bold-r-normal--8-80-75-75-c-80-iso646.1991-irv
+clB9x15.pcf.gz -schumacher-clean-bold-r-normal--15-150-75-75-c-90-iso646.1991-irv
+clI6x12.pcf.gz -schumacher-clean-medium-i-normal--12-120-75-75-c-60-iso646.1991-irv
+clI8x8.pcf.gz -schumacher-clean-medium-i-normal--8-80-75-75-c-80-iso646.1991-irv
+clR4x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-40-iso646.1991-irv
+clR5x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-50-iso646.1991-irv
+clR5x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-50-iso646.1991-irv
+clR5x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv
+clR6x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-60-iso646.1991-irv
+clR6x12-ISO8859-1.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-1
+clR6x12-ISO8859-10.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-10
+clR6x12-ISO8859-13.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-13
+clR6x12-ISO8859-14.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-14
+clR6x12-ISO8859-15.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-15
+clR6x12-ISO8859-16.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-16
+clR6x12-ISO8859-2.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-2
+clR6x12-ISO8859-3.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-3
+clR6x12-ISO8859-4.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-4
+clR6x12-ISO8859-5.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-5
+clR6x12-ISO8859-7.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-7
+clR6x12-ISO8859-8.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-8
+clR6x12-ISO8859-9.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-9
+clR6x12-KOI8-R.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-koi8-r
+clR6x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso10646-1
+clR6x13.pcf.gz -schumacher-clean-medium-r-normal--13-130-75-75-c-60-iso646.1991-irv
+clR6x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-60-iso646.1991-irv
+clR6x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-60-iso646.1991-irv
+clR7x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-70-iso646.1991-irv
+clR7x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-70-iso646.1991-irv
+clR7x14.pcf.gz -schumacher-clean-medium-r-normal--14-140-75-75-c-70-iso646.1991-irv
+clR7x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-70-iso646.1991-irv
+clR8x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-80-iso646.1991-irv
+clR8x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-80-iso646.1991-irv
+clR8x13.pcf.gz -schumacher-clean-medium-r-normal--13-130-75-75-c-80-iso646.1991-irv
+clR8x14.pcf.gz -schumacher-clean-medium-r-normal--14-140-75-75-c-80-iso646.1991-irv
+clR8x16.pcf.gz -schumacher-clean-medium-r-normal--16-160-75-75-c-80-iso646.1991-irv
+clR8x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-80-iso646.1991-irv
+clR9x15.pcf.gz -schumacher-clean-medium-r-normal--15-150-75-75-c-90-iso646.1991-irv
+cu-alt12.pcf.gz -mutt-clearlyu alternate glyphs-medium-r-normal--17-120-100-100-p-122-iso10646-1
+cu-arabic12.pcf.gz -mutt-clearlyu arabic extra-medium-r-normal--17-120-100-100-p-101-fontspecific-0
+cu-devnag12.pcf.gz -mutt-clearlyu devangari extra-medium-r-normal--17-120-100-100-p-105-fontspecific-0
+cu-lig12.pcf.gz -mutt-clearlyu ligature-medium-r-normal--17-120-100-100-p-141-fontspecific-0
+cu-pua12.pcf.gz -mutt-clearlyu pua-medium-r-normal--17-120-100-100-p-110-iso10646-1
+cu12.pcf.gz -mutt-clearlyu-medium-r-normal--17-120-100-100-p-123-iso10646-1
+cuarabic12.pcf.gz -mutt-clearlyu arabic-medium-r-normal--17-120-100-100-p-93-iso10646-1
+cudevnag12.pcf.gz -mutt-clearlyu devanagari-medium-r-normal--15-120-90-90-p-104-fontspecific-0
+cursor.pcf.gz cursor
+deccurs.pcf.gz decw$cursor
+decsess.pcf.gz decw$session
+gb16fs.pcf.gz -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0
+gb16st.pcf.gz -isas-song ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0
+gb24st.pcf.gz -isas-song ti-medium-r-normal--24-240-72-72-c-240-gb2312.1980-0
+hanglg16.pcf.gz -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0
+hanglm16.pcf.gz -daewoo-mincho-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0
+hanglm24.pcf.gz -daewoo-mincho-medium-r-normal--24-170-100-100-c-240-ksc5601.1987-0
+jiskan16.pcf.gz -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0
+jiskan24.pcf.gz -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
+k14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0
+micro.pcf.gz micro
+nil2.pcf.gz -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific
+olcursor.pcf.gz -sun-open look cursor-----12-120-75-75-p-160-sunolcursor-1
+olgl10.pcf.gz -sun-open look glyph-----10-100-75-75-p-101-sunolglyph-1
+olgl12.pcf.gz -sun-open look glyph-----12-120-75-75-p-113-sunolglyph-1
+olgl14.pcf.gz -sun-open look glyph-----14-140-75-75-p-128-sunolglyph-1
+olgl19.pcf.gz -sun-open look glyph-----19-190-75-75-p-154-sunolglyph-1
diff --git a/meta/packages/xorg-lib/libpciaccess/fix-mtrr-check.patch b/meta/packages/xorg-lib/libpciaccess/fix-mtrr-check.patch
new file mode 100644
index 0000000000..e2d9f62318
--- /dev/null
+++ b/meta/packages/xorg-lib/libpciaccess/fix-mtrr-check.patch
@@ -0,0 +1,19 @@
+---
+ configure.ac |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- libpciaccess-0.10.3.orig/configure.ac
++++ libpciaccess-0.10.3/configure.ac
+@@ -89,12 +89,10 @@ esac
+ AM_CONDITIONAL(LINUX, [test "x$linux" = xyes])
+ AM_CONDITIONAL(FREEBSD, [test "x$freebsd" = xyes])
+ AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes])
+ AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes])
+ 
+-AC_CHECK_FILE([/usr/include/asm/mtrr.h],
+-              [have_mtrr_h="yes"], [have_mtrr_h="no"])
+ if test "x$have_mtrr_h" = xyes; then
+     AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings])
+ fi
+ 
+ AC_SUBST(PCIACCESS_CFLAGS)
diff --git a/meta/packages/xorg-lib/libpciaccess_0.10.3.bb b/meta/packages/xorg-lib/libpciaccess_0.10.3.bb
new file mode 100644
index 0000000000..82ff529166
--- /dev/null
+++ b/meta/packages/xorg-lib/libpciaccess_0.10.3.bb
@@ -0,0 +1,5 @@
+require xorg-lib-common.inc
+
+DEPENDS += "xproto virtual/libx11"
+
+SRC_URI += "file://fix-mtrr-check.patch;patch=1"
diff --git a/meta/packages/xorg-lib/libx11-trim_1.1.5.bb b/meta/packages/xorg-lib/libx11-trim_1.1.5.bb
new file mode 100644
index 0000000000..659b7ba5b0
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-trim_1.1.5.bb
@@ -0,0 +1,30 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 protocol and utility library"
+DEPENDS += "libxcb xproto xextproto xtrans libxau"
+
+#FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+#SRC_URI += "file://X18NCMSstubs.diff;patch=1 "
+
+PROVIDES = "virtual/libx11"
+
+PE = "1"
+PR = "r0"
+
+XORG_PN = "libX11"
+LEAD_SONAME = "libX11.so"
+
+#EXTRA_OECONF += "--disable-xlocale --disable-xcms --with-xcb"
+EXTRA_OECONF += "--disable-xcms --with-xcb"
+
+do_compile() {
+        (
+         unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+         cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+         cd ../../
+        ) || exit 1
+        oe_runmake
+}
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB "
+
diff --git a/meta/packages/xorg-lib/libxau_1.0.4.bb b/meta/packages/xorg-lib/libxau_1.0.4.bb
new file mode 100644
index 0000000000..3a77534cff
--- /dev/null
+++ b/meta/packages/xorg-lib/libxau_1.0.4.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "A Sample Authorization Protocol for X"
+DEPENDS += " xproto"
+PROVIDES = "xau"
+PE = "1"
+
+XORG_PN = "libXau"
diff --git a/meta/packages/xorg-lib/libxfont_1.3.3.bb b/meta/packages/xorg-lib/libxfont_1.3.3.bb
new file mode 100644
index 0000000000..a5afe7e956
--- /dev/null
+++ b/meta/packages/xorg-lib/libxfont_1.3.3.bb
@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 font rasterisation library"
+LICENSE= "BSD-X"
+DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
+PROVIDES = "xfont"
+PE = "1"
+
+#SRC_URI += "file://no-scalable-crash.patch;patch=1"
+
+XORG_PN = "libXfont"
diff --git a/meta/packages/xorg-lib/xtrans_1.2.1.bb b/meta/packages/xorg-lib/xtrans_1.2.1.bb
new file mode 100644
index 0000000000..75ba93c783
--- /dev/null
+++ b/meta/packages/xorg-lib/xtrans_1.2.1.bb
@@ -0,0 +1,12 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "network API translation layer to insulate X applications and \
+libraries from OS network vageries."
+PE = "1"
+PR = "r0"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xtrans"
+
+RDEPENDS_${PN}-dev = ""
+
+XORG_PN = "xtrans"
diff --git a/meta/packages/xorg-proto/dri2proto_1.1.bb b/meta/packages/xorg-proto/dri2proto_1.1.bb
new file mode 100644
index 0000000000..a0e1fd3989
--- /dev/null
+++ b/meta/packages/xorg-proto/dri2proto_1.1.bb
@@ -0,0 +1,3 @@
+DESCRIPTION = "DRI2 extension headers"
+
+require xorg-proto-common.inc
diff --git a/meta/packages/xorg-proto/inputproto-native_1.4.3.bb b/meta/packages/xorg-proto/inputproto-native_1.4.4.bb
index b6ce61142f..b6ce61142f 100644
--- a/meta/packages/xorg-proto/inputproto-native_1.4.3.bb
+++ b/meta/packages/xorg-proto/inputproto-native_1.4.4.bb
diff --git a/meta/packages/xorg-proto/inputproto-sdk_1.4.3.bb b/meta/packages/xorg-proto/inputproto-sdk_1.4.4.bb
index f0e1985bf9..f0e1985bf9 100644
--- a/meta/packages/xorg-proto/inputproto-sdk_1.4.3.bb
+++ b/meta/packages/xorg-proto/inputproto-sdk_1.4.4.bb
diff --git a/meta/packages/xorg-proto/inputproto_1.4.3.bb b/meta/packages/xorg-proto/inputproto_1.4.4.bb
index e3a8b09f2b..e3a8b09f2b 100644
--- a/meta/packages/xorg-proto/inputproto_1.4.3.bb
+++ b/meta/packages/xorg-proto/inputproto_1.4.4.bb
diff --git a/meta/packages/xorg-xserver/xserver-xf86-common.inc b/meta/packages/xorg-xserver/xserver-xf86-common.inc
new file mode 100644
index 0000000000..ea296e001d
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-common.inc
@@ -0,0 +1,53 @@
+DESCRIPTION = "The X.Org X server"
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/base"
+LICENSE = "MIT-X"
+
+# xf86-*-* packages depend on an X server built with the xfree86 DDX
+# so we have a virtual to represent that:
+PROVIDES = "virtual/xserver-xf86"
+
+# Other packages tend to just care that there is *an* X server:
+PROVIDES += "virtual/xserver"
+
+XORG_PN = "xorg-server"
+SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \
+           file://xorg.conf"
+
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+inherit autotools pkgconfig
+
+PACKAGES =+ "${PN}-utils"
+
+FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
+FILES_${PN} = "${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so /etc/X11 "
+FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled"
+
+FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
+                    ${libdir}/xorg/modules/*/.debug \
+                    ${libdir}/xorg/modules/*/*/.debug \
+                    "
+
+CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
+
+# xorg-server.m4 contains a macro used by the xf86-*-* drivers to check for
+# server extensions. The problem is that it modifies CFLAGS during the drivers
+# ./configure with -I`pkg-config --variable=sdkdir xorg-server` and the sdkdir
+# variable doesn't point into the staging area and so causes
+# "CROSS COMPILE Badness" warnings.
+do_configure_prepend () {
+        sed -i "s|\`pkg-config --variable=sdkdir xorg-server\`|${STAGING_DIR}/${HOST_SYS}/\`pkg-config --variable=sdkdir xorg-server\`|" xorg-server.m4
+}
+
+do_stage() {
+        autotools_stage_all
+}
+
+do_install_append () {
+        install -d ${D}/${sysconfdir}/X11
+#       install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
+        ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts
+
+}
+
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc
new file mode 100644
index 0000000000..1cc7bdde4e
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc
@@ -0,0 +1,31 @@
+require xserver-xf86-common.inc
+
+PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto xf86driproto dri2proto"
+
+LIB_DEPS = "pixman mesa-dri libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
+
+DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
+
+RDEPENDS = "hal xorg-minimal-fonts"
+
+FILES_${PN} += "${bindir}/Xorg "
+
+EXTRA_OECONF += "--disable-cfb \
+                 --disable-afb \
+                 --disable-mfb \
+                 --disable-dga \
+                 --disable-xinerama \
+                 --disable-xf86misc \
+                 --disable-xorgcfg \
+                 --disable-dmx \
+                 --disable-xnest \
+                 --disable-xvfb \
+                 --enable-composite \
+                 --enable-dri \
+                 --enable-glx-tls \
+                 --sysconfdir=/etc/X11 \
+                 --localstatedir=/var \
+                 --with-fontdir=/usr/share/fonts/X11 \
+                 --with-xkb-output=/var/lib/xkb \
+                 ac_cv_file__usr_share_sgml_X11_defs_ent=no"
+
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/drmfix.patch b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/drmfix.patch
new file mode 100644
index 0000000000..a62a767f23
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/drmfix.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am        2007-08-23 21:04:53.000000000 +0200
++++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am     2008-03-13 18:27:23.000000000 +0100
+@@ -41,7 +41,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/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf
new file mode 100644
index 0000000000..e3ffbe6ed3
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf
@@ -0,0 +1,73 @@
+
+Section "Files"
+EndSection
+
+Section "InputDevice"
+        Identifier      "Synaptics Touchpad"
+        Driver          "synaptics"
+        Option          "SendCoreEvents"        "true"
+        Option          "Device"                "/dev/psaux"
+        Option          "Protocol"              "auto-dev"
+        Option          "HorizEdgeScroll"       "0"
+EndSection
+
+Section "InputDevice"
+        Driver          "wacom"
+        Identifier      "stylus"
+        Option          "Device"        "/dev/input/wacom"
+        Option          "Type"          "stylus"
+        Option          "ForceDevice"   "ISDV4"         # Tablet PC ONLY
+EndSection
+
+Section "InputDevice"
+        Driver          "wacom"
+        Identifier      "eraser"
+        Option          "Device"        "/dev/input/wacom"
+        Option          "Type"          "eraser"
+        Option          "ForceDevice"   "ISDV4"         # Tablet PC ONLY
+EndSection
+
+Section "InputDevice"
+        Driver          "wacom"
+        Identifier      "cursor"
+        Option          "Device"        "/dev/input/wacom"
+        Option          "Type"          "cursor"
+        Option          "ForceDevice"   "ISDV4"         # Tablet PC ONLY
+EndSection
+
+Section "Device"
+        Identifier      "Intel Corporation Mobile GM965/GL960 Integrated Graphics Controller"
+        Driver          "intel"
+        BusID           "PCI:0:2:0"
+        Option "AccelMethod" "EXA"
+EndSection
+
+Section "Monitor"
+        Identifier      "Generic Monitor"
+        Option          "DPMS"
+EndSection
+
+Section "Screen"
+        Identifier      "Default Screen"
+        Device          "Intel Corporation Mobile GM965/GL960 Integrated Graphics Controller"
+        Monitor         "Generic Monitor"
+        DefaultDepth    24
+        SubSection "Display"
+                Modes           "1024x768" "720x400" "640x480"
+                Virtual         3000 2048
+        EndSubSection
+EndSection
+
+Section "ServerLayout"
+        Identifier      "Default Layout"
+        Screen          "Default Screen"
+        InputDevice     "Generic Keyboard"
+        InputDevice     "Configured Mouse"
+
+# Uncomment if you have a wacom tablet
+#       InputDevice     "stylus"        "SendCoreEvents"
+#       InputDevice     "cursor"        "SendCoreEvents"
+#       InputDevice     "eraser"        "SendCoreEvents"
+        InputDevice     "Synaptics Touchpad"
+EndSection
+
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
new file mode 100644
index 0000000000..9f4cb8ec75
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
@@ -0,0 +1,7 @@
+require xserver-xf86-dri-lite.inc
+
+PE = "1"
+PR = "r1"
+
+SRC_URI += "file://drmfix.patch;patch=1"
+
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
new file mode 100644
index 0000000000..47be75fdb6
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -0,0 +1,10 @@
+require xserver-xf86-dri-lite.inc
+
+PE = "1"
+PR = "r1"
+PV = "1.5.0+git${SRCREV}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git "
+
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
deleted file mode 100644
index 742f4ee5f0..0000000000
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-#
-
-. /etc/formfactor/config
-
-# note xinit needs full server path
-XSERVER=/usr/bin/Xipaq
-if [ -f /usr/bin/Xfbdev ]; then
-  XSERVER=/usr/bin/Xfbdev
-fi
-if [ -f /usr/bin/Xepson ]; then
-  XSERVER=/usr/bin/Xepson
-fi
-if [ -f /usr/bin/Xorg ]; then
-  XSERVER=/usr/bin/Xorg
-fi
-if [ -f /usr/bin/Xomap ]; then
-  XSERVER=/usr/bin/Xomap
-fi
-
-. /etc/profile
-
-module_id() {
-    ## used to read from assets, but sometimes assets is corrupted
-    # grep "Module ID" /proc/hal/assets | sed "s/.*://"
-    ## used to read from /proc/hal/model, but that is removed in 2.6
-    # echo ' iPAQ' `cat /proc/hal/model`
-    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
-}
-
-export USER=root
-
-ARGS=" -br -pn"
-
-# use ucb 1x00 touchscreen if present
-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
-  ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
-fi
-
-# use usb mouse if present
-# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
-  ARGS="$ARGS -mouse /dev/input/mice"
-fi
-
-# kdrive 1.4 onwards needs -mouse args
-if [ -n "$TSLIB_TSDEVICE" ]; then
-  ARGS="$ARGS -mouse tslib"
-fi
-
-# start off server in conventional location.
-case `module_id` in
-        "Generic OMAP1510/1610/1710")
-                ARGS="$ARGS -mouse /dev/input/event0" ;;
-        "Compulab CM-x270")
-                #modprobe mbxfb
-                #ARGS="$ARGS -fb /dev/fb1"
-                ;;
-        "Nokia N800")
-                ARGS="$ARGS -mouse tslib" ;;
-        "Nokia 770")
-                ARGS="$ARGS -mouse tslib" ;;
-        *)
-                ;;
-esac
-
-ARGS="$ARGS -screen ${DISPLAY_WIDTH_PIXELS}x${DISPLAY_HEIGHT_PIXELS}@${DISPLAY_ORIENTATION}x${DISPLAY_BPP}"
-
-if [ ! -z "$DISPLAY_DPI" ]; then
-        ARGS="$ARGS -dpi $DISPLAY_DPI"
-fi
-
-if [ ! -z "$DISPLAY_SUBPIXEL_ORDER" ]; then
-        ARGS="$ARGS -rgba $DISPLAY_SUBPIXEL_ORDER"
-fi
-
-DISPLAY=':0'
-
-exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
diff --git a/meta/site/ix86-common b/meta/site/ix86-common
index a5c4b60805..646b90ba89 100644
--- a/meta/site/ix86-common
+++ b/meta/site/ix86-common
@@ -263,3 +263,6 @@ ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}
 
 #dbus
 ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
+
+#libpciaccess
+have_mtrr_h=yes