Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@607 311d38ba-8fff-0310-9ca6-ca027cbcb966

meta/conf/distro/include/preferred-xorg-versions.inc

@@ -0,0 +1,109 @@
+PREFERRED_VERSION_applewmproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_bigreqsproto = "X11R7.0-1.0.2"
+PREFERRED_VERSION_bigreqsproto-native = "X11R7.0-1.0.2"
+PREFERRED_VERSION_compositeproto = "X11R7.1-0.3.1"
+PREFERRED_VERSION_damageproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_diet-x11 = "X11R7.1-1.0.1"
+PREFERRED_VERSION_dmxproto = "X11R7.0-2.2.2"
+PREFERRED_VERSION_evieext = "X11R7.0-1.0.2"
+PREFERRED_VERSION_fixesproto = "X11R7.1-4.0"
+PREFERRED_VERSION_fontcacheproto = "X11R7.0-0.1.2"
+PREFERRED_VERSION_fontcacheproto-native = "X11R7.0-0.1.2"
+PREFERRED_VERSION_fontsproto = "X11R7.0-2.0.2"
+PREFERRED_VERSION_fontsproto-native = "X11R7.0-2.0.2"
+PREFERRED_VERSION_gccmakedep = "X11R7.1-1.0.2"
+PREFERRED_VERSION_glproto = "X11R7.1-1.4.7"
+PREFERRED_VERSION_imake = "X11R7.1-1.0.2"
+PREFERRED_VERSION_inputproto = "X11R7.0-1.3.2"
+PREFERRED_VERSION_inputproto-native = "X11R7.0-1.3.2"
+PREFERRED_VERSION_kbproto = "X11R7.1-1.0.3"
+PREFERRED_VERSION_kbproto-native = "X11R7.0-1.0.2"
+PREFERRED_VERSION_libapplewm = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libdmx = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libfontenc = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libfontenc-native = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libfs = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libice = "X11R7.1-1.0.1"
+PREFERRED_VERSION_liblbxutil = "X11R7.1-1.0.1"
+PREFERRED_VERSION_liboldx = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libsm = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libwindowswm = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libx11 = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libx11-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxau = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxau-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxaw = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxcomposite = "X11R7.1-0.3"
+PREFERRED_VERSION_libxcursor = "X11R7.1-1.1.6"
+PREFERRED_VERSION_libxdamage = "X11R7.1-1.0.3"
+PREFERRED_VERSION_libxdmcp = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxdmcp-native = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxevie = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxext = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxfixes = "X11R7.1-4.0.1"
+PREFERRED_VERSION_libxfont = "X11R7.1-1.2.0"
+PREFERRED_VERSION_libxfont-native = "X11R7.1-1.1.0"
+PREFERRED_VERSION_libxfontcache = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxft = "X11R7.0-2.1.8.2"
+PREFERRED_VERSION_libxi = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxinerama = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxkbfile = "X11R7.1-1.0.3"
+PREFERRED_VERSION_libxkbui = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxmu = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxp = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxpm = "X11R7.1-3.5.5"
+PREFERRED_VERSION_libxprintapputil = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxprintutil = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxrandr = "X11R7.1-1.1.1"
+PREFERRED_VERSION_libxrender = "X11R7.1-0.9.1"
+PREFERRED_VERSION_libxres = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxscrnsaver = "X11R7.1-1.1.0"
+PREFERRED_VERSION_libxt = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxtrap = "X11R7.0-1.0.0"
+PREFERRED_VERSION_libxtst = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxv = "X11R7.0-1.0.1"
+PREFERRED_VERSION_libxvmc = "X11R7.1-1.0.2"
+PREFERRED_VERSION_libxxf86dga = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxxf86misc = "X11R7.1-1.0.1"
+PREFERRED_VERSION_libxxf86vm = "X11R7.1-1.0.1"
+PREFERRED_VERSION_lndir = "X11R7.0-1.0.1"
+PREFERRED_VERSION_makedepend = "X11R7.0-1.0.0"
+PREFERRED_VERSION_makedepend-native = "X11R7.0-1.0.0"
+PREFERRED_VERSION_printproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_randrproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_recordproto = "X11R7.0-1.13.2"
+PREFERRED_VERSION_renderproto = "X11R7.0-0.9.2"
+PREFERRED_VERSION_resourceproto = "X11R7.0-1.0.2"
+PREFERRED_VERSION_scrnsaverproto = "X11R7.1-1.1.0"
+PREFERRED_VERSION_trapproto = "X11R7.0-3.4.3"
+PREFERRED_VERSION_util-macros = "X11R7.1-1.0.2"
+PREFERRED_VERSION_util-macros-native = "X11R7.1-1.0.2"
+PREFERRED_VERSION_videoproto = "X11R7.0-2.2.2"
+PREFERRED_VERSION_windowswmproto = "X11R7.0-1.0.3"
+PREFERRED_VERSION_xauth = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xcmiscproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xcmiscproto-native = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xdpyinfo = "X11R7.0-1.0.1"
+PREFERRED_VERSION_xextproto = "X11R7.0-7.0.2"
+PREFERRED_VERSION_xextproto-native = "X11R7.0-7.0.2"
+PREFERRED_VERSION_xf86bigfontproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xf86bigfontproto-native = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xf86dgaproto = "X11R7.0-2.0.2"
+PREFERRED_VERSION_xf86driproto = "X11R7.0-2.0.3"
+PREFERRED_VERSION_xf86miscproto = "X11R7.0-0.9.2"
+PREFERRED_VERSION_xf86rushproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xf86vidmodeproto = "X11R7.0-2.2.2"
+PREFERRED_VERSION_xhost = "X11R7.1-1.0.1"
+PREFERRED_VERSION_xineramaproto = "X11R7.0-1.1.2"
+PREFERRED_VERSION_xmodmap = "X11R7.1-1.0.1"
+PREFERRED_VERSION_xorg-cf-files = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xproto = "X11R7.1-7.0.5"
+PREFERRED_VERSION_xproto-native = "X11R7.1-7.0.5"
+PREFERRED_VERSION_xproxymanagementprotocol = "X11R7.0-1.0.2"
+PREFERRED_VERSION_xrandr = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xrdb = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xserver-xorg = "X11R7.1-1.1.0"
+PREFERRED_VERSION_xset = "X11R7.1-1.0.2"
+PREFERRED_VERSION_xtrans = "X11R7.0-1.0.0"
+PREFERRED_VERSION_xtrans-native = "X11R7.0-1.0.0"

