summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/xcalibrate/xcalibrate/.mtn2git_empty0
-rw-r--r--packages/xcalibrate/xcalibrate/xextproto.patch11
-rw-r--r--packages/xcalibrate/xcalibrate_20060312.bb17
-rw-r--r--packages/xcalibrate/xcalibrate_cvs.bb3
-rw-r--r--packages/xdpyinfo/xdpyinfo/.mtn2git_empty0
-rw-r--r--packages/xdpyinfo/xdpyinfo/disable-xkb.patch18
-rw-r--r--packages/xdpyinfo/xdpyinfo_1.0.1.bb11
-rw-r--r--packages/xev/xev_1.0.1.bb11
-rw-r--r--packages/xhost/xhost_1.0.0.bb9
-rw-r--r--packages/xlibs/diet-x11/.mtn2git_empty0
-rw-r--r--packages/xlibs/diet-x11/X18NCMSstubs.diff528
-rw-r--r--packages/xlibs/diet-x11_X11R7.0-1.0.0.bb13
-rw-r--r--packages/xlibs/libfontenc_1.0.1.bb15
-rw-r--r--packages/xlibs/libice_X11R7.0-1.0.0.bb17
-rw-r--r--packages/xlibs/libsm_X11R7.0-1.0.0.bb17
-rw-r--r--packages/xlibs/libx11_X11R7.0-1.0.0.bb30
-rw-r--r--packages/xlibs/libxau_1.0.0.bb17
-rw-r--r--packages/xlibs/libxaw_X11R7.0-1.0.1.bb20
-rw-r--r--packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb16
-rw-r--r--packages/xlibs/libxcursor_1.1.5.2.bb18
-rw-r--r--packages/xlibs/libxdamage_1.0.2.2.bb16
-rw-r--r--packages/xlibs/libxdmcp_1.0.0.bb17
-rw-r--r--packages/xlibs/libxext-native_cvs.bb1
-rw-r--r--packages/xlibs/libxext_1.0.0.bb19
-rw-r--r--packages/xlibs/libxfixes_3.0.1.2.bb15
-rw-r--r--packages/xlibs/libxfont_X11R7.0-1.0.0.bb17
-rw-r--r--packages/xlibs/libxft_2.1.8.2.bb26
-rw-r--r--packages/xlibs/libxi_X11R7.0-1.0.0.bb17
-rw-r--r--packages/xlibs/libxinerama_X11R7.0-1.0.1.bb19
-rw-r--r--packages/xlibs/libxkbfile_1.0.1.bb15
-rw-r--r--packages/xlibs/libxmu_1.0.0.bb24
-rw-r--r--packages/xlibs/libxp_1.0.0.bb18
-rw-r--r--packages/xlibs/libxpm_3.5.4.2.bb17
-rw-r--r--packages/xlibs/libxrandr_1.1.0.2.bb17
-rw-r--r--packages/xlibs/libxrender_0.9.0.2.bb17
-rw-r--r--packages/xlibs/libxres_X11R7.0-1.0.0.bb18
-rw-r--r--packages/xlibs/libxss_1.0.1.bb20
-rw-r--r--packages/xlibs/libxt_1.0.0.bb27
-rw-r--r--packages/xlibs/libxtst_1.0.1.bb17
-rw-r--r--packages/xlibs/libxv_X11R7.0-1.0.1.bb17
-rw-r--r--packages/xlibs/libxxf86dga_1.0.0.bb16
-rw-r--r--packages/xlibs/libxxf86vm_1.0.0.bb16
-rw-r--r--packages/xlibs/util-macros_1.0.1.bb12
-rw-r--r--packages/xlibs/xtrans_1.0.0.bb13
-rw-r--r--packages/xmodmap/xmodmap_1.0.0.bb10
-rw-r--r--packages/xproto/applewmproto_1.0.3.bb1
-rw-r--r--packages/xproto/bigreqsproto_1.0.2.bb1
-rw-r--r--packages/xproto/compositeproto_0.2.2.bb3
-rw-r--r--packages/xproto/damageproto_1.0.3.bb3
-rw-r--r--packages/xproto/dmxproto_2.2.2.bb1
-rw-r--r--packages/xproto/evieext_1.0.2.bb1
-rw-r--r--packages/xproto/fixesproto_3.0.2.bb3
-rw-r--r--packages/xproto/fontcacheproto_0.1.2.bb1
-rw-r--r--packages/xproto/fontsproto_2.0.2.bb1
-rw-r--r--packages/xproto/glproto_1.4.3.bb1
-rw-r--r--packages/xproto/inputproto_1.3.2.bb1
-rw-r--r--packages/xproto/kbproto_1.0.2.bb1
-rw-r--r--packages/xproto/printproto_1.0.3.bb1
-rw-r--r--packages/xproto/proto-common.inc12
-rw-r--r--packages/xproto/randrproto_1.1.2.bb3
-rw-r--r--packages/xproto/recordproto_1.13.2.bb3
-rw-r--r--packages/xproto/renderproto_0.9.2.bb3
-rw-r--r--packages/xproto/resourceproto_1.0.2.bb3
-rw-r--r--packages/xproto/scrnsaverproto_1.0.2.bb1
-rw-r--r--packages/xproto/trapproto_3.4.3.bb1
-rw-r--r--packages/xproto/videoproto_2.2.2.bb1
-rw-r--r--packages/xproto/windowswmproto_1.0.3.bb1
-rw-r--r--packages/xproto/xcmiscproto_1.1.2.bb1
-rw-r--r--packages/xproto/xextproto_7.0.2.bb3
-rw-r--r--packages/xproto/xf86bigfontproto_1.1.2.bb1
-rw-r--r--packages/xproto/xf86dgaproto_2.0.2.bb3
-rw-r--r--packages/xproto/xf86driproto_2.0.3.bb1
-rw-r--r--packages/xproto/xf86miscproto_0.9.2.bb1
-rw-r--r--packages/xproto/xf86rushproto_1.1.2.bb1
-rw-r--r--packages/xproto/xf86vidmodeproto_2.2.2.bb3
-rw-r--r--packages/xproto/xineramaproto_1.1.2.bb1
-rw-r--r--packages/xproto/xproto_7.0.4.bb1
-rw-r--r--packages/xproto/xproxymanagementprotocol_1.0.2.bb1
-rw-r--r--packages/xrandr/xrandr_1.0.1.bb9
-rw-r--r--packages/xrdb/xrdb_1.0.1.bb11
-rw-r--r--packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff464
-rw-r--r--packages/xserver/xserver-kdrive_20050207.bb6
-rw-r--r--packages/xserver/xserver-kdrive_20060312.bb52
-rw-r--r--packages/xserver/xserver-kdrive_cvs.bb3
-rw-r--r--packages/xset/xset/disable-xkb.patch18
-rw-r--r--packages/xset/xset_1.0.1.bb16
86 files changed, 1833 insertions, 2 deletions
diff --git a/packages/xcalibrate/xcalibrate/.mtn2git_empty b/packages/xcalibrate/xcalibrate/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xcalibrate/xcalibrate/.mtn2git_empty
diff --git a/packages/xcalibrate/xcalibrate/xextproto.patch b/packages/xcalibrate/xcalibrate/xextproto.patch
new file mode 100644
index 0000000000..cb190c073b
--- /dev/null
+++ b/packages/xcalibrate/xcalibrate/xextproto.patch
@@ -0,0 +1,11 @@
+--- XCalibrate/configure.ac.orig 2006-03-08 14:57:07.000000000 +0100
++++ XCalibrate/configure.ac 2006-03-08 14:57:14.000000000 +0100
+@@ -7,7 +7,7 @@
+ AC_PROG_LIBTOOL
+
+ # Check for X
+-PKG_CHECK_MODULES(XCALIBRATE, x11 xextensions xcalibrateext)
++PKG_CHECK_MODULES(XCALIBRATE, x11 xextproto xcalibrateext)
+
+ AC_OUTPUT([Makefile
+ xcalibrate.pc])
diff --git a/packages/xcalibrate/xcalibrate_20060312.bb b/packages/xcalibrate/xcalibrate_20060312.bb
new file mode 100644
index 0000000000..16e9642765
--- /dev/null
+++ b/packages/xcalibrate/xcalibrate_20060312.bb
@@ -0,0 +1,17 @@
+PV = "0.0+cvs${FIXEDSRCDATE}"
+FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
+LICENSE = "BSD-X"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "libx11 xcalibrateext libxext"
+DESCRIPTION = "XCalibrate client-side library"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \
+ file://xextproto.patch;patch=1"
+S = "${WORKDIR}/XCalibrate"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xcalibrate/xcalibrate_cvs.bb b/packages/xcalibrate/xcalibrate_cvs.bb
index ab2b076079..ea69ec6f2d 100644
--- a/packages/xcalibrate/xcalibrate_cvs.bb
+++ b/packages/xcalibrate/xcalibrate_cvs.bb
@@ -5,7 +5,8 @@ PRIORITY = "optional"
DEPENDS = "libx11 xcalibrateext libxext"
DESCRIPTION = "XCalibrate client-side library"
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate \
+ file://xextproto.patch;patch=1"
S = "${WORKDIR}/XCalibrate"
inherit autotools pkgconfig
diff --git a/packages/xdpyinfo/xdpyinfo/.mtn2git_empty b/packages/xdpyinfo/xdpyinfo/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xdpyinfo/xdpyinfo/.mtn2git_empty
diff --git a/packages/xdpyinfo/xdpyinfo/disable-xkb.patch b/packages/xdpyinfo/xdpyinfo/disable-xkb.patch
new file mode 100644
index 0000000000..24af21f4fc
--- /dev/null
+++ b/packages/xdpyinfo/xdpyinfo/disable-xkb.patch
@@ -0,0 +1,18 @@
+--- xdpyinfo-1.0.1/configure.ac.orig 2006-03-08 16:33:05.000000000 +0100
++++ xdpyinfo-1.0.1/configure.ac 2006-03-08 16:41:59.000000000 +0100
+@@ -45,11 +45,15 @@
+ AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>])
+ CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+
++AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
++ XKB="$enableval", XKB="yes")
++if test "x$XKB" = "xyes" ; then
+ PKG_CHECK_MODULES(DPY_XKB, x11,
+ [SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS $DPY_X11_CFLAGS"
+ AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>])
+ CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
++fi
+
+ PKG_CHECK_MODULES(DPY_XF86VIDMODE, xxf86vm,
+ [SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/packages/xdpyinfo/xdpyinfo_1.0.1.bb b/packages/xdpyinfo/xdpyinfo_1.0.1.bb
new file mode 100644
index 0000000000..41d9807551
--- /dev/null
+++ b/packages/xdpyinfo/xdpyinfo_1.0.1.bb
@@ -0,0 +1,11 @@
+LICENSE = "MIT"
+DEPENDS = "libx11 libxext libxtst"
+DESCRIPTION = "X display information utility"
+SECTION = "x11/base"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xdpyinfo-1.0.1.tar.bz2 \
+ file://disable-xkb.patch;patch=1"
+
+EXTRA_OECONF = "--disable-xkb"
+
+inherit autotools pkgconfig
diff --git a/packages/xev/xev_1.0.1.bb b/packages/xev/xev_1.0.1.bb
new file mode 100644
index 0000000000..4f00093a37
--- /dev/null
+++ b/packages/xev/xev_1.0.1.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "X Event Viewer"
+HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps"
+LICENSE = "MIT"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+SECTION = "x11/base"
+DEPENDS = "libx11 libxau"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2 \
+ file://diet-x11.patch;patch=1"
+
+inherit autotools
diff --git a/packages/xhost/xhost_1.0.0.bb b/packages/xhost/xhost_1.0.0.bb
new file mode 100644
index 0000000000..baacf25564
--- /dev/null
+++ b/packages/xhost/xhost_1.0.0.bb
@@ -0,0 +1,9 @@
+LICENSE = "MIT"
+DEPENDS = "libx11 libxext libxmu"
+DESCRIPTION = "server access control program for X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "x11/base"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
diff --git a/packages/xlibs/diet-x11/.mtn2git_empty b/packages/xlibs/diet-x11/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xlibs/diet-x11/.mtn2git_empty
diff --git a/packages/xlibs/diet-x11/X18NCMSstubs.diff b/packages/xlibs/diet-x11/X18NCMSstubs.diff
new file mode 100644
index 0000000000..54b1727a95
--- /dev/null
+++ b/packages/xlibs/diet-x11/X18NCMSstubs.diff
@@ -0,0 +1,528 @@
+--- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100
+@@ -83,6 +83,7 @@
+ * from UCS char to specified charset char.
+ * This converter is needed for _XimGetCharCode subroutine.
+ */
++#ifdef XLOCALE
+ XPointer
+ _XimGetLocaleCode (
+ _Xconst char* encoding_name)
+@@ -96,6 +97,7 @@
+ }
+ return cvt;
+ }
++#endif
+
+ /*
+ * Returns the locale dependent representation of a keysym.
+@@ -107,6 +109,7 @@
+ * locale
+ */
+ /*ARGSUSED*/
++#ifdef XLOCALE
+ int
+ _XimGetCharCode (
+ XPointer ucs_conv,
+@@ -135,6 +138,7 @@
+ buf[count]= '\0';
+ return count;
+ }
++#endif
+
+ #ifdef XKB
+ static int lookup_string(
+--- libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c.orig 2006-03-08 08:43:19.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c 2006-03-08 11:41:28.000000000 +0100
+@@ -0,0 +1,428 @@
++/*
++ * X18NCMSstubs.c
++ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
++ *
++ * Copyright © 2003 Matthew Allum
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Matthew Allum not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. Keith Packard and Compaq makes no
++ * representations about the suitability of this software for any purpose. It
++ * is provided "as is" without express or implied warranty.
++ *
++ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
++ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#include <stdlib.h>
++#include "Xlibint.h"
++#include "Xlcint.h"
++#include <X11/Xlocale.h>
++#include <X11/Xos.h>
++#ifdef WIN32
++#undef close
++#endif
++#include <X11/Xutil.h>
++#include "XlcPubI.h"
++
++#include "Xcmsint.h" /* for XcmsCCC type */
++#include "XlcPubI.h" /* for XLCd type */
++#include "config.h"
++
++#if ! XLOCALE
++
++Bool
++XSupportsLocale()
++{
++ return False;
++}
++
++char *
++XSetLocaleModifiers(
++ const char *modifiers)
++{
++ return NULL;
++}
++
++XLCd
++_XOpenLC(
++ char *name)
++{
++ return NULL;
++}
++
++XLCd
++_XlcCurrentLC()
++{
++ return NULL;
++}
++
++void
++_XlcVaToArgList(
++ va_list var,
++ int count,
++ XlcArgList *args_ret)
++{
++ return;
++}
++
++void
++_XlcCountVaList(
++ va_list var,
++ int *count_ret)
++{
++ return;
++}
++
++void
++_XCloseLC(
++ XLCd lcd)
++{
++ return;
++}
++
++int
++_XlcConvert(
++ XlcConv conv,
++ XPointer *from,
++ int *from_left,
++ XPointer *to,
++ int *to_left,
++ XPointer *args,
++ int num_args)
++{
++ return 0;
++}
++
++/* XIM Stubs */
++
++XPointer
++_XimGetLocaleCode ( _Xconst char* encoding_name )
++{
++ return NULL;
++}
++
++int
++_XimGetCharCode (
++ XPointer ucs_conv,
++ KeySym keysym,
++ unsigned char* buf,
++ int nbytes)
++{
++ return 0;
++}
++
++/* Xrm Stubs */
++
++XrmMethods
++_XrmInitParseInfo(
++ XPointer *state)
++{
++ return (XrmMethods) NULL;
++}
++
++/* Xwc Stubs */
++
++int
++XwcTextExtents(
++ XFontSet font_set,
++ _Xconst wchar_t *text,
++ int text_len,
++ XRectangle *overall_ink_extents,
++ XRectangle *overall_logical_extents)
++{
++ return 0;
++}
++
++void
++XwcDrawString(Display *display,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x, int y,
++ _Xconst wchar_t *string,
++ int num_wchars)
++{
++ ;
++}
++
++void
++XwcDrawText(
++ Display *dpy,
++ Drawable d,
++ GC gc,
++ int x,
++ int y,
++ XwcTextItem *text_items,
++ int nitems)
++{
++ ;
++}
++
++void
++XwcDrawImageString(
++ Display *dpy,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x,
++ int y,
++ _Xconst wchar_t *text,
++ int text_len)
++{
++ ;
++}
++
++int
++XwcTextEscapement(
++ XFontSet font_set,
++ _Xconst wchar_t *text,
++ int text_len)
++{
++ return 0;
++}
++
++Status
++XwcTextPerCharExtents(
++ XFontSet font_set,
++ _Xconst wchar_t *text,
++ int text_len,
++ XRectangle *ink_extents_buffer,
++ XRectangle *logical_extents_buffer,
++ int buffer_size,
++ int *num_chars,
++ XRectangle *max_ink_extents,
++ XRectangle *max_logical_extents)
++{
++ ;
++}
++
++int
++XwcTextPropertyToTextList(
++ Display *dpy,
++ const XTextProperty *text_prop,
++ wchar_t ***list_ret,
++ int *count_ret)
++{
++ return 0;
++}
++
++int
++XwcTextListToTextProperty(
++ Display *dpy,
++ wchar_t **list,
++ int count,
++ XICCEncodingStyle style,
++ XTextProperty *text_prop)
++{
++ return 0;
++}
++
++void
++XwcFreeStringList(wchar_t **list)
++{
++ return;
++}
++
++
++void XmbSetWMProperties ( /* Actually from mbWMProps.c */
++ Display *dpy,
++ Window w,
++ _Xconst char *windowName,
++ _Xconst char *iconName,
++ char **argv,
++ int argc,
++ XSizeHints *sizeHints,
++ XWMHints *wmHints,
++ XClassHint *classHints)
++{
++ return;
++}
++
++int
++XmbTextPropertyToTextList(
++ Display *dpy,
++ const XTextProperty *text_prop,
++ char ***list_ret,
++ int *count_ret)
++{
++ return XLocaleNotSupported;
++}
++
++int
++XmbTextListToTextProperty(
++ Display *dpy,
++ char **list,
++ int count,
++ XICCEncodingStyle style,
++ XTextProperty *text_prop)
++{
++ return XLocaleNotSupported;
++}
++
++int
++XmbTextExtents(
++ XFontSet font_set,
++ _Xconst char *text,
++ int text_len,
++ XRectangle *overall_ink_extents,
++ XRectangle *overall_logical_extents)
++{
++ return 0;
++}
++
++void
++XmbDrawText(
++ Display *dpy,
++ Drawable d,
++ GC gc,
++ int x,
++ int y,
++ XmbTextItem *text_items,
++ int nitems)
++{
++ ;
++}
++
++void
++XmbDrawString(
++ Display *dpy,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x,
++ int y,
++ _Xconst char *text,
++ int text_len)
++{
++ ;
++}
++
++void
++XmbDrawImageString(
++ Display *dpy,
++ Drawable d,
++ XFontSet font_set,
++ GC gc,
++ int x,
++ int y,
++ _Xconst char *text,
++ int text_len)
++{
++ ;
++}
++
++int
++XmbTextEscapement(
++ XFontSet font_set,
++ _Xconst char *text,
++ int text_len)
++{
++ return 0;
++}
++
++Status
++XmbTextPerCharExtents(
++ XFontSet font_set,
++ _Xconst char *text,
++ int text_len,
++ XRectangle *ink_extents_buffer,
++ XRectangle *logical_extents_buffer,
++ int buffer_size,
++ int *num_chars,
++ XRectangle *max_ink_extents,
++ XRectangle *max_logical_extents)
++{
++ return 0;
++}
++
++unsigned int
++KeySymToUcs4(KeySym keysym)
++{
++ return 0;
++}
++
++#endif
++
++#if ! XCMS
++
++XcmsCCC
++XcmsCCCOfColormap(dpy, cmap)
++ Display *dpy;
++ Colormap cmap;
++{
++ return NULL;
++}
++
++Status
++_XcmsResolveColorString (
++ XcmsCCC ccc,
++ const char **color_string,
++ XcmsColor *pColor_exact_return,
++ XcmsColorFormat result_format)
++{
++ return(XcmsFailure);
++}
++
++void
++_XcmsUnresolveColor(
++ XcmsCCC ccc,
++ XcmsColor *pColor)
++{
++ return;
++}
++
++void
++_XUnresolveColor(
++ XcmsCCC ccc,
++ XColor *pXColor)
++{
++ return;
++}
++
++XcmsCmapRec *
++_XcmsAddCmapRec(dpy, cmap, windowID, visual)
++ Display *dpy;
++ Colormap cmap;
++ Window windowID;
++ Visual *visual;
++{
++ return NULL;
++}
++
++void
++_XcmsRGB_to_XColor(
++ XcmsColor *pColors,
++ XColor *pXColors,
++ unsigned int nColors)
++{
++ return;
++}
++
++XcmsCmapRec *
++_XcmsCopyCmapRecAndFree(
++ Display *dpy,
++ Colormap src_cmap,
++ Colormap copy_cmap)
++{
++ return NULL;
++}
++
++void
++_XcmsDeleteCmapRec(
++ Display *dpy,
++ Colormap cmap)
++{
++ return;
++}
++
++#endif
+--- libX11-X11R7.0-1.0.0/src/Makefile.am.orig 2006-03-08 08:31:09.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/Makefile.am 2006-03-08 09:36:23.000000000 +0100
+@@ -331,6 +331,8 @@
+ libX11_la_SOURCES+=UIThrStubs.c
+ endif
+
++libX11_la_SOURCES+=X18NCMSstubs.c
++
+ x11datadir = @X11_DATADIR@
+ x11data_DATA = XKeysymDB XErrorDB
+
+@@ -338,7 +340,8 @@
+ $(x11data_DATA) \
+ os2Stubs.c \
+ udcInf.c \
+- UIThrStubs.c
++ UIThrStubs.c \
++ X18NCMSstubs.c
+
+ #
+ # Figure out which sub-libraries to link into Xlib
+--- libX11-X11R7.0-1.0.0/src/locking.c.orig 2006-03-08 11:05:56.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/locking.c 2006-03-08 11:06:37.000000000 +0100
+@@ -55,7 +55,9 @@
+ #define NUM_FREE_CVLS 4
+
+ /* in lcWrap.c */
++#ifdef XLOCALE
+ extern LockInfoPtr _Xi18n_lock;
++#endif
+
+ #ifdef WIN32
+ static DWORD _X_TlsIndex = (DWORD)-1;
+@@ -625,9 +627,11 @@
+ _Xglobal_lock = &global_lock;
+ xmutex_init(_Xglobal_lock->lock);
+ xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
++#ifdef XLOCALE
+ _Xi18n_lock = &i18n_lock;
+ xmutex_init(_Xi18n_lock->lock);
+ xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
++#endif
+ _XLockMutex_fn = _XLockMutex;
+ _XUnlockMutex_fn = _XUnlockMutex;
+ _XCreateMutex_fn = _XCreateMutex;
+--- libX11-X11R7.0-1.0.0/configure.ac.orig 2006-03-08 10:03:57.000000000 +0100
++++ libX11-X11R7.0-1.0.0/configure.ac 2006-03-08 10:06:01.000000000 +0100
+@@ -215,7 +215,14 @@
+ esac
+ AC_SUBST(KEYSYMDEF)
+
+-AM_CONDITIONAL(UDC, test xfalse = xtrue)
++AC_ARG_ENABLE(udc,
++ AC_HELP_STRING([--disable-udc],
++ [Disable Xlib support for UDC *EXPERIMENTAL*]),
++ [UDC=$enableval],[UDC=yes])
++AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
++if test x"$UDC" = "xyes"; then
++ AC_DEFINE(UDC,1,[Include support for UDC])
++fi
+
+ AC_ARG_ENABLE(xcms,
+ AC_HELP_STRING([--disable-xcms],
diff --git a/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb b/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..daca669f0a
--- /dev/null
+++ b/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb
@@ -0,0 +1,13 @@
+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"
+
+#do_stage_append () {
+# rm -f ${STAGING_INCDIR}/X11/XKBlib.h
+#}
diff --git a/packages/xlibs/libfontenc_1.0.1.bb b/packages/xlibs/libfontenc_1.0.1.bb
new file mode 100644
index 0000000000..3d56bca223
--- /dev/null
+++ b/packages/xlibs/libfontenc_1.0.1.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "X fontenc library (used by libxfont)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "zlib xproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libice_X11R7.0-1.0.0.bb b/packages/xlibs/libice_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..251188b1c2
--- /dev/null
+++ b/packages/xlibs/libice_X11R7.0-1.0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X11 ICE library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "libx11 util-macros"
+PROVIDES = "ice"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libICE-${PV}.tar.bz2"
+S = "${WORKDIR}/libICE-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libsm_X11R7.0-1.0.0.bb b/packages/xlibs/libsm_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..14ec6ffac0
--- /dev/null
+++ b/packages/xlibs/libsm_X11R7.0-1.0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Session management library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+#PV="1:1.0.0"
+
+DEPENDS = "libx11 libice util-macros"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libSM-1.0.0.tar.bz2"
+S = "${WORKDIR}/libSM-1.0.0"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libx11_X11R7.0-1.0.0.bb b/packages/xlibs/libx11_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..d5be287341
--- /dev/null
+++ b/packages/xlibs/libx11_X11R7.0-1.0.0.bb
@@ -0,0 +1,30 @@
+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"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libX11-${PV}.tar.bz2"
+S = "${WORKDIR}/libX11-${PV}"
+
+inherit autotools pkgconfig
+
+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
+}
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxau_1.0.0.bb b/packages/xlibs/libxau_1.0.0.bb
new file mode 100644
index 0000000000..828d4ebd3d
--- /dev/null
+++ b/packages/xlibs/libxau_1.0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Authorization Protocol for X."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto util-macros"
+PROVIDES = "xau"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXau-${PV}.tar.bz2"
+S = "${WORKDIR}/libXau-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxaw_X11R7.0-1.0.1.bb b/packages/xlibs/libxaw_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..4d3c6acdbd
--- /dev/null
+++ b/packages/xlibs/libxaw_X11R7.0-1.0.1.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "X Athena Widgets library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "xproto libx11 libxt libxmu libxpm"
+PROVIDES = "xaw"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXaw-${PV}.tar.bz2"
+S = "${WORKDIR}/libXaw-${PV}"
+
+inherit autotools pkgconfig
+
+# FIXME: libXaw needs a full x11, not diet
+BROKEN = "1"
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
new file mode 100644
index 0000000000..6de1388350
--- /dev/null
+++ b/packages/xlibs/libxcomposite_X11R7.0-0.2.2.2.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "X Composite extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 compositeproto xextproto libxfixes"
+PROVIDES = "xcomposite"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2"
+S = "${WORKDIR}/libXcomposite-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxcursor_1.1.5.2.bb b/packages/xlibs/libxcursor_1.1.5.2.bb
new file mode 100644
index 0000000000..d20b52d0f0
--- /dev/null
+++ b/packages/xlibs/libxcursor_1.1.5.2.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "X Cursor library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libxfixes"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcursor-${PV}.tar.bz2"
+S = "${WORKDIR}/libXcursor-${PV}"
+
+FILES_${PN} += "${libdir}/libXcursor.so"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxdamage_1.0.2.2.bb b/packages/xlibs/libxdamage_1.0.2.2.bb
new file mode 100644
index 0000000000..572df1d190
--- /dev/null
+++ b/packages/xlibs/libxdamage_1.0.2.2.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "X Damage extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 damageproto libxfixes xproto"
+PROVIDES = "xdamage"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdamage-${PV}.tar.bz2"
+S = "${WORKDIR}/libXdamage-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxdmcp_1.0.0.bb b/packages/xlibs/libxdmcp_1.0.0.bb
new file mode 100644
index 0000000000..4ba746369f
--- /dev/null
+++ b/packages/xlibs/libxdmcp_1.0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X Display Manager Control Protocol library."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto util-macros"
+PROVIDES = "xdmcp"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXdmcp-${PV}.tar.bz2"
+S = "${WORKDIR}/libXdmcp-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxext-native_cvs.bb b/packages/xlibs/libxext-native_cvs.bb
index dfc439a9f6..296a741ebf 100644
--- a/packages/xlibs/libxext-native_cvs.bb
+++ b/packages/xlibs/libxext-native_cvs.bb
@@ -2,3 +2,4 @@ SECTION = "unknown"
include libxext_${PV}.bb
inherit native
DEPENDS = "x11-native xextensions-native"
+PROVIDES = ""
diff --git a/packages/xlibs/libxext_1.0.0.bb b/packages/xlibs/libxext_1.0.0.bb
new file mode 100644
index 0000000000..1c15f819b6
--- /dev/null
+++ b/packages/xlibs/libxext_1.0.0.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "X Server Extension library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto libx11 xextproto util-macros"
+PROVIDES = "xext"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXext-${PV}.tar.bz2"
+S = "${WORKDIR}/libXext-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxfixes_3.0.1.2.bb b/packages/xlibs/libxfixes_3.0.1.2.bb
new file mode 100644
index 0000000000..ea898d723b
--- /dev/null
+++ b/packages/xlibs/libxfixes_3.0.1.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "X Fixes extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 fixesproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfixes-${PV}.tar.bz2"
+S = "${WORKDIR}/libXfixes-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxfont_X11R7.0-1.0.0.bb b/packages/xlibs/libxfont_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..9b154a0e9a
--- /dev/null
+++ b/packages/xlibs/libxfont_X11R7.0-1.0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X font library (used by the X server)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "xproto xtrans zlib fontcacheproto fontsproto libfontenc"
+PROVIDES = "xfont"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXfont-${PV}.tar.bz2"
+S = "${WORKDIR}/libXfont-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxft_2.1.8.2.bb b/packages/xlibs/libxft_2.1.8.2.bb
new file mode 100644
index 0000000000..d97049d935
--- /dev/null
+++ b/packages/xlibs/libxft_2.1.8.2.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
+LICENSE = "MIT-X"
+SECTION = "x11/libs"
+
+DEPENDS = "libx11 xproto libxrender freetype fontconfig"
+PROVIDES = "xft"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXft-${PV}.tar.bz2"
+S = "${WORKDIR}/libXft-${PV}"
+
+FILES_${PN} = ${libdir}/lib*.so.*
+FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+ ${libdir}/*.a ${libdir}/pkgconfig \
+ ${datadir}/aclocal ${bindir} ${sbindir}
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
+python do_package() {
+ if bb.data.getVar('DEBIAN_NAMES', d, 1):
+ bb.data.setVar('PKG_${PN}', 'libxft2', d)
+ bb.build.exec_func('package_do_package', d)
+}
diff --git a/packages/xlibs/libxi_X11R7.0-1.0.0.bb b/packages/xlibs/libxi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..e771e60cda
--- /dev/null
+++ b/packages/xlibs/libxi_X11R7.0-1.0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X Input extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+
+DEPENDS = "xproto libx11 xextproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXi-${PV}.tar.bz2"
+S = "${WORKDIR}/libXi-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb b/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..26b746d465
--- /dev/null
+++ b/packages/xlibs/libxinerama_X11R7.0-1.0.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Xinerama library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "xineramaproto xproto libx11 libxext"
+PROVIDES = "xinerama"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXinerama-${PV}.tar.bz2"
+S = "${WORKDIR}/libXinerama-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxkbfile_1.0.1.bb b/packages/xlibs/libxkbfile_1.0.1.bb
new file mode 100644
index 0000000000..deae8278c5
--- /dev/null
+++ b/packages/xlibs/libxkbfile_1.0.1.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxmu_1.0.0.bb b/packages/xlibs/libxmu_1.0.0.bb
new file mode 100644
index 0000000000..e404ff527d
--- /dev/null
+++ b/packages/xlibs/libxmu_1.0.0.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "X Window System miscellaneous utility library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "libxt libxext util-macros"
+PROVIDES = "xmu"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXmu-${PV}.tar.bz2"
+S = "${WORKDIR}/libXmu-${PV}"
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+
+LEAD_SONAME = "libXmu"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxp_1.0.0.bb b/packages/xlibs/libxp_1.0.0.bb
new file mode 100644
index 0000000000..c8547cf783
--- /dev/null
+++ b/packages/xlibs/libxp_1.0.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "X print extension library."
+SECTION = "libs"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "libx11 libxext xextproto libxau printproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXp-${PV}.tar.bz2"
+S = "${WORKDIR}/libXp-${PV}"
+
+inherit autotools pkgconfig
+
+CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxpm_3.5.4.2.bb b/packages/xlibs/libxpm_3.5.4.2.bb
new file mode 100644
index 0000000000..10cf6a6ead
--- /dev/null
+++ b/packages/xlibs/libxpm_3.5.4.2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X Pixmap library."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "X-BSD"
+
+DEPENDS = "xproto libx11 util-macros"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXpm-${PV}.tar.bz2"
+S = "${WORKDIR}/libXpm-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h
+ oe_libinstall -a -so libXpm ${STAGING_LIBDIR}
+}
diff --git a/packages/xlibs/libxrandr_1.1.0.2.bb b/packages/xlibs/libxrandr_1.1.0.2.bb
new file mode 100644
index 0000000000..81787ad871
--- /dev/null
+++ b/packages/xlibs/libxrandr_1.1.0.2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X Resize and Rotate extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "randrproto libx11 libxrender libxext"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXrandr-${PV}.tar.bz2"
+S = "${WORKDIR}/libXrandr-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxrender_0.9.0.2.bb b/packages/xlibs/libxrender_0.9.0.2.bb
new file mode 100644
index 0000000000..fdaa9f4eb9
--- /dev/null
+++ b/packages/xlibs/libxrender_0.9.0.2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X Render extension library."
+SECTION = "libs"
+#MAINTAINER = ""
+LICENSE = "BSD"
+
+DEPENDS = "renderproto libx11"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXrender-${PV}.tar.bz2"
+S = "${WORKDIR}/libXrender-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxres_X11R7.0-1.0.0.bb b/packages/xlibs/libxres_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..69f20fc8f4
--- /dev/null
+++ b/packages/xlibs/libxres_X11R7.0-1.0.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "X Resource usage library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "X-MIT"
+
+DEPENDS = "libx11 xextproto libxext resourceproto"
+PROVIDES = "xres"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXres-${PV}.tar.bz2"
+S = "${WORKDIR}/libXres-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxss_1.0.1.bb b/packages/xlibs/libxss_1.0.1.bb
new file mode 100644
index 0000000000..54abc86a23
--- /dev/null
+++ b/packages/xlibs/libxss_1.0.1.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "X screen saver extension library."
+SECTION = "libs"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11 libxext xextproto scrnsaverproto"
+PROVIDES = "libxss"
+RREPLACES = "libxss"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXScrnSaver-${PV}.tar.bz2"
+S = "${WORKDIR}/libXScrnSaver-${PV}"
+
+inherit autotools pkgconfig
+
+#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxt_1.0.0.bb b/packages/xlibs/libxt_1.0.0.bb
new file mode 100644
index 0000000000..0f9fbf1860
--- /dev/null
+++ b/packages/xlibs/libxt_1.0.0.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "X Toolkit Intrinsics"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "X-MIT"
+
+DEPENDS = "libx11 libsm util-macros"
+PROVIDES = "xt"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXt-${PV}.tar.bz2"
+S = "${WORKDIR}/libXt-${PV}"
+
+inherit autotools pkgconfig
+
+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
+}
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxtst_1.0.1.bb b/packages/xlibs/libxtst_1.0.1.bb
new file mode 100644
index 0000000000..89c7b6607a
--- /dev/null
+++ b/packages/xlibs/libxtst_1.0.1.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X Test Extension: client side library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11 libxext recordproto xextproto inputproto"
+PROVIDES = "xtst"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXtst-${PV}.tar.bz2"
+S = "${WORKDIR}/libXtst-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxv_X11R7.0-1.0.1.bb b/packages/xlibs/libxv_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..12b480dedc
--- /dev/null
+++ b/packages/xlibs/libxv_X11R7.0-1.0.1.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "X Video extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11 libxext xextproto videoproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXv-${PV}.tar.bz2"
+S = "${WORKDIR}/libXv-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/libxxf86dga_1.0.0.bb b/packages/xlibs/libxxf86dga_1.0.0.bb
new file mode 100644
index 0000000000..9a4824c153
--- /dev/null
+++ b/packages/xlibs/libxxf86dga_1.0.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xxf86dga extension library."
+SECTION = "x11/libs"
+LICENSE = "XFree86"
+
+DEPENDS = "libx11 libxext xxf86dgaproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86dga-${PV}.tar.bz2"
+S = "${WORKDIR}/libXxf86dga-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
+}
diff --git a/packages/xlibs/libxxf86vm_1.0.0.bb b/packages/xlibs/libxxf86vm_1.0.0.bb
new file mode 100644
index 0000000000..fe67e123d9
--- /dev/null
+++ b/packages/xlibs/libxxf86vm_1.0.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Xxf86vm extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT"
+
+DEPENDS = "libx11 libxext xxf86vidmodeproto"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86vm-${PV}.tar.bz2"
+S = "${WORKDIR}/libXxf86vm-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/util-macros_1.0.1.bb b/packages/xlibs/util-macros_1.0.1.bb
new file mode 100644
index 0000000000..87e2ecfa62
--- /dev/null
+++ b/packages/xlibs/util-macros_1.0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "X autotools macros"
+SECTION = "x11/libs"
+LICENSE= "Xorg"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/xlibs/xtrans_1.0.0.bb b/packages/xlibs/xtrans_1.0.0.bb
new file mode 100644
index 0000000000..79503126f2
--- /dev/null
+++ b/packages/xlibs/xtrans_1.0.0.bb
@@ -0,0 +1,13 @@
+LICENSE = "MIT"
+SECTION = "x11/libs"
+DESCRIPTION = "network API translation layer to \
+insulate X applications and libraries from OS \
+network vageries."
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xmodmap/xmodmap_1.0.0.bb b/packages/xmodmap/xmodmap_1.0.0.bb
new file mode 100644
index 0000000000..57140361b4
--- /dev/null
+++ b/packages/xmodmap/xmodmap_1.0.0.bb
@@ -0,0 +1,10 @@
+LICENSE = "MIT"
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "x11/base"
+
+DEPENDS = "libx11"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xmodmap-1.0.0.tar.bz2"
+
+inherit autotools pkgconfig
diff --git a/packages/xproto/applewmproto_1.0.3.bb b/packages/xproto/applewmproto_1.0.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/applewmproto_1.0.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/bigreqsproto_1.0.2.bb b/packages/xproto/bigreqsproto_1.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/bigreqsproto_1.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/compositeproto_0.2.2.bb b/packages/xproto/compositeproto_0.2.2.bb
new file mode 100644
index 0000000000..0989abb63c
--- /dev/null
+++ b/packages/xproto/compositeproto_0.2.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "compositeext"
diff --git a/packages/xproto/damageproto_1.0.3.bb b/packages/xproto/damageproto_1.0.3.bb
new file mode 100644
index 0000000000..cde80f0ffa
--- /dev/null
+++ b/packages/xproto/damageproto_1.0.3.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "damageext"
diff --git a/packages/xproto/dmxproto_2.2.2.bb b/packages/xproto/dmxproto_2.2.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/dmxproto_2.2.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/evieext_1.0.2.bb b/packages/xproto/evieext_1.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/evieext_1.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/fixesproto_3.0.2.bb b/packages/xproto/fixesproto_3.0.2.bb
new file mode 100644
index 0000000000..2be69994a8
--- /dev/null
+++ b/packages/xproto/fixesproto_3.0.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "fixesext"
diff --git a/packages/xproto/fontcacheproto_0.1.2.bb b/packages/xproto/fontcacheproto_0.1.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/fontcacheproto_0.1.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/fontsproto_2.0.2.bb b/packages/xproto/fontsproto_2.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/fontsproto_2.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/glproto_1.4.3.bb b/packages/xproto/glproto_1.4.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/glproto_1.4.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/inputproto_1.3.2.bb b/packages/xproto/inputproto_1.3.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/inputproto_1.3.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/kbproto_1.0.2.bb b/packages/xproto/kbproto_1.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/kbproto_1.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/printproto_1.0.3.bb b/packages/xproto/printproto_1.0.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/printproto_1.0.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/proto-common.inc b/packages/xproto/proto-common.inc
new file mode 100644
index 0000000000..4a712a810a
--- /dev/null
+++ b/packages/xproto/proto-common.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/xproto/randrproto_1.1.2.bb b/packages/xproto/randrproto_1.1.2.bb
new file mode 100644
index 0000000000..fafe3d3bef
--- /dev/null
+++ b/packages/xproto/randrproto_1.1.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "randrext"
diff --git a/packages/xproto/recordproto_1.13.2.bb b/packages/xproto/recordproto_1.13.2.bb
new file mode 100644
index 0000000000..9e2cafceb8
--- /dev/null
+++ b/packages/xproto/recordproto_1.13.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "recordext"
diff --git a/packages/xproto/renderproto_0.9.2.bb b/packages/xproto/renderproto_0.9.2.bb
new file mode 100644
index 0000000000..7f9febd8fa
--- /dev/null
+++ b/packages/xproto/renderproto_0.9.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "renderext"
diff --git a/packages/xproto/resourceproto_1.0.2.bb b/packages/xproto/resourceproto_1.0.2.bb
new file mode 100644
index 0000000000..e210b894ee
--- /dev/null
+++ b/packages/xproto/resourceproto_1.0.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "resourceext"
diff --git a/packages/xproto/scrnsaverproto_1.0.2.bb b/packages/xproto/scrnsaverproto_1.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/scrnsaverproto_1.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/trapproto_3.4.3.bb b/packages/xproto/trapproto_3.4.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/trapproto_3.4.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/videoproto_2.2.2.bb b/packages/xproto/videoproto_2.2.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/videoproto_2.2.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/windowswmproto_1.0.3.bb b/packages/xproto/windowswmproto_1.0.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/windowswmproto_1.0.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xcmiscproto_1.1.2.bb b/packages/xproto/xcmiscproto_1.1.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xcmiscproto_1.1.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xextproto_7.0.2.bb b/packages/xproto/xextproto_7.0.2.bb
new file mode 100644
index 0000000000..1ae2522d5f
--- /dev/null
+++ b/packages/xproto/xextproto_7.0.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+PROVIDES = "xextensions"
diff --git a/packages/xproto/xf86bigfontproto_1.1.2.bb b/packages/xproto/xf86bigfontproto_1.1.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xf86bigfontproto_1.1.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xf86dgaproto_2.0.2.bb b/packages/xproto/xf86dgaproto_2.0.2.bb
new file mode 100644
index 0000000000..3d7166c741
--- /dev/null
+++ b/packages/xproto/xf86dgaproto_2.0.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "xxf86dgaext"
diff --git a/packages/xproto/xf86driproto_2.0.3.bb b/packages/xproto/xf86driproto_2.0.3.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xf86driproto_2.0.3.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xf86miscproto_0.9.2.bb b/packages/xproto/xf86miscproto_0.9.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xf86miscproto_0.9.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xf86rushproto_1.1.2.bb b/packages/xproto/xf86rushproto_1.1.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xf86rushproto_1.1.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xf86vidmodeproto_2.2.2.bb b/packages/xproto/xf86vidmodeproto_2.2.2.bb
new file mode 100644
index 0000000000..9ce9a207b8
--- /dev/null
+++ b/packages/xproto/xf86vidmodeproto_2.2.2.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+
+CONFLICTS = "xxf86vmext"
diff --git a/packages/xproto/xineramaproto_1.1.2.bb b/packages/xproto/xineramaproto_1.1.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xineramaproto_1.1.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xproto_7.0.4.bb b/packages/xproto/xproto_7.0.4.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xproto_7.0.4.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xproto/xproxymanagementprotocol_1.0.2.bb b/packages/xproto/xproxymanagementprotocol_1.0.2.bb
new file mode 100644
index 0000000000..66419fe87f
--- /dev/null
+++ b/packages/xproto/xproxymanagementprotocol_1.0.2.bb
@@ -0,0 +1 @@
+include proto-common.inc
diff --git a/packages/xrandr/xrandr_1.0.1.bb b/packages/xrandr/xrandr_1.0.1.bb
new file mode 100644
index 0000000000..51f8f1c196
--- /dev/null
+++ b/packages/xrandr/xrandr_1.0.1.bb
@@ -0,0 +1,9 @@
+LICENSE= "BSD-X"
+DEPENDS = "libxrandr libx11 libxext"
+DESCRIPTION = "X Resize and Rotate extension command."
+SECTION = "x11/base"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xrandr-1.0.1.tar.bz2"
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools pkgconfig
diff --git a/packages/xrdb/xrdb_1.0.1.bb b/packages/xrdb/xrdb_1.0.1.bb
new file mode 100644
index 0000000000..7d6b588dd1
--- /dev/null
+++ b/packages/xrdb/xrdb_1.0.1.bb
@@ -0,0 +1,11 @@
+DEPENDS = "libx11 libxmu libxext"
+DESCRIPTION = "X server resource database utility"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "x11/base"
+LICENSE = "xrdb"
+PR = "r0"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/xrdb-1.0.1.tar.bz2"
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools pkgconfig
diff --git a/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff b/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff
new file mode 100644
index 0000000000..596e498b80
--- /dev/null
+++ b/packages/xserver/xserver-kdrive/build-20050207-against-X11R7.diff
@@ -0,0 +1,464 @@
+--- xserver.orig/configure.ac 2006-03-11 16:27:42.000000000 +0100
++++ xserver/configure.ac 2006-03-11 16:46:51.000000000 +0100
+@@ -79,7 +79,7 @@
+ # tslib touchscreen driver
+ AC_CHECK_HEADERS([tslib.h])
+
+-REQUIRED_MODULES="randr render fixesext damageext xextensions xfont xproto xtrans xau"
++REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xextproto xfont xproto xtrans xau"
+
+ DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi"
+ DEFAULT_VENDOR_STRING="freedesktop.org"
+--- xserver.orig/dix/dispatch.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/dix/dispatch.c 2006-03-11 16:30:59.000000000 +0100
+@@ -79,7 +79,6 @@
+ #endif
+
+ #include "windowstr.h"
+-#include "fontstruct.h"
+ #include "dixfontstr.h"
+ #include "gcstruct.h"
+ #include "selection.h"
+--- xserver.orig/dix/glyphcurs.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/dix/glyphcurs.c 2006-03-11 16:31:57.000000000 +0100
+@@ -51,7 +51,6 @@
+ #include <config.h>
+ #endif
+ #include "misc.h"
+-#include "fontstruct.h"
+ #include "dixfontstr.h"
+ #include "scrnintstr.h"
+ #include "gcstruct.h"
+--- xserver.orig/dix/main.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/dix/main.c 2006-03-11 16:32:05.000000000 +0100
+@@ -89,7 +89,6 @@
+ #include "colormap.h"
+ #include "colormapst.h"
+ #include "cursorstr.h"
+-#include "font.h"
+ #include "opaque.h"
+ #include "servermd.h"
+ #include "site.h"
+--- xserver.orig/dix/swaprep.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/dix/swaprep.c 2006-03-11 16:32:24.000000000 +0100
+@@ -57,7 +57,7 @@
+ #include <X11/Xproto.h>
+ #include "misc.h"
+ #include "dixstruct.h"
+-#include "fontstruct.h"
++#include "dixfont.h"
+ #include "scrnintstr.h"
+ #include "swaprep.h"
+ #include "globals.h"
+--- xserver.orig/dix/xpstubs.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/dix/xpstubs.c 2006-03-11 16:32:34.000000000 +0100
+@@ -31,7 +31,7 @@
+ #include <config.h>
+ #endif
+ #include "misc.h"
+-#include "font.h"
++#include "dixfont.h"
+
+ Bool
+ XpClientIsBitmapClient(ClientPtr client)
+--- xserver.orig/fb/fbglyph.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/fb/fbglyph.c 2006-03-11 16:52:01.000000000 +0100
+@@ -26,7 +26,6 @@
+ #include <config.h>
+ #endif
+ #include "fb.h"
+-#include "fontstruct.h"
+ #include "dixfontstr.h"
+
+ Bool
+--- xserver.orig/hw/kdrive/epson/epson13806draw.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/hw/kdrive/epson/epson13806draw.c 2006-03-11 16:34:56.000000000 +0100
+@@ -38,7 +38,6 @@
+ #include "pixmapstr.h"
+ #include "regionstr.h"
+ #include "mistruct.h"
+-#include "fontstruct.h"
+ #include "dixfontstr.h"
+ #include "fb.h"
+ #include "migc.h"
+--- xserver.orig/hw/kdrive/i810/i810draw.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/hw/kdrive/i810/i810draw.c 2006-03-11 16:34:41.000000000 +0100
+@@ -51,7 +51,6 @@
+ #include "pixmapstr.h"
+ #include "regionstr.h"
+ #include "mistruct.h"
+-#include "fontstruct.h"
+ #include "dixfontstr.h"
+ #include "fb.h"
+ #include "migc.h"
+--- xserver.orig/hw/kdrive/src/kaa.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/hw/kdrive/src/kaa.c 2006-03-11 16:35:39.000000000 +0100
+@@ -29,7 +29,6 @@
+ #endif
+ #include "kdrive.h"
+ #include "kaa.h"
+-#include "fontstruct.h"
+ #include "dixfontstr.h"
+
+ #define DEBUG_MIGRATE 0
+--- xserver.orig/include/dixfont.h 2006-03-11 16:27:42.000000000 +0100
++++ xserver/include/dixfont.h 2006-03-11 16:43:25.000000000 +0100
+@@ -27,10 +27,10 @@
+ #define DIXFONT_H 1
+
+ #include "dix.h"
+-#include "font.h"
+-#include "fontconf.h"
++#include <X11/fonts/font.h>
++#include <X11/fonts/fontconf.h>
+ #include "closure.h"
+-#include "fontstruct.h"
++#include <X11/fonts/fontstruct.h>
+
+ #define NullDIXFontProp ((DIXFontPropPtr)0)
+
+--- xserver.orig/include/dixfontstr.h 2006-03-11 16:27:42.000000000 +0100
++++ xserver/include/dixfontstr.h 2006-03-11 16:43:31.000000000 +0100
+@@ -27,7 +27,6 @@
+
+ #include "servermd.h"
+ #include "dixfont.h"
+-#include "fontstruct.h"
+ #include "closure.h"
+ #define NEED_REPLIES
+ #include "X11/Xproto.h" /* for xQueryFontReply */
+--- xserver.orig/mi/mibstore.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/mi/mibstore.c 2006-03-11 16:36:26.000000000 +0100
+@@ -57,7 +57,6 @@
+ #include "gcstruct.h"
+ #include "windowstr.h"
+ #include "pixmapstr.h"
+-#include "fontstruct.h"
+ #include "dixfontstr.h"
+ #include "dixstruct.h" /* For requestingClient */
+ #include "mi.h"
+--- xserver.orig/mi/miglblt.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/mi/miglblt.c 2006-03-11 16:53:52.000000000 +0100
+@@ -55,7 +55,6 @@
+ #include <X11/Xmd.h>
+ #include <X11/Xproto.h>
+ #include "misc.h"
+-#include "fontstruct.h"
+ #include "dixfontstr.h"
+ #include "gcstruct.h"
+ #include "windowstr.h"
+--- xserver.orig/mi/mi.h 2006-03-11 16:27:42.000000000 +0100
++++ xserver/mi/mi.h 2006-03-11 16:36:16.000000000 +0100
+@@ -54,7 +54,7 @@
+ #include "validate.h"
+ #include "window.h"
+ #include "gc.h"
+-#include "font.h"
++#include "dixfont.h"
+ #include "input.h"
+ #include "cursor.h"
+
+--- xserver.orig/mi/miinitext.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/mi/miinitext.c 2006-03-11 16:36:41.000000000 +0100
+@@ -54,6 +54,8 @@
+ #include "extension.h"
+ #include "micmap.h"
+ #include "xext.h"
++#include "pixmap.h"
++#include "gc.h"
+
+ #ifdef NOPEXEXT /* sleaze for Solaris cpp building XsunMono */
+ #undef PEXEXT
+--- xserver.orig/mi/mipolytext.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/mi/mipolytext.c 2006-03-11 16:36:48.000000000 +0100
+@@ -63,7 +63,6 @@
+ #include <X11/Xproto.h>
+ #include "misc.h"
+ #include "gcstruct.h"
+-#include "fontstruct.h"
+ #include "dixfontstr.h"
+ #include "mi.h"
+
+--- xserver.orig/mi/misprite.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/mi/misprite.c 2006-03-11 16:37:00.000000000 +0100
+@@ -42,7 +42,6 @@
+ # include "input.h"
+ # include "mi.h"
+ # include "cursorstr.h"
+-# include "font.h"
+ # include "scrnintstr.h"
+ # include "colormapst.h"
+ # include "windowstr.h"
+@@ -50,7 +49,6 @@
+ # include "mipointer.h"
+ # include "mispritest.h"
+ # include "dixfontstr.h"
+-# include "fontstruct.h"
+ #ifdef RENDER
+ # include "mipict.h"
+ #endif
+--- xserver.orig/miext/damage/damage.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/damage/damage.c 2006-03-11 16:37:17.000000000 +0100
+@@ -28,9 +28,7 @@
+ #include <X11/X.h>
+ #include "scrnintstr.h"
+ #include "windowstr.h"
+-#include "font.h"
+ #include "dixfontstr.h"
+-#include "fontstruct.h"
+ #include "mi.h"
+ #include "regionstr.h"
+ #include "globals.h"
+--- xserver.orig/miext/shadow/shadow.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shadow.c 2006-03-11 16:38:13.000000000 +0100
+@@ -29,9 +29,7 @@
+ #include <X11/X.h>
+ #include "scrnintstr.h"
+ #include "windowstr.h"
+-#include "font.h"
+ #include "dixfontstr.h"
+-#include "fontstruct.h"
+ #include "mi.h"
+ #include "regionstr.h"
+ #include "globals.h"
+--- xserver.orig/miext/shadow/shalloc.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shalloc.c 2006-03-11 16:38:25.000000000 +0100
+@@ -29,9 +29,7 @@
+ #include <X11/X.h>
+ #include "scrnintstr.h"
+ #include "windowstr.h"
+-#include "font.h"
+ #include "dixfontstr.h"
+-#include "fontstruct.h"
+ #include "mi.h"
+ #include "regionstr.h"
+ #include "globals.h"
+--- xserver.orig/miext/shadow/shpacked.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shpacked.c 2006-03-11 16:38:33.000000000 +0100
+@@ -28,9 +28,7 @@
+ #include <X11/X.h>
+ #include "scrnintstr.h"
+ #include "windowstr.h"
+-#include "font.h"
+ #include "dixfontstr.h"
+-#include "fontstruct.h"
+ #include "mi.h"
+ #include "regionstr.h"
+ #include "globals.h"
+--- xserver.orig/miext/shadow/shplanar8.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shplanar8.c 2006-03-11 16:38:44.000000000 +0100
+@@ -28,9 +28,7 @@
+ #include <X11/X.h>
+ #include "scrnintstr.h"
+ #include "windowstr.h"
+-#include "font.h"
+ #include "dixfontstr.h"
+-#include "fontstruct.h"
+ #include "mi.h"
+ #include "regionstr.h"
+ #include "globals.h"
+--- xserver.orig/miext/shadow/shplanar.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shplanar.c 2006-03-11 16:38:39.000000000 +0100
+@@ -28,9 +28,7 @@
+ #include <X11/X.h>
+ #include "scrnintstr.h"
+ #include "windowstr.h"
+-#include "font.h"
+ #include "dixfontstr.h"
+-#include "fontstruct.h"
+ #include "mi.h"
+ #include "regionstr.h"
+ #include "globals.h"
+--- xserver.orig/miext/shadow/shrotate.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shrotate.c 2006-03-11 16:38:56.000000000 +0100
+@@ -28,9 +28,7 @@
+ #include <X11/X.h>
+ #include "scrnintstr.h"
+ #include "windowstr.h"
+-#include "font.h"
+ #include "dixfontstr.h"
+-#include "fontstruct.h"
+ #include "mi.h"
+ #include "regionstr.h"
+ #include "globals.h"
+--- xserver.orig/miext/shadow/shrotpack.h 2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shrotpack.h 2006-03-11 16:39:02.000000000 +0100
+@@ -30,9 +30,7 @@
+ #include <X11/X.h>
+ #include "scrnintstr.h"
+ #include "windowstr.h"
+-#include "font.h"
+ #include "dixfontstr.h"
+-#include "fontstruct.h"
+ #include "mi.h"
+ #include "regionstr.h"
+ #include "globals.h"
+--- xserver.orig/miext/shadow/shrotpackYX.h 2006-03-11 16:27:42.000000000 +0100
++++ xserver/miext/shadow/shrotpackYX.h 2006-03-11 16:39:08.000000000 +0100
+@@ -25,9 +25,7 @@
+ #include <X11/X.h>
+ #include "scrnintstr.h"
+ #include "windowstr.h"
+-#include "font.h"
+ #include "dixfontstr.h"
+-#include "fontstruct.h"
+ #include "mi.h"
+ #include "regionstr.h"
+ #include "globals.h"
+--- xserver.orig/os/xstrans.c 2006-03-11 16:27:42.000000000 +0100
++++ xserver/os/xstrans.c 2006-03-11 16:39:31.000000000 +0100
+@@ -27,4 +27,4 @@
+
+ #include "config.h"
+
+-#include <transport.c>
++#include <X11/Xtrans/transport.c>
+--- xserver.orig/os/xstrans.h 2006-03-11 16:27:42.000000000 +0100
++++ xserver/os/xstrans.h 2006-03-11 16:39:37.000000000 +0100
+@@ -25,4 +25,4 @@
+ #define XSERV_t
+ #define TRANS_SERVER
+
+-#include <Xtrans.h>
++#include <X11/Xtrans/Xtrans.h>
+--- xserver.orig/Xext/shmint.h 2006-03-11 16:27:42.000000000 +0100
++++ xserver/Xext/shmint.h 2006-03-11 16:29:24.000000000 +0100
+@@ -32,27 +32,6 @@
+ #include "pixmap.h"
+ #include "gc.h"
+
+-typedef struct _ShmFuncs {
+- PixmapPtr (* CreatePixmap)(ScreenPtr pScreen,
+- int width,
+- int height,
+- int depth,
+- char *addr);
+- void (* PutImage)(DrawablePtr dst,
+- GCPtr pGC,
+- int depth,
+- unsigned int format,
+- int w,
+- int h,
+- int sx,
+- int sy,
+- int sw,
+- int sh,
+- int dx,
+- int dy,
+- char *data);
+-} ShmFuncs, *ShmFuncsPtr;
+-
+ void
+ ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
+
+--- xserver.orig/Xext/syncint.h 2006-03-11 16:27:42.000000000 +0100
++++ xserver/Xext/syncint.h 2006-03-11 16:30:16.000000000 +0100
+@@ -48,7 +48,7 @@
+ PERFORMANCE OF THIS SOFTWARE.
+
+ ******************************************************************/
+-/* $Id: syncint.h,v 3.1 2003-11-02 19:56:10 keithp Exp $ */
++/* $Id: syncint.h,v 3.2 2005-04-20 18:42:31 clee Exp $ */
+
+ #ifndef _SYNCINT_H_
+ #define _SYNCINT_H_
+@@ -57,26 +57,10 @@
+
+ #define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
+
+-typedef struct _SyncCounter {
+- ClientPtr client; /* Owning client. 0 for system counters */
+- XSyncCounter id; /* resource ID */
+- CARD64 value; /* counter value */
+- struct _SyncTriggerList *pTriglist; /* list of triggers */
+- Bool beingDestroyed; /* in process of going away */
+- struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
+-} SyncCounter;
+-
+ /*
+ * The System Counter interface
+ */
+
+-typedef enum {
+- XSyncCounterNeverChanges,
+- XSyncCounterNeverIncreases,
+- XSyncCounterNeverDecreases,
+- XSyncCounterUnrestricted
+-} SyncCounterType;
+-
+ typedef void
+ (*SyncQueryValueProcPtr) (pointer pCounter,
+ CARD64 *freshvalue);
+@@ -86,16 +70,6 @@
+ CARD64 *lessthan,
+ CARD64 *greaterthan);
+
+-typedef struct _SysCounterInfo {
+- char *name;
+- CARD64 resolution;
+- CARD64 bracket_greater;
+- CARD64 bracket_less;
+- SyncCounterType counterType; /* how can this counter change */
+- SyncQueryValueProcPtr QueryValue;
+- SyncBracketValuesProcPtr BracketValues;
+-} SysCounterInfo;
+-
+ struct _SyncTrigger;
+
+ typedef Bool
+@@ -108,55 +82,6 @@
+ typedef void
+ (*SyncCounterDestroyedProcPtr) (struct _SyncTrigger *pTrigger);
+
+-typedef struct _SyncTrigger {
+- SyncCounter *pCounter;
+- CARD64 wait_value; /* wait value */
+- unsigned int value_type; /* Absolute or Relative */
+- unsigned int test_type; /* transition or Comparision type */
+- CARD64 test_value; /* trigger event threshold value */
+- SyncCheckTriggerProcPtr CheckTrigger;
+- SyncTriggerFiredProcPtr TriggerFired;
+- SyncCounterDestroyedProcPtr CounterDestroyed;
+-} SyncTrigger;
+-
+-typedef struct _SyncTriggerList {
+- SyncTrigger *pTrigger;
+- struct _SyncTriggerList *next;
+-} SyncTriggerList;
+-
+-typedef struct _SyncAlarmClientList {
+- ClientPtr client;
+- XID delete_id;
+- struct _SyncAlarmClientList *next;
+-} SyncAlarmClientList;
+-
+-typedef struct _SyncAlarm {
+- SyncTrigger trigger;
+- ClientPtr client;
+- XSyncAlarm alarm_id;
+- CARD64 delta;
+- int events;
+- int state;
+- SyncAlarmClientList *pEventClients;
+-} SyncAlarm;
+-
+-typedef struct {
+- ClientPtr client;
+- CARD32 delete_id;
+- int num_waitconditions;
+-} SyncAwaitHeader;
+-
+-typedef struct {
+- SyncTrigger trigger;
+- CARD64 event_threshold;
+- SyncAwaitHeader *pHeader;
+-} SyncAwait;
+-
+-typedef union {
+- SyncAwaitHeader header;
+- SyncAwait await;
+-} SyncAwaitUnion;
+-
+ pointer
+ SyncCreateSystemCounter(char *name,
+ CARD64 inital_value,
diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index e0db6be3e7..73d57e93e1 100644
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -4,6 +4,11 @@ DEFAULT_PREFERENCE = "1"
LICENSE = "MIT"
DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
+
+# Uncomment the following DEPENDS line and the commented line in SRC_URI
+# to make this snapshot build against X11R7.0 xlibs.
+#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto"
+
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
@@ -34,6 +39,7 @@ FILES_xserver-kdrive-epson = "${bindir}/Xepson"
FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
+# file://build-20050207-against-X11R7.diff;patch=1 \
file://kmode.patch;patch=1 \
file://disable-apm.patch;patch=1 \
file://fbdev-not-fix.patch;patch=1 "
diff --git a/packages/xserver/xserver-kdrive_20060312.bb b/packages/xserver/xserver-kdrive_20060312.bb
new file mode 100644
index 0000000000..9c763dbfed
--- /dev/null
+++ b/packages/xserver/xserver-kdrive_20060312.bb
@@ -0,0 +1,52 @@
+PV = "0.0+cvs${FIXEDSRCDATE}"
+FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
+DEFAULT_PREFERENCE = "1"
+
+LICENSE = "MIT"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto"
+PROVIDES = "virtual/xserver"
+RPROVIDES = "virtual/xserver"
+PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
+SECTION = "x11/base"
+DESCRIPTION = "X server from freedesktop.org"
+DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices"
+DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
+DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices"
+DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices"
+DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices"
+DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices"
+DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
+DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
+DESCRIPTION_xserver-kdrive-fake = "Fake X server"
+DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
+
+PR = "r11"
+
+FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
+FILES_xserver-kdrive-ati = "${bindir}/Xati"
+FILES_xserver-kdrive-vesa = "${bindir}/Xvesa"
+FILES_xserver-kdrive-via = "${bindir}/Xvia"
+FILES_xserver-kdrive-mga = "${bindir}/Xmga"
+FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64"
+FILES_xserver-kdrive-fake = "${bindir}/Xfake"
+FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
+FILES_xserver-kdrive-epson = "${bindir}/Xepson"
+FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \
+ 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"
+
+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}/xserver"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-composite --disable-xinerama"
diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xserver/xserver-kdrive_cvs.bb
index b891bca467..f049c8cae0 100644
--- a/packages/xserver/xserver-kdrive_cvs.bb
+++ b/packages/xserver/xserver-kdrive_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
DEFAULT_PREFERENCE = "-2"
LICENSE = "MIT"
-DEPENDS = "tslib xproto xdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
@@ -34,6 +34,7 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \
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 \
diff --git a/packages/xset/xset/disable-xkb.patch b/packages/xset/xset/disable-xkb.patch
new file mode 100644
index 0000000000..6060fbb995
--- /dev/null
+++ b/packages/xset/xset/disable-xkb.patch
@@ -0,0 +1,18 @@
+--- xset-1.0.1/configure.ac.orig 2006-03-08 19:46:59.000000000 +0100
++++ xset-1.0.1/configure.ac 2006-03-08 19:47:40.000000000 +0100
+@@ -42,11 +42,15 @@
+ AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
+ CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+
++AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
++ XKB="$enableval", XKB="yes")
++if test "x$XKB" = "xyes" ; then
+ PKG_CHECK_MODULES(SET_XKB, x11,
+ [SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS"
+ AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>])
+ CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
++fi
+
+ PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc,
+ [SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/packages/xset/xset_1.0.1.bb b/packages/xset/xset_1.0.1.bb
new file mode 100644
index 0000000000..793e6d420b
--- /dev/null
+++ b/packages/xset/xset_1.0.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "user preference utility for X"
+LICENSE = "MIT"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+DEPENDS = "libx11 libxext xextproto libxmu"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+SECTION = "x11/base"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-${PV}.tar.bz2 \
+ file://disable-xkb.patch;patch=1"
+
+EXTRA_OECONF = "--disable-xkb"
+
+inherit autotools pkgconfig