summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/slugos.conf6
-rw-r--r--packages/asterisk/asterisk_1.2.9.1.bb4
-rw-r--r--packages/e17/e-wm_0.16.999.027.bb (renamed from packages/e17/e-wm_0.16.999.026.bb)0
-rw-r--r--packages/efl/e_0.16.999.027.bb (renamed from packages/efl/e_0.16.999.026.bb)0
-rw-r--r--packages/efl/ecore-fb_0.9.9.027.bb (renamed from packages/efl/ecore-fb_0.9.9.026.bb)0
-rw-r--r--packages/efl/ecore-native_0.9.9.027.bb (renamed from packages/efl/ecore-native_0.9.9.026.bb)0
-rw-r--r--packages/efl/ecore-x11_0.9.9.027.bb (renamed from packages/efl/ecore-x11_0.9.9.026.bb)0
-rw-r--r--packages/efl/edje-native_0.5.0.027.bb (renamed from packages/efl/edje-native_0.5.0.026.bb)0
-rw-r--r--packages/efl/edje-utils_0.5.0.027.bb (renamed from packages/efl/edje-utils_0.5.0.026.bb)0
-rw-r--r--packages/efl/edje_0.5.0.027.bb (renamed from packages/efl/edje_0.5.0.026.bb)0
-rw-r--r--packages/efl/eet-native_0.9.10.027.bb (renamed from packages/efl/eet-native_0.9.10.026.bb)0
-rw-r--r--packages/efl/eet_0.9.10.027.bb (renamed from packages/efl/eet_0.9.10.026.bb)0
-rw-r--r--packages/efl/embryo-native_0.9.1.027.bb (renamed from packages/efl/embryo-native_0.9.1.026.bb)0
-rw-r--r--packages/efl/embryo-utils_0.9.1.027.bb (renamed from packages/efl/embryo-utils_0.9.1.026.bb)0
-rw-r--r--packages/efl/embryo_0.9.1.027.bb (renamed from packages/efl/embryo_0.9.1.026.bb)0
-rw-r--r--packages/efl/evas-fb_0.9.9.027.bb (renamed from packages/efl/evas-fb_0.9.9.026.bb)0
-rw-r--r--packages/efl/evas-native_0.9.9.027.bb (renamed from packages/efl/evas-native_0.9.9.026.bb)0
-rw-r--r--packages/efl/evas-x11_0.9.9.027.bb (renamed from packages/efl/evas-x11_0.9.9.026.bb)0
-rw-r--r--packages/efl/evas.inc2
-rw-r--r--packages/efl/evas/fix-configure.patch (renamed from packages/efl/evas/fix-configure-0.9.9.026.patch)0
-rw-r--r--packages/gcc/gcc-4.1.1/gcc41-configure.in.patch22
-rw-r--r--packages/gcc/gcc-cross_4.1.1.bb2
-rw-r--r--packages/gcc/gcc_4.1.1.bb3
-rw-r--r--packages/xlibs/diet-x11_X11R7.1-1.0.1.bb11
-rw-r--r--packages/xlibs/files/fix-utf8-wrong-define.patch (renamed from packages/xlibs/libx11/fix-utf8-wrong-define.patch)0
-rw-r--r--packages/xlibs/libfontenc_1.0.2.bb12
-rw-r--r--packages/xlibs/libice_X11R7.1-1.0.1.bb13
-rw-r--r--packages/xlibs/liblbxutil/.mtn2git_empty (renamed from packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty)0
-rw-r--r--packages/xlibs/liblbxutil/mkg3states.patch (renamed from packages/xlibs/liblbxutil-1.0.0/mkg3states.patch)0
-rw-r--r--packages/xlibs/liblbxutil_1.0.1.bb18
-rw-r--r--packages/xlibs/libsm_X11R7.1-1.0.1.bb13
-rw-r--r--packages/xlibs/libx11_X11R7.1-1.0.1.bb26
-rw-r--r--packages/xlibs/libxau_1.0.1.bb14
-rw-r--r--packages/xlibs/libxaw_X11R7.1-1.0.2.bb16
-rw-r--r--packages/xlibs/libxcomposite_X11R7.1-0.3.bb15
-rw-r--r--packages/xlibs/libxcursor_1.1.6.bb14
-rw-r--r--packages/xlibs/libxdamage_1.0.3.bb12
-rw-r--r--packages/xlibs/libxdmcp_1.0.1.bb13
-rw-r--r--packages/xlibs/libxext_1.0.1.bb16
-rw-r--r--packages/xlibs/libxfixes_4.0.1.bb11
-rw-r--r--packages/xlibs/libxfont_X11R7.1-1.1.0.bb13
-rw-r--r--packages/xlibs/libxi_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xlibs/libxi_X11R7.1-1.0.1.bb12
-rw-r--r--packages/xlibs/libxkbfile_1.0.3.bb12
-rw-r--r--packages/xlibs/libxkbui_1.0.2.bb13
-rw-r--r--packages/xlibs/libxmu_1.0.1.bb20
-rw-r--r--packages/xlibs/libxpm_3.5.5.bb21
-rw-r--r--packages/xlibs/libxrandr_1.1.1.bb13
-rw-r--r--packages/xlibs/libxrender_0.9.1.bb13
-rw-r--r--packages/xlibs/libxres_X11R7.1-1.0.1.bb14
-rw-r--r--packages/xlibs/libxt_1.0.2.bb23
-rw-r--r--packages/xlibs/libxxf86dga_1.0.1.bb16
-rw-r--r--packages/xlibs/libxxf86misc_1.0.1.bb12
-rw-r--r--packages/xlibs/libxxf86vm_1.0.1.bb13
-rw-r--r--packages/xlibs/util-macros_1.0.2.bb11
-rw-r--r--packages/xlibs/xorg-xlibs.inc7
-rw-r--r--packages/xproto/compositeproto_0.3.1.bb3
-rw-r--r--packages/xproto/fixesproto_4.0.bb3
-rw-r--r--packages/xproto/glproto_1.4.7.bb2
-rw-r--r--packages/xproto/proto-common.inc6
-rw-r--r--packages/xproto/scrnsaverproto_1.1.0.bb2
-rw-r--r--packages/xproto/xproto_7.0.5.bb2
-rw-r--r--packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch37
-rw-r--r--packages/xserver/xserver-kdrive/enable-builtin-fonts.patch12
-rw-r--r--packages/xserver/xserver-kdrive/enable-tslib.patch23
-rw-r--r--packages/xserver/xserver-kdrive/optional-xkb.patch54
-rw-r--r--packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb44
-rw-r--r--packages/xserver/xserver-kdrive_git.bb47
68 files changed, 680 insertions, 13 deletions
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index d868f099e7..123fd4362a 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -159,9 +159,9 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
# cannot be in ${MACHINE}.conf)
PREFERRED_VERSION_binutils ?= "2.16"
PREFERRED_VERSION_binutils-cross ?= "2.16"
-PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross ?= "3.4.4"
-PREFERRED_VERSION_gcc ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross ?= "4.1.1"
+PREFERRED_VERSION_gcc ?= "4.1.1"
PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
#For SVN uclibc:
#SRCDATE_uclibc ?= "20060120"
diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.9.1.bb
index 4298318935..7e7448d0e5 100644
--- a/packages/asterisk/asterisk_1.2.9.1.bb
+++ b/packages/asterisk/asterisk_1.2.9.1.bb
@@ -1,8 +1,8 @@
DESCRIPTION="The Astersisk open source software PBX"
HOMEPAGE="www.asterisk.org"
LICENSE="GPL"
-DEPENDS="ncurses zlib openssl"
-PR = "r0"
+DEPENDS="ncurses zlib openssl curl"
+PR = "r1"
SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
file://asterisk.patch;patch=1"
diff --git a/packages/e17/e-wm_0.16.999.026.bb b/packages/e17/e-wm_0.16.999.027.bb
index df78fbdcd0..df78fbdcd0 100644
--- a/packages/e17/e-wm_0.16.999.026.bb
+++ b/packages/e17/e-wm_0.16.999.027.bb
diff --git a/packages/efl/e_0.16.999.026.bb b/packages/efl/e_0.16.999.027.bb
index 5078c71365..5078c71365 100644
--- a/packages/efl/e_0.16.999.026.bb
+++ b/packages/efl/e_0.16.999.027.bb
diff --git a/packages/efl/ecore-fb_0.9.9.026.bb b/packages/efl/ecore-fb_0.9.9.027.bb
index a957c5dd8c..a957c5dd8c 100644
--- a/packages/efl/ecore-fb_0.9.9.026.bb
+++ b/packages/efl/ecore-fb_0.9.9.027.bb
diff --git a/packages/efl/ecore-native_0.9.9.026.bb b/packages/efl/ecore-native_0.9.9.027.bb
index 299470841c..299470841c 100644
--- a/packages/efl/ecore-native_0.9.9.026.bb
+++ b/packages/efl/ecore-native_0.9.9.027.bb
diff --git a/packages/efl/ecore-x11_0.9.9.026.bb b/packages/efl/ecore-x11_0.9.9.027.bb
index 3a88ad229b..3a88ad229b 100644
--- a/packages/efl/ecore-x11_0.9.9.026.bb
+++ b/packages/efl/ecore-x11_0.9.9.027.bb
diff --git a/packages/efl/edje-native_0.5.0.026.bb b/packages/efl/edje-native_0.5.0.027.bb
index 5eb077922a..5eb077922a 100644
--- a/packages/efl/edje-native_0.5.0.026.bb
+++ b/packages/efl/edje-native_0.5.0.027.bb
diff --git a/packages/efl/edje-utils_0.5.0.026.bb b/packages/efl/edje-utils_0.5.0.027.bb
index f8eb917e4d..f8eb917e4d 100644
--- a/packages/efl/edje-utils_0.5.0.026.bb
+++ b/packages/efl/edje-utils_0.5.0.027.bb
diff --git a/packages/efl/edje_0.5.0.026.bb b/packages/efl/edje_0.5.0.027.bb
index d51dd119e4..d51dd119e4 100644
--- a/packages/efl/edje_0.5.0.026.bb
+++ b/packages/efl/edje_0.5.0.027.bb
diff --git a/packages/efl/eet-native_0.9.10.026.bb b/packages/efl/eet-native_0.9.10.027.bb
index fa20c9fb30..fa20c9fb30 100644
--- a/packages/efl/eet-native_0.9.10.026.bb
+++ b/packages/efl/eet-native_0.9.10.027.bb
diff --git a/packages/efl/eet_0.9.10.026.bb b/packages/efl/eet_0.9.10.027.bb
index 6e6032e098..6e6032e098 100644
--- a/packages/efl/eet_0.9.10.026.bb
+++ b/packages/efl/eet_0.9.10.027.bb
diff --git a/packages/efl/embryo-native_0.9.1.026.bb b/packages/efl/embryo-native_0.9.1.027.bb
index a33adb7bd2..a33adb7bd2 100644
--- a/packages/efl/embryo-native_0.9.1.026.bb
+++ b/packages/efl/embryo-native_0.9.1.027.bb
diff --git a/packages/efl/embryo-utils_0.9.1.026.bb b/packages/efl/embryo-utils_0.9.1.027.bb
index d507c53cce..d507c53cce 100644
--- a/packages/efl/embryo-utils_0.9.1.026.bb
+++ b/packages/efl/embryo-utils_0.9.1.027.bb
diff --git a/packages/efl/embryo_0.9.1.026.bb b/packages/efl/embryo_0.9.1.027.bb
index 0009c0a149..0009c0a149 100644
--- a/packages/efl/embryo_0.9.1.026.bb
+++ b/packages/efl/embryo_0.9.1.027.bb
diff --git a/packages/efl/evas-fb_0.9.9.026.bb b/packages/efl/evas-fb_0.9.9.027.bb
index 3f7847874c..3f7847874c 100644
--- a/packages/efl/evas-fb_0.9.9.026.bb
+++ b/packages/efl/evas-fb_0.9.9.027.bb
diff --git a/packages/efl/evas-native_0.9.9.026.bb b/packages/efl/evas-native_0.9.9.027.bb
index cbcbe304e9..cbcbe304e9 100644
--- a/packages/efl/evas-native_0.9.9.026.bb
+++ b/packages/efl/evas-native_0.9.9.027.bb
diff --git a/packages/efl/evas-x11_0.9.9.026.bb b/packages/efl/evas-x11_0.9.9.027.bb
index e130923816..e130923816 100644
--- a/packages/efl/evas-x11_0.9.9.026.bb
+++ b/packages/efl/evas-x11_0.9.9.027.bb
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index e93803982e..4577535aaa 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -12,7 +12,7 @@ inherit efl
export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}"
SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
- file://fix-configure-${PV}.patch;patch=1 \
+ file://fix-configure.patch;patch=1 \
${E_CVS};module=e17/libs/evas/m4;date=20060101"
S = "${WORKDIR}/evas-${PV}"
diff --git a/packages/efl/evas/fix-configure-0.9.9.026.patch b/packages/efl/evas/fix-configure.patch
index 61e2446c24..61e2446c24 100644
--- a/packages/efl/evas/fix-configure-0.9.9.026.patch
+++ b/packages/efl/evas/fix-configure.patch
diff --git a/packages/gcc/gcc-4.1.1/gcc41-configure.in.patch b/packages/gcc/gcc-4.1.1/gcc41-configure.in.patch
new file mode 100644
index 0000000000..3d33bcb978
--- /dev/null
+++ b/packages/gcc/gcc-4.1.1/gcc41-configure.in.patch
@@ -0,0 +1,22 @@
+--- gcc-3.4.4/configure.in.orig 2005-08-09 19:57:51.504323183 -0700
++++ gcc-3.4.4/configure.in 2005-08-09 20:00:12.073168623 -0700
+@@ -1907,7 +1907,7 @@
+ *) gxx_include_dir=${with_gxx_include_dir} ;;
+ esac
+
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+ *" newlib "*)
+ case " $target_configargs " in
+--- gcc-3.4.4/configure.orig 2005-08-09 21:02:29.668360660 -0700
++++ gcc-3.4.4/configure 2005-08-09 21:02:50.157649970 -0700
+@@ -2669,7 +2669,7 @@
+ *) gxx_include_dir=${with_gxx_include_dir} ;;
+ esac
+
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+ *" newlib "*)
+ case " $target_configargs " in
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 76e14ddca1..ef21de5f01 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -5,7 +5,7 @@ inherit cross
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
# NOTE: split PR. If the main .oe changes something that affects its *build*
# remember to increment this one too.
-PR = "r2"
+PR = "r3"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index da4665fd88..3918eef72a 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
@@ -13,6 +13,7 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
file://armeb-fix.patch;patch=1 \
file://arm-nolibfloat.patch;patch=1 \
file://arm-softfloat.patch;patch=1 \
+ file://gcc41-configure.in.patch;patch=1 \
file://ldflags.patch;patch=1"
SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
diff --git a/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb b/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..747c525535
--- /dev/null
+++ b/packages/xlibs/diet-x11_X11R7.1-1.0.1.bb
@@ -0,0 +1,11 @@
+SECTION = "x11/base"
+include libx11_${PV}.bb
+
+PROVIDES += "libx11"
+
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+ file://fix-disable-xlocale.diff;patch=1 \
+ file://fix-utf8-wrong-define.patch;patch=1"
diff --git a/packages/xlibs/libx11/fix-utf8-wrong-define.patch b/packages/xlibs/files/fix-utf8-wrong-define.patch
index dca88fba92..dca88fba92 100644
--- a/packages/xlibs/libx11/fix-utf8-wrong-define.patch
+++ b/packages/xlibs/files/fix-utf8-wrong-define.patch
diff --git a/packages/xlibs/libfontenc_1.0.2.bb b/packages/xlibs/libfontenc_1.0.2.bb
new file mode 100644
index 0000000000..b67c4a0e38
--- /dev/null
+++ b/packages/xlibs/libfontenc_1.0.2.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X fontenc library (used by libxfont)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "zlib xproto"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libice_X11R7.1-1.0.1.bb b/packages/xlibs/libice_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..a1e92b66fa
--- /dev/null
+++ b/packages/xlibs/libice_X11R7.1-1.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X11 ICE library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "libx11 util-macros"
+PROVIDES = "ice"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libICE"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty b/packages/xlibs/liblbxutil/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty
+++ b/packages/xlibs/liblbxutil/.mtn2git_empty
diff --git a/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch b/packages/xlibs/liblbxutil/mkg3states.patch
index 58463db46b..58463db46b 100644
--- a/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch
+++ b/packages/xlibs/liblbxutil/mkg3states.patch
diff --git a/packages/xlibs/liblbxutil_1.0.1.bb b/packages/xlibs/liblbxutil_1.0.1.bb
new file mode 100644
index 0000000000..795cd4555d
--- /dev/null
+++ b/packages/xlibs/liblbxutil_1.0.1.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "xproto"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/${PN}-X11R7.1-${PV}.tar.bz2 \
+ file://mkg3states.patch;patch=1"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
diff --git a/packages/xlibs/libsm_X11R7.1-1.0.1.bb b/packages/xlibs/libsm_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..468b014165
--- /dev/null
+++ b/packages/xlibs/libsm_X11R7.1-1.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Session management library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+#PV="1:1.0.1"
+
+DEPENDS = "libx11 libice util-macros"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libSM"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libx11_X11R7.1-1.0.1.bb b/packages/xlibs/libx11_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..6836c872bd
--- /dev/null
+++ b/packages/xlibs/libx11_X11R7.1-1.0.1.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+
+DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
+PROVIDES = "x11"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+
+XORG_PN = "libX11"
+XORG_RELEASE = "X11R7.1"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+ )
+ rm -f ${STAGING_INCDIR}/X11/Xlib.h
+ oe_runmake
+}
diff --git a/packages/xlibs/libxau_1.0.1.bb b/packages/xlibs/libxau_1.0.1.bb
new file mode 100644
index 0000000000..39e2f88b95
--- /dev/null
+++ b/packages/xlibs/libxau_1.0.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Authorization Protocol for X."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto util-macros"
+PROVIDES = "xau"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXau"
+
+include xorg-xlibs.inc
+
diff --git a/packages/xlibs/libxaw_X11R7.1-1.0.2.bb b/packages/xlibs/libxaw_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..7fb68385a1
--- /dev/null
+++ b/packages/xlibs/libxaw_X11R7.1-1.0.2.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "X Athena Widgets library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "xproto libx11 libxt libxmu libxpm"
+PROVIDES = "xaw"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXaw"
+
+include xorg-xlibs.inc
+
+# FIXME: libXaw needs a full x11, not diet
+BROKEN = "1"
diff --git a/packages/xlibs/libxcomposite_X11R7.1-0.3.bb b/packages/xlibs/libxcomposite_X11R7.1-0.3.bb
new file mode 100644
index 0000000000..2847ada716
--- /dev/null
+++ b/packages/xlibs/libxcomposite_X11R7.1-0.3.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "X Composite extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 compositeproto libxfixes"
+PROVIDES = "xcomposite"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXcomposite"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/libXcomposite-${PV}.tar.bz2 \
+ file://change-include-order.patch;patch=1"
diff --git a/packages/xlibs/libxcursor_1.1.6.bb b/packages/xlibs/libxcursor_1.1.6.bb
new file mode 100644
index 0000000000..20f44bfb41
--- /dev/null
+++ b/packages/xlibs/libxcursor_1.1.6.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "X Cursor library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libxfixes"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXcursor"
+
+include xorg-xlibs.inc
+
+FILES_${PN} += "${libdir}/libXcursor.so"
diff --git a/packages/xlibs/libxdamage_1.0.3.bb b/packages/xlibs/libxdamage_1.0.3.bb
new file mode 100644
index 0000000000..b97e01cfb0
--- /dev/null
+++ b/packages/xlibs/libxdamage_1.0.3.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X Damage extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 damageproto libxfixes xproto"
+PROVIDES = "xdamage"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXdamage"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxdmcp_1.0.1.bb b/packages/xlibs/libxdmcp_1.0.1.bb
new file mode 100644
index 0000000000..d9cfadbf7b
--- /dev/null
+++ b/packages/xlibs/libxdmcp_1.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X Display Manager Control Protocol library."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto util-macros"
+PROVIDES = "xdmcp"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXdmcp"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxext_1.0.1.bb b/packages/xlibs/libxext_1.0.1.bb
new file mode 100644
index 0000000000..5ee1d82990
--- /dev/null
+++ b/packages/xlibs/libxext_1.0.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "X Server Extension library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto libx11 util-macros"
+PROVIDES = "xext"
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXext"
+
+include xorg-xlibs.inc
+
diff --git a/packages/xlibs/libxfixes_4.0.1.bb b/packages/xlibs/libxfixes_4.0.1.bb
new file mode 100644
index 0000000000..5b8881e0b8
--- /dev/null
+++ b/packages/xlibs/libxfixes_4.0.1.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "X Fixes extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 fixesproto"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXfixes"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxfont_X11R7.1-1.1.0.bb b/packages/xlibs/libxfont_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..d17359dc29
--- /dev/null
+++ b/packages/xlibs/libxfont_X11R7.1-1.1.0.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X font library (used by the X server)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype"
+PROVIDES = "xfont"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXfont"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxi_X11R7.0-1.0.0.bb b/packages/xlibs/libxi_X11R7.0-1.0.0.bb
index 20a29e094a..4e357cde7c 100644
--- a/packages/xlibs/libxi_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/libxi_X11R7.0-1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "X Input extension library."
SECTION = "x11/libs"
LICENSE = "MIT-X"
-DEPENDS = "xproto libx11 xext"
+DEPENDS = "xproto libx11 libxext"
XORG_PN = "libXi"
diff --git a/packages/xlibs/libxi_X11R7.1-1.0.1.bb b/packages/xlibs/libxi_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..d698f04ee1
--- /dev/null
+++ b/packages/xlibs/libxi_X11R7.1-1.0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X Input extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+
+DEPENDS = "xproto libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXi"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxkbfile_1.0.3.bb b/packages/xlibs/libxkbfile_1.0.3.bb
new file mode 100644
index 0000000000..36e3e5f600
--- /dev/null
+++ b/packages/xlibs/libxkbfile_1.0.3.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
diff --git a/packages/xlibs/libxkbui_1.0.2.bb b/packages/xlibs/libxkbui_1.0.2.bb
new file mode 100644
index 0000000000..a914f1e0ef
--- /dev/null
+++ b/packages/xlibs/libxkbui_1.0.2.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11 libxt libxkbfile"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
+
diff --git a/packages/xlibs/libxmu_1.0.1.bb b/packages/xlibs/libxmu_1.0.1.bb
new file mode 100644
index 0000000000..cc06d2a671
--- /dev/null
+++ b/packages/xlibs/libxmu_1.0.1.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "X Window System miscellaneous utility library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "libxt libxext util-macros"
+PROVIDES = "xmu"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXmu"
+
+include xorg-xlibs.inc
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+
+LEAD_SONAME = "libXmu"
diff --git a/packages/xlibs/libxpm_3.5.5.bb b/packages/xlibs/libxpm_3.5.5.bb
new file mode 100644
index 0000000000..397be2faf4
--- /dev/null
+++ b/packages/xlibs/libxpm_3.5.5.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "X Pixmap library."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "X-BSD"
+
+DEPENDS = "xproto libx11 util-macros"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXpm"
+
+include xorg-xlibs.inc
+
+do_stage () {
+ install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h
+ oe_libinstall -a -so libXpm ${STAGING_LIBDIR}
+}
+
+PACKAGES =+ "sxpm cxpm"
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
diff --git a/packages/xlibs/libxrandr_1.1.1.bb b/packages/xlibs/libxrandr_1.1.1.bb
new file mode 100644
index 0000000000..0c7978945a
--- /dev/null
+++ b/packages/xlibs/libxrandr_1.1.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X Resize and Rotate extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "randrproto libx11 libxrender libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXrandr"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxrender_0.9.1.bb b/packages/xlibs/libxrender_0.9.1.bb
new file mode 100644
index 0000000000..1ee518645b
--- /dev/null
+++ b/packages/xlibs/libxrender_0.9.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "X Render extension library."
+SECTION = "libs"
+#MAINTAINER = ""
+LICENSE = "BSD"
+
+DEPENDS = "renderproto libx11"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXrender"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxres_X11R7.1-1.0.1.bb b/packages/xlibs/libxres_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..e2ac5aee7b
--- /dev/null
+++ b/packages/xlibs/libxres_X11R7.1-1.0.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "X Resource usage library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "X-MIT"
+
+DEPENDS = "libx11 libxext"
+PROVIDES = "xres"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXres"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
diff --git a/packages/xlibs/libxt_1.0.2.bb b/packages/xlibs/libxt_1.0.2.bb
new file mode 100644
index 0000000000..69c74343a4
--- /dev/null
+++ b/packages/xlibs/libxt_1.0.2.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "X Toolkit Intrinsics"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "X-MIT"
+
+DEPENDS = "libx11 libsm util-macros"
+PROVIDES = "xt"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXt"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
+ )
+ oe_runmake
+}
diff --git a/packages/xlibs/libxxf86dga_1.0.1.bb b/packages/xlibs/libxxf86dga_1.0.1.bb
new file mode 100644
index 0000000000..2842c2c458
--- /dev/null
+++ b/packages/xlibs/libxxf86dga_1.0.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xxf86dga extension library."
+SECTION = "x11/libs"
+LICENSE = "XFree86"
+
+DEPENDS = "libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXxf86dga"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
+}
diff --git a/packages/xlibs/libxxf86misc_1.0.1.bb b/packages/xlibs/libxxf86misc_1.0.1.bb
new file mode 100644
index 0000000000..2544f91ab1
--- /dev/null
+++ b/packages/xlibs/libxxf86misc_1.0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Xxf86vm extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT"
+DEPENDS = "libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXxf86misc"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
diff --git a/packages/xlibs/libxxf86vm_1.0.1.bb b/packages/xlibs/libxxf86vm_1.0.1.bb
new file mode 100644
index 0000000000..0ab206a0df
--- /dev/null
+++ b/packages/xlibs/libxxf86vm_1.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Xxf86vm extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT"
+
+DEPENDS = "libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXxf86vm"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
diff --git a/packages/xlibs/util-macros_1.0.2.bb b/packages/xlibs/util-macros_1.0.2.bb
new file mode 100644
index 0000000000..76101b0345
--- /dev/null
+++ b/packages/xlibs/util-macros_1.0.2.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "X autotools macros"
+SECTION = "x11/libs"
+LICENSE= "Xorg"
+#MAINTAINER = ""
+
+XORG_PN = "${PN}"
+XORG_RELEASE = "X11R7.1"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/${PN}-X11R7.1-${PV}.tar.bz2"
diff --git a/packages/xlibs/xorg-xlibs.inc b/packages/xlibs/xorg-xlibs.inc
index 1a89d35363..8fb46777b0 100644
--- a/packages/xlibs/xorg-xlibs.inc
+++ b/packages/xlibs/xorg-xlibs.inc
@@ -1,7 +1,10 @@
-XORG_PV = "${@['X11R7.0-${PV}','${PV}'][bb.data.getVar('PV', d, 1)[0:8]=='X11R7.0-']}"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${XORG_PN}-${XORG_PV}.tar.bz2"
+XORG_PV = "${@['${XORG_RELEASE}-${PV}','${PV}'][bb.data.getVar('PV', d, 1)[0:4]=='X11R']}"
+XORG_RELEASE ?= "X11R7.0"
+
+SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/${XORG_PN}-${XORG_PV}.tar.bz2"
S = "${WORKDIR}/${XORG_PN}-${XORG_PV}"
+
inherit autotools pkgconfig
do_stage() {
diff --git a/packages/xproto/compositeproto_0.3.1.bb b/packages/xproto/compositeproto_0.3.1.bb
new file mode 100644
index 0000000000..bb55a2022e
--- /dev/null
+++ b/packages/xproto/compositeproto_0.3.1.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
+CONFLICTS = "compositeext"
diff --git a/packages/xproto/fixesproto_4.0.bb b/packages/xproto/fixesproto_4.0.bb
new file mode 100644
index 0000000000..8e552e6bc5
--- /dev/null
+++ b/packages/xproto/fixesproto_4.0.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
+CONFLICTS = "fixesext"
diff --git a/packages/xproto/glproto_1.4.7.bb b/packages/xproto/glproto_1.4.7.bb
new file mode 100644
index 0000000000..67c086e764
--- /dev/null
+++ b/packages/xproto/glproto_1.4.7.bb
@@ -0,0 +1,2 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
diff --git a/packages/xproto/proto-common.inc b/packages/xproto/proto-common.inc
index f35a791171..65dfd4207a 100644
--- a/packages/xproto/proto-common.inc
+++ b/packages/xproto/proto-common.inc
@@ -3,9 +3,11 @@ SECTION = "x11/libs"
LICENSE= "MIT-X"
#MAINTAINER = ""
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/${PN}-X11R7.0-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/proto/${PN}-${XORG_RELEASE}-${PV}.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+S = "${WORKDIR}/${PN}-${XORG_RELEASE}-${PV}"
+
+XORG_RELEASE ?= "X11R7.0"
inherit autotools pkgconfig
diff --git a/packages/xproto/scrnsaverproto_1.1.0.bb b/packages/xproto/scrnsaverproto_1.1.0.bb
new file mode 100644
index 0000000000..67c086e764
--- /dev/null
+++ b/packages/xproto/scrnsaverproto_1.1.0.bb
@@ -0,0 +1,2 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
diff --git a/packages/xproto/xproto_7.0.5.bb b/packages/xproto/xproto_7.0.5.bb
new file mode 100644
index 0000000000..67c086e764
--- /dev/null
+++ b/packages/xproto/xproto_7.0.5.bb
@@ -0,0 +1,2 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
diff --git a/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
new file mode 100644
index 0000000000..9c43e52ead
--- /dev/null
+++ b/packages/xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
@@ -0,0 +1,37 @@
+--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
+@@ -505,7 +505,11 @@
+ XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
+
+ dnl Core modules for most extensions, et al.
++if test "$KDRIVE" = yes; then
++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto"
++else
+ REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto"
++fi
+ REQUIRED_LIBS="xfont xau fontenc"
+
+ AM_CONDITIONAL(XV, [test "x$XV" = xyes])
+@@ -1514,7 +1526,9 @@
+ AC_SUBST(XKB_COMPILED_DIR)
+
+ dnl and the rest of these are generic, so they're in config.h
++if test ! x"$KDRIVE" = xyes; then
+ AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
++fi
+ AC_DEFINE(XResExtension, 1, [Build XRes extension])
+
+ dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined
+@@ -1534,10 +1548,12 @@
+
+ AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
+
++if test ! "x$KDRIVE" = xyes ; then
+ dnl xorgconfig CLI configuration utility
+ PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
+ AC_SUBST(XORGCONFIG_DEP_CFLAGS)
+ AC_SUBST(XORGCONFIG_DEP_LIBS)
++fi
+
+ dnl xorgcfg GUI configuration utility
+ AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg],
diff --git a/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch b/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch
new file mode 100644
index 0000000000..13a6c2c954
--- /dev/null
+++ b/packages/xserver/xserver-kdrive/enable-builtin-fonts.patch
@@ -0,0 +1,12 @@
+--- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig 2006-06-08 14:49:12.158684250 +0200
++++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c 2006-06-08 14:49:52.493205000 +0200
+@@ -52,8 +52,8 @@
+ /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */
+
+ #define NEED_REPLIES
+ #ifdef HAVE_DIX_CONFIG_H
+-#include <dix-config.h>
++#include <kdrive-config.h>
+ #endif
+
+ #include <X11/X.h>
diff --git a/packages/xserver/xserver-kdrive/enable-tslib.patch b/packages/xserver/xserver-kdrive/enable-tslib.patch
new file mode 100644
index 0000000000..e488657b74
--- /dev/null
+++ b/packages/xserver/xserver-kdrive/enable-tslib.patch
@@ -0,0 +1,23 @@
+--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
+@@ -1438,6 +1446,10 @@
+ fi
+
+- # tslib...
++ AC_CHECK_HEADERS([tslib.h])
++ if test "$ac_cv_header_tslib_h" = yes; then
++ AC_DEFINE(TSLIB, 1, [Build kdrive with tslib support])
++ AC_DEFINE(TOUCHSCREEN, 1, [Build kdrive with touchscreen support])
++ fi
+
+ # damage shadow extension glx (NOTYET) fb mi
+ KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'
+@@ -1467,7 +1479,7 @@
+ AC_SUBST(KDRIVE_CFLAGS)
+ AC_SUBST(KDRIVE_PURE_LIBS)
+ AC_SUBST(KDRIVE_LIBS)
+-AM_CONDITIONAL(TSLIB, false)
++AM_CONDITIONAL(TSLIB, [test x"$ac_cv_header_tslib_h" = xyes])
+ AM_CONDITIONAL(H3600_TS, false)
+ AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
+ AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
diff --git a/packages/xserver/xserver-kdrive/optional-xkb.patch b/packages/xserver/xserver-kdrive/optional-xkb.patch
new file mode 100644
index 0000000000..d9ef51c5ba
--- /dev/null
+++ b/packages/xserver/xserver-kdrive/optional-xkb.patch
@@ -0,0 +1,54 @@
+--- git/Makefile.am.orig 2006-06-09 16:01:51.000000000 +0200
++++ git/Makefile.am 2006-06-09 16:02:59.000000000 +0200
+@@ -35,6 +35,10 @@
+ XINPUT_DIR=Xi
+ endif
+
++if XKB
++XKB_DIR=xkb
++endif
++
+ if DBE
+ DBE_DIR=dbe
+ endif
+@@ -51,7 +55,7 @@
+ randr \
+ render \
+ $(XINPUT_DIR) \
+- xkb \
++ $(XKB_DIR) \
+ $(DBE_DIR) \
+ $(MFB_DIR) \
+ $(AFB_DIR) \
+--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
+@@ -418,6 +418,7 @@
+ AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes])
+ AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMS=$enableval], [DPMSExtension=yes])
+ AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes])
++AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes])
+
+ dnl DDXes.
+ AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
+@@ -739,12 +740,15 @@
+
+ AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
+
+-AC_DEFINE(XKB, 1, [Build XKB])
+-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
+-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
+-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
+-XKB_LIB='$(top_builddir)/xkb/libxkb.la'
+-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
++AM_CONDITIONAL(XKB, [test "x$XKB" = xyes])
++if test "x$XKB" = xyes; then
++ AC_DEFINE(XKB, 1, [Build XKB])
++ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
++ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
++ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
++ XKB_LIB='$(top_builddir)/xkb/libxkb.la'
++ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
++fi
+
+ AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
+ [Do not have `strcasecmp'.]))
diff --git a/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb
new file mode 100644
index 0000000000..fd7a323eee
--- /dev/null
+++ b/packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb
@@ -0,0 +1,44 @@
+LICENSE = "MIT"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+
+PROVIDES = "virtual/xserver"
+RPROVIDES = "virtual/xserver"
+PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
+SECTION = "x11/base"
+DESCRIPTION = "X server from freedesktop.org"
+DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
+DESCRIPTION_xserver-kdrive-fake = "Fake X server"
+DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
+
+FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
+FILES_xserver-kdrive-fake = "${bindir}/Xfake"
+FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
+
+SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \
+ file://kmode.patch;patch=1 \
+ file://disable-apm.patch;patch=1 \
+ file://no-serial-probing.patch;patch=1 \
+ file://kdrive-evdev.patch;patch=1 \
+ file://kdrive-use-evdev.patch;patch=1 \
+ file://fbdev-not-fix.patch;patch=1 \
+ file://enable-builtin-fonts.patch;patch=1 \
+ file://optional-xkb.patch;patch=1 \
+ file://disable-xf86-dga-xorgcfg.patch;patch=1 \
+ file://enable-tslib.patch;patch=1"
+
+SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
+SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
+PACKAGE_ARCH_poodle = "poodle"
+
+S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-composite --enable-kdrive \
+ --disable-dga --disable-dri --disable-xinerama \
+ --disable-xf86misc --disable-xf86vidmode \
+ --disable-xorg --disable-xorgcfg \
+ --disable-xkb --disable-xnest --disable-xvfb \
+ --disable-xevie --disable-xprint --disable-xtrap \
+ --with-default-font-path=built-ins \
+ ac_cv_file__usr_share_X11_sgml_defs_ent=no"
diff --git a/packages/xserver/xserver-kdrive_git.bb b/packages/xserver/xserver-kdrive_git.bb
new file mode 100644
index 0000000000..1f42cc159c
--- /dev/null
+++ b/packages/xserver/xserver-kdrive_git.bb
@@ -0,0 +1,47 @@
+PV = "0.0+git"
+DEFAULT_PREFERENCE = "-2"
+
+LICENSE = "MIT"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+
+PROVIDES = "virtual/xserver"
+RPROVIDES = "virtual/xserver"
+PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
+SECTION = "x11/base"
+DESCRIPTION = "X server from freedesktop.org"
+DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
+DESCRIPTION_xserver-kdrive-fake = "Fake X server"
+DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
+
+FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
+FILES_xserver-kdrive-fake = "${bindir}/Xfake"
+FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
+
+SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
+ file://kmode.patch;patch=1 \
+ file://disable-apm.patch;patch=1 \
+ file://no-serial-probing.patch;patch=1 \
+ file://kdrive-evdev.patch;patch=1 \
+ file://kdrive-use-evdev.patch;patch=1 \
+ file://fbdev-not-fix.patch;patch=1 \
+ file://enable-builtin-fonts.patch;patch=1 \
+ file://optional-xkb.patch;patch=1 \
+ file://disable-xf86-dga-xorgcfg.patch;patch=1 \
+ file://enable-tslib.patch;patch=1"
+
+SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
+SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
+PACKAGE_ARCH_poodle = "poodle"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-composite --enable-kdrive \
+ --disable-dga --disable-dri --disable-xinerama \
+ --disable-xf86misc --disable-xf86vidmode \
+ --disable-xorg --disable-xorgcfg \
+ --disable-xkb --disable-xnest --disable-xvfb \
+ --disable-xevie --disable-xprint --disable-xtrap \
+ --with-default-font-path=built-ins \
+ ac_cv_file__usr_share_X11_sgml_defs_ent=no"