meta/conf/distro/poky.conf

@@ -103,7 +103,7 @@ SRCDATE_libfakekey ?= "20051101"
 SRCDATE_xmodmap ?= "20051101"
 SRCDATE_libxrandr ?= "20051101"
 SRCDATE_libxtst ?= "20051101"
-SRCDATE_xcalibrate ?= "20051101"
+SRCDATE_xcalibrate ?= "20060312"
 SRCDATE_libxmu ?= "20051115"
 SRCDATE_xdpyinfo ?= "20051115"
 SRCDATE_xauth ?= "20060120"
@@ -127,7 +127,6 @@ PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}"
 PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}"
 PREFERRED_VERSION_matchbox-wm ?= "1.1"
 PREFERRED_VERSION_libmatchbox ?= "1.9"
-PREFERRED_VERSION_xserver-kdrive = "0.0+cvs${SRCDATE}"
 
 PREFERRED_VERSION_glib-2.0 ?= "2.10.3"
 PREFERRED_VERSION_glib-2.0-native ?= "2.10.3"
@@ -140,7 +139,6 @@ PREFERRED_VERSION_pango ?= "1.10.1"
 PREFERRED_VERSION_dbus ?= "0.60"
 PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}"
 
-PREFERRED_VERSION_diet-x11 ?= "6.2.1"
 PREFERRED_VERSION_dillo2 ?= "0.6.6"
 PREFERRED_VERSION_evince ?= "0.3.2"
 PREFERRED_VERSION_firefox ?= "1.0"
@@ -161,14 +159,15 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.6"
 PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
 PREFERRED_VERSION_xdemineur ?= "2.1.1"
 PREFERRED_VERSION_xextensions ?= "1.0.1"
-PREFERRED_VERSION_xhost ?= "0.0+cvs20040413"
+
+
 PREFERRED_VERSION_xmonobut ?= "0.4"
 PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" 
-PREFERRED_VERSION_xproto ?= "6.6.2"
-PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
 PREFERRED_VERSION_xst ?= "0.15"
 PREFERRED_VERSION_oprofile ?= "0.9.1+cvs${SRCDATE}"
 
+require conf/distro/include/preferred-xorg-versions.inc
+
 PCMCIA_MANAGER ?= "pcmciautils"
 
 CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/"

meta/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])

meta/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 = "virtual/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
+}

meta/packages/xcalibrate/xcalibrate_cvs.bb

