summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf1
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc24
-rw-r--r--meta/conf/distro/poky.conf1
-rw-r--r--meta/conf/machine/eee901.conf16
-rw-r--r--meta/packages/drm/libdrm_2.3.1.bb10
-rw-r--r--meta/packages/libxslt/libxslt-native_1.1.22.bb4
-rw-r--r--meta/packages/mesa/mesa-common.inc20
-rw-r--r--meta/packages/mesa/mesa-dri_7.1.bb15
-rw-r--r--meta/packages/mesa/mesa-dri_git.bb20
-rw-r--r--meta/packages/mesa/mesa-mesa.inc41
-rw-r--r--meta/packages/mesa/mesa_7.0.2.bb48
-rw-r--r--meta/packages/tasks/task-poky.bb2
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xdefaults (renamed from meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults)0
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xinit (renamed from meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit)0
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xserver83
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xsession (renamed from meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession)0
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xsession.d/12keymap.sh (renamed from meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/12keymap.sh)0
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xsession.d/90XWindowManager.sh (renamed from meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90XWindowManager.sh)0
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/default.xmodmap (renamed from meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/default.xmodmap)0
-rw-r--r--meta/packages/x11-common/x11-common_0.1.bb (renamed from meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb)4
-rw-r--r--meta/packages/x11-common/xserver-nodm-init.bb (renamed from meta/packages/xserver-kdrive-common/xserver-nodm-init.bb)0
-rwxr-xr-xmeta/packages/x11-common/xserver-nodm-init/xserver-nodm (renamed from meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm)0
-rw-r--r--meta/packages/xcb/libpthread-stubs_0.1.bb17
-rw-r--r--meta/packages/xcb/libxcb.inc55
-rw-r--r--meta/packages/xcb/libxcb/xcbincludedir.patch11
-rw-r--r--meta/packages/xcb/libxcb_1.0.bb6
-rw-r--r--meta/packages/xcb/libxcb_git.bb12
-rw-r--r--meta/packages/xcb/xcb-proto.inc19
-rw-r--r--meta/packages/xcb/xcb-proto_1.0.bb2
-rw-r--r--meta/packages/xcb/xcb-proto_git.bb13
-rw-r--r--meta/packages/xorg-driver/xf86-driver-common.inc32
-rw-r--r--meta/packages/xorg-driver/xf86-input-common.inc7
-rw-r--r--meta/packages/xorg-driver/xf86-input-evdev_2.0.4.bb4
-rw-r--r--meta/packages/xorg-driver/xf86-input-keyboard_1.3.1.bb4
-rw-r--r--meta/packages/xorg-driver/xf86-input-mouse_1.3.0.bb4
-rw-r--r--meta/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb4
-rw-r--r--meta/packages/xorg-driver/xf86-video-common.inc4
-rw-r--r--meta/packages/xorg-driver/xf86-video-intel_2.4.2.bb5
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts.bb21
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/.mtn2git_empty0
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gzbin0 -> 4637 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gzbin0 -> 4551 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gzbin0 -> 4409 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gzbin0 -> 4689 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gzbin0 -> 4502 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gzbin0 -> 4614 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gzbin0 -> 4547 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gzbin0 -> 4519 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gzbin0 -> 4418 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gzbin0 -> 4572 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gzbin0 -> 4541 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gzbin0 -> 4550 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gzbin0 -> 4035 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gzbin0 -> 4645 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gzbin0 -> 5057 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gzbin0 -> 76746 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gzbin0 -> 4643 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gzbin0 -> 4569 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gzbin0 -> 4700 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gzbin0 -> 4494 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gzbin0 -> 4638 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gzbin0 -> 4539 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gzbin0 -> 4498 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gzbin0 -> 4362 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gzbin0 -> 4584 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gzbin0 -> 4500 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gzbin0 -> 4529 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gzbin0 -> 4008 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gzbin0 -> 4653 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gzbin0 -> 23787 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gzbin0 -> 4219 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gzbin0 -> 4152 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gzbin0 -> 4275 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gzbin0 -> 4083 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gzbin0 -> 4209 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gzbin0 -> 4111 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gzbin0 -> 4115 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gzbin0 -> 3959 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gzbin0 -> 4154 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gzbin0 -> 4075 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gzbin0 -> 4124 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gzbin0 -> 4206 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gzbin0 -> 15495 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gzbin0 -> 5225 bytes
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/fonts.alias80
-rw-r--r--meta/packages/xorg-font/xorg-minimal-fonts/misc/fonts.dir410
-rw-r--r--meta/packages/xorg-lib/libpciaccess/fix-mtrr-check.patch19
-rw-r--r--meta/packages/xorg-lib/libpciaccess_0.10.3.bb5
-rw-r--r--meta/packages/xorg-lib/libx11-trim_1.1.5.bb30
-rw-r--r--meta/packages/xorg-lib/libxau_1.0.4.bb8
-rw-r--r--meta/packages/xorg-lib/libxfont_1.3.3.bb11
-rw-r--r--meta/packages/xorg-lib/xtrans_1.2.1.bb12
-rw-r--r--meta/packages/xorg-proto/dri2proto_1.1.bb3
-rw-r--r--meta/packages/xorg-proto/inputproto-native_1.4.4.bb (renamed from meta/packages/xorg-proto/inputproto-native_1.4.3.bb)0
-rw-r--r--meta/packages/xorg-proto/inputproto-sdk_1.4.4.bb (renamed from meta/packages/xorg-proto/inputproto-sdk_1.4.3.bb)0
-rw-r--r--meta/packages/xorg-proto/inputproto_1.4.4.bb (renamed from meta/packages/xorg-proto/inputproto_1.4.3.bb)0
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-common.inc53
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc31
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite/drmfix.patch13
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg.conf73
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb7
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb10
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver79
-rw-r--r--meta/site/ix86-common3
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"
624MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320" 624MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320"
625MACHINE_DISPLAY_ORIENTATION ?= "0" 625MACHINE_DISPLAY_ORIENTATION ?= "0"
626MACHINE_DISPLAY_BPP ?= "16" 626MACHINE_DISPLAY_BPP ?= "16"
627MACHINE_DRI_MODULES ?= "auto"
627 628
628DISTRO_EXTRA_RDEPENDS ?= "" 629DISTRO_EXTRA_RDEPENDS ?= ""
629DISTRO_EXTRA_RRECOMMENDS ?= "" 630DISTRO_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"
19PREFERRED_VERSION_gccmakedep = "1.0.2" 19PREFERRED_VERSION_gccmakedep = "1.0.2"
20PREFERRED_VERSION_glproto = "1.4.9" 20PREFERRED_VERSION_glproto = "1.4.9"
21PREFERRED_VERSION_imake = "1.0.2" 21PREFERRED_VERSION_imake = "1.0.2"
22PREFERRED_VERSION_inputproto = "1.4.3" 22PREFERRED_VERSION_inputproto = "1.4.4"
23PREFERRED_VERSION_inputproto-native = "1.4.3" 23PREFERRED_VERSION_inputproto-native = "1.4.4"
24PREFERRED_VERSION_inputproto-sdk = "1.4.3" 24PREFERRED_VERSION_inputproto-sdk = "1.4.3"
25PREFERRED_VERSION_kbproto = "1.0.3" 25PREFERRED_VERSION_kbproto = "1.0.3"
26PREFERRED_VERSION_kbproto-native = "1.0.3" 26PREFERRED_VERSION_kbproto-native = "1.0.3"
@@ -36,9 +36,10 @@ PREFERRED_VERSION_liboldx = "1.0.1"
36PREFERRED_VERSION_libsm = "1.0.3" 36PREFERRED_VERSION_libsm = "1.0.3"
37PREFERRED_VERSION_libwindowswm = "1.0.0" 37PREFERRED_VERSION_libwindowswm = "1.0.0"
38PREFERRED_VERSION_libx11 = "1.1.4" 38PREFERRED_VERSION_libx11 = "1.1.4"
39PREFERRED_VERSION_libx11-trim = "1.1.5"
39PREFERRED_VERSION_libx11-native = "1.1.4" 40PREFERRED_VERSION_libx11-native = "1.1.4"
40PREFERRED_VERSION_libx11-sdk = "1.1.4" 41PREFERRED_VERSION_libx11-sdk = "1.1.4"
41PREFERRED_VERSION_libxau = "1.0.3" 42PREFERRED_VERSION_libxau = "1.0.4"
42PREFERRED_VERSION_libxau-native = "1.0.3" 43PREFERRED_VERSION_libxau-native = "1.0.3"
43PREFERRED_VERSION_libxau-sdk = "1.0.3" 44PREFERRED_VERSION_libxau-sdk = "1.0.3"
44PREFERRED_VERSION_libxaw = "1.0.4" 45PREFERRED_VERSION_libxaw = "1.0.4"
@@ -52,7 +53,7 @@ PREFERRED_VERSION_libxevie = "1.0.2"
52PREFERRED_VERSION_libxext = "1.0.4" 53PREFERRED_VERSION_libxext = "1.0.4"
53PREFERRED_VERSION_libxext-sdk = "1.0.4" 54PREFERRED_VERSION_libxext-sdk = "1.0.4"
54PREFERRED_VERSION_libxfixes = "4.0.3" 55PREFERRED_VERSION_libxfixes = "4.0.3"
55PREFERRED_VERSION_libxfont = "1.3.2" 56PREFERRED_VERSION_libxfont = "1.3.3"
56PREFERRED_VERSION_libxfont-native = "1.3.2" 57PREFERRED_VERSION_libxfont-native = "1.3.2"
57PREFERRED_VERSION_libxfontcache = "1.0.4" 58PREFERRED_VERSION_libxfontcache = "1.0.4"
58PREFERRED_VERSION_libxft = "2.1.12" 59PREFERRED_VERSION_libxft = "2.1.12"
@@ -127,10 +128,21 @@ PREFERRED_VERSION_xproxymanagementprotocol = "1.0.2"
127PREFERRED_VERSION_xrandr = "1.2.3" 128PREFERRED_VERSION_xrandr = "1.2.3"
128PREFERRED_VERSION_xrdb = "1.0.5" 129PREFERRED_VERSION_xrdb = "1.0.5"
129PREFERRED_VERSION_xserver-kdrive = "1.3.0.0" 130PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
130PREFERRED_VERSION_xserver-xorg = "1.3.0.0" 131PREFERRED_VERSION_xserver-xf86-dri-lite = "1.5.0"
131PREFERRED_VERSION_xset = "1.0.4" 132PREFERRED_VERSION_xset = "1.0.4"
132PREFERRED_VERSION_xtrans = "1.0.4" 133PREFERRED_VERSION_xtrans = "1.2.1"
133PREFERRED_VERSION_xtrans-native = "1.0.4" 134PREFERRED_VERSION_xtrans-native = "1.0.4"
134PREFERRED_VERSION_xtrans-sdk = "1.0.4" 135PREFERRED_VERSION_xtrans-sdk = "1.0.4"
135PREFERRED_VERSION_xvinfo = "1.0.2" 136PREFERRED_VERSION_xvinfo = "1.0.2"
136PREFERRED_VERSION_xwininfo = "1.0.3" 137PREFERRED_VERSION_xwininfo = "1.0.3"
138PREFERRED_VERSION_mesa-dri = "7.1"
139PREFERRED_VERSION_libdrm = "2.3.1"
140PREFERRED_VERSION_xcb-proto = "1.0"
141PREFERRED_VERSION_libxcb = "1.0"
142PREFERRED_VERSION_libpciaccess = "0.10.3"
143PREFERRED_VERSION_xf86-input-evdev = "2.0.4"
144PREFERRED_VERSION_xf86-input-mouse = "1.3.0"
145PREFERRED_VERSION_xf86-input-keyboard = "1.3.1"
146PREFERRED_VERSION_xf86-input-synaptics = "0.15.0"
147PREFERRED_VERSION_xf86-video-intel = "2.4.2"
148
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
65PREFERRED_PROVIDER_virtual/db ?= "db" 65PREFERRED_PROVIDER_virtual/db ?= "db"
66PREFERRED_PROVIDER_virtual/db-native ?= "db-native" 66PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
67PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" 67PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
68PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
68PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" 69PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
69PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" 70PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
70PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" 71PREFERRED_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 @@
1#@TYPE: Machine
2#@NAME: Asus EEE 901 PC
3
4#@DESCRIPTION: Machine configuration for the Asus EEE 901 PC
5
1TARGET_ARCH = "i586" 6TARGET_ARCH = "i586"
2PACKAGE_EXTRA_ARCHS = "x86" 7PACKAGE_EXTRA_ARCHS = "x86"
3 8
@@ -8,6 +13,14 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi"
8KERNEL_IMAGETYPE = "bzImage" 13KERNEL_IMAGETYPE = "bzImage"
9 14
10PREFERRED_PROVIDER_virtual/kernel = "linux-moblin2" 15PREFERRED_PROVIDER_virtual/kernel = "linux-moblin2"
16PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
17PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-dri-lite"
18XSERVER = "xserver-xf86-dri-lite \
19 xf86-input-mouse \
20 xf86-input-keyboard \
21 xf86-input-synaptics \
22 xf86-video-intel"
23MACHINE_DRI_MODULES = "i915"
11 24
12MACHINE_EXTRA_RDEPENDS = "rt2860" 25MACHINE_EXTRA_RDEPENDS = "rt2860"
13 26
@@ -15,9 +28,6 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
15 28
16GUI_MACHINE_CLASS = "bigscreen" 29GUI_MACHINE_CLASS = "bigscreen"
17 30
18PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
19XSERVER="xserver-kdrive-fbdev"
20
21IMAGE_ROOTFS_SIZE_ext3 = "250000" 31IMAGE_ROOTFS_SIZE_ext3 = "250000"
22 32
23IMAGE_FSTYPES += "ext3 jffs2 cpio.gz" 33IMAGE_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 @@
1SECTION = "x11/base"
2LICENSE = "MIT"
3SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
4PROVIDES = "drm"
5
6inherit autotools pkgconfig
7
8do_stage() {
9 autotools_stage_all
10}
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 @@
1require libxslt_${PV}.bb
2inherit native
3
4DEPENDS = "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 @@
1SECTION = "x11" 1SECTION = "x11"
2 2
3SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ 3DESCRIPTION = "An open source implementation of the OpenGL spec"
4 file://mklib-rpath-link.patch;patch=1" 4HOMEPAGE = "http://mesa3d.org"
5LICENSE = "MIT"
6
7SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2"
5S = "${WORKDIR}/Mesa-${PV}" 8S = "${WORKDIR}/Mesa-${PV}"
6 9
7LICENSE = "LGPL" 10inherit autotools pkgconfig
11
12EXTRA_OECONF = "--disable-glu \
13 --disable-glw \
14 --disable-glut \
15 --enable-glx-tls"
16
17do_stage() {
18 autotools_stage_all
19}
20
8 21
9DEPENDS = "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 @@
1include mesa-common.inc
2
3PROTO_DEPS = "xf86driproto glproto"
4LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
5
6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
7
8PE = "1"
9PR = "r0"
10
11FILES_${PN} += "${libdir}/dri/*.so"
12FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
13
14EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}"
15
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 @@
1include mesa-common.inc
2
3PROTO_DEPS = "xf86driproto glproto"
4LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
5
6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
7
8PV = "7.1+git${SRCREV}"
9PR = "r0"
10
11DEFAULT_PREFERENCE = "-1"
12
13SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
14S = "${WORKDIR}/git"
15
16FILES_${PN} += "${libdir}/dri/*.so"
17FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
18
19EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}"
20
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 @@
1include mesa-common.inc
2
3PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
4
5FILES_libgl = "${libdir}/libGL.so.*"
6FILES_libglu = "${libdir}/libGLU.so.*"
7FILES_libosmesa = "${libdir}/libOSMesa.so.*"
8
9FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
10FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
11FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
12
13do_configure() {
14 cd configs
15
16 cp linux current
17 sed -e "s%CC *= *.*%CC = ${CC}%" -i current
18 sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current
19 sed -e "s%LD *= *.*%LD = ${LD}%" -i current
20 sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current
21 sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current
22 sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current
23 sed -i s:\$\(CC\):gcc:g ../src/mesa/x86/Makefile
24 echo "SRC_DIRS = mesa glu glut/glx" >> current
25}
26
27do_compile() {
28 oe_runmake default
29}
30
31do_install() {
32 install -d ${D}${libdir}
33 cp -pP lib/* ${D}${libdir}/
34 install -d ${D}${includedir}
35 cp -R include/GL ${D}${includedir}/
36}
37
38do_stage() {
39 cp -pP lib/* ${STAGING_LIBDIR}/
40 cp -R include/GL ${STAGING_INCDIR}/
41}
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 @@
1include mesa-mesa.inc 1# Note: we don't require mesa-common.inc since going forward mesa will
2# be autotool based.
2 3
3SRC_URI_append = " file://fix-host-compile.patch;patch=1 " 4SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
5 file://mklib-rpath-link.patch;patch=1 \
6 file://fix-host-compile.patch;patch=1 "
7S = "${WORKDIR}/Mesa-${PV}"
4 8
9DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice"
5 10
11PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
12
13FILES_libgl = "${libdir}/libGL.so.*"
14FILES_libglu = "${libdir}/libGLU.so.*"
15FILES_libosmesa = "${libdir}/libOSMesa.so.*"
16
17FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
18FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
19FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
20
21do_configure() {
22 cd configs
23
24 cp linux current
25 sed -e "s%CC *= *.*%CC = ${CC}%" -i current
26 sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current
27 sed -e "s%LD *= *.*%LD = ${LD}%" -i current
28 sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current
29 sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current
30 sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current
31 sed -i s:\$\(CC\):gcc:g ../src/mesa/x86/Makefile
32 echo "SRC_DIRS = mesa glu glut/glx" >> current
33}
34
35do_compile() {
36 oe_runmake default
37}
38
39do_install() {
40 install -d ${D}${libdir}
41 cp -pP lib/* ${D}${libdir}/
42 install -d ${D}${includedir}
43 cp -R include/GL ${D}${includedir}/
44}
45
46do_stage() {
47 cp -pP lib/* ${STAGING_LIBDIR}/
48 cp -R include/GL ${STAGING_INCDIR}/
49}
6 50
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 = "\
46 matchbox-desktop \ 46 matchbox-desktop \
47 matchbox-session \ 47 matchbox-session \
48 ${XSERVER} \ 48 ${XSERVER} \
49 xserver-kdrive-common \ 49 x11-common \
50 xserver-nodm-init \ 50 xserver-nodm-init \
51 liberation-fonts \ 51 liberation-fonts \
52 xauth \ 52 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 @@
1#!/bin/sh
2#
3
4. /etc/formfactor/config
5
6# note xinit needs full server path
7XSERVER=/usr/bin/Xipaq
8if [ -f /usr/bin/Xfbdev ]; then
9 XSERVER=/usr/bin/Xfbdev
10fi
11if [ -f /usr/bin/Xepson ]; then
12 XSERVER=/usr/bin/Xepson
13fi
14if [ -f /usr/bin/Xorg ]; then
15 XSERVER=/usr/bin/Xorg
16fi
17if [ -f /usr/bin/Xomap ]; then
18 XSERVER=/usr/bin/Xomap
19fi
20
21. /etc/profile
22
23module_id() {
24 ## used to read from assets, but sometimes assets is corrupted
25 # grep "Module ID" /proc/hal/assets | sed "s/.*://"
26 ## used to read from /proc/hal/model, but that is removed in 2.6
27 # echo ' iPAQ' `cat /proc/hal/model`
28 awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
29}
30
31export USER=root
32
33ARGS=" -br -pn"
34
35if [ "$XSERVER" != "/usr/bin/Xorg" ]; then
36
37 # use ucb 1x00 touchscreen if present
38 if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
39 ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
40 fi
41
42 # use usb mouse if present
43 if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ]; then
44 ARGS="$ARGS -mouse /dev/input/mice"
45 fi
46
47 # kdrive 1.4 onwards needs -mouse args
48 if [ -n "$TSLIB_TSDEVICE" ]; then
49 ARGS="$ARGS -mouse tslib"
50 fi
51
52 # start off server in conventional location.
53 case `module_id` in
54 "Generic OMAP1510/1610/1710")
55 ARGS="$ARGS -mouse /dev/input/event0" ;;
56 "Compulab CM-x270")
57 #modprobe mbxfb
58 #ARGS="$ARGS -fb /dev/fb1"
59 ;;
60 "Nokia N800")
61 ARGS="$ARGS -mouse tslib" ;;
62 "Nokia 770")
63 ARGS="$ARGS -mouse tslib" ;;
64 *)
65 ;;
66 esac
67
68 ARGS="$ARGS -screen ${DISPLAY_WIDTH_PIXELS}x${DISPLAY_HEIGHT_PIXELS}@${DISPLAY_ORIENTATION}x${DISPLAY_BPP}"
69
70 if [ ! -z "$DISPLAY_DPI" ]; then
71 ARGS="$ARGS -dpi $DISPLAY_DPI"
72 fi
73
74 if [ ! -z "$DISPLAY_SUBPIXEL_ORDER" ]; then
75 ARGS="$ARGS -rgba $DISPLAY_SUBPIXEL_ORDER"
76 fi
77
78fi
79
80DISPLAY=':0'
81
82exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
83
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 @@
1DESCRIPTION = "Common X11 scripts" 1DESCRIPTION = "Common X11 scripts"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor" 4RDEPENDS_${PN} = "xmodmap xdpyinfo xtscal xinit formfactor"
5PR = "r32" 5PR = "r34"
6 6
7SRC_URI = "file://etc" 7SRC_URI = "file://etc"
8S = ${WORKDIR} 8S = ${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 @@
1DESCRIPTION = "This library provides weak aliases for pthread functions \
2not provided in libc or otherwise available by default."
3SECTION = "x11/libs"
4LICENSE = "MIT-X"
5HOMEPAGE = "http://xcb.freedesktop.org"
6
7PARALLEL_MAKE = ""
8#DEPENDS = "xcb-proto xproto libxau libxslt-native"
9# DEPENDS += "xsltproc-native gperf-native"
10
11SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2"
12
13inherit autotools pkgconfig
14
15do_stage() {
16 autotools_stage_all
17}
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 @@
1DESCRIPTION = "XCB: an X protocol C binding"
2SECTION = "x11/libs"
3LICENSE = "MIT-X"
4HOMEPAGE = "http://xcb.freedesktop.org"
5
6PARALLEL_MAKE = ""
7DEPENDS = "xcb-proto xproto libxau libxslt-native"
8# DEPENDS += "xsltproc-native gperf-native"
9
10SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2"
11# file://xcbincludedir.patch;patch=1"
12
13PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \
14 libxcb-randr libxcb-record libxcb-render libxcb-res \
15 libxcb-screensaver libxcb-shape libxcb-shm libxcb-sync \
16 libxcb-xevie libxcb-xf86dri libxcb-xfixes libxcb-xlib \
17 libxcb-xprint libxcb-xtest libxcb-xv libxcb-xvmc"
18
19FILES_${PN} = "${libdir}/libxcb.so.*"
20#FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h"
21FILES_libxcb-composite = "${libdir}/libxcb-composite.so.*"
22FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*"
23FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*"
24FILES_libxcb-glx = "${libdir}/libxcb-glx.so.*"
25FILES_libxcb-randr = "${libdir}/libxcb-randr.so.*"
26FILES_libxcb-record = "${libdir}/libxcb-record.so.*"
27FILES_libxcb-render = "${libdir}/libxcb-render.so.*"
28FILES_libxcb-res = "${libdir}/libxcb-res.so.*"
29FILES_libxcb-screensaver = "${libdir}/libxcb-screensaver.so.*"
30FILES_libxcb-shape = "${libdir}/libxcb-shape.so.*"
31FILES_libxcb-shm = "${libdir}/libxcb-shm.so.*"
32FILES_libxcb-sync = "${libdir}/libxcb-sync.so.*"
33FILES_libxcb-xevie = "${libdir}/libxcb-xevie.so.*"
34FILES_libxcb-xf86dri = "${libdir}/libxcb-xf86dri.so.*"
35FILES_libxcb-xfixes = "${libdir}/libxcb-xfixes.so.*"
36FILES_libxcb-xinerama = "${libdir}/libxcb-xinerama.so.*"
37FILES_libxcb-xlib = "${libdir}/libxcb-xlib.so.*"
38FILES_libxcb-xprint = "${libdir}/libxcb-xprint.so.*"
39FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*"
40FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*"
41FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*"
42
43inherit autotools pkgconfig
44
45# XCBPROTO_XCBINCLUDEDIR is setup based on `pkg-config --variable=xcbincludedir xcb-proto`
46# but the xcbincludedir variable doesn't point into the staging area, so it needs some
47# tweeking here:
48do_configure_prepend () {
49 sed -i "s|XCBPROTO_XCBINCLUDEDIR=|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR}/${HOST_SYS}/|" \
50 ${S}/configure.ac
51}
52
53do_stage() {
54 autotools_stage_all
55}
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 @@
1--- libxcb-1.0.orig/configure.ac 2006-11-23 15:33:01.000000000 +0000
2+++ libxcb-1.0/configure.ac 2008-09-10 20:29:12.000000000 +0100
3@@ -50,7 +50,7 @@
4
5 # Find the xcb-proto protocol descriptions
6 AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)
7-XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
8+XCBPROTO_XCBINCLUDEDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
9 AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR)
10 AC_SUBST(XCBPROTO_XCBINCLUDEDIR)
11
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 @@
1include libxcb.inc
2PR = "r0"
3
4DEPENDS += "libpthread-stubs"
5
6PACKAGES =+ "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 @@
1DEFAULT_PREFERENCE = "-1"
2
3include libxcb.inc
4PV = "1.0+git"
5PR = "r0"
6
7DEPENDS += "libpthread-stubs"
8
9SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git"
10S = "${WORKDIR}/git/xcb"
11
12PACKAGES =+ "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 @@
1DESCRIPTION = "XCB: an X protocol C binding"
2SECTION = "x11/libs"
3LICENSE = "MIT-X"
4HOMEPAGE = "http://xcb.freedesktop.org"
5
6SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2"
7
8inherit autotools pkgconfig
9
10FILES_${PN}-dev += "${datadir}/xcb/*.xml"
11
12do_stage() {
13 oe_runmake DESTDIR="${D}" install
14 mkdir -p ${STAGING_LIBDIR}/pkgconfig
15 install ${D}${libdir}/pkgconfig/xcb-proto.pc ${STAGING_LIBDIR}/pkgconfig
16 mkdir -p ${STAGING_DATADIR}/xcb
17 install ${D}${datadir}/xcb/*.xml ${STAGING_DATADIR}/xcb
18}
19
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 @@
1include xcb-proto.inc
2PR = "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 @@
1DEFAULT_PREFERENCE = "-1"
2
3include xcb-proto.inc
4PV = "1.0+git"
5PR = "r0"
6
7SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git"
8S = "${WORKDIR}/git/xcb-proto"
9
10do_stage() {
11 autotools_stage_all
12}
13
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 @@
1DESCRIPTION = "X driver"
2HOMEPAGE = "http://www.x.org"
3SECTION = "x11/drivers"
4LICENSE = "MIT-X"
5
6PE = "1"
7PR = "r0"
8
9DEPENDS = "virtual/xserver-xf86 xproto randrproto"
10
11XORG_PN = "${PN}"
12SRC_URI = "${XORG_MIRROR}/individual/driver/${XORG_PN}-${PV}.tar.bz2"
13
14S = "${WORKDIR}/${XORG_PN}-${PV}"
15
16FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
17FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
18
19inherit autotools pkgconfig
20
21do_stage() {
22 autotools_stage_all
23}
24
25# AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement
26# macro that simply assumes the test succeeds.
27do_configure_prepend () {
28 echo 'AC_DEFUN(CC_AC_CHECK_FILE, $2)' > configure.ac.new
29 sed 's/AC_CHECK_FILE/CC_AC_CHECK_FILE/g' configure.ac >> configure.ac.new
30 mv configure.ac.new configure.ac
31}
32
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 @@
1include xf86-driver-common.inc
2
3DEPENDS += "inputproto kbproto "
4
5FILES_${PN} += " ${libdir}/xorg/modules/input/*.so"
6FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug"
7
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 @@
1require xf86-input-common.inc
2
3DESCRIPTION = "X.Org X server -- evdev input driver"
4
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 @@
1require xf86-input-common.inc
2
3DESCRIPTION = "X.Org X server -- keyboard input driver"
4
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 @@
1require xf86-input-common.inc
2
3DESCRIPTION = "X.Org X server -- mouse input driver"
4
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 @@
1require xf86-input-common.inc
2
3DESCRIPTION = "X.Org X server -- keyboard input driver"
4
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 @@
1include xf86-driver-common.inc
2
3DEPENDS = "renderproto videoproto xextproto fontsproto"
4
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 @@
1require xf86-video-common.inc
2
3DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
4DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
5
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 @@
1HOMEPAGE = "http://www.x.org"
2SECTION = "x11/fonts"
3LICENSE = "MIT-X"
4
5SRC_URI = "file://misc"
6
7PE = "1"
8PR = "r0"
9
10PACKAGES = "${PN}"
11PACKAGE_ARCH = "all"
12FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/"
13
14do_install() {
15 install -d ${D}/${datadir}/fonts/X11/misc
16 install -m 0644 ${WORKDIR}/misc/* ${D}/${datadir}/fonts/X11/misc/
17 install -d ${D}/${libdir}/X11
18 ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s
19}
20
21
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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 @@
1!! fonts.alias -- automatically generated file. DO NOT EDIT.
2!! To modify, see update-fonts-alias(8).
3!! /etc/X11/fonts/misc/xfonts-base.alias
4! $Xorg: fonts.alias,v 1.3 2000/08/21 16:42:31 coskrey Exp $
5fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
6variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
75x7 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
85x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1
96x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1
106x10 -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1
116x12 -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1
126x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
136x13bold -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1
147x13 -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1
157x13bold -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1
167x13euro -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-15
177x13eurobold -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-15
187x14 -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
197x14bold -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1
208x13 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1
218x13bold -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1
228x16 -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1
239x15 -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1
249x15bold -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1
2510x20 -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
2612x24 -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1
27nil2 -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific
28
29heb6x13 -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8
30heb8x13 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
31
32k14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-0
33a14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1
34r14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0
35rk14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0
36r16 -sony-fixed-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0
37rk16 -sony-fixed-medium-r-normal--16-*-*-*-*-*-jisx0201.1976-0
38r24 -sony-fixed-medium-r-normal--24-*-*-*-*-*-jisx0201.1976-0
39rk24 -sony-fixed-medium-r-normal--24-*-*-*-*-*-jisx0201.1976-0
40kana14 -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0
418x16kana -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0
428x16romankana -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0
4312x24kana -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
4412x24romankana -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
45kanji16 -jis-fixed-medium-r-normal--16-*-*-*-*-*-jisx0208.1983-0
46kanji24 -jis-fixed-medium-r-normal--24-*-*-*-*-*-jisx0208.1983-0
47
48hanzigb16st "-isas-song ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0"
49hanzigb24st "-isas-song ti-medium-r-normal--24-240-72-72-c-240-gb2312.1980-0"
50hanzigb16fs "-isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0"
51
52olcursor "-sun-open look cursor-----12-120-75-75-p-160-sunolcursor-1"
53olglyph-10 "-sun-open look glyph-----10-100-75-75-p-101-sunolglyph-1"
54olglyph-12 "-sun-open look glyph-----12-120-75-75-p-113-sunolglyph-1"
55olglyph-14 "-sun-open look glyph-----14-140-75-75-p-128-sunolglyph-1"
56olglyph-19 "-sun-open look glyph-----19-190-75-75-p-154-sunolglyph-1"
57
58-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
59-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
60-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
61-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
62-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
63-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
64-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
65-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
66-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
67-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
68-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
69-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
70-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
71-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
72-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
73-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
74-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
75-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
76-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
77-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
78-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
79-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
80-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 @@
1409
210x20-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
310x20-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-10
410x20-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-11
510x20-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-13
610x20-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-14
710x20-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-15
810x20-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-16
910x20-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-2
1010x20-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-3
1110x20-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-4
1210x20-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-5
1310x20-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-7
1410x20-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-8
1510x20-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-9
1610x20-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-koi8-r
1710x20.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1
1812x13ja.pcf.gz -misc-fixed-medium-r-normal-ja-13-120-75-75-c-120-iso10646-1
1912x24.pcf.gz -sony-fixed-medium-r-normal--24-170-100-100-c-120-iso8859-1
2012x24rk.pcf.gz -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
2118x18ja.pcf.gz -misc-fixed-medium-r-normal-ja-18-120-100-100-c-180-iso10646-1
2218x18ko.pcf.gz -misc-fixed-medium-r-normal-ko-18-120-100-100-c-180-iso10646-1
234x6-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-1
244x6-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-10
254x6-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-13
264x6-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-14
274x6-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-15
284x6-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-16
294x6-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-2
304x6-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-3
314x6-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-4
324x6-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-5
334x6-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-7
344x6-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-8
354x6-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-9
364x6-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-koi8-r
374x6.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso10646-1
385x7-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
395x7-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-10
405x7-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-13
415x7-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-14
425x7-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-15
435x7-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-16
445x7-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-2
455x7-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-3
465x7-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-4
475x7-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-5
485x7-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-7
495x7-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-8
505x7-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-9
515x7-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-koi8-r
525x7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1
535x8-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1
545x8-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-10
555x8-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-13
565x8-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-14
575x8-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-15
585x8-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-16
595x8-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-2
605x8-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-3
615x8-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-4
625x8-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-5
635x8-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-7
645x8-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-8
655x8-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-9
665x8-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r
675x8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1
686x10-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1
696x10-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-10
706x10-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-13
716x10-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-14
726x10-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-15
736x10-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-16
746x10-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-2
756x10-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-3
766x10-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-4
776x10-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-5
786x10-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-7
796x10-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-8
806x10-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-9
816x10-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-koi8-r
826x10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1
836x12-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1
846x12-ISO8859-10.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-10
856x12-ISO8859-13.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-13
866x12-ISO8859-14.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-14
876x12-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-15
886x12-ISO8859-16.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-16
896x12-ISO8859-2.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-2
906x12-ISO8859-3.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-3
916x12-ISO8859-4.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-4
926x12-ISO8859-5.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-5
936x12-ISO8859-7.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-7
946x12-ISO8859-8.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-8
956x12-ISO8859-9.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-9
966x12-KOI8-R.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-koi8-r
976x12.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso10646-1
986x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
996x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-10
1006x13-ISO8859-11.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-11
1016x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-13
1026x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-14
1036x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-15
1046x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-16
1056x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-2
1066x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-3
1076x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-4
1086x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-5
1096x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-7
1106x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-8
1116x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-9
1126x13-KOI8-R.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r
1136x13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
1146x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1
1156x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-10
1166x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-13
1176x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-14
1186x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-15
1196x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-16
1206x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-2
1216x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-3
1226x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-4
1236x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-5
1246x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-7
1256x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-8
1266x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-9
1276x13B.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso10646-1
1286x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-1
1296x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-10
1306x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-13
1316x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-14
1326x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-15
1336x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-16
1346x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-2
1356x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-3
1366x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-4
1376x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-5
1386x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-7
1396x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-9
1406x13O.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso10646-1
1416x9-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1
1426x9-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-10
1436x9-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-13
1446x9-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-14
1456x9-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-15
1466x9-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-16
1476x9-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-2
1486x9-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-3
1496x9-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-4
1506x9-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-5
1516x9-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-7
1526x9-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-8
1536x9-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-9
1546x9-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-koi8-r
1556x9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso10646-1
1567x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1
1577x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-10
1587x13-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-11
1597x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-13
1607x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-14
1617x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-15
1627x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-16
1637x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-2
1647x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-3
1657x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-4
1667x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-5
1677x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-7
1687x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-8
1697x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-9
1707x13-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-koi8-r
1717x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso10646-1
1727x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1
1737x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-10
1747x13B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-11
1757x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-13
1767x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-14
1777x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-15
1787x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-16
1797x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-2
1807x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-3
1817x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-4
1827x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-5
1837x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-7
1847x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-8
1857x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-9
1867x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso10646-1
1877x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-1
1887x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-10
1897x13O-ISO8859-11.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-11
1907x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-13
1917x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-14
1927x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-15
1937x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-16
1947x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-2
1957x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-3
1967x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-4
1977x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-5
1987x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-7
1997x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-9
2007x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso10646-1
2017x14-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
2027x14-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-10
2037x14-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-11
2047x14-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-13
2057x14-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-14
2067x14-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-15
2077x14-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-16
2087x14-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-2
2097x14-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-3
2107x14-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-4
2117x14-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-5
2127x14-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-7
2137x14-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-8
2147x14-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-9
2157x14-JISX0201.1976-0.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0
2167x14-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-koi8-r
2177x14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
2187x14B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1
2197x14B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-10
2207x14B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-11
2217x14B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-13
2227x14B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-14
2237x14B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-15
2247x14B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-16
2257x14B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-2
2267x14B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-3
2277x14B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-4
2287x14B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-5
2297x14B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-7
2307x14B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-8
2317x14B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-9
2327x14B.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso10646-1
2338x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1
2348x13-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-10
2358x13-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-13
2368x13-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-14
2378x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-15
2388x13-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-16
2398x13-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-2
2408x13-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-3
2418x13-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-4
2428x13-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-5
2438x13-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-7
2448x13-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
2458x13-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-9
2468x13-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-koi8-r
2478x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1
2488x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1
2498x13B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-10
2508x13B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-13
2518x13B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-14
2528x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-15
2538x13B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-16
2548x13B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-2
2558x13B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-3
2568x13B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-4
2578x13B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-5
2588x13B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-7
2598x13B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-8
2608x13B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-9
2618x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso10646-1
2628x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-1
2638x13O-ISO8859-10.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-10
2648x13O-ISO8859-13.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-13
2658x13O-ISO8859-14.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-14
2668x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-15
2678x13O-ISO8859-16.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-16
2688x13O-ISO8859-2.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-2
2698x13O-ISO8859-3.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-3
2708x13O-ISO8859-4.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-4
2718x13O-ISO8859-5.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-5
2728x13O-ISO8859-7.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-7
2738x13O-ISO8859-9.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-9
2748x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso10646-1
2758x16.pcf.gz -sony-fixed-medium-r-normal--16-120-100-100-c-80-iso8859-1
2768x16rk.pcf.gz -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0
2779x15-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1
2789x15-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-10
2799x15-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-11
2809x15-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-13
2819x15-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-14
2829x15-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-15
2839x15-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-16
2849x15-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-2
2859x15-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-3
2869x15-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-4
2879x15-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-5
2889x15-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-7
2899x15-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-8
2909x15-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-9
2919x15-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-koi8-r
2929x15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1
2939x15B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1
2949x15B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-10
2959x15B-ISO8859-11.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-11
2969x15B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-13
2979x15B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-14
2989x15B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-15
2999x15B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-16
3009x15B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-2
3019x15B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-3
3029x15B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-4
3039x15B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-5
3049x15B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-7
3059x15B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-8
3069x15B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-9
3079x15B.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1
3089x18-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1
3099x18-ISO8859-10.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-10
3109x18-ISO8859-11.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-11
3119x18-ISO8859-13.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-13
3129x18-ISO8859-14.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-14
3139x18-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-15
3149x18-ISO8859-16.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-16
3159x18-ISO8859-2.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-2
3169x18-ISO8859-3.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-3
3179x18-ISO8859-4.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-4
3189x18-ISO8859-5.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-5
3199x18-ISO8859-7.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-7
3209x18-ISO8859-8.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-8
3219x18-ISO8859-9.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-9
3229x18-KOI8-R.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-koi8-r
3239x18.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
3249x18B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-1
3259x18B-ISO8859-10.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-10
3269x18B-ISO8859-13.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-13
3279x18B-ISO8859-14.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-14
3289x18B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-15
3299x18B-ISO8859-16.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-16
3309x18B-ISO8859-2.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-2
3319x18B-ISO8859-3.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-3
3329x18B-ISO8859-4.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-4
3339x18B-ISO8859-5.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-5
3349x18B-ISO8859-7.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-7
3359x18B-ISO8859-8.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-8
3369x18B-ISO8859-9.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-9
3379x18B.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso10646-1
338arabic24.pcf.gz -arabic-newspaper-medium-r-normal--32-246-100-100-p-137-iso10646-1
339clB6x10.pcf.gz -schumacher-clean-bold-r-normal--10-100-75-75-c-60-iso646.1991-irv
340clB6x12.pcf.gz -schumacher-clean-bold-r-normal--12-120-75-75-c-60-iso646.1991-irv
341clB8x10.pcf.gz -schumacher-clean-bold-r-normal--10-100-75-75-c-80-iso646.1991-irv
342clB8x12.pcf.gz -schumacher-clean-bold-r-normal--12-120-75-75-c-80-iso646.1991-irv
343clB8x13.pcf.gz -schumacher-clean-bold-r-normal--13-130-75-75-c-80-iso646.1991-irv
344clB8x14.pcf.gz -schumacher-clean-bold-r-normal--14-140-75-75-c-80-iso646.1991-irv
345clB8x16.pcf.gz -schumacher-clean-bold-r-normal--16-160-75-75-c-80-iso646.1991-irv
346clB8x8.pcf.gz -schumacher-clean-bold-r-normal--8-80-75-75-c-80-iso646.1991-irv
347clB9x15.pcf.gz -schumacher-clean-bold-r-normal--15-150-75-75-c-90-iso646.1991-irv
348clI6x12.pcf.gz -schumacher-clean-medium-i-normal--12-120-75-75-c-60-iso646.1991-irv
349clI8x8.pcf.gz -schumacher-clean-medium-i-normal--8-80-75-75-c-80-iso646.1991-irv
350clR4x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-40-iso646.1991-irv
351clR5x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-50-iso646.1991-irv
352clR5x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-50-iso646.1991-irv
353clR5x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv
354clR6x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-60-iso646.1991-irv
355clR6x12-ISO8859-1.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-1
356clR6x12-ISO8859-10.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-10
357clR6x12-ISO8859-13.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-13
358clR6x12-ISO8859-14.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-14
359clR6x12-ISO8859-15.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-15
360clR6x12-ISO8859-16.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-16
361clR6x12-ISO8859-2.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-2
362clR6x12-ISO8859-3.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-3
363clR6x12-ISO8859-4.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-4
364clR6x12-ISO8859-5.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-5
365clR6x12-ISO8859-7.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-7
366clR6x12-ISO8859-8.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-8
367clR6x12-ISO8859-9.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso8859-9
368clR6x12-KOI8-R.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-koi8-r
369clR6x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-60-iso10646-1
370clR6x13.pcf.gz -schumacher-clean-medium-r-normal--13-130-75-75-c-60-iso646.1991-irv
371clR6x6.pcf.gz -schumacher-clean-medium-r-normal--6-60-75-75-c-60-iso646.1991-irv
372clR6x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-60-iso646.1991-irv
373clR7x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-70-iso646.1991-irv
374clR7x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-70-iso646.1991-irv
375clR7x14.pcf.gz -schumacher-clean-medium-r-normal--14-140-75-75-c-70-iso646.1991-irv
376clR7x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-70-iso646.1991-irv
377clR8x10.pcf.gz -schumacher-clean-medium-r-normal--10-100-75-75-c-80-iso646.1991-irv
378clR8x12.pcf.gz -schumacher-clean-medium-r-normal--12-120-75-75-c-80-iso646.1991-irv
379clR8x13.pcf.gz -schumacher-clean-medium-r-normal--13-130-75-75-c-80-iso646.1991-irv
380clR8x14.pcf.gz -schumacher-clean-medium-r-normal--14-140-75-75-c-80-iso646.1991-irv
381clR8x16.pcf.gz -schumacher-clean-medium-r-normal--16-160-75-75-c-80-iso646.1991-irv
382clR8x8.pcf.gz -schumacher-clean-medium-r-normal--8-80-75-75-c-80-iso646.1991-irv
383clR9x15.pcf.gz -schumacher-clean-medium-r-normal--15-150-75-75-c-90-iso646.1991-irv
384cu-alt12.pcf.gz -mutt-clearlyu alternate glyphs-medium-r-normal--17-120-100-100-p-122-iso10646-1
385cu-arabic12.pcf.gz -mutt-clearlyu arabic extra-medium-r-normal--17-120-100-100-p-101-fontspecific-0
386cu-devnag12.pcf.gz -mutt-clearlyu devangari extra-medium-r-normal--17-120-100-100-p-105-fontspecific-0
387cu-lig12.pcf.gz -mutt-clearlyu ligature-medium-r-normal--17-120-100-100-p-141-fontspecific-0
388cu-pua12.pcf.gz -mutt-clearlyu pua-medium-r-normal--17-120-100-100-p-110-iso10646-1
389cu12.pcf.gz -mutt-clearlyu-medium-r-normal--17-120-100-100-p-123-iso10646-1
390cuarabic12.pcf.gz -mutt-clearlyu arabic-medium-r-normal--17-120-100-100-p-93-iso10646-1
391cudevnag12.pcf.gz -mutt-clearlyu devanagari-medium-r-normal--15-120-90-90-p-104-fontspecific-0
392cursor.pcf.gz cursor
393deccurs.pcf.gz decw$cursor
394decsess.pcf.gz decw$session
395gb16fs.pcf.gz -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0
396gb16st.pcf.gz -isas-song ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0
397gb24st.pcf.gz -isas-song ti-medium-r-normal--24-240-72-72-c-240-gb2312.1980-0
398hanglg16.pcf.gz -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0
399hanglm16.pcf.gz -daewoo-mincho-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0
400hanglm24.pcf.gz -daewoo-mincho-medium-r-normal--24-170-100-100-c-240-ksc5601.1987-0
401jiskan16.pcf.gz -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0
402jiskan24.pcf.gz -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
403k14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0
404micro.pcf.gz micro
405nil2.pcf.gz -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific
406olcursor.pcf.gz -sun-open look cursor-----12-120-75-75-p-160-sunolcursor-1
407olgl10.pcf.gz -sun-open look glyph-----10-100-75-75-p-101-sunolglyph-1
408olgl12.pcf.gz -sun-open look glyph-----12-120-75-75-p-113-sunolglyph-1
409olgl14.pcf.gz -sun-open look glyph-----14-140-75-75-p-128-sunolglyph-1
410olgl19.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 @@
1---
2 configure.ac | 2 --
3 1 file changed, 2 deletions(-)
4
5--- libpciaccess-0.10.3.orig/configure.ac
6+++ libpciaccess-0.10.3/configure.ac
7@@ -89,12 +89,10 @@ esac
8 AM_CONDITIONAL(LINUX, [test "x$linux" = xyes])
9 AM_CONDITIONAL(FREEBSD, [test "x$freebsd" = xyes])
10 AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes])
11 AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes])
12
13-AC_CHECK_FILE([/usr/include/asm/mtrr.h],
14- [have_mtrr_h="yes"], [have_mtrr_h="no"])
15 if test "x$have_mtrr_h" = xyes; then
16 AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings])
17 fi
18
19 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 @@
1require xorg-lib-common.inc
2
3DEPENDS += "xproto virtual/libx11"
4
5SRC_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 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X11 protocol and utility library"
4DEPENDS += "libxcb xproto xextproto xtrans libxau"
5
6#FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
7#SRC_URI += "file://X18NCMSstubs.diff;patch=1 "
8
9PROVIDES = "virtual/libx11"
10
11PE = "1"
12PR = "r0"
13
14XORG_PN = "libX11"
15LEAD_SONAME = "libX11.so"
16
17#EXTRA_OECONF += "--disable-xlocale --disable-xcms --with-xcb"
18EXTRA_OECONF += "--disable-xcms --with-xcb"
19
20do_compile() {
21 (
22 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
23 cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
24 cd ../../
25 ) || exit 1
26 oe_runmake
27}
28
29FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB "
30
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 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "A Sample Authorization Protocol for X"
4DEPENDS += " xproto"
5PROVIDES = "xau"
6PE = "1"
7
8XORG_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 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X11 font rasterisation library"
4LICENSE= "BSD-X"
5DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
6PROVIDES = "xfont"
7PE = "1"
8
9#SRC_URI += "file://no-scalable-crash.patch;patch=1"
10
11XORG_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 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "network API translation layer to insulate X applications and \
4libraries from OS network vageries."
5PE = "1"
6PR = "r0"
7
8FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xtrans"
9
10RDEPENDS_${PN}-dev = ""
11
12XORG_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 @@
1DESCRIPTION = "DRI2 extension headers"
2
3require 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 @@
1DESCRIPTION = "The X.Org X server"
2HOMEPAGE = "http://www.x.org"
3SECTION = "x11/base"
4LICENSE = "MIT-X"
5
6# xf86-*-* packages depend on an X server built with the xfree86 DDX
7# so we have a virtual to represent that:
8PROVIDES = "virtual/xserver-xf86"
9
10# Other packages tend to just care that there is *an* X server:
11PROVIDES += "virtual/xserver"
12
13XORG_PN = "xorg-server"
14SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \
15 file://xorg.conf"
16
17S = "${WORKDIR}/${XORG_PN}-${PV}"
18
19inherit autotools pkgconfig
20
21PACKAGES =+ "${PN}-utils"
22
23FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
24FILES_${PN} = "${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so /etc/X11 "
25FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled"
26
27FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
28 ${libdir}/xorg/modules/*/.debug \
29 ${libdir}/xorg/modules/*/*/.debug \
30 "
31
32CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
33
34# xorg-server.m4 contains a macro used by the xf86-*-* drivers to check for
35# server extensions. The problem is that it modifies CFLAGS during the drivers
36# ./configure with -I`pkg-config --variable=sdkdir xorg-server` and the sdkdir
37# variable doesn't point into the staging area and so causes
38# "CROSS COMPILE Badness" warnings.
39do_configure_prepend () {
40 sed -i "s|\`pkg-config --variable=sdkdir xorg-server\`|${STAGING_DIR}/${HOST_SYS}/\`pkg-config --variable=sdkdir xorg-server\`|" xorg-server.m4
41}
42
43do_stage() {
44 autotools_stage_all
45}
46
47do_install_append () {
48 install -d ${D}/${sysconfdir}/X11
49# install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
50 ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts
51
52}
53
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 @@
1require xserver-xf86-common.inc
2
3PROTO_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"
4
5LIB_DEPS = "pixman mesa-dri libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
6
7DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
8
9RDEPENDS = "hal xorg-minimal-fonts"
10
11FILES_${PN} += "${bindir}/Xorg "
12
13EXTRA_OECONF += "--disable-cfb \
14 --disable-afb \
15 --disable-mfb \
16 --disable-dga \
17 --disable-xinerama \
18 --disable-xf86misc \
19 --disable-xorgcfg \
20 --disable-dmx \
21 --disable-xnest \
22 --disable-xvfb \
23 --enable-composite \
24 --enable-dri \
25 --enable-glx-tls \
26 --sysconfdir=/etc/X11 \
27 --localstatedir=/var \
28 --with-fontdir=/usr/share/fonts/X11 \
29 --with-xkb-output=/var/lib/xkb \
30 ac_cv_file__usr_share_sgml_X11_defs_ent=no"
31
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 @@
1Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
2===================================================================
3--- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200
4+++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am 2008-03-13 18:27:23.000000000 +0100
5@@ -41,7 +41,7 @@
6
7 AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
8
9-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
10+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
11
12 # FIXME: These need to be added to the build
13 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 @@
1
2Section "Files"
3EndSection
4
5Section "InputDevice"
6 Identifier "Synaptics Touchpad"
7 Driver "synaptics"
8 Option "SendCoreEvents" "true"
9 Option "Device" "/dev/psaux"
10 Option "Protocol" "auto-dev"
11 Option "HorizEdgeScroll" "0"
12EndSection
13
14Section "InputDevice"
15 Driver "wacom"
16 Identifier "stylus"
17 Option "Device" "/dev/input/wacom"
18 Option "Type" "stylus"
19 Option "ForceDevice" "ISDV4" # Tablet PC ONLY
20EndSection
21
22Section "InputDevice"
23 Driver "wacom"
24 Identifier "eraser"
25 Option "Device" "/dev/input/wacom"
26 Option "Type" "eraser"
27 Option "ForceDevice" "ISDV4" # Tablet PC ONLY
28EndSection
29
30Section "InputDevice"
31 Driver "wacom"
32 Identifier "cursor"
33 Option "Device" "/dev/input/wacom"
34 Option "Type" "cursor"
35 Option "ForceDevice" "ISDV4" # Tablet PC ONLY
36EndSection
37
38Section "Device"
39 Identifier "Intel Corporation Mobile GM965/GL960 Integrated Graphics Controller"
40 Driver "intel"
41 BusID "PCI:0:2:0"
42 Option "AccelMethod" "EXA"
43EndSection
44
45Section "Monitor"
46 Identifier "Generic Monitor"
47 Option "DPMS"
48EndSection
49
50Section "Screen"
51 Identifier "Default Screen"
52 Device "Intel Corporation Mobile GM965/GL960 Integrated Graphics Controller"
53 Monitor "Generic Monitor"
54 DefaultDepth 24
55 SubSection "Display"
56 Modes "1024x768" "720x400" "640x480"
57 Virtual 3000 2048
58 EndSubSection
59EndSection
60
61Section "ServerLayout"
62 Identifier "Default Layout"
63 Screen "Default Screen"
64 InputDevice "Generic Keyboard"
65 InputDevice "Configured Mouse"
66
67# Uncomment if you have a wacom tablet
68# InputDevice "stylus" "SendCoreEvents"
69# InputDevice "cursor" "SendCoreEvents"
70# InputDevice "eraser" "SendCoreEvents"
71 InputDevice "Synaptics Touchpad"
72EndSection
73
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 @@
1require xserver-xf86-dri-lite.inc
2
3PE = "1"
4PR = "r1"
5
6SRC_URI += "file://drmfix.patch;patch=1"
7
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 @@
1require xserver-xf86-dri-lite.inc
2
3PE = "1"
4PR = "r1"
5PV = "1.5.0+git${SRCREV}"
6
7DEFAULT_PREFERENCE = "-1"
8
9SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git "
10
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 @@
1#!/bin/sh
2#
3
4. /etc/formfactor/config
5
6# note xinit needs full server path
7XSERVER=/usr/bin/Xipaq
8if [ -f /usr/bin/Xfbdev ]; then
9 XSERVER=/usr/bin/Xfbdev
10fi
11if [ -f /usr/bin/Xepson ]; then
12 XSERVER=/usr/bin/Xepson
13fi
14if [ -f /usr/bin/Xorg ]; then
15 XSERVER=/usr/bin/Xorg
16fi
17if [ -f /usr/bin/Xomap ]; then
18 XSERVER=/usr/bin/Xomap
19fi
20
21. /etc/profile
22
23module_id() {
24 ## used to read from assets, but sometimes assets is corrupted
25 # grep "Module ID" /proc/hal/assets | sed "s/.*://"
26 ## used to read from /proc/hal/model, but that is removed in 2.6
27 # echo ' iPAQ' `cat /proc/hal/model`
28 awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
29}
30
31export USER=root
32
33ARGS=" -br -pn"
34
35# use ucb 1x00 touchscreen if present
36if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
37 ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
38fi
39
40# use usb mouse if present
41# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
42if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
43 ARGS="$ARGS -mouse /dev/input/mice"
44fi
45
46# kdrive 1.4 onwards needs -mouse args
47if [ -n "$TSLIB_TSDEVICE" ]; then
48 ARGS="$ARGS -mouse tslib"
49fi
50
51# start off server in conventional location.
52case `module_id` in
53 "Generic OMAP1510/1610/1710")
54 ARGS="$ARGS -mouse /dev/input/event0" ;;
55 "Compulab CM-x270")
56 #modprobe mbxfb
57 #ARGS="$ARGS -fb /dev/fb1"
58 ;;
59 "Nokia N800")
60 ARGS="$ARGS -mouse tslib" ;;
61 "Nokia 770")
62 ARGS="$ARGS -mouse tslib" ;;
63 *)
64 ;;
65esac
66
67ARGS="$ARGS -screen ${DISPLAY_WIDTH_PIXELS}x${DISPLAY_HEIGHT_PIXELS}@${DISPLAY_ORIENTATION}x${DISPLAY_BPP}"
68
69if [ ! -z "$DISPLAY_DPI" ]; then
70 ARGS="$ARGS -dpi $DISPLAY_DPI"
71fi
72
73if [ ! -z "$DISPLAY_SUBPIXEL_ORDER" ]; then
74 ARGS="$ARGS -rgba $DISPLAY_SUBPIXEL_ORDER"
75fi
76
77DISPLAY=':0'
78
79exec 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}
263 263
264#dbus 264#dbus
265ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes} 265ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
266
267#libpciaccess
268have_mtrr_h=yes