@@ -2,10 +2,11 @@ PV = "0.0+cvs${SRCDATE}"
 LICENSE = "BSD-X"
 SECTION = "x11/libs"
 PRIORITY = "optional"
-DEPENDS = "libx11 xcalibrateext libxext"
+DEPENDS = "virtual/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 

meta/packages/xorg-app/xauth_X11R7.0-1.0.1.bb

@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " virtual/libx11 libxau libxext libxmu"
+

meta/packages/xorg-app/xauth_cvs.bb

@@ -1,6 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
-DEPENDS = "libx11 libxau libxmu libxext"
+DEPENDS = "virtual/libx11 libxau libxmu libxext"
 DESCRIPTION = "X authority file utility"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"

meta/packages/xorg-app/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"

meta/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb

@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X display information utility"
+LICENSE = "MIT"
+
+DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp"
+
+SRC_URI += "file://disable-xkb.patch;patch=1"
+
+EXTRA_OECONF = "--disable-xkb"

meta/packages/xorg-app/xdpyinfo_cvs.bb

@@ -1,6 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE = "MIT"
-DEPENDS = "libx11 libxext libxtst"
+DEPENDS = "virtual/libx11 libxext libxtst"
 DESCRIPTION = "X display information utility"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "x11/base"

meta/packages/xorg-app/xhost_20040413.bb

@@ -1,7 +1,7 @@
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 LICENSE = "MIT"
 PV = "0.0+cvs${FIXEDSRCDATE}"
-DEPENDS = "libx11 libxext libxmu"
+DEPENDS = "virtual/libx11 libxext libxmu"
 DESCRIPTION = "server access control program for X"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"

meta/packages/xorg-app/xhost_X11R7.0-1.0.0.bb

@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Server access control program for X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "MIT"
+
+DEPENDS += " virtual/libx11 libxmu libxau"
+

meta/packages/xorg-app/xhost_X11R7.1-1.0.1.bb

@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Server access control program for X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "MIT"
+
+DEPENDS += " virtual/libx11 libxmu libxau"
+

meta/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb

@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Utility for modifying keymaps and pointer button mappings in X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "MIT"
+
+DEPENDS += " virtual/libx11"
+

meta/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb

@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "MIT"
+
+DEPENDS += " virtual/libx11"
+

meta/packages/xorg-app/xmodmap_cvs.bb

@@ -5,7 +5,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 PR = "r1"
 
-DEPENDS = "libx11"
+DEPENDS = "virtual/libx11"
 
 SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \
            file://autofoo.patch;patch=1"

meta/packages/xorg-app/xorg-app-common.inc

@@ -0,0 +1,18 @@
+DESCRIPTION = "X application"
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/apps"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+
+#DEPENDS = ""
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+FILES_${PN} += "  /usr/lib/X11/${XORG_PN}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}

meta/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb

@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X Resize and Rotate extension command."
+LICENSE= "BSD-X"
+
+DEPENDS += " libxrandr libxrender virtual/libx11"
+

meta/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb

@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X Resize and Rotate extension command."
+LICENSE= "BSD-X"
+
+DEPENDS += " libxrandr libxrender virtual/libx11"
+

meta/packages/xorg-app/xrandr_cvs.bb

@@ -1,6 +1,6 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
-DEPENDS = "libxrandr libx11 libxext"
+DEPENDS = "libxrandr virtual/libx11 libxext"
 DESCRIPTION = "X Resize and Rotate extension command."
 SECTION = "x11/base"
 

meta/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb

@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X server resource database utility"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "xrdb"
+
+DEPENDS += " libxmu virtual/libx11 libxext"
+

meta/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb

@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X server resource database utility"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "xrdb"
+
+DEPENDS += " libxmu virtual/libx11 libxext"

meta/packages/xorg-app/xrdb_cvs.bb

@@ -1,5 +1,5 @@
 PV = "0.0+cvs${SRCDATE}"
-DEPENDS = "libx11 libxmu libxext"
+DEPENDS = "virtual/libx11 libxmu libxext"
 DESCRIPTION = "X server resource database utility"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"

meta/packages/xorg-app/xset_20040817.bb

@@ -5,7 +5,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.0+cvs${FIXEDSRCDATE}"
 PR = "r1"
 
-DEPENDS = "libx11 libxext xextensions libxmu"
+DEPENDS = "virtual/libx11 libxext xextensions libxmu"
 
 CFLAGS += "-D_GNU_SOURCE"
 

meta/packages/xorg-app/xset_X11R7.0-1.0.1.bb

@@ -0,0 +1,13 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "user preference utility for X"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+LICENSE = "MIT"
+
+DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp"
+
+SRC_URI += "file://disable-xkb.patch;patch=1"
+
+CFLAGS += "-D_GNU_SOURCE"
+EXTRA_OECONF = "--disable-xkb"
+

meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb

@@ -0,0 +1,13 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "user preference utility for X"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+LICENSE = "MIT"
+
+DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp"
+
+SRC_URI += "file://disable-xkb.patch;patch=1"
+
+CFLAGS += "-D_GNU_SOURCE"
+EXTRA_OECONF = "--disable-xkb"
+

meta/packages/xorg-lib/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 <20> 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],

meta/packages/xorg-lib/diet-x11/fix-disable-xlocale.diff

@@ -0,0 +1,14 @@
+--- libX11-X11R7.0-1.0.0/src/Font.c.orig	2006-03-12 18:35:42.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/Font.c	2006-03-12 18:40:27.000000000 +0100
+@@ -701,7 +701,11 @@
+     }
+     if (l - 2 - (p - charset) < 0)
+ 	return 0;
++#ifdef XLOCALE
+     if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
++#else
++    if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
++#endif
+ 	return 0;
+     if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
+ 	return 0;

meta/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch

@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define
++++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h
+@@ -103,7 +103,7 @@
+ 
+ /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
+    November 2000. Its presence is indicated through the following macro. */
+-#define X_HAVE_UTF8_STRING 1
++#undef X_HAVE_UTF8_STRING
+ 
+ typedef char *XPointer;
+ 

meta/packages/xorg-lib/diet-x11/xim.patch

@@ -0,0 +1,55 @@
+--- libX11-6.2.1/src/X18NCMSstubs.c	2003-12-04 22:47:47.000000000 +0000
++++ libX11-6.2.1/src/X18NCMSstubs.c-new	2005-12-09 12:09:03.000000000 +0000
+@@ -90,6 +90,52 @@
+   return;
+ }
+ 
++XIM
++XOpenIM (
++    Display* display,
++    struct _XrmHashBucketRec* rdb,
++    char* res_name,
++    char* res_class)
++{
++  return (XIM) NULL;
++}
++
++Status
++XCloseIM ( XIM im )
++{
++  return NULL;
++}
++
++XIC
++XCreateIC ( XIM im, ...)
++{
++  return NULL;
++}
++
++void
++XDestroyIC ( XIC ic )
++{
++  return;
++}
++
++int
++XmbLookupString (
++    XIC ic,
++    XKeyPressedEvent* ev,
++    char* buffer,
++    int nbytes,
++    KeySym* keysym,
++    Status* status)
++{
++  return XLookupNone;
++}
++
++char *
++XGetICValues( XIC ic, ...)
++{
++  return (char *) NULL;
++}
++
+ XPointer
+ _XimGetLocaleCode ( _Xconst char* encoding_name )
+ {

meta/packages/xorg-lib/diet-x11_20050226.bb

@@ -1,10 +1,6 @@
 SECTION = "x11/base"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-include libx11_${PV}.bb
+require libx11_${PV}.bb
 
 EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
 
 SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"
-
-

meta/packages/xorg-lib/diet-x11_6.2.1.bb

@@ -0,0 +1,9 @@
+SECTION = "x11/base"
+require libx11_${PV}.bb
+
+EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \
+	file://xim.patch;patch=1"
+

meta/packages/xorg-lib/diet-x11_X11R7.0-1.0.0.bb

@@ -0,0 +1,13 @@
+SECTION = "x11/base"
+require libx11_${PV}.bb
+
+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"
+
+#do_stage_append () {
+#	rm -f ${STAGING_INCDIR}/X11/XKBlib.h
+#}

meta/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb

@@ -0,0 +1,9 @@
+SECTION = "x11/base"
+require libx11_${PV}.bb
+
+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"

meta/packages/xorg-lib/diet-x11_cvs.bb

@@ -0,0 +1,7 @@
+SECTION = "x11/base"
+require libx11_cvs.bb
+
+EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
+
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \
+	file://xim.patch;patch=1"

meta/packages/xorg-lib/libapplewm_X11R7.0-1.0.0.bb

@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " virtual/libx11 libxext xextproto applewmproto"
+
+XORG_PN = "libAppleWM"
+

meta/packages/xorg-lib/libdmx_X11R7.0-1.0.1.bb

@@ -0,0 +1,5 @@
+require xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " virtual/libx11 libxext xextproto dmxproto"

meta/packages/xorg-lib/libdmx_X11R7.1-1.0.2.bb

@@ -0,0 +1,5 @@
+require xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " virtual/libx11 libxext xextproto dmxproto"

meta/packages/xorg-lib/libfontenc-native_X11R7.0-1.0.1.bb

@@ -0,0 +1,12 @@
+DESCRIPTION = "X fontenc library (used by libxfont)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "zlib-native xproto-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libfontenc-${PV}.tar.bz2"
+S = "${WORKDIR}/libfontenc-${PV}"
+
+inherit native autotools pkgconfig

meta/packages/xorg-lib/libfontenc-native_X11R7.1-1.0.2.bb

@@ -0,0 +1,12 @@
+DESCRIPTION = "X libfontenc library (used by libxfont)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "zlib-native xproto-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libfontenc-${PV}.tar.bz2"
+S = "${WORKDIR}/libfontenc-${PV}"
+
+inherit native autotools pkgconfig

meta/packages/xorg-lib/libfontenc_X11R7.0-1.0.1.bb

@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X fontenc library (used by libxfont)."
+LICENSE = "BSD-X"
+PRIORITY = "optional"
+
+DEPENDS += " zlib xproto"
+

meta/packages/xorg-lib/libfontenc_X11R7.1-1.0.2.bb

@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X fontenc library (used by libxfont)."
+LICENSE = "BSD-X"
+PRIORITY = "optional"
+
+DEPENDS += " zlib xproto"
+

meta/packages/xorg-lib/libfs_X11R7.0-1.0.0.bb

@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+#DESCRIPTION = " "
+
+DEPENDS += " xproto fontsproto xtrans"
+
+XORG_PN = "libFS"
+

meta/packages/xorg-lib/libice_6.3.3.bb

@@ -2,7 +2,7 @@ SECTION = "libs"
 LICENSE= "MIT"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11"
+DEPENDS = "virtual/libx11"
 PROVIDES = "ice"
 DESCRIPTION = "X11 ICE library"
 PR = "r1"

meta/packages/xorg-lib/libice_X11R7.0-1.0.0.bb

@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 ICE library"
+PRIORITY = "optional"
+
+DEPENDS += " xproto xtrans"
+PROVIDES = "ice"
+
+XORG_PN = "libICE"
+

meta/packages/xorg-lib/libice_X11R7.1-1.0.1.bb

@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 ICE library"
+PRIORITY = "optional"
+
+DEPENDS += " xproto xtrans"
+PROVIDES = "ice"
+
+XORG_PN = "libICE"
+

meta/packages/xorg-lib/libice_cvs.bb

@@ -0,0 +1,17 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "MIT"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "virtual/libx11"
+PROVIDES = "ice"
+DESCRIPTION = "X11 ICE library"
+PR = "r1"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=ICE"
+S = "${WORKDIR}/ICE"
+
+inherit autotools pkgconfig 
+
+do_stage () {
+	autotools_stage_all
+}

meta/packages/xorg-lib/liblbxutil/mkg3states.patch

@@ -0,0 +1,51 @@
+--- liblbxutil-1.0.0/configure.ac.old	2006-03-31 02:38:44.000000000 -0500
++++ liblbxutil-1.0.0/configure.ac	2006-03-31 02:39:06.000000000 -0500
+@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION
+ 
+ AC_OUTPUT([Makefile
+ 	   src/Makefile
++	   src/image/Makefile
+ 	   lbxutil.pc])
+--- liblbxutil-1.0.0/src/Makefile.am.old	2006-03-31 02:38:51.000000000 -0500
++++ liblbxutil-1.0.0/src/Makefile.am	2006-03-31 02:39:49.000000000 -0500
+@@ -1,9 +1,6 @@
+ lib_LTLIBRARIES = liblbxutil.la
+ 
+-noinst_PROGRAMS = mkg3states
+-
+-mkg3states_SOURCES =				\
+-	$(srcdir)/image/mkg3states.c
++SUBDIRS = image
+ 
+ liblbxutil_la_SOURCES =				\
+ 	$(srcdir)/lbx_zlib/reqstats.h		\
+@@ -28,9 +25,8 @@ INCLUDES = @LBXUTIL_CFLAGS@ 
+ 
+ $(srcdir)/image/dfaxg42d.c: g3states.h
+ 
+-g3states.h: mkg3states
+-	-rm -f g3states.h
+-	./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
++g3states.h: image/mkg3states
++	./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
+ 
+ liblbxutil_la_LDFLAGS = -version-number 1:0:0
+ 
+--- liblbxutil-1.0.0/src/image/Makefile.am.old	2006-03-31 02:41:19.000000000 -0500
++++ liblbxutil-1.0.0/src/image/Makefile.am	2006-03-31 02:40:40.000000000 -0500
+@@ -0,0 +1,15 @@
++# evil hack
++CFLAGS=$(CFLAGS_FOR_BUILD)
++CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++LDFLAGS=$(LDFLAGS_FOR_BUILD)
++
++CC=$(CC_FOR_BUILD)
++LIBTOOL = @LIBTOOL@ --tag=CC
++
++noinst_PROGRAMS = mkg3states
++
++mkg3states_SOURCES =				\
++	mkg3states.c
++
++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)

meta/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb

@@ -0,0 +1,6 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "XFIXES Extension"
+
+DEPENDS += " xextproto xproto zlib"
+PROVIDES = "lbxutil"

meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb

@@ -0,0 +1,6 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "XFIXES Extension"
+
+DEPENDS += " xextproto xproto zlib"
+PROVIDES = "lbxutil"

meta/packages/xorg-lib/liboldx_X11R7.0-1.0.1.bb

@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " virtual/libx11"
+
+XORG_PN = "liboldX"
+

meta/packages/xorg-lib/libsm_6.0.3.bb

@@ -2,7 +2,7 @@ SECTION = "libs"
 LICENSE = "MIT-X"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11 libice"
+DEPENDS = "virtual/libx11 libice"
 DESCRIPTION = "Session management library"
 PR = "r1"
 

meta/packages/xorg-lib/libsm_X11R7.0-1.0.0.bb

@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Session management library"
+PRIORITY = "optional"
+
+DEPENDS += " libice xproto xtrans"
+
+XORG_PN = "libSM"
+

meta/packages/xorg-lib/libsm_X11R7.1-1.0.1.bb

@@ -0,0 +1,9 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Session management library"
+PRIORITY = "optional"
+
+DEPENDS += " libice xproto xtrans"
+
+XORG_PN = "libSM"
+

meta/packages/xorg-lib/libsm_cvs.bb

@@ -0,0 +1,18 @@
+PV = "6.0.3+cvs${SRCDATE}"
+LICENSE = "MIT-X"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "virtual/libx11 libice"
+DESCRIPTION = "Session management library"
+PR = "r1"
+
+DEFAULT_PREFERENCE="-1"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=SM"
+S = "${WORKDIR}/SM"
+
+inherit autotools pkgconfig 
+
+do_stage () {
+	autotools_stage_all
+}

meta/packages/xorg-lib/libwindowswm_X11R7.0-1.0.0.bb

@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " virtual/libx11 libxext xextproto windowswmproto"
+
+XORG_PN = "libWindowsWM"
+

meta/packages/xorg-lib/libx11-native_6.2.1.bb

@@ -1,6 +1,6 @@
 SECTION = "x11/base"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-include libx11_${PV}.bb
+require libx11_${PV}.bb
 inherit native
 DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
 PROVIDES = ""

meta/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb

@@ -0,0 +1,25 @@
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+PROVIDES = "x11-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libX11-${PV}.tar.bz2"
+S = "${WORKDIR}/libX11-${PV}"
+
+inherit native 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
+}

meta/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb

@@ -0,0 +1,25 @@
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+PROVIDES = "x11-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libX11-${PV}.tar.bz2"
+S = "${WORKDIR}/libX11-${PV}"
+
+inherit native 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
+}

meta/packages/xorg-lib/libx11-native_cvs.bb

@@ -0,0 +1,5 @@
+SECTION = "x11/base"
+require libx11_cvs.bb
+inherit native
+DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
+PROVIDES = ""

meta/packages/xorg-lib/libx11/autofoo.patch

@@ -0,0 +1,22 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libX11-6.2.1/configure.ac~autofoo
++++ libX11-6.2.1/configure.ac
+@@ -7,12 +7,12 @@
+         [jg@freedesktop.org],
+         libX11)
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_INIT_AUTOMAKE([dist-bzip2])
++AC_CONFIG_AUX_DIR(.)
+ 
++AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+ AM_CONFIG_HEADER([src/config.h])
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Checks for programs.
+ AC_PROG_LIBTOOL

meta/packages/xorg-lib/libx11_20050226.bb

@@ -0,0 +1,6 @@
+SRCDATE = "20050226"
+
+require libx11_cvs.bb
+
+DEFAULT_PREFERENCE = "0"
+

meta/packages/xorg-lib/libx11_6.2.1.bb

@@ -3,7 +3,8 @@ LICENSE = "XFree86"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
-PROVIDES = "x11"
+PROVIDES = "virtual/libx11"
+RPROVIDES = "virtual/libx11"
 DESCRIPTION = "Base X libs."
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
 FILES_${PN}-locale += "${datadir}/X11/locale"

meta/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb

@@ -0,0 +1,22 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+
+DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+	libxdmcp xf86bigfontproto kbproto inputproto"
+PROVIDES = "virtual/libx11"
+RPROVIDES = "virtual/libx11"
+
+XORG_PN = "libX11"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+
+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
+}

meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb

@@ -0,0 +1,22 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+
+DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+	libxdmcp xf86bigfontproto kbproto inputproto"
+PROVIDES = "virtual/libx11"
+RPROVIDES = "virtual/libx11"
+
+XORG_PN = "libX11"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+
+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
+}

meta/packages/xorg-lib/libx11_cvs.bb

@@ -0,0 +1,42 @@
+PV = "6.2.1+cvs${SRCDATE}"
+LICENSE = "XFree86"
+PR = "r6"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
+PROVIDES = "virtual/libx11"
+RPROVIDES = "virtual/libx11"
+DESCRIPTION = "Base X libs."
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=X11 \
+	   file://errordb-keysymdb-path-fix.patch;patch=1"
+S = "${WORKDIR}/X11"
+
+inherit autotools pkgconfig 
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD
+#		unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+		oe_runmake -C src/util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys
+	)
+	rm -f ${STAGING_INCDIR}/X11/Xlib.h
+	oe_runmake
+}
+
+do_stage() {
+	install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h
+	install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h
+	install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h
+	install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h
+	install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h
+	install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h
+	install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h
+	install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h
+	install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h
+
+	oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR}
+}

meta/packages/xorg-lib/libx11_git.bb

@@ -0,0 +1,33 @@
+DEFAULT_PREFERENCE = "-1"
+
+DESCRIPTION = "Xlib/XCB: Xlib with XCB transport"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+
+DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
+PROVIDES = "virtual/libx11"
+RPROVIDES = "virtual/libx11"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
+S = "${WORKDIR}/git"
+
+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
+}

meta/packages/xorg-lib/libxau-native_0.1.1.bb

@@ -1,6 +1,6 @@
 SECTION = "x11/base"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
-include libxau_${PV}.bb
+require libxau_${PV}.bb
 inherit native
 DEPENDS = "xproto-native"
 PROVIDES = ""

meta/packages/xorg-lib/libxau-native_X11R7.0-1.0.0.bb

@@ -0,0 +1,11 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "xproto-native util-macros-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXau-${PV}.tar.bz2"
+S = "${WORKDIR}/libXau-${PV}"
+
+inherit native autotools pkgconfig

meta/packages/xorg-lib/libxau-native_X11R7.1-1.0.1.bb

@@ -0,0 +1,11 @@
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "xproto-native util-macros-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/libXau-${PV}.tar.bz2"
+S = "${WORKDIR}/libXau-${PV}"
+
+inherit native autotools pkgconfig

meta/packages/xorg-lib/libxau-native_cvs.bb

@@ -1,6 +1,6 @@
 SECTION = "x11/base"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
-include libxau_cvs.bb
+require libxau_cvs.bb
 inherit native
 DEPENDS = "xproto-native"
 PROVIDES = ""

meta/packages/xorg-lib/libxau_X11R7.0-1.0.0.bb

@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "A Sample Authorization Protocol for X"
+PRIORITY = "optional"
+
+DEPENDS += " xproto"
+PROVIDES = "xau"
+
+XORG_PN = "libXau"
+

meta/packages/xorg-lib/libxau_X11R7.1-1.0.1.bb

@@ -0,0 +1,10 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "A Sample Authorization Protocol for X"
+PRIORITY = "optional"
+
+DEPENDS += " xproto"
+PROVIDES = "xau"
+
+XORG_PN = "libXau"
+

meta/packages/xorg-lib/libxaw/auxdir.patch

@@ -0,0 +1,10 @@
+--- /tmp/configure.ac	2005-06-17 21:26:17.519157272 +0200
++++ libXaw-7.0.2/configure.ac	2005-06-17 21:26:34.832525240 +0200
+@@ -10,7 +10,6 @@
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ 
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ 
+ # Check for progs
+ AC_PROG_CC

meta/packages/xorg-lib/libxaw_7.0.2.bb

@@ -0,0 +1,21 @@
+SECTION = "x11/libs"
+LICENSE = "MIT"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "xproto virtual/libx11 libxt libxmu libxpm"
+PROVIDES = "xaw"
+DESCRIPTION = "X Athena Widgets library"
+
+SRC_URI = "${XLIBS_MIRROR}/libXaw-${PV}.tar.bz2 \
+	   file://auxdir.patch;patch=1"
+
+S = "${WORKDIR}/libXaw-${PV}"
+
+inherit autotools pkgconfig 
+
+# FIXME: libXaw needs a full x11, not diet
+BROKEN = "1"
+
+do_stage () {
+	autotools_stage_all
+}

meta/packages/xorg-lib/libxaw_X11R7.0-1.0.1.bb

@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Xaw is the X Athena Widget Set."
+
+DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+PROVIDES = "xaw"
+
+XORG_PN = "libXaw"
+
+do_stage () {
+	autotools_stage_all
+	ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6
+	ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7
+	ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so
+}

meta/packages/xorg-lib/libxaw_X11R7.1-1.0.2.bb

@@ -0,0 +1,15 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Xaw is the X Athena Widget Set."
+
+DEPENDS += " xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
+PROVIDES = "xaw"
+
+XORG_PN = "libXaw"
+
+do_stage () {
+	autotools_stage_all
+	ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6
+	ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7
+	ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so
+}

meta/packages/xorg-lib/libxaw_cvs.bb

@@ -0,0 +1,19 @@
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "xproto virtual/libx11 libxt libxmu libxpm"
+PROVIDES = "xaw"
+DESCRIPTION = "X Athena Widgets library"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xaw"
+S = "${WORKDIR}/Xaw"
+
+inherit autotools pkgconfig 
+
+# FIXME: libXaw needs a full x11, not diet
+BROKEN = "1"
+
+do_stage () {
+	oe_runmake install DESTDIR="" mandir=${STAGING_DATADIR}/man bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}

meta/packages/xorg-lib/libxcomposite/change-include-order.patch

@@ -0,0 +1,14 @@
+This patch makes the build use its own Xcomposite.h over rather than an
+older Xcomposite.h that might already be installed in the staging dir.
+
+--- libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am.orig	2006-03-12 20:10:17.000000000 +0100
++++ libXcomposite-X11R7.0-0.2.2.2/src/Makefile.am	2006-03-12 20:10:35.000000000 +0100
+@@ -21,7 +21,7 @@
+ #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ #  PERFORMANCE OF THIS SOFTWARE.
+ 
+-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
++AM_CFLAGS = -I$(top_srcdir)/include $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
+ 
+ lib_LTLIBRARIES = libXcomposite.la
+ 

meta/packages/xorg-lib/libxcomposite_1.0.1.bb

@@ -1,6 +1,6 @@
 SECTION = "x11/libs"
 LICENSE= "BSD-X"
-DEPENDS = "libx11 compositeext xextensions libxfixes"
+DEPENDS = "virtual/libx11 compositeext xextensions libxfixes"
 PROVIDES = "xcomposite"
 DESCRIPTION = "X Composite extension library."
 PR = "r1"

meta/packages/xorg-lib/libxcomposite_X11R7.0-0.2.2.2.bb

@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Composite extension library."
+LICENSE= "BSD-X"
+
+DEPENDS += " compositeproto virtual/libx11 libxfixes"
+PROVIDES = "xcomposite"
+
+XORG_PN = "libXcomposite"
+
+SRC_URI += " file://change-include-order.patch;patch=1"

meta/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb

@@ -0,0 +1,11 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X Composite extension library."
+LICENSE= "BSD-X"
+
+DEPENDS += " compositeproto virtual/libx11 libxfixes"
+PROVIDES = "xcomposite"
+
+XORG_PN = "libXcomposite"
+
+SRC_URI += " file://change-include-order.patch;patch=1"

meta/packages/xorg-lib/libxcomposite_cvs.bb

@@ -1,7 +1,7 @@
 PV = "0.0+cvs${SRCDATE}"
 LICENSE= "BSD-X"
 SECTION = "x11/libs"
-DEPENDS = "libx11 compositeext xextensions libxfixes"
+DEPENDS = "virtual/libx11 compositeext xextensions libxfixes"
 PROVIDES = "xcomposite"
 DESCRIPTION = "X Composite extension library."