This is the first step for the update to X11R7.1.
This will not build and will be followed by more patches and updates.
+++ /dev/null
-DESCRIPTION = "X application"
-SECTION = "x11/apps"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2"
-
-S = ${WORKDIR}/${PN}-X11R7.0-${PV}
-
-inherit autotools pkgconfig
-
-do_stage () {
- autotools_stage_all
-}
+++ /dev/null
-include app-common.inc
-DEPENDS = "libxfont"
+++ /dev/null
-include app-common.inc
-DEPENDS = "libx11 libice"
+++ /dev/null
-include app-common.inc
-DEPENDS = "mkfontscale"
+++ /dev/null
-include app-common.inc
-DEPENDS = "libfontenc freetype"
+++ /dev/null
-include app-common.inc
-DEPENDS = "libx11 libxt"
+++ /dev/null
-PR = "r1"
-
-include app-common.inc
-DEPENDS = "libx11 libxt libxmu"
-
-inherit update-alternatives
-
-ALTERNATIVE_PATH = "${bindir}/twm"
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "1"
-
-
-
+++ /dev/null
-diff -urN xauth.orig/Imakefile xauth/Imakefile
---- xauth.orig/Imakefile 2004-04-23 21:54:38.000000000 +0200
-+++ xauth/Imakefile 1970-01-01 01:00:00.000000000 +0100
-@@ -1,19 +0,0 @@
--XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:11 cpqbld Exp $
--
--
--
--
--XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.5tsi Exp $
--
-- DEPLIBS = $(DEPXAUTHLIB) $(DEPXMUULIB) $(DEPXLIB)
--LOCAL_LIBRARIES = $(XAUTHLIB) $(XMUULIB) $(XLIB)
-- SRCS = xauth.c gethost.c process.c parsedpy.c
-- OBJS = xauth.o gethost.o process.o parsedpy.o
-- CONN_DEFINES = $(CONNECTION_FLAGS)
-- DEPEND_DEFINES = $(CONN_DEFINES) $(SIGNAL_DEFINES)
--
--ComplexProgramTarget(xauth)
--
--SpecialCObjectRule(gethost,$(ICONFIGFILES),$(CONN_DEFINES) $(SIGNAL_DEFINES))
--SpecialCObjectRule(process,$(ICONFIGFILES),$(CONN_DEFINES) $(SIGNAL_DEFINES))
--SpecialCObjectRule(parsedpy,$(ICONFIGFILES),$(CONN_DEFINES))
-diff -urN xauth.orig/Makefile.am xauth/Makefile.am
---- xauth.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xauth/Makefile.am 2004-08-14 13:20:37.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# 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 Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD 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.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XAUTH_CFLAGS@
-+
-+bin_PROGRAMS = xauth
-+
-+xauth_SOURCES = gethost.c parsedpy.c process.c xauth.c xauth.h
-+
-+xauth_LDADD = @XAUTH_LIBS@
-+
-+man5_MANS=xauth.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xauth.orig/autogen.sh xauth/autogen.sh
---- xauth.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ xauth/autogen.sh 2004-08-14 13:15:46.000000000 +0200
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+autoreconf -v --install || exit 1
-+./configure --enable-maintainer-mode "$@"
-diff -urN xauth.orig/configure.ac xauth/configure.ac
---- xauth.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xauth/configure.ac 2004-08-14 23:43:54.000000000 +0200
-@@ -0,0 +1,57 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xauth],4.4.0,[],xauth)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XAUTH, xau xext xmuu x11)
-+
-+AC_TYPE_SIGNAL
-+
-+# Transport selection
-+AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes])
-+AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes])
-+AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes])
-+if test "$UNIXCONN" = "yes"; then
-+ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
-+fi
-+if test "$TCPCONN" = "yes"; then
-+ AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
-+fi
-+if test "$IPV6CONN" = "yes"; then
-+ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections])
-+fi
-+
-+AC_OUTPUT([Makefile])
+++ /dev/null
-include app-common.inc
-DEPENDS = "libx11 libxau libxext libxmu"
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-DEPENDS = "libx11 libxau libxmu libxext"
-DESCRIPTION = "X authority file utility"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
-SECTION = "x11/base"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xauth \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xauth"
-
-inherit autotools pkgconfig
+++ /dev/null
-include app-common.inc
-DEPENDS = "libx11 libxrender libxft libxkbfile libxaw"
+++ /dev/null
-include app-common.inc
-DEPENDS = "libx11 libxau libxext libxmu"
+++ /dev/null
-include app-common.inc
-DEPENDS = "libx11 twm xclock xeyes xrdb"
+++ /dev/null
-include app-common.inc
-DEPENDS = "libx11 libxkbfile"
+++ /dev/null
---- 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"
+++ /dev/null
-LICENSE = "MIT"
-DEPENDS = "libx11 libxext libxtst"
-DESCRIPTION = "X display information utility"
-SECTION = "x11/base"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2 \
- file://disable-xkb.patch;patch=1"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-EXTRA_OECONF = "--disable-xkb"
-
-inherit autotools pkgconfig
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-DEPENDS = "libx11 libxext libxtst"
-DESCRIPTION = "X display information utility"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "x11/base"
-PR = "r1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xdpyinfo"
-S = "${WORKDIR}/xdpyinfo"
-
-inherit autotools pkgconfig
+++ /dev/null
---- xev/xev.c 2004-02-06 11:00:37.000000000 -0800
-+++ xev/xev.new.c 2005-08-04 15:40:36.000000000 -0700
-@@ -149,7 +149,7 @@
- nbytes = XLookupString (e, str, 256, &ks, NULL);
-
- /* not supposed to call XmbLookupString on a key release event */
-- if (e->type == KeyPress && xic) {
-+ /*if (e->type == KeyPress && xic) {
- do {
- nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status);
- buf[nmbbytes] = '\0';
-@@ -159,7 +159,7 @@
- buf = realloc (buf, bsize);
- }
- } while (status == XBufferOverflow);
-- }
-+ }*/
-
- if (ks == NoSymbol)
- ksname = "NoSymbol";
-@@ -189,7 +189,7 @@
- }
-
- /* not supposed to call XmbLookupString on a key release event */
-- if (e->type == KeyPress && xic) {
-+ /*if (e->type == KeyPress && xic) {
- printf (" XmbLookupString gives %d bytes: ", nmbbytes);
- if (nmbbytes > 0) {
- dump (buf, nmbbytes);
-@@ -200,7 +200,7 @@
-
- printf (" XFilterEvent returns: %s\n",
- XFilterEvent (eventp, e->window) ? "True" : "False");
-- }
-+ }*/
- }
-
- static void
-@@ -857,7 +857,7 @@
- fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName);
- }
-
-- xim = XOpenIM (dpy, NULL, NULL, NULL);
-+ /*xim = XOpenIM (dpy, NULL, NULL, NULL);
- if (xim == NULL) {
- fprintf (stderr, "%s: XOpenIM failed\n", ProgramName);
- }
-@@ -884,7 +884,7 @@
- }
- XFree (xim_styles);
- }
-- }
-+ }*/
-
- screen = DefaultScreen (dpy);
-
-@@ -948,7 +948,7 @@
- printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw);
- }
-
-- if (xim && xim_style) {
-+ /*if (xim && xim_style) {
- xic = XCreateIC (xim,
- XNInputStyle, xim_style,
- XNClientWindow, w,
-@@ -958,7 +958,7 @@
- if (xic == NULL) {
- fprintf (stderr, "XCreateIC failed\n");
- }
-- }
-+ }*/
-
- for (done = 0; !done; ) {
- XEvent event;
+++ /dev/null
-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}-X11R7.0-${PV}.tar.bz2 \
- file://diet-x11.patch;patch=1"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-inherit autotools
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-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"
-PR = "r1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xev \
- file://diet-x11.patch;patch=1"
-S = "${WORKDIR}/xev"
-
-do_compile() {
- ${CC} -o xev xev.c -lX11 -lXau -I${STAGING_INCDIR} -L${STAGING_LIBDIR}
-}
-
-do_install() {
- install -d ${D}${bindir}
- install -m 755 ${PN} ${D}${bindir}
-}
+++ /dev/null
---- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100
-+++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100
-@@ -2038,11 +2038,11 @@
- */
- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
- ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
-- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
- LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
- LDPRELIB = LdPreLib $(INSTALLED_LIBS)
- LDPOSTLIB = LdPostLib
-- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING)
- CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-
- LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
---- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100
-+++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100
-@@ -114,7 +114,7 @@
- STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
- CDEBUGFLAGS = LibraryCDebugFlags
- CLIBDEBUGFLAGS = LibraryDebugOpt
-- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
-+ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
- # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
- PICFLAGS = LargePositionIndependentCFlags
- # endif
---- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100
-+++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100
-@@ -3359,7 +3359,7 @@
- FREETYPE2LIBDIR = Freetype2LibDir
- FREETYPE2INCDIR = Freetype2IncDir
- #if Freetype2LibDirStandard
--FREETYPE2LIB = -lfreetype
-+FREETYPE2LIB = $(LD_STAGING) -lfreetype
- #else
- FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype
- #endif
+++ /dev/null
-diff -Naur xc.old/config/pswrap/lexer.l xc/config/pswrap/lexer.l
---- xc.old/config/pswrap/lexer.l 2004-04-23 18:42:00.000000000 +0000
-+++ xc/config/pswrap/lexer.l 2004-11-16 21:07:10.569144105 +0000
-@@ -41,6 +41,7 @@
- #include <ctype.h>
- #include <stdlib.h>
- #include <string.h>
-+int yy_prev_more_offset;
-
- #include "pswpriv.h"
- #include "pswparser.h"
-diff -Naur xc.old/programs/twm/lex.l xc/programs/twm/lex.l
---- xc.old/programs/twm/lex.l 2004-04-23 18:42:00.000000000 +0000
-+++ xc/programs/twm/lex.l 2004-11-16 21:07:10.569144105 +0000
-@@ -65,6 +41,7 @@
- #include "gram.h"
- #include "list.h"
- #include "parse.h"
-+int yy_prev_more_offset;
-
- #ifdef FLEX_SCANNER
- int yylineno;
-diff -Naur xc.old/programs/xgc/lex.l xc/programs/xgc/lex.l
---- xc.old/programs/xgc/lex.l 2004-04-23 18:42:00.000000000 +0000
-+++ xc/programs/xgc/lex.l 2004-11-16 21:07:10.569144105 +0000
-@@ -11,6 +11,9 @@
- #include <X11/X.h>
- #include "gram.h"
- #include "constants.h"
-+
-+int yy_prev_more_offset;
-+
- #if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__UNIXOS2__)
- int yylineno = 0;
- #endif
-diff -Naur xc.old/programs/Xserver/hw/dmx/config/scanner.l xc/programs/Xserver/hw/dmx/config/scanner.l
---- xc.old/programs/Xserver/hw/dmx/config/scanner.l 2004-07-30 20:06:00.000000000 +0000
-+++ xc.old/programs/Xserver/hw/dmx/config/scanner.l 2004-11-16 21:07:10.569144105 +0000
-@@ -37,6 +37,9 @@
- #include "parser.h"
- #include <string.h>
- #include <ctype.h>
-+
-+int yy_prev_more_offset;
-+
- static int getdimension(int token, const char *text, int leng);
- static int getstring(int token, const char *text, int leng);
- static int gettoken(int token, const char *text, int leng);
+++ /dev/null
-SECTION = "x11/base"
-PR = "r1"
-# XXX Is this true? These fonts are from X.org.
-LICENSE = "XFree86"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;tag=XORG-6_8_0;method=pserver \
- file://lexer.patch;patch=1"
-
-
-PACKAGES = "${PN}-75dpi ${PN}-100dpi ${PN}-type1 ${PN}-cyrillic ${PN}-ttf ${PN}"
-FILES_${PN}-75dpi = "${libdir}/X11/fonts/75dpi"
-FILES_${PN}-100dpi = "${libdir}/X11/fonts/100dpi"
-FILES_${PN}-type1 = "${libdir}/X11/fonts/Type1"
-FILES_${PN}-ttf = "${libdir}/X11/fonts/TTF"
-FILES_${PN}-cyrillic = "${libdir}/X11/fonts/cyrillic"
-FILES_${PN} = "${libdir}/X11/fonts"
-
-PACKAGE_ARCH = "all"
-
-S = "${WORKDIR}/xc"
-
-do_configure() {
- echo "#define ProjectRoot /usr" >> config/cf/host.def
- echo "#define XnestServer NO" >> config/cf/host.def
- echo "#define XdmxServer NO" >> config/cf/host.def
- echo "#define CcCmd ${BUILD_CC}" >> config/cf/host.def
- echo "#define LdCmd ${BUILD_LD}" >> config/cf/host.def
- echo "#define BuildFreetype2Library YES" >> config/cf/host.def
- echo "#define HasFreetype2 NO" >> config/cf/host.def
- echo "" > config/cf/date.def
- make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake
- make CC="${BUILD_CC}" xmakefile
- make Makefiles
- make clean
-}
-
-do_compile() {
- #make depend
- make includes
- make -C config/util
- make -C lib/freetype2
- make -C lib/font
- make -C lib/fontenc
- make -C lib/fontconfig
- make -C programs/mkfontscale
- make -C programs/bdftopcf
- make -C programs/fc-cache
- make -C fonts
-}
-
-do_install() {
- make -C fonts DESTDIR="${D}" install
-}
-
-do_stage() {
- :
-}
+++ /dev/null
-diff -urN xhost.orig/Imakefile xhost/Imakefile
---- xhost.orig/Imakefile 2003-11-14 16:54:53.000000000 +0100
-+++ xhost/Imakefile 1970-01-01 01:00:00.000000000 +0100
-@@ -1,16 +0,0 @@
--XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:24 cpqbld Exp $
--#if HasSecureRPC
--RPC_DEFINES = -DSECURE_RPC
--#else
--RPC_DEFINES =
--#endif
--KRB5_DEFINES = Krb5Defines
--KRB5_INCLUDE = Krb5Includes
-- INCLUDES = $(KRB5_INCLUDE)
-- DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
--LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
-- SRCS = xhost.c
-- OBJS = xhost.o
-- DEFINES = ConnectionFlags $(SIGNAL_DEFINES) $(RPC_DEFINES) $(KRB5_DEFINES)
--
--ComplexProgramTarget(xhost)
-diff -urN xhost.orig/Makefile.am xhost/Makefile.am
---- xhost.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xhost/Makefile.am 2004-08-15 17:43:47.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# 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 Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD 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.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XHOST_CFLAGS@
-+
-+bin_PROGRAMS = xhost
-+
-+xhost_SOURCES = xhost.c
-+
-+xhost_LDADD = @XHOST_LIBS@
-+
-+man5_MANS=xhost.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xhost.orig/configure.ac xhost/configure.ac
---- xhost.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xhost/configure.ac 2004-08-15 17:43:42.000000000 +0200
-@@ -0,0 +1,57 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xhost],4.4.0,[],xhost)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XHOST, xext xmuu x11)
-+
-+AC_TYPE_SIGNAL
-+
-+# Transport selection
-+AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes])
-+AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes])
-+AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes])
-+if test "$UNIXCONN" = "yes"; then
-+ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
-+fi
-+if test "$TCPCONN" = "yes"; then
-+ AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
-+fi
-+if test "$IPV6CONN" = "yes"; then
-+ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections])
-+fi
-+
-+AC_OUTPUT([Makefile])
-diff -urN xhost.orig/xhost.c xhost/xhost.c
---- xhost.orig/xhost.c 2003-11-14 16:54:53.000000000 +0100
-+++ xhost/xhost.c 2004-08-15 17:53:07.000000000 +0200
-@@ -27,6 +27,10 @@
-
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #if defined(TCPCONN) || defined(STREAMSCONN)
- #define NEEDSOCKETS
- #endif
-@@ -102,11 +106,7 @@
- static int local_xerror();
- static char *get_hostname();
-
--#ifdef SIGNALRETURNSINT
--#define signal_t int
--#else
--#define signal_t void
--#endif
-+#define signal_t RETSIGTYPE
- static signal_t nameserver_lost();
-
- #define NAMESERVER_TIMEOUT 5 /* time to wait for nameserver */
+++ /dev/null
-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}-X11R7.0-${PV}.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-inherit autotools pkgconfig
+++ /dev/null
-FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
-LICENSE = "MIT"
-PV = "0.0+cvs${FIXEDSRCDATE}"
-DEPENDS = "libx11 libxext libxmu"
-DESCRIPTION = "server access control program for X"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
-SECTION = "x11/base"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xhost;date=${FIXEDSRCDATE} \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xhost"
-
-inherit autotools pkgconfig
+++ /dev/null
---- 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],
+++ /dev/null
---- 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;
+++ /dev/null
-
-#
-# 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;
-
+++ /dev/null
-SECTION = "x11/base"
-include libx11_${PV}.bb
-
-EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
-
-SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"
+++ /dev/null
-SECTION = "x11/base"
-include 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"
-
+++ /dev/null
-SECTION = "x11/base"
-include libx11_${PV}.bb
-
-PROVIDES += "libx11"
-
-EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
-
-SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
- file://fix-disable-xlocale.diff;patch=1 \
- file://fix-utf8-wrong-define.patch;patch=1"
-
-#do_stage_append () {
-# rm -f ${STAGING_INCDIR}/X11/XKBlib.h
-#}
+++ /dev/null
-SECTION = "x11/base"
-include libx11_${PV}.bb
-
-PROVIDES += "libx11"
-
-EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
-
-SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
- file://fix-disable-xlocale.diff;patch=1 \
- file://fix-utf8-wrong-define.patch;patch=1"
+++ /dev/null
-SECTION = "x11/base"
-include 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"
+++ /dev/null
---- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200
-+++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200
-@@ -56,7 +56,7 @@
- #include <stdio.h>
-
- #ifndef ERRORDB
--#define ERRORDB "/usr/lib/X11/XErrorDB"
-+#define ERRORDB "/usr/share/X11/XErrorDB"
- #endif
-
- /*
---- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200
-+++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200
-@@ -36,7 +36,7 @@
- #include "Key.h"
-
- #ifndef KEYSYMDB
--#define KEYSYMDB "/usr/lib/X11/XKeysymDB"
-+#define KEYSYMDB "/usr/share/X11/XKeysymDB"
- #endif
-
- static Bool initialized;
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define
-+++ libX11-6.2.1/include/X11/Xlib.h
-@@ -100,7 +100,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;
-
+++ /dev/null
-DESCRIPTION = "X fontenc library (used by libxfont)."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "BSD-X"
-
-DEPENDS = "zlib xproto"
-
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
+++ /dev/null
-DESCRIPTION = "X fontenc library (used by libxfont)."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "BSD-X"
-
-DEPENDS = "zlib xproto"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libICE-6.3.3/configure.ac~autofoo 2004-05-11 01:50:07.000000000 -0400
-+++ libICE-6.3.3/configure.ac 2005-01-18 02:30:07.463895544 -0500
-@@ -8,12 +8,12 @@
- libICE)
-
- AC_CONFIG_SRCDIR([Makefile.am])
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
-
- AM_MAINTAINER_MODE
-
- AM_CONFIG_HEADER([config.h])
--AC_CONFIG_AUX_DIR(.)
-
- # Checks for programs.
- AC_PROG_LIBTOOL
+++ /dev/null
-SECTION = "libs"
-LICENSE= "MIT"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11"
-PROVIDES = "ice"
-DESCRIPTION = "X11 ICE library"
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libICE-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libICE-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage () {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X11 ICE library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "libx11 util-macros"
-PROVIDES = "ice"
-
-XORG_PN = "libICE"
-
-include xorg-xlibs.inc
+++ /dev/null
-DESCRIPTION = "X11 ICE library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "libx11 util-macros"
-PROVIDES = "ice"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libICE"
-
-include xorg-xlibs.inc
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "MIT"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "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
-}
+++ /dev/null
---- 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)
+++ /dev/null
-DESCRIPTION = "X11 keyboard library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "xextproto"
-
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-X11R7.0-${PV}.tar.bz2 \
- file://mkg3states.patch;patch=1"
-
-export CC_FOR_BUILD = "${BUILD_CC}"
-export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
+++ /dev/null
-DESCRIPTION = "X11 keyboard library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "xproto"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/${PN}-X11R7.1-${PV}.tar.bz2 \
- file://mkg3states.patch;patch=1"
-
-export CC_FOR_BUILD = "${BUILD_CC}"
-export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libSM-6.0.3/configure.ac~autofoo 2004-05-11 01:51:21.000000000 -0400
-+++ libSM-6.0.3/configure.ac 2005-01-18 12:15:50.405356376 -0500
-@@ -8,12 +8,12 @@
- libSM)
-
- AC_CONFIG_SRCDIR([Makefile.am])
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
-
- AM_MAINTAINER_MODE
-
- AM_CONFIG_HEADER([config.h])
--AC_CONFIG_AUX_DIR(.)
-
- # Checks for programs.
- AC_PROG_LIBTOOL
+++ /dev/null
-SECTION = "libs"
-LICENSE = "MIT-X"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11 libice"
-DESCRIPTION = "Session management library"
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libSM-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libSM-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage () {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "Session management library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "MIT-X"
-#PV="1:1.0.0"
-
-DEPENDS = "libx11 libice util-macros"
-
-XORG_PN = "libSM"
-
-include xorg-xlibs.inc
+++ /dev/null
-DESCRIPTION = "Session management library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "MIT-X"
-#PV="1:1.0.1"
-
-DEPENDS = "libx11 libice util-macros"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libSM"
-
-include xorg-xlibs.inc
+++ /dev/null
-PV = "6.0.3+cvs${SRCDATE}"
-LICENSE = "MIT-X"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "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
-}
+++ /dev/null
-SECTION = "x11/base"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-include libx11_${PV}.bb
-inherit native
-DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
-PROVIDES = ""
+++ /dev/null
-SECTION = "x11/base"
-include libx11_cvs.bb
-inherit native
-DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
-PROVIDES = ""
+++ /dev/null
-
-#
-# 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
+++ /dev/null
---- 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 )
- {
+++ /dev/null
-SRCDATE = "20050226"
-
-include libx11_cvs.bb
-
-DEFAULT_PREFERENCE = "0"
-
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE = "XFree86"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
-PROVIDES = "x11"
-DESCRIPTION = "Base X libs."
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
-FILES_${PN}-locale += "${datadir}/X11/locale"
-PR = "r4"
-
-SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
- file://errordb-keysymdb-path-fix.patch;patch=1 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libX11-${PV}"
-
-inherit autotools pkgconfig
-
-do_compile() {
- (
- unset CC LD CXX CCLD
-# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
- oe_runmake -C src/util 'CFLAGS= -D_GNU_SOURCE' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys
- )
- 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}
-}
+++ /dev/null
-DESCRIPTION = "Base X libs."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "XFree86"
-
-DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
-PROVIDES = "x11"
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
-FILES_${PN}-locale += "${datadir}/X11/locale"
-
-XORG_PN = "libX11"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
- )
- rm -f ${STAGING_INCDIR}/X11/Xlib.h
- oe_runmake
-}
+++ /dev/null
-DESCRIPTION = "Base X libs."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "XFree86"
-
-DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
-PROVIDES = "x11"
-
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
-FILES_${PN}-locale += "${datadir}/X11/locale"
-
-XORG_PN = "libX11"
-XORG_RELEASE = "X11R7.1"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
- )
- rm -f ${STAGING_INCDIR}/X11/Xlib.h
- oe_runmake
-}
+++ /dev/null
-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 = "x11"
-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}
-}
+++ /dev/null
-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 = "x11"
-
-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
-}
+++ /dev/null
-SECTION = "x11/base"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
-include libxau_${PV}.bb
-inherit native
-DEPENDS = "xproto-native"
-PROVIDES = ""
+++ /dev/null
-SECTION = "x11/base"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
-include libxau_cvs.bb
-inherit native
-DEPENDS = "xproto-native"
-PROVIDES = ""
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libXau-0.1.1/configure.ac~autofoo
-+++ libXau-0.1.1/configure.ac
-@@ -25,11 +25,10 @@
-
- AC_PREREQ([2.57])
- AC_INIT(libXau, [0.1.1], [keithp@keithp.com],libXau)
--AM_INIT_AUTOMAKE([dist-bzip2])
--AM_MAINTAINER_MODE
--
- AM_CONFIG_HEADER(config.h)
- AC_CONFIG_AUX_DIR(.)
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-
- AC_PROG_CC
- AC_PROG_INSTALL
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE= "MIT"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto"
-PROVIDES = "xau"
-DESCRIPTION = "Authorization Protocol for X."
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXau-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "Authorization Protocol for X."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "xproto util-macros"
-PROVIDES = "xau"
-
-XORG_PN = "libXau"
-
-include xorg-xlibs.inc
-
+++ /dev/null
-DESCRIPTION = "Authorization Protocol for X."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "xproto util-macros"
-PROVIDES = "xau"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXau"
-
-include xorg-xlibs.inc
-
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "MIT"
-PR = "r1"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto"
-PROVIDES = "xau"
-DESCRIPTION = "Authorization Protocol for X."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xau"
-S = "${WORKDIR}/Xau"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
---- /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
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE = "MIT"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "xproto 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
-}
+++ /dev/null
-DESCRIPTION = "X Athena Widgets library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "MIT"
-
-DEPENDS = "xproto libx11 libxt libxmu libxpm"
-PROVIDES = "xaw"
-
-XORG_PN = "libXaw"
-
-include xorg-xlibs.inc
-
-# FIXME: libXaw needs a full x11, not diet
-BROKEN = "1"
+++ /dev/null
-DESCRIPTION = "X Athena Widgets library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "MIT"
-
-DEPENDS = "xproto libx11 libxt libxmu libxpm"
-PROVIDES = "xaw"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXaw"
-
-include xorg-xlibs.inc
-
-# FIXME: libXaw needs a full x11, not diet
-BROKEN = "1"
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "xproto 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}
-}
+++ /dev/null
-Index: libXcomposite-1.0.1/configure.ac
-===================================================================
---- libXcomposite-1.0.1.orig/configure.ac 2004-01-15 03:59:12.000000000 -0500
-+++ libXcomposite-1.0.1/configure.ac 2005-01-18 17:05:25.573929256 -0500
-@@ -33,11 +33,11 @@
- dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
- dnl
- AC_INIT(libXcomposite, 1.0.1, [keithp@keithp.com], libXcomposite)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
-
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
-
- # Check for progs
- AC_PROG_CC
+++ /dev/null
-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
-
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-DEPENDS = "libx11 compositeext xextensions libxfixes"
-PROVIDES = "xcomposite"
-DESCRIPTION = "X Composite extension library."
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXcomposite-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXcomposite-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X Composite extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libx11 compositeproto xextproto libxfixes"
-PROVIDES = "xcomposite"
-
-XORG_PN = "libXcomposite"
-
-include xorg-xlibs.inc
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2 \
- file://change-include-order.patch;patch=1"
+++ /dev/null
-DESCRIPTION = "X Composite extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libx11 compositeproto libxfixes"
-PROVIDES = "xcomposite"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXcomposite"
-
-include xorg-xlibs.inc
-
-SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/libXcomposite-${PV}.tar.bz2 \
- file://change-include-order.patch;patch=1"
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "x11/libs"
-DEPENDS = "libx11 compositeext xextensions libxfixes"
-PROVIDES = "xcomposite"
-DESCRIPTION = "X Composite extension library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcomposite"
-S = "${WORKDIR}/Xcomposite"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libXcursor-1.1.2/configure.ac~autofoo 2004-01-16 23:38:26.000000000 -0500
-+++ libXcursor-1.1.2/configure.ac 2005-01-18 13:40:06.539707120 -0500
-@@ -31,11 +31,11 @@
- dnl not possible to extract the version number here from Xcursor.h
- dnl
- AC_INIT([libXcursor],1.1.2,[keithp@keithp.com],[libXcursor])
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AC_CONFIG_SRCDIR([Makefile.am])
- AM_MAINTAINER_MODE
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
-
- dnl libtool versioning
-
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
-Index: Xcursor/configure.ac
-===================================================================
---- Xcursor.orig/configure.ac 2004-04-12 10:11:12.000000000 -0400
-+++ Xcursor/configure.ac 2005-01-18 16:04:36.860617992 -0500
-@@ -31,11 +31,11 @@
- dnl not possible to extract the version number here from Xcursor.h
- dnl
- AC_INIT([libXcursor],1.1.3,[keithp@keithp.com],[libXcursor])
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AC_CONFIG_SRCDIR([Makefile.am])
- AM_MAINTAINER_MODE
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
-
- dnl libtool versioning
-
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DESCRIPTION = "X Cursor library"
-DEPENDS = "libxfixes"
-PR = "r2"
-
-SRC_URI = "${XLIBS_MIRROR}/libXcursor-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXcursor-${PV}"
-FILES_${PN} += "${libdir}/libXcursor.so"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X Cursor library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libxfixes"
-
-XORG_PN = "libXcursor"
-
-include xorg-xlibs.inc
-
-FILES_${PN} += "${libdir}/libXcursor.so"
+++ /dev/null
-DESCRIPTION = "X Cursor library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libxfixes"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXcursor"
-
-include xorg-xlibs.inc
-
-FILES_${PN} += "${libdir}/libXcursor.so"
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DESCRIPTION = "X Cursor library"
-DEPENDS = "libxfixes"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcursor"
-S = "${WORKDIR}/Xcursor"
-FILES_${PN} += "${libdir}/libXcursor.so"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-Index: libXdamage-1.0.1/configure.ac
-===================================================================
---- libXdamage-1.0.1.orig/configure.ac 2004-01-15 03:54:55.000000000 -0500
-+++ libXdamage-1.0.1/configure.ac 2005-01-18 19:07:16.951430928 -0500
-@@ -33,11 +33,11 @@
- dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
- dnl
- AC_INIT(libXdamage, 1.0.1, [keithp@keithp.com], libXdamage)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
-
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
-
- # Check for progs
- AC_PROG_CC
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- /dev/null
-+++ Xdamage/m4/pkg.m4
-@@ -0,0 +1,57 @@
-+
-+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-+dnl also defines GSTUFF_PKG_ERRORS on error
-+AC_DEFUN(PKG_CHECK_MODULES, [
-+ succeeded=no
-+
-+ if test -z "$PKG_CONFIG"; then
-+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+ fi
-+
-+ if test "$PKG_CONFIG" = "no" ; then
-+ echo "*** The pkg-config script could not be found. Make sure it is"
-+ echo "*** in your path, or set the PKG_CONFIG environment variable"
-+ echo "*** to the full path to pkg-config."
-+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+ else
-+ PKG_CONFIG_MIN_VERSION=0.9.0
-+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+ AC_MSG_CHECKING(for $2)
-+
-+ if $PKG_CONFIG --exists "$2" ; then
-+ AC_MSG_RESULT(yes)
-+ succeeded=yes
-+
-+ AC_MSG_CHECKING($1_CFLAGS)
-+ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-+ AC_MSG_RESULT($$1_CFLAGS)
-+
-+ AC_MSG_CHECKING($1_LIBS)
-+ $1_LIBS=`$PKG_CONFIG --libs "$2"`
-+ AC_MSG_RESULT($$1_LIBS)
-+ else
-+ $1_CFLAGS=""
-+ $1_LIBS=""
-+ ## If we have a custom action on failure, don't print errors, but
-+ ## do set a variable so people can do so.
-+ $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+ ifelse([$4], ,echo $$1_PKG_ERRORS,)
-+ fi
-+
-+ AC_SUBST($1_CFLAGS)
-+ AC_SUBST($1_LIBS)
-+ else
-+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+ fi
-+ fi
-+
-+ if test $succeeded = yes; then
-+ ifelse([$3], , :, [$3])
-+ else
-+ ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-+ fi
-+])
-+
-+
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-DEPENDS = "libx11 damageext libxfixes xproto"
-PROVIDES = "xdamage"
-DESCRIPTION = "X Damage extension library."
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXdamage-${PV}.tar.bz2 \
- file://m4.patch;patch=1 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXdamage-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X Damage extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libx11 damageproto libxfixes xproto"
-PROVIDES = "xdamage"
-
-XORG_PN = "libXdamage"
-
-include xorg-xlibs.inc
+++ /dev/null
-DESCRIPTION = "X Damage extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libx11 damageproto libxfixes xproto"
-PROVIDES = "xdamage"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXdamage"
-
-include xorg-xlibs.inc
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "x11/libs"
-DEPENDS = "libx11 damageext libxfixes xproto"
-PROVIDES = "xdamage"
-DESCRIPTION = "X Damage extension library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdamage \
- file://m4.patch;patch=1"
-S = "${WORKDIR}/Xdamage"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-SECTION = "x11/libs"
-include libxdmcp_${PV}.bb
-inherit native
-DEPENDS = "xproto-native"
-PROVIDES = ""
+++ /dev/null
-SECTION = "x11/libs"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxdmcp"
-include libxdmcp_${PV}.bb
-inherit native
-DEPENDS = "xproto-native"
-PROVIDES = ""
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libXdmcp-0.1.3/configure.ac~autofoo
-+++ libXdmcp-0.1.3/configure.ac
-@@ -25,12 +25,11 @@
-
- AC_PREREQ([2.57])
- AC_INIT(libXdmcp, [0.1.3], [keithp@keithp.com],libXdmcp)
-+AC_CONFIG_AUX_DIR(.)
-+AC_CONFIG_HEADERS([include/X11/Xdmcpconf.h])
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
--
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
--AC_CONFIG_HEADERS([include/X11/Xdmcpconf.h])
-
- AC_PROG_CC
- AC_PROG_INSTALL
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE= "MIT"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto"
-PROVIDES = "xdmcp"
-DESCRIPTION = "X Display Manager Control Protocol library."
-PR = "r1"
-S = "${WORKDIR}/libXdmcp-${PV}"
-
-SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE= "MIT"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto"
-PROVIDES = "xdmcp"
-DESCRIPTION = "X Display Manager Control Protocol library."
-PR = "r1"
-S = "${WORKDIR}/libXdmcp-${PV}"
-
-SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X Display Manager Control Protocol library."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "xproto util-macros"
-PROVIDES = "xdmcp"
-
-XORG_PN = "libXdmcp"
-
-include xorg-xlibs.inc
+++ /dev/null
-DESCRIPTION = "X Display Manager Control Protocol library."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "xproto util-macros"
-PROVIDES = "xdmcp"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXdmcp"
-
-include xorg-xlibs.inc
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "MIT"
-PR = "r1"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto"
-PROVIDES = "xdmcp"
-DESCRIPTION = "X Display Manager Control Protocol library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdmcp"
-S = "${WORKDIR}/Xdmcp"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-SECTION = "unknown"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext"
-include libxext_${PV}.bb
-inherit native
-DEPENDS = "libx11-native xextensions-native"
-PROVIDES = ""
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- Xext/configure.ac~autofoo
-+++ Xext/configure.ac
-@@ -8,9 +8,8 @@
- libXext)
-
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_INIT_AUTOMAKE([dist-bzip2])
--
- AC_CONFIG_AUX_DIR(.)
-+AM_INIT_AUTOMAKE([dist-bzip2])
-
- AM_MAINTAINER_MODE
-
+++ /dev/null
-DESCRIPTION = "X Server Extension library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "xproto libx11 xextproto util-macros"
-PROVIDES = "xext"
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-XORG_PN = "libXext"
-
-include xorg-xlibs.inc
-
+++ /dev/null
-DESCRIPTION = "X Server Extension library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE= "MIT"
-
-DEPENDS = "xproto libx11 util-macros"
-PROVIDES = "xext"
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXext"
-
-include xorg-xlibs.inc
-
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-PR = "r1"
-LICENSE= "MIT"
-DESCRIPTION = "X Server Extension library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "xproto libx11 xextensions"
-PROVIDES = "xext"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext"
-S = "${WORKDIR}/Xext"
-
-inherit autotools pkgconfig
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libXfixes-2.0.1/configure.ac~autofoo 2004-01-15 03:40:23.000000000 -0500
-+++ libXfixes-2.0.1/configure.ac 2005-01-18 13:35:33.461221360 -0500
-@@ -33,11 +33,11 @@
- dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
- dnl
- AC_INIT(libXfixes, 2.0.1, [keithp@keithp.com], libXfixes)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
-
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
-
- # Check for progs
- AC_PROG_CC
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE= "BSD-X"
-DEPENDS = "libx11 fixesext"
-DESCRIPTION = "X Fixes extension library."
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXfixes-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X Fixes extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libx11 fixesproto"
-
-XORG_PN = "libXfixes"
-
-include xorg-xlibs.inc
+++ /dev/null
-DESCRIPTION = "X Fixes extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE= "BSD-X"
-
-DEPENDS = "libx11 fixesproto"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXfixes"
-
-include xorg-xlibs.inc
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-SECTION = "x11/libs"
-DEPENDS = "libx11 fixesext"
-DESCRIPTION = "X Fixes extension library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes"
-S = "${WORKDIR}/Xfixes"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libXfont-1.4.2/configure.ac~autofoo 2004-05-06 20:19:03.000000000 -0400
-+++ libXfont-1.4.2/configure.ac 2005-01-16 12:14:14.042598720 -0500
-@@ -35,9 +35,9 @@
- dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
- dnl not possible to extract the version number here from Xfont.h
- dnl
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
- AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h])
-
- # Check for progs
+++ /dev/null
-Index: fontfile/fontdir.c
-===================================================================
-RCS file: /cvs/xlibs/Xfont/fontfile/fontdir.c,v
-retrieving revision 3.22
-diff -u -r3.22 fontdir.c
---- xfont/fontfile/fontdir.c 7 Jul 2003 16:40:11 -0000 3.22
-+++ xfont/fontfile/fontdir.c 30 Dec 2004 20:37:12 -0000
-@@ -699,6 +699,11 @@
- */
- if (isscale)
- {
-+ /* If the fontname says it is scalable, make sure that the
-+ * renderer supports OpenScalable and GetInfoScalable.
-+ */
-+ if (renderer->OpenScalable && renderer->GetInfoScalable)
-+ {
- if (vals.values_supplied & SIZE_SPECIFY_MASK)
- {
- bzero((char *)&zeroVals, sizeof(zeroVals));
-@@ -798,6 +803,7 @@
- bitmap->name.name);
- }
- }
-+ }
- }
- return TRUE;
- }
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE = "BSD-X"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto xtrans zlib"
-PROVIDES = "xfont"
-DESCRIPTION = "X font library (used by the X server)."
-PR = "r2"
-
-SRC_URI = "${XLIBS_MIRROR}/libXfont-${PV}.tar.bz2 \
- file://scalable.patch;patch=1 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXfont-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-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 freetype"
-PROVIDES = "xfont"
-
-XORG_PN = "libXfont"
-
-include xorg-xlibs.inc
+++ /dev/null
-DESCRIPTION = "X font library (used by the X server)."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "BSD-X"
-
-DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype"
-PROVIDES = "xfont"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXfont"
-
-include xorg-xlibs.inc
+++ /dev/null
-DESCRIPTION = "X font library (used by the X server)."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "BSD-X"
-
-DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype"
-PROVIDES = "xfont"
-
-XORG_PN = "libXfont"
-
-include xorg-xlibs.inc
-
-SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2"
-S = "${WORKDIR}/${XORG_PN}-1.2.0"
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "BSD-X"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto xtrans zlib"
-PROVIDES = "xfont"
-DESCRIPTION = "X font library (used by the X server)."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfont \
- file://scalable.patch;patch=1"
-S = "${WORKDIR}/Xfont"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libXft-2.1.6/configure.ac~autofoo 2004-03-22 10:02:59.000000000 -0500
-+++ libXft-2.1.6/configure.ac 2005-01-17 02:08:10.165951760 -0500
-@@ -33,12 +33,12 @@
- dnl Please bump the minor library number at each release as well.
- dnl
- AC_INIT(libXft, 2.1.6, [keithp@keithp.com], libXft)
-+AC_CONFIG_AUX_DIR(.)
-
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
-
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
-
- # checks for progs
- AC_PROG_CC
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-DEPENDS = "libx11 xproto libxrender freetype fontconfig"
-DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
-PROVIDES = "xft"
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXft-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-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)
-}
+++ /dev/null
-DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
-LICENSE = "MIT-X"
-SECTION = "x11/libs"
-
-DEPENDS = "libx11 xproto libxrender freetype fontconfig"
-PROVIDES = "xft"
-
-
-XORG_PN = "libXft"
-
-include xorg-xlibs.inc
-
-FILES_${PN} = ${libdir}/lib*.so.*
-FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
- ${libdir}/*.a ${libdir}/pkgconfig \
- ${datadir}/aclocal ${bindir} ${sbindir}
-
-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)
-}
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT-X"
-SECTION = "x11/libs"
-DEPENDS = "libx11 xproto libxrender freetype fontconfig"
-DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
-PROVIDES = "xft"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xft"
-S = "${WORKDIR}/Xft"
-
-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)
-}
+++ /dev/null
-Index: libXi-6.0.1/configure.ac
-===================================================================
---- libXi-6.0.1.orig/configure.ac 2003-11-01 04:11:49.000000000 -0500
-+++ libXi-6.0.1/configure.ac 2005-01-20 11:34:06.878357352 -0500
-@@ -8,7 +8,6 @@
- AM_MAINTAINER_MODE
-
- AM_CONFIG_HEADER([config.h])
--AC_CONFIG_AUX_DIR(.)
-
- # Checks for programs.
- AC_PROG_LIBTOOL
+++ /dev/null
-DESCRIPTION = "X Input Extension library"
-LICENSE = "MIT-X"
-SECTION = "x11/libs"
-DEPENDS = "xproto libx11 xextensions"
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXi-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
-
+++ /dev/null
-DESCRIPTION = "X Input extension library."
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-
-DEPENDS = "xproto libx11 libxext"
-
-XORG_PN = "libXi"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
+++ /dev/null
-DESCRIPTION = "X Input extension library."
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-
-DEPENDS = "xproto libx11 libxext"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXi"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT-X"
-SECTION = "x11/libs"
-DEPENDS = "xproto libx11 xextensions"
-DESCRIPTION = "X Input extension library."
-PR = "r1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xi \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/Xi"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "Xinerama library"
-LICENSE = "MIT"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "panoramixext xproto libx11 libxext"
-PROVIDES = "xinerama"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama;date=20050505"
-S = "${WORKDIR}/Xinerama"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-LICENSE = "MIT"
-DESCRIPTION = "Xinerama library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "panoramixext xproto libx11 libxext"
-PROVIDES = "xinerama"
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXinerama-${PV}.tar.bz2"
-S = "${WORKDIR}/libXinerama-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "Xinerama library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "MIT"
-
-DEPENDS = "xineramaproto xproto libx11 libxext"
-PROVIDES = "xinerama"
-
-XORG_PN = "libXinerama"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
+++ /dev/null
-DESCRIPTION = "Xinerama library"
-LICENSE = "MIT"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "panoramixext xproto libx11 libxext"
-PROVIDES = "xinerama"
-PV = "0.0+cvs${SRCDATE}"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama"
-S = "${WORKDIR}/Xinerama"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X11 keyboard library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "libx11"
-
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
+++ /dev/null
-DESCRIPTION = "X11 keyboard library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "libx11"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
+++ /dev/null
-LICENSE = "GPL"
-PV = "0.0+cvs${SRCDATE}"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "libx11"
-DESCRIPTION = "X11 keyboard library"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xkbfile"
-S = "${WORKDIR}/xkbfile"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X11 keyboard library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "libx11 libxt libxkbfile kbproto"
-
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
-
+++ /dev/null
-DESCRIPTION = "X11 keyboard library"
-SECTION = "libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "libx11 libxt libxkbfile"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
-
+++ /dev/null
-DESCRIPTION = "X Window System miscellaneous utility library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "MIT"
-
-DEPENDS = "libxt libxext util-macros"
-PROVIDES = "xmu"
-
-XORG_PN = "libXmu"
-
-include xorg-xlibs.inc
-
-PACKAGES =+ "libxmuu libxmuu-dev"
-
-FILES_libxmuu = "${libdir}/libXmuu.so.*"
-FILES_libxmuu-dev = "${libdir}/libXmuu.so"
-
-LEAD_SONAME = "libXmu"
+++ /dev/null
-DESCRIPTION = "X Window System miscellaneous utility library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "MIT"
-
-DEPENDS = "libxt libxext util-macros"
-PROVIDES = "xmu"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXmu"
-
-include xorg-xlibs.inc
-
-PACKAGES =+ "libxmuu libxmuu-dev"
-
-FILES_libxmuu = "${libdir}/libXmuu.so.*"
-FILES_libxmuu-dev = "${libdir}/libXmuu.so"
-
-LEAD_SONAME = "libXmu"
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "libxt libxext"
-PROVIDES = "xmu"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xmu"
-S = "${WORKDIR}/Xmu"
-
-PACKAGES =+ "xmuu xmuu-dev"
-
-FILES_xmuu = "${libdir}/libXmuu.so.*"
-FILES_xmuu-dev = "${libdir}/libXmuu.so"
-
-inherit autotools pkgconfig
-
-do_stage () {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X print extension library."
-SECTION = "libs"
-#MAINTAINER = ""
-LICENSE = "MIT"
-
-DEPENDS = "libx11 libxext xextproto libxau printproto"
-
-XORG_PN = "libXp"
-
-include xorg-xlibs.inc
-
-CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
-EXTRA_OECONF="--enable-malloc0returnsnull"
+++ /dev/null
-
-LICENSE = "MIT"
-PV = "0.0+cvs${SRCDATE}"
-
-SECTION = "libs"
-DEPENDS = "libx11 libxext"
-DESCRIPTION = "X print extension library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xp"
-S = "${WORKDIR}/Xp"
-
-inherit autotools pkgconfig
-
-CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-Index: libXpm-3.5.1/configure.ac
-===================================================================
---- libXpm-3.5.1.orig/configure.ac 2004-05-11 02:00:35.000000000 -0400
-+++ libXpm-3.5.1/configure.ac 2005-01-19 18:35:57.187402008 -0500
-@@ -1,12 +1,12 @@
- AC_PREREQ(2.57)
- AC_INIT([libXpm], 3.5.1, [daniel@freedesktop.org], libXpm)
- AC_CONFIG_SRCDIR([Makefile.am])
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
-
- AM_MAINTAINER_MODE
-
- AM_CONFIG_HEADER([lib/config.h])
--AC_CONFIG_AUX_DIR(.)
-
- # Checks for programs.
- AC_PROG_LIBTOOL
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE = "X-BSD"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto libx11"
-PROVIDES = "xpm"
-DESCRIPTION = "X Pixmap library."
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXpm-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXpm-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage () {
- install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h
- oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR}
-}
+++ /dev/null
-DESCRIPTION = "X Pixmap library."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "X-BSD"
-PR = "r1"
-
-DEPENDS = "xproto libx11 util-macros"
-
-XORG_PN = "libXpm"
-
-include xorg-xlibs.inc
-
-do_stage () {
- install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h
- oe_libinstall -a -so libXpm ${STAGING_LIBDIR}
-}
-
-PACKAGES =+ "sxpm cxpm"
-FILES_cxpm = "${bindir}/cxpm"
-FILES_sxpm = "${bindir}/sxpm"
+++ /dev/null
-DESCRIPTION = "X Pixmap library."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "X-BSD"
-
-DEPENDS = "xproto libx11 util-macros"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXpm"
-
-include xorg-xlibs.inc
-
-do_stage () {
- install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h
- oe_libinstall -a -so libXpm ${STAGING_LIBDIR}
-}
-
-PACKAGES =+ "sxpm cxpm"
-FILES_cxpm = "${bindir}/cxpm"
-FILES_sxpm = "${bindir}/sxpm"
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "X-BSD"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "xproto libx11"
-PROVIDES = "xpm"
-DESCRIPTION = "X Pixmap library."
-PR = "r1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xpm"
-S = "${WORKDIR}/Xpm"
-
-inherit autotools pkgconfig
-
-do_stage () {
- install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h
- oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR}
-}
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libXrandr-1.0.2/configure.ac~autofoo 2004-01-15 03:23:00.000000000 -0500
-+++ libXrandr-1.0.2/configure.ac 2005-01-16 11:18:35.924069872 -0500
-@@ -33,11 +33,11 @@
- dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
- dnl
- AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
-
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
-
- # Check for progs
- AC_PROG_CC
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- Xrandr/configure.ac~autofoo.patch 2004-07-01 15:01:55.000000000 -0400
-+++ Xrandr/configure.ac 2005-01-16 11:22:09.169651616 -0500
-@@ -33,11 +33,11 @@
- dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
- dnl
- AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
-
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
-
- # Check for progs
- AC_PROG_CC
---- Xrandr/ChangeLog~autofoo.patch 2004-09-19 04:53:38.000000000 -0400
-+++ Xrandr/ChangeLog 2005-01-16 11:52:29.694889712 -0500
-@@ -1,3 +1,7 @@
-+2005-01-16 Chris Larson <kergoth@handhelds.org>
-+
-+ * configure.ac: Fix to work with automake 1.9.x.
-+
- 2004-09-19 Carlos Romero <kidcrash@freedesktop.org>
-
- * Makefile.am:
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE = "BSD-X"
-DEPENDS = "randrext libx11 libxrender libxext"
-DESCRIPTION = "X Resize and Rotate extension library."
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXrandr-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXrandr-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X Resize and Rotate extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE = "BSD-X"
-
-DEPENDS = "randrproto libx11 libxrender libxext"
-
-XORG_PN = "libXrandr"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
+++ /dev/null
-DESCRIPTION = "X Resize and Rotate extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE = "BSD-X"
-
-DEPENDS = "randrproto libx11 libxrender libxext"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXrandr"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "BSD-X"
-SECTION = "x11/libs"
-DEPENDS = "randrext libx11 libxrender libxext"
-DESCRIPTION = "X Resize and Rotate extension library."
-PR = "r1"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrandr"
-S = "${WORKDIR}/Xrandr"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libXrender-0.8.4/configure.ac~autofoo
-+++ libXrender-0.8.4/configure.ac
-@@ -33,11 +33,10 @@
- dnl protocol, so Xrender version l.n.m corresponds to protocol version l.n
- dnl
- AC_INIT(libXrender, 0.8.4, [keithp@keithp.com], libXrender)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
--
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
-
- # Check for progs
- AC_PROG_CC
+++ /dev/null
-SECTION = "libs"
-DEPENDS = "renderext libx11"
-DESCRIPTION = "X Render extension library."
-LICENSE = "BSD"
-PR = "r1"
-
-SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXrender-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X Render extension library."
-SECTION = "libs"
-#MAINTAINER = ""
-LICENSE = "BSD"
-
-DEPENDS = "renderproto libx11"
-
-XORG_PN = "libXrender"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
+++ /dev/null
-DESCRIPTION = "X Render extension library."
-SECTION = "libs"
-#MAINTAINER = ""
-LICENSE = "BSD"
-
-DEPENDS = "renderproto libx11"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXrender"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-PR = "r1"
-SECTION = "libs"
-DEPENDS = "renderext libx11"
-DESCRIPTION = "X Render extension library."
-LICENSE = "BSD"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrender"
-S = "${WORKDIR}/Xrender"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-SECTION = "x11/libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "libx11 xextensions libxext resourceext"
-PROVIDES = "xres"
-DESCRIPTION = "X Resource usage library."
-LICENSE = "X-MIT"
-SRC_URI = "${XLIBS_MIRROR}/libXres-${PV}.tar.bz2"
-S = "${WORKDIR}/libXres-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X Resource usage library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE = "X-MIT"
-
-DEPENDS = "libx11 xextproto libxext resourceproto"
-PROVIDES = "xres"
-
-XORG_PN = "libXres"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
+++ /dev/null
-DESCRIPTION = "X Resource usage library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE = "X-MIT"
-
-DEPENDS = "libx11 libxext"
-PROVIDES = "xres"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXres"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-SECTION = "x11/libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "libx11 xextensions libxext resourceext"
-PROVIDES = "xres"
-DESCRIPTION = "X Resource usage library."
-LICENSE = "X-MIT"
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XRes"
-S = "${WORKDIR}/XRes"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X screen saver extension library."
-SECTION = "libs"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "libx11 libxext xextproto scrnsaverproto"
-PROVIDES = "libxss"
-RREPLACES = "libxss"
-
-XORG_PN = "libXScrnSaver"
-
-include xorg-xlibs.inc
-
-#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
-EXTRA_OECONF="--enable-malloc0returnsnull"
+++ /dev/null
-LICENSE = "GPL"
-
-PV = "0.0+cvs${SRCDATE}"
-PR = "r2"
-
-SECTION = "libs"
-DEPENDS = "libx11 libxext"
-DESCRIPTION = "X screen saver extension library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xss"
-S = "${WORKDIR}/Xss"
-
-inherit autotools pkgconfig
-
-#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libXt-0.1.5/configure.ac~autofoo 2004-05-06 20:19:04.000000000 -0400
-+++ libXt-0.1.5/configure.ac 2005-01-18 13:10:13.683262728 -0500
-@@ -28,11 +28,11 @@
- dnl
- dnl
- AC_INIT(libXt, 0.1.5, [keithp@keithp.com], libXt)
-+AC_CONFIG_AUX_DIR(.)
- AM_INIT_AUTOMAKE([dist-bzip2])
- AM_MAINTAINER_MODE
-
- AM_CONFIG_HEADER(config.h)
--AC_CONFIG_AUX_DIR(.)
-
- # Check for progs
- AC_PROG_CC
+++ /dev/null
-SECTION = "x11/libs"
-PRIORITY = "optional"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "libx11 libsm"
-PROVIDES = "xt"
-DESCRIPTION = "X Toolkit Intrinsics"
-LICENSE = "X-MIT"
-PR = "r1"
-SRC_URI = "${XLIBS_MIRROR}/libXt-${PV}.tar.bz2 \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/libXt-${PV}"
-
-PARALLEL_MAKE = ""
-
-inherit autotools pkgconfig
-
-#nasty hack as utils need to be native
-do_compile() {
- (
- unset CC LD CXX CCLD
-# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
- oe_runmake -C util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs
- )
- oe_runmake
-}
-
-do_stage () {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X Toolkit Intrinsics"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "X-MIT"
-
-DEPENDS = "libx11 libsm util-macros kbproto"
-PROVIDES = "xt"
-
-XORG_PN = "libXt"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
-
-do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
- )
- oe_runmake
-}
+++ /dev/null
-DESCRIPTION = "X Toolkit Intrinsics"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "X-MIT"
-
-DEPENDS = "libx11 libsm util-macros"
-PROVIDES = "xt"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXt"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
-
-do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
- )
- oe_runmake
-}
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "libx11 libsm"
-PROVIDES = "xt"
-DESCRIPTION = "X Toolkit Intrinsics"
-LICENSE = "X-MIT"
-PR = "r1"
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xt"
-S = "${WORKDIR}/Xt"
-
-inherit autotools pkgconfig
-
-
-do_compile() {
- (
- unset CC LD CXX CCLD
- oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs
- )
- oe_runmake
-}
-
-
-do_stage () {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X Test Extension: client side library"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "libx11 libxext recordproto xextproto inputproto"
-PROVIDES = "xtst"
-
-XORG_PN = "libXtst"
-
-include xorg-xlibs.inc
+++ /dev/null
-LICENSE = "GPL"
-PV = "0.0+cvs${SRCDATE}"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-DEPENDS = "libx11 recordext libxext"
-PROVIDES = "xtst"
-DESCRIPTION = "X Test Extension: client side library"
-PR = "r3"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xtst"
-S = "${WORKDIR}/Xtst"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-LICENSE = "GPL"
-SECTION = "x11/libs"
-DEPENDS = "libx11 libxext"
-DESCRIPTION = "X Video extension library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xv;date=20040918;method=pserver"
-S = "${WORKDIR}/Xv"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-LICENSE = "GPL"
-SECTION = "x11/libs"
-DEPENDS = "libx11 libxext"
-DESCRIPTION = "X Video extension library."
-
-SRC_URI = "${XLIBS_MIRROR}/libXv-${PV}.tar.bz2"
-S = "${WORKDIR}/libXv-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X Video extension library."
-SECTION = "x11/libs"
-#MAINTAINER = ""
-LICENSE = "GPL"
-
-DEPENDS = "libx11 libxext xextproto videoproto"
-
-XORG_PN = "libXv"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
+++ /dev/null
---- XvMC/hw/via/Makefile.am.old 2005-03-06 11:25:11.000000000 +0000
-+++ XvMC/hw/via/Makefile.am 2005-03-06 11:25:22.000000000 +0000
-@@ -1,5 +1,5 @@
- AM_CFLAGS = $(XVMC_CFLAGS)
--libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
-+libviaXvMC_la_LIBADD = $(XVMC_LIBS) -ldrm
-
- lib_LTLIBRARIES = libviaXvMC.la
-
+++ /dev/null
---- XvMC/hw/via/viaXvMC.c.old 2004-10-18 20:54:49.000000000 +0100
-+++ XvMC/hw/via/viaXvMC.c 2004-10-18 20:55:03.000000000 +0100
-@@ -43,6 +43,8 @@
- #include <xf86drm.h>
- #include <pthread.h>
- #include "vldXvMC.h"
-+
-+#define TRUE 1
-
- #define SAREAPTR(ctx) ((ViaXvMCSAreaPriv *) \
- (((CARD8 *)(ctx)->sAreaAddress) + \
+++ /dev/null
---- XvMC/configure.ac.old 2004-09-18 13:16:31.000000000 +0100
-+++ XvMC/configure.ac 2004-09-18 13:16:32.000000000 +0100
-@@ -14,4 +14,5 @@
- AC_OUTPUT([Makefile
- hw/Makefile
- hw/i810/Makefile
-+ hw/via/Makefile
- xvmc.pc])
---- /dev/null 2004-06-13 02:32:19.000000000 +0100
-+++ XvMC/hw/via/Makefile.am 2004-09-18 13:16:01.000000000 +0100
-@@ -0,0 +1,7 @@
-+AM_CFLAGS = $(XVMC_CFLAGS)
-+libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
-+
-+lib_LTLIBRARIES = libviaXvMC.la
-+
-+libviaXvMC_la_SOURCES = viaXvMC.c viaXvMC.h viaLowLevel.c viaLowLevel.h \
-+ viaXvMCPriv.h
---- XvMC/hw/Makefile.am.old 2004-10-17 22:34:27.000000000 +0100
-+++ XvMC/hw/Makefile.am 2004-10-17 22:34:31.000000000 +0100
-@@ -1 +1 @@
--SUBDIRS = i810
-+SUBDIRS = i810 via
+++ /dev/null
-DESCRIPTION = "X Video Motion Compensation extension library."
-SECTION = "x11/libs"
-DEPENDS = "libx11 libxext libxv drm xserver-xorg"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
- cvs://anonymous@cvs.sourceforge.net/cvsroot/unichrome;module=libxvmc;date=${PV};method=pserver \
- file://via.patch;patch=1 \
- file://true.patch"
-S = "${WORKDIR}/XvMC"
-
-CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg"
-
-# this one is for via only atm.
-COMPATIBLE_HOST = 'i.86.*-linux'
-
-inherit autotools pkgconfig
-
-do_configure_prepend() {
- install -d ${S}/hw/via
- cp ${WORKDIR}/libxvmc/*.[ch] ${S}/hw/via/
- ( cd ${S}/hw/via ; patch < ${WORKDIR}/true.patch )
-}
-
-do_compile() {
- oe_runmake
- oe_runmake -C hw/via
-}
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DATADIR}/man
- oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
- install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
-}
+++ /dev/null
-DESCRIPTION = "X Video Motion Compensation extension library."
-SECTION = "x11/libs"
-DEPENDS = "libx11 libxext libxv drm xserver-xorg"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
- file://true.patch;patch=1 file://drm.patch;patch=1"
-S = "${WORKDIR}/XvMC"
-
-CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE"
-
-# this one is for via only atm.
-COMPATIBLE_HOST = 'i.86.*-linux'
-
-inherit autotools pkgconfig
-
-do_compile() {
- oe_runmake
- oe_runmake -C hw/via
-}
-
-do_install() {
- oe_runmake DESTDIR='${D}' install
- oe_runmake -C hw/via DESTDIR='${D}' install
-}
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DATADIR}/man
- oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
- install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
-}
+++ /dev/null
-DESCRIPTION = "X Video Motion Compensation extension library."
-SECTION = "x11/libs"
-DEPENDS = "libx11 libxext libxv drm xserver-xorg"
-PR = "r0"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
- ${FREEDESKTOP_CVS}/xorg;module=xc/lib/XvMC;date=${PV};method=pserver \
- file://true.patch;patch=1 file://drm.patch;patch=1"
-S = "${WORKDIR}/XvMC"
-
-CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE"
-
-# this one is for via only atm.
-COMPATIBLE_HOST = 'i.86.*-linux'
-
-inherit autotools pkgconfig
-
-do_compile() {
- oe_runmake
- oe_runmake -C hw/via
-}
-
-do_install() {
- oe_runmake DESTDIR='${D}' install
- oe_runmake -C hw/via DESTDIR='${D}' install
-}
-
-do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
- bindir=${STAGING_BINDIR} \
- includedir=${STAGING_INCDIR} \
- libdir=${STAGING_LIBDIR} \
- datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DATADIR}/man
- oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
- install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
-}
+++ /dev/null
-DESCRIPTION = "Xxf86dga extension library."
-SECTION = "x11/libs"
-LICENSE = "XFree86"
-
-DEPENDS = "libx11 libxext xf86dgaproto"
-
-XORG_PN = "libXxf86dga"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
- oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
-}
+++ /dev/null
-DESCRIPTION = "Xxf86dga extension library."
-SECTION = "x11/libs"
-LICENSE = "XFree86"
-
-DEPENDS = "libx11 libxext"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXxf86dga"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
-do_stage() {
- oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
-}
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "XFree86"
-
-SECTION = "x11/libs"
-DEPENDS = "libx11 libxext xxf86dgaext"
-DESCRIPTION = "Xxf86dga extension library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86dga"
-S = "${WORKDIR}/Xxf86dga"
-
-inherit autotools pkgconfig
-
-do_stage() {
- oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
-}
+++ /dev/null
-DESCRIPTION = "Xxf86vm extension library."
-SECTION = "x11/libs"
-LICENSE = "MIT"
-DEPENDS = "libx11 libxext xf86miscproto"
-
-XORG_PN = "libXxf86misc"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
+++ /dev/null
-DESCRIPTION = "Xxf86vm extension library."
-SECTION = "x11/libs"
-LICENSE = "MIT"
-DEPENDS = "libx11 libxext"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXxf86misc"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
+++ /dev/null
-DESCRIPTION = "Xxf86vm extension library."
-SECTION = "x11/libs"
-LICENSE = "MIT"
-
-DEPENDS = "libx11 libxext xf86vidmodeproto"
-
-XORG_PN = "libXxf86vm"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
+++ /dev/null
-DESCRIPTION = "Xxf86vm extension library."
-SECTION = "x11/libs"
-LICENSE = "MIT"
-
-DEPENDS = "libx11 libxext"
-
-XORG_RELEASE = "X11R7.1"
-XORG_PN = "libXxf86vm"
-
-include xorg-xlibs.inc
-
-EXTRA_OECONF="--enable-malloc0returnsnull"
-
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-
-SECTION = "x11/libs"
-DEPENDS = "libx11 libxext xxf86vmext"
-DESCRIPTION = "Xxf86vm extension library."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86vm"
-S = "${WORKDIR}/Xxf86vm"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-DESCRIPTION = "X autotools macros"
-SECTION = "x11/libs"
-LICENSE= "Xorg"
-#MAINTAINER = ""
-
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-X11R7.0-${PV}.tar.bz2"
+++ /dev/null
-DESCRIPTION = "X autotools macros"
-SECTION = "x11/libs"
-LICENSE= "Xorg"
-#MAINTAINER = ""
-
-XORG_PN = "${PN}"
-XORG_RELEASE = "X11R7.1"
-
-include xorg-xlibs.inc
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/${PN}-X11R7.1-${PV}.tar.bz2"
+++ /dev/null
-XORG_PV = "${@['${XORG_RELEASE}-${PV}','${PV}'][bb.data.getVar('PV', d, 1)[0:4]=='X11R']}"
-XORG_RELEASE ?= "X11R7.0"
-
-SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/${XORG_PN}-${XORG_PV}.tar.bz2"
-S = "${WORKDIR}/${XORG_PN}-${XORG_PV}"
-
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-SECTION = "x11/base"
-include xtrans_${PV}.bb
-inherit native
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE = "MIT"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DESCRIPTION = "network API translation layer to \
-insulate X applications and libraries from OS \
-network vageries."
-
-SRC_URI = "${XLIBS_MIRROR}/libXtrans-0.1.tar.bz2"
-S = "${WORKDIR}/libXtrans-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-LICENSE = "MIT"
-SECTION = "x11/libs"
-DESCRIPTION = "network API translation layer to \
-insulate X applications and libraries from OS \
-network vageries."
-
-XORG_PN = "${PN}"
-
-include xorg-xlibs.inc
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-SECTION = "x11/libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DESCRIPTION = "network API translation layer to \
-insulate X applications and libraries from OS \
-network vageries."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xtrans"
-S = "${WORKDIR}/xtrans"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-diff -urN xmodmap.orig/Makefile.am xmodmap/Makefile.am
---- xmodmap.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xmodmap/Makefile.am 2004-08-31 19:49:33.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# 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 Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD 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.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XMODMAP_CFLAGS@
-+
-+bin_PROGRAMS = xmodmap
-+
-+xmodmap_SOURCES = exec.c handle.c pf.c wq.h xmodmap.c xmodmap.h
-+
-+xmodmap_LDADD = @XMODMAP_LIBS@
-+
-+man5_MANS=xmodmap.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xmodmap.orig/autogen.sh xmodmap/autogen.sh
---- xmodmap.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ xmodmap/autogen.sh 2004-08-31 19:46:14.000000000 +0200
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+autoreconf -v --install || exit 1
-+./configure --enable-maintainer-mode "$@"
-diff -urN xmodmap.orig/configure.ac xmodmap/configure.ac
---- xmodmap.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xmodmap/configure.ac 2004-08-31 20:27:03.000000000 +0200
-@@ -0,0 +1,41 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xmodmap],4.4.0,[],xmodmap)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XMODMAP, x11)
-+
-+AC_OUTPUT([Makefile])
+++ /dev/null
-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/${PN}-X11R7.0-1.0.0.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-inherit autotools pkgconfig
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
-SECTION = "x11/base"
-PR = "r1"
-
-DEPENDS = "libx11"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xmodmap"
-
-inherit autotools pkgconfig
--- /dev/null
+include app-common.inc
+DEPENDS = "libxfont"
--- /dev/null
+include app-common.inc
+DEPENDS = "libx11 libice"
--- /dev/null
+include app-common.inc
+DEPENDS = "mkfontscale"
--- /dev/null
+include app-common.inc
+DEPENDS = "libfontenc freetype"
--- /dev/null
+include app-common.inc
+DEPENDS = "libx11 libxt"
--- /dev/null
+PR = "r1"
+
+include app-common.inc
+DEPENDS = "libx11 libxt libxmu"
+
+inherit update-alternatives
+
+ALTERNATIVE_PATH = "${bindir}/twm"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "1"
+
+
+
--- /dev/null
+diff -urN xauth.orig/Imakefile xauth/Imakefile
+--- xauth.orig/Imakefile 2004-04-23 21:54:38.000000000 +0200
++++ xauth/Imakefile 1970-01-01 01:00:00.000000000 +0100
+@@ -1,19 +0,0 @@
+-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:11 cpqbld Exp $
+-
+-
+-
+-
+-XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.5tsi Exp $
+-
+- DEPLIBS = $(DEPXAUTHLIB) $(DEPXMUULIB) $(DEPXLIB)
+-LOCAL_LIBRARIES = $(XAUTHLIB) $(XMUULIB) $(XLIB)
+- SRCS = xauth.c gethost.c process.c parsedpy.c
+- OBJS = xauth.o gethost.o process.o parsedpy.o
+- CONN_DEFINES = $(CONNECTION_FLAGS)
+- DEPEND_DEFINES = $(CONN_DEFINES) $(SIGNAL_DEFINES)
+-
+-ComplexProgramTarget(xauth)
+-
+-SpecialCObjectRule(gethost,$(ICONFIGFILES),$(CONN_DEFINES) $(SIGNAL_DEFINES))
+-SpecialCObjectRule(process,$(ICONFIGFILES),$(CONN_DEFINES) $(SIGNAL_DEFINES))
+-SpecialCObjectRule(parsedpy,$(ICONFIGFILES),$(CONN_DEFINES))
+diff -urN xauth.orig/Makefile.am xauth/Makefile.am
+--- xauth.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xauth/Makefile.am 2004-08-14 13:20:37.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# 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 Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD 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.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XAUTH_CFLAGS@
++
++bin_PROGRAMS = xauth
++
++xauth_SOURCES = gethost.c parsedpy.c process.c xauth.c xauth.h
++
++xauth_LDADD = @XAUTH_LIBS@
++
++man5_MANS=xauth.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xauth.orig/autogen.sh xauth/autogen.sh
+--- xauth.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ xauth/autogen.sh 2004-08-14 13:15:46.000000000 +0200
+@@ -0,0 +1,3 @@
++#! /bin/sh
++autoreconf -v --install || exit 1
++./configure --enable-maintainer-mode "$@"
+diff -urN xauth.orig/configure.ac xauth/configure.ac
+--- xauth.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xauth/configure.ac 2004-08-14 23:43:54.000000000 +0200
+@@ -0,0 +1,57 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xauth],4.4.0,[],xauth)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XAUTH, xau xext xmuu x11)
++
++AC_TYPE_SIGNAL
++
++# Transport selection
++AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes])
++AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes])
++AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes])
++if test "$UNIXCONN" = "yes"; then
++ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
++fi
++if test "$TCPCONN" = "yes"; then
++ AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
++fi
++if test "$IPV6CONN" = "yes"; then
++ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections])
++fi
++
++AC_OUTPUT([Makefile])
--- /dev/null
+include app-common.inc
+DEPENDS = "libx11 libxau libxext libxmu"
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT"
+DEPENDS = "libx11 libxau libxmu libxext"
+DESCRIPTION = "X authority file utility"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "x11/base"
+PR = "r2"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xauth \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/xauth"
+
+inherit autotools pkgconfig
--- /dev/null
+include app-common.inc
+DEPENDS = "libx11 libxrender libxft libxkbfile libxaw"
--- /dev/null
+--- 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"
--- /dev/null
+LICENSE = "MIT"
+DEPENDS = "libx11 libxext libxtst"
+DESCRIPTION = "X display information utility"
+SECTION = "x11/base"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2 \
+ file://disable-xkb.patch;patch=1"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+
+EXTRA_OECONF = "--disable-xkb"
+
+inherit autotools pkgconfig
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT"
+DEPENDS = "libx11 libxext libxtst"
+DESCRIPTION = "X display information utility"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+SECTION = "x11/base"
+PR = "r1"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xdpyinfo"
+S = "${WORKDIR}/xdpyinfo"
+
+inherit autotools pkgconfig
--- /dev/null
+--- xev/xev.c 2004-02-06 11:00:37.000000000 -0800
++++ xev/xev.new.c 2005-08-04 15:40:36.000000000 -0700
+@@ -149,7 +149,7 @@
+ nbytes = XLookupString (e, str, 256, &ks, NULL);
+
+ /* not supposed to call XmbLookupString on a key release event */
+- if (e->type == KeyPress && xic) {
++ /*if (e->type == KeyPress && xic) {
+ do {
+ nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status);
+ buf[nmbbytes] = '\0';
+@@ -159,7 +159,7 @@
+ buf = realloc (buf, bsize);
+ }
+ } while (status == XBufferOverflow);
+- }
++ }*/
+
+ if (ks == NoSymbol)
+ ksname = "NoSymbol";
+@@ -189,7 +189,7 @@
+ }
+
+ /* not supposed to call XmbLookupString on a key release event */
+- if (e->type == KeyPress && xic) {
++ /*if (e->type == KeyPress && xic) {
+ printf (" XmbLookupString gives %d bytes: ", nmbbytes);
+ if (nmbbytes > 0) {
+ dump (buf, nmbbytes);
+@@ -200,7 +200,7 @@
+
+ printf (" XFilterEvent returns: %s\n",
+ XFilterEvent (eventp, e->window) ? "True" : "False");
+- }
++ }*/
+ }
+
+ static void
+@@ -857,7 +857,7 @@
+ fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName);
+ }
+
+- xim = XOpenIM (dpy, NULL, NULL, NULL);
++ /*xim = XOpenIM (dpy, NULL, NULL, NULL);
+ if (xim == NULL) {
+ fprintf (stderr, "%s: XOpenIM failed\n", ProgramName);
+ }
+@@ -884,7 +884,7 @@
+ }
+ XFree (xim_styles);
+ }
+- }
++ }*/
+
+ screen = DefaultScreen (dpy);
+
+@@ -948,7 +948,7 @@
+ printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw);
+ }
+
+- if (xim && xim_style) {
++ /*if (xim && xim_style) {
+ xic = XCreateIC (xim,
+ XNInputStyle, xim_style,
+ XNClientWindow, w,
+@@ -958,7 +958,7 @@
+ if (xic == NULL) {
+ fprintf (stderr, "XCreateIC failed\n");
+ }
+- }
++ }*/
+
+ for (done = 0; !done; ) {
+ XEvent event;
--- /dev/null
+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}-X11R7.0-${PV}.tar.bz2 \
+ file://diet-x11.patch;patch=1"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+
+inherit autotools
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+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"
+PR = "r1"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xev \
+ file://diet-x11.patch;patch=1"
+S = "${WORKDIR}/xev"
+
+do_compile() {
+ ${CC} -o xev xev.c -lX11 -lXau -I${STAGING_INCDIR} -L${STAGING_LIBDIR}
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 755 ${PN} ${D}${bindir}
+}
--- /dev/null
+include app-common.inc
+DEPENDS = "libx11 libxau libxext libxmu"
--- /dev/null
+diff -urN xhost.orig/Imakefile xhost/Imakefile
+--- xhost.orig/Imakefile 2003-11-14 16:54:53.000000000 +0100
++++ xhost/Imakefile 1970-01-01 01:00:00.000000000 +0100
+@@ -1,16 +0,0 @@
+-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:24 cpqbld Exp $
+-#if HasSecureRPC
+-RPC_DEFINES = -DSECURE_RPC
+-#else
+-RPC_DEFINES =
+-#endif
+-KRB5_DEFINES = Krb5Defines
+-KRB5_INCLUDE = Krb5Includes
+- INCLUDES = $(KRB5_INCLUDE)
+- DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
+-LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
+- SRCS = xhost.c
+- OBJS = xhost.o
+- DEFINES = ConnectionFlags $(SIGNAL_DEFINES) $(RPC_DEFINES) $(KRB5_DEFINES)
+-
+-ComplexProgramTarget(xhost)
+diff -urN xhost.orig/Makefile.am xhost/Makefile.am
+--- xhost.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xhost/Makefile.am 2004-08-15 17:43:47.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# 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 Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD 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.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XHOST_CFLAGS@
++
++bin_PROGRAMS = xhost
++
++xhost_SOURCES = xhost.c
++
++xhost_LDADD = @XHOST_LIBS@
++
++man5_MANS=xhost.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xhost.orig/configure.ac xhost/configure.ac
+--- xhost.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xhost/configure.ac 2004-08-15 17:43:42.000000000 +0200
+@@ -0,0 +1,57 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xhost],4.4.0,[],xhost)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XHOST, xext xmuu x11)
++
++AC_TYPE_SIGNAL
++
++# Transport selection
++AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes])
++AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes])
++AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes])
++if test "$UNIXCONN" = "yes"; then
++ AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
++fi
++if test "$TCPCONN" = "yes"; then
++ AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
++fi
++if test "$IPV6CONN" = "yes"; then
++ AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections])
++fi
++
++AC_OUTPUT([Makefile])
+diff -urN xhost.orig/xhost.c xhost/xhost.c
+--- xhost.orig/xhost.c 2003-11-14 16:54:53.000000000 +0100
++++ xhost/xhost.c 2004-08-15 17:53:07.000000000 +0200
+@@ -27,6 +27,10 @@
+
+ */
+
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #if defined(TCPCONN) || defined(STREAMSCONN)
+ #define NEEDSOCKETS
+ #endif
+@@ -102,11 +106,7 @@
+ static int local_xerror();
+ static char *get_hostname();
+
+-#ifdef SIGNALRETURNSINT
+-#define signal_t int
+-#else
+-#define signal_t void
+-#endif
++#define signal_t RETSIGTYPE
+ static signal_t nameserver_lost();
+
+ #define NAMESERVER_TIMEOUT 5 /* time to wait for nameserver */
--- /dev/null
+FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
+LICENSE = "MIT"
+PV = "0.0+cvs${FIXEDSRCDATE}"
+DEPENDS = "libx11 libxext libxmu"
+DESCRIPTION = "server access control program for X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "x11/base"
+PR = "r2"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xhost;date=${FIXEDSRCDATE} \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/xhost"
+
+inherit autotools pkgconfig
--- /dev/null
+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}-X11R7.0-${PV}.tar.bz2"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+
+inherit autotools pkgconfig
--- /dev/null
+include app-common.inc
+DEPENDS = "libx11 twm xclock xeyes xrdb"
--- /dev/null
+include app-common.inc
+DEPENDS = "libx11 libxkbfile"
--- /dev/null
+diff -urN xmodmap.orig/Makefile.am xmodmap/Makefile.am
+--- xmodmap.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xmodmap/Makefile.am 2004-08-31 19:49:33.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# 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 Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD 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.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XMODMAP_CFLAGS@
++
++bin_PROGRAMS = xmodmap
++
++xmodmap_SOURCES = exec.c handle.c pf.c wq.h xmodmap.c xmodmap.h
++
++xmodmap_LDADD = @XMODMAP_LIBS@
++
++man5_MANS=xmodmap.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xmodmap.orig/autogen.sh xmodmap/autogen.sh
+--- xmodmap.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ xmodmap/autogen.sh 2004-08-31 19:46:14.000000000 +0200
+@@ -0,0 +1,3 @@
++#! /bin/sh
++autoreconf -v --install || exit 1
++./configure --enable-maintainer-mode "$@"
+diff -urN xmodmap.orig/configure.ac xmodmap/configure.ac
+--- xmodmap.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xmodmap/configure.ac 2004-08-31 20:27:03.000000000 +0200
+@@ -0,0 +1,41 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xmodmap],4.4.0,[],xmodmap)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XMODMAP, x11)
++
++AC_OUTPUT([Makefile])
--- /dev/null
+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/${PN}-X11R7.0-1.0.0.tar.bz2"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+
+inherit autotools pkgconfig
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT"
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "x11/base"
+PR = "r1"
+
+DEPENDS = "libx11"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/xmodmap"
+
+inherit autotools pkgconfig
--- /dev/null
+DESCRIPTION = "X application"
+SECTION = "x11/apps"
+LICENSE= "MIT-X"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2"
+
+S = ${WORKDIR}/${PN}-X11R7.0-${PV}
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
--- /dev/null
+diff -urN xprop.orig/Makefile.am xprop/Makefile.am
+--- xprop.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xprop/Makefile.am 2004-08-15 18:49:43.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# 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 Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD 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.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XPROP_CFLAGS@
++
++bin_PROGRAMS = xprop
++
++xprop_SOURCES = dsimple.c dsimple.h xprop.c
++
++xprop_LDADD = @XPROP_LIBS@
++
++man5_MANS=xprop.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xprop.orig/configure.ac xprop/configure.ac
+--- xprop.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xprop/configure.ac 2004-08-15 19:00:43.000000000 +0200
+@@ -0,0 +1,44 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xprop],4.4.0,[],xprop)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XPROP, xext xmuu x11)
++
++AC_CHECK_HEADERS([wchar.h])
++AC_CHECK_HEADERS([wctype.h])
++
++AC_OUTPUT([Makefile])
+diff -urN xprop.orig/dsimple.c xprop/dsimple.c
+--- xprop.orig/dsimple.c 2003-11-14 16:54:54.000000000 +0100
++++ xprop/dsimple.c 2004-08-15 19:19:32.000000000 +0200
+@@ -27,11 +27,16 @@
+
+ */
+
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xos.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ /*
+ * Other_stuff.h: Definitions of routines in other_stuff.
+ *
+@@ -69,7 +74,7 @@
+ char *Malloc(size)
+ unsigned size;
+ {
+- char *data, *malloc();
++ char *data;
+
+ if (!(data = malloc(size)))
+ Fatal_Error("Out of memory!");
+@@ -85,7 +90,7 @@
+ char *ptr;
+ int size;
+ {
+- char *new_ptr, *realloc();
++ char *new_ptr;
+
+ if (!ptr)
+ return(Malloc(size));
+diff -urN xprop.orig/xprop.c xprop/xprop.c
+--- xprop.orig/xprop.c 2004-04-23 21:55:03.000000000 +0200
++++ xprop/xprop.c 2004-08-15 19:23:13.000000000 +0200
+@@ -30,6 +30,10 @@
+ /* $XFree86: xc/programs/xprop/xprop.c,v 1.15 2003/09/24 02:43:38 dawes Exp $ */
+
+
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <X11/Xlib.h>
+ #include <X11/Xos.h>
+ #include <X11/Xfuncs.h>
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT"
+DEPENDS = "libx11 libxmu libxext"
+DESCRIPTION = "property displayer for X"
+MAINTER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "x11/base"
+PR = "r2"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xprop;tag=XORG-MAIN \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/xprop"
+
+inherit autotools pkgconfig
--- /dev/null
+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/${PN}-X11R7.0-1.0.1.tar.bz2"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+
+inherit autotools pkgconfig
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "BSD-X"
+DEPENDS = "libxrandr libx11 libxext"
+DESCRIPTION = "X Resize and Rotate extension command."
+SECTION = "x11/base"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xrandr"
+S = "${WORKDIR}/xrandr"
+
+inherit autotools pkgconfig
--- /dev/null
+diff -urN xrdb.orig/Imakefile xrdb/Imakefile
+--- xrdb.orig/Imakefile 2004-04-23 21:55:03.000000000 +0200
++++ xrdb/Imakefile 1970-01-01 01:00:00.000000000 +0100
+@@ -1,19 +0,0 @@
+-XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $
+-
+-
+-
+-
+-XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.6tsi Exp $
+-
+-#ifdef PatheticCpp
+- CPPDEFS = -DPATHETICCPP
+-#endif
+-#if HasMkstemp
+- CPPDEFS = -DHAS_MKSTEMP
+-#endif
+-XCOMM Due to ill make parsing the cpp is passed directly in source file
+- DEFINES = -DCPP="\"$(CPP)\"" $(CPPDEFS)
+- DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB)
+-LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB)
+-
+-SimpleProgramTarget(xrdb)
+diff -urN xrdb.orig/Makefile.am xrdb/Makefile.am
+--- xrdb.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xrdb/Makefile.am 2004-08-14 16:05:01.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# 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 Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD 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.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XRDB_CFLAGS@
++
++bin_PROGRAMS = xrdb
++
++xrdb_SOURCES = xrdb.c
++
++xrdb_LDADD = @XRDB_LIBS@
++
++man5_MANS=xrdb.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xrdb.orig/autogen.sh xrdb/autogen.sh
+--- xrdb.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ xrdb/autogen.sh 2004-08-14 15:57:35.000000000 +0200
+@@ -0,0 +1,3 @@
++#! /bin/sh
++autoreconf -v --install || exit 1
++./configure --enable-maintainer-mode "$@"
+diff -urN xrdb.orig/configure.ac xrdb/configure.ac
+--- xrdb.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xrdb/configure.ac 2004-08-14 16:03:31.000000000 +0200
+@@ -0,0 +1,41 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xrdb],4.4.0,[],xrdb)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XRDB, xext xmuu x11)
++
++AC_OUTPUT([Makefile])
--- /dev/null
+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/${PN}-X11R7.0-1.0.1.tar.bz2"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+
+inherit autotools pkgconfig
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+DEPENDS = "libx11 libxmu libxext"
+DESCRIPTION = "X server resource database utility"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "x11/base"
+LICENSE = "xrdb"
+PR = "r2"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xrdb \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/xrdb"
+
+inherit autotools pkgconfig
--- /dev/null
+diff -urN xset.orig/Makefile.am xset/Makefile.am
+--- xset.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xset/Makefile.am 2004-08-14 16:32:10.000000000 +0200
+@@ -0,0 +1,53 @@
++#
++# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
++#
++# Copyright © 2003 Keith Packard
++#
++# 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 Keith Packard not be used in
++# advertising or publicity pertaining to distribution of the software without
++# specific, written prior permission. Keith Packard makes no
++# representations about the suitability of this software for any purpose. It
++# is provided "as is" without express or implied warranty.
++#
++# KEITH PACKARD 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.
++#
++
++AUTOMAKE_OPTIONS = 1.7 foreign
++
++AM_CFLAGS = @XSET_CFLAGS@
++
++bin_PROGRAMS = xset
++
++xset_SOURCES = xset.c
++
++xset_LDADD = @XSET_LIBS@
++
++man5_MANS=xset.man
++
++EXTRA_DIST= $(man5_MANS)
++
++MAINTAINERCLEANFILES = configure \
++config.guess \
++config.sub \
++install-sh \
++ltmain.sh \
++missing \
++mkinstalldirs \
++aclocal.m4 \
++Makefile.in \
++depcomp \
++autoscan.log \
++configure.scan \
++config.h \
++config.h.in \
++$(man5_MANS)
+diff -urN xset.orig/autogen.sh xset/autogen.sh
+--- xset.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ xset/autogen.sh 2004-08-14 16:27:56.000000000 +0200
+@@ -0,0 +1,3 @@
++#! /bin/sh
++autoreconf -v --install || exit 1
++./configure --enable-maintainer-mode "$@"
+diff -urN xset.orig/configure.ac xset/configure.ac
+--- xset.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
++++ xset/configure.ac 2004-08-17 14:21:25.000000000 +0200
+@@ -0,0 +1,41 @@
++dnl
++dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
++dnl
++dnl Copyright © 2003 Keith Packard
++dnl
++dnl Permission to use, copy, modify, distribute, and sell this software and its
++dnl documentation for any purpose is hereby granted without fee, provided that
++dnl the above copyright notice appear in all copies and that both that
++dnl copyright notice and this permission notice appear in supporting
++dnl documentation, and that the name of Keith Packard not be used in
++dnl advertising or publicity pertaining to distribution of the software without
++dnl specific, written prior permission. Keith Packard makes no
++dnl representations about the suitability of this software for any purpose. It
++dnl is provided "as is" without express or implied warranty.
++dnl
++dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++dnl PERFORMANCE OF THIS SOFTWARE.
++dnl
++
++AC_PREREQ(2.57)
++AC_INIT([xset],4.4.0,[],xset)
++AC_CONFIG_SRCDIR([Makefile.am])
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
++AM_CONFIG_HEADER(config.h)
++
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AC_PROG_MAKE_SET
++
++PKG_CHECK_MODULES(XSET, xext xextensions xmuu x11)
++
++AC_OUTPUT([Makefile])
--- /dev/null
+--- 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"
--- /dev/null
+DESCRIPTION = "user preference utility for X"
+LICENSE = "MIT"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
+PV = "0.0+cvs${FIXEDSRCDATE}"
+PR = "r1"
+
+DEPENDS = "libx11 libxext xextensions libxmu"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+SECTION = "x11/base"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xset;date=${FIXEDSRCDATE} \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/xset"
+
+inherit autotools pkgconfig
--- /dev/null
+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}-X11R7.0-${PV}.tar.bz2 \
+ file://disable-xkb.patch;patch=1"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+
+EXTRA_OECONF = "--disable-xkb"
+
+inherit autotools pkgconfig
+++ /dev/null
-DESCRIPTION = "X data files"
-SECTION = "x11/data"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/data/${PN}-X11R7.0-${PV}.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage () {
- autotools_stage_all
-}
+++ /dev/null
-include data-common.inc
--- /dev/null
+include data-common.inc
+++ /dev/null
-include data-common.inc
-FILES_${PN} = "/usr/share/X11/*"
-RDEPENDS = "xkbcomp"
--- /dev/null
+include data-common.inc
+FILES_${PN} = "/usr/share/X11/*"
+RDEPENDS = "xkbcomp"
--- /dev/null
+DESCRIPTION = "X data files"
+SECTION = "x11/data"
+LICENSE= "MIT-X"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/data/${PN}-X11R7.0-${PV}.tar.bz2"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
--- /dev/null
+--- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100
++++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100
+@@ -2038,11 +2038,11 @@
+ */
+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
++ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
+ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+ LDPRELIB = LdPreLib $(INSTALLED_LIBS)
+ LDPOSTLIB = LdPostLib
+- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
++ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING)
+ CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
+
+ LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
+--- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100
++++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100
+@@ -114,7 +114,7 @@
+ STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
+ CDEBUGFLAGS = LibraryCDebugFlags
+ CLIBDEBUGFLAGS = LibraryDebugOpt
+- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
++ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
+ # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
+ PICFLAGS = LargePositionIndependentCFlags
+ # endif
+--- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100
++++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100
+@@ -3359,7 +3359,7 @@
+ FREETYPE2LIBDIR = Freetype2LibDir
+ FREETYPE2INCDIR = Freetype2IncDir
+ #if Freetype2LibDirStandard
+-FREETYPE2LIB = -lfreetype
++FREETYPE2LIB = $(LD_STAGING) -lfreetype
+ #else
+ FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype
+ #endif
--- /dev/null
+diff -Naur xc.old/config/pswrap/lexer.l xc/config/pswrap/lexer.l
+--- xc.old/config/pswrap/lexer.l 2004-04-23 18:42:00.000000000 +0000
++++ xc/config/pswrap/lexer.l 2004-11-16 21:07:10.569144105 +0000
+@@ -41,6 +41,7 @@
+ #include <ctype.h>
+ #include <stdlib.h>
+ #include <string.h>
++int yy_prev_more_offset;
+
+ #include "pswpriv.h"
+ #include "pswparser.h"
+diff -Naur xc.old/programs/twm/lex.l xc/programs/twm/lex.l
+--- xc.old/programs/twm/lex.l 2004-04-23 18:42:00.000000000 +0000
++++ xc/programs/twm/lex.l 2004-11-16 21:07:10.569144105 +0000
+@@ -65,6 +41,7 @@
+ #include "gram.h"
+ #include "list.h"
+ #include "parse.h"
++int yy_prev_more_offset;
+
+ #ifdef FLEX_SCANNER
+ int yylineno;
+diff -Naur xc.old/programs/xgc/lex.l xc/programs/xgc/lex.l
+--- xc.old/programs/xgc/lex.l 2004-04-23 18:42:00.000000000 +0000
++++ xc/programs/xgc/lex.l 2004-11-16 21:07:10.569144105 +0000
+@@ -11,6 +11,9 @@
+ #include <X11/X.h>
+ #include "gram.h"
+ #include "constants.h"
++
++int yy_prev_more_offset;
++
+ #if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__UNIXOS2__)
+ int yylineno = 0;
+ #endif
+diff -Naur xc.old/programs/Xserver/hw/dmx/config/scanner.l xc/programs/Xserver/hw/dmx/config/scanner.l
+--- xc.old/programs/Xserver/hw/dmx/config/scanner.l 2004-07-30 20:06:00.000000000 +0000
++++ xc.old/programs/Xserver/hw/dmx/config/scanner.l 2004-11-16 21:07:10.569144105 +0000
+@@ -37,6 +37,9 @@
+ #include "parser.h"
+ #include <string.h>
+ #include <ctype.h>
++
++int yy_prev_more_offset;
++
+ static int getdimension(int token, const char *text, int leng);
+ static int getstring(int token, const char *text, int leng);
+ static int gettoken(int token, const char *text, int leng);
--- /dev/null
+include font-common.inc
+
+DEPENDS = "mkfontscale"
+FILES_${PN} = "${libdir}/X11/fonts/*"
--- /dev/null
+include font-common.inc
+
+DEPENDS = "bdftopcf font-util"
+FILES_${PN} = "${libdir}/X11/fonts/*"
--- /dev/null
+include font-common.inc
+
+DEPENDS = "bdftopcf font-util"
+
+FILES_${PN} = "${libdir}/X11/fonts/misc/*"
+
+EXTRA_OECONF = "--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-6 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15 --disable-iso8859-16 --disable-jisx0201 --disable-koi8-r"
--- /dev/null
+include font-common.inc
+
+DEPENDS = "bdftopcf"
+
+FILES_${PN} = "${bindir}/* ${libdir}/X11/fonts/util/*"
--- /dev/null
+SECTION = "x11/base"
+PR = "r1"
+# XXX Is this true? These fonts are from X.org.
+LICENSE = "XFree86"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;tag=XORG-6_8_0;method=pserver \
+ file://lexer.patch;patch=1"
+
+
+PACKAGES = "${PN}-75dpi ${PN}-100dpi ${PN}-type1 ${PN}-cyrillic ${PN}-ttf ${PN}"
+FILES_${PN}-75dpi = "${libdir}/X11/fonts/75dpi"
+FILES_${PN}-100dpi = "${libdir}/X11/fonts/100dpi"
+FILES_${PN}-type1 = "${libdir}/X11/fonts/Type1"
+FILES_${PN}-ttf = "${libdir}/X11/fonts/TTF"
+FILES_${PN}-cyrillic = "${libdir}/X11/fonts/cyrillic"
+FILES_${PN} = "${libdir}/X11/fonts"
+
+PACKAGE_ARCH = "all"
+
+S = "${WORKDIR}/xc"
+
+do_configure() {
+ echo "#define ProjectRoot /usr" >> config/cf/host.def
+ echo "#define XnestServer NO" >> config/cf/host.def
+ echo "#define XdmxServer NO" >> config/cf/host.def
+ echo "#define CcCmd ${BUILD_CC}" >> config/cf/host.def
+ echo "#define LdCmd ${BUILD_LD}" >> config/cf/host.def
+ echo "#define BuildFreetype2Library YES" >> config/cf/host.def
+ echo "#define HasFreetype2 NO" >> config/cf/host.def
+ echo "" > config/cf/date.def
+ make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake
+ make CC="${BUILD_CC}" xmakefile
+ make Makefiles
+ make clean
+}
+
+do_compile() {
+ #make depend
+ make includes
+ make -C config/util
+ make -C lib/freetype2
+ make -C lib/font
+ make -C lib/fontenc
+ make -C lib/fontconfig
+ make -C programs/mkfontscale
+ make -C programs/bdftopcf
+ make -C programs/fc-cache
+ make -C fonts
+}
+
+do_install() {
+ make -C fonts DESTDIR="${D}" install
+}
+
+do_stage() {
+ :
+}
--- /dev/null
+DESCRIPTION = "X font files"
+SECTION = "x11/fonts"
+LICENSE= "MIT-X"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/${PN}-X11R7.0-${PV}.tar.bz2"
+S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+FONT_DIR = "${datadir}/share/fonts"
+DEPENDS = "encodings mkfontscale mkfontdir"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
+
+
+FILES_${PN} += " ${libdir}/X11/fonts/*.gz ${libdir}/X11/fonts/*/*.gz"
+
+pkg_postinst_${PN} () {
+
+ if [ "x$D" != "x" ]; then
+ exit 1
+ fi
+
+ for fontdir in /usr/lib/X11/fonts/* /usr/lib/X11/fonts/*/* ; do
+ if test -d $fontdir ; then
+ mkfontdir $fontdir
+ mkfontscale $fontdir
+ fi
+ done
+}
+++ /dev/null
-include font-common.inc
-
-DEPENDS = "mkfontscale"
-FILES_${PN} = "${libdir}/X11/fonts/*"
+++ /dev/null
-DESCRIPTION = "X font files"
-SECTION = "x11/fonts"
-LICENSE= "MIT-X"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/${PN}-X11R7.0-${PV}.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-FONT_DIR = "${datadir}/share/fonts"
-DEPENDS = "encodings mkfontscale mkfontdir"
-
-inherit autotools pkgconfig
-
-do_stage () {
- autotools_stage_all
-}
-
-
-FILES_${PN} += " ${libdir}/X11/fonts/*.gz ${libdir}/X11/fonts/*/*.gz"
-
-pkg_postinst_${PN} () {
-
- if [ "x$D" != "x" ]; then
- exit 1
- fi
-
- for fontdir in /usr/lib/X11/fonts/* /usr/lib/X11/fonts/*/* ; do
- if test -d $fontdir ; then
- mkfontdir $fontdir
- mkfontscale $fontdir
- fi
- done
-}
+++ /dev/null
-include font-common.inc
-
-DEPENDS = "bdftopcf font-util"
-FILES_${PN} = "${libdir}/X11/fonts/*"
+++ /dev/null
-include font-common.inc
-
-DEPENDS = "bdftopcf font-util"
-
-FILES_${PN} = "${libdir}/X11/fonts/misc/*"
-
-EXTRA_OECONF = "--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-6 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15 --disable-iso8859-16 --disable-jisx0201 --disable-koi8-r"
+++ /dev/null
-include font-common.inc
-
-DEPENDS = "bdftopcf"
-
-FILES_${PN} = "${bindir}/* ${libdir}/X11/fonts/util/*"
--- /dev/null
+--- 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],
--- /dev/null
+--- 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;
--- /dev/null
+
+#
+# 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;
+
--- /dev/null
+SECTION = "x11/base"
+include libx11_${PV}.bb
+
+EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
+
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"
--- /dev/null
+SECTION = "x11/base"
+include 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"
+
--- /dev/null
+SECTION = "x11/base"
+include libx11_${PV}.bb
+
+PROVIDES += "libx11"
+
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+ file://fix-disable-xlocale.diff;patch=1 \
+ file://fix-utf8-wrong-define.patch;patch=1"
+
+#do_stage_append () {
+# rm -f ${STAGING_INCDIR}/X11/XKBlib.h
+#}
--- /dev/null
+SECTION = "x11/base"
+include libx11_${PV}.bb
+
+PROVIDES += "libx11"
+
+EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+CFLAGS += "-D_GNU_SOURCE"
+
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+ file://fix-disable-xlocale.diff;patch=1 \
+ file://fix-utf8-wrong-define.patch;patch=1"
--- /dev/null
+SECTION = "x11/base"
+include 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"
--- /dev/null
+--- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200
++++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200
+@@ -56,7 +56,7 @@
+ #include <stdio.h>
+
+ #ifndef ERRORDB
+-#define ERRORDB "/usr/lib/X11/XErrorDB"
++#define ERRORDB "/usr/share/X11/XErrorDB"
+ #endif
+
+ /*
+--- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200
++++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200
+@@ -36,7 +36,7 @@
+ #include "Key.h"
+
+ #ifndef KEYSYMDB
+-#define KEYSYMDB "/usr/lib/X11/XKeysymDB"
++#define KEYSYMDB "/usr/share/X11/XKeysymDB"
+ #endif
+
+ static Bool initialized;
--- /dev/null
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define
++++ libX11-6.2.1/include/X11/Xlib.h
+@@ -100,7 +100,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;
+
--- /dev/null
+DESCRIPTION = "X fontenc library (used by libxfont)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "zlib xproto"
+
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
--- /dev/null
+DESCRIPTION = "X fontenc library (used by libxfont)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "zlib xproto"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
--- /dev/null
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libICE-6.3.3/configure.ac~autofoo 2004-05-11 01:50:07.000000000 -0400
++++ libICE-6.3.3/configure.ac 2005-01-18 02:30:07.463895544 -0500
+@@ -8,12 +8,12 @@
+ libICE)
+
+ AC_CONFIG_SRCDIR([Makefile.am])
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+
+ AM_MAINTAINER_MODE
+
+ AM_CONFIG_HEADER([config.h])
+-AC_CONFIG_AUX_DIR(.)
+
+ # Checks for programs.
+ AC_PROG_LIBTOOL
--- /dev/null
+SECTION = "libs"
+LICENSE= "MIT"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "libx11"
+PROVIDES = "ice"
+DESCRIPTION = "X11 ICE library"
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libICE-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libICE-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X11 ICE library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "libx11 util-macros"
+PROVIDES = "ice"
+
+XORG_PN = "libICE"
+
+include xorg-xlibs.inc
--- /dev/null
+DESCRIPTION = "X11 ICE library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "libx11 util-macros"
+PROVIDES = "ice"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libICE"
+
+include xorg-xlibs.inc
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "MIT"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "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
+}
--- /dev/null
+--- 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)
--- /dev/null
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "xextproto"
+
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/${PN}-X11R7.0-${PV}.tar.bz2 \
+ file://mkg3states.patch;patch=1"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
--- /dev/null
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "xproto"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/lib/${PN}-X11R7.1-${PV}.tar.bz2 \
+ file://mkg3states.patch;patch=1"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
--- /dev/null
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libSM-6.0.3/configure.ac~autofoo 2004-05-11 01:51:21.000000000 -0400
++++ libSM-6.0.3/configure.ac 2005-01-18 12:15:50.405356376 -0500
+@@ -8,12 +8,12 @@
+ libSM)
+
+ AC_CONFIG_SRCDIR([Makefile.am])
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+
+ AM_MAINTAINER_MODE
+
+ AM_CONFIG_HEADER([config.h])
+-AC_CONFIG_AUX_DIR(.)
+
+ # Checks for programs.
+ AC_PROG_LIBTOOL
--- /dev/null
+SECTION = "libs"
+LICENSE = "MIT-X"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "libx11 libice"
+DESCRIPTION = "Session management library"
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libSM-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libSM-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "Session management library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+#PV="1:1.0.0"
+
+DEPENDS = "libx11 libice util-macros"
+
+XORG_PN = "libSM"
+
+include xorg-xlibs.inc
--- /dev/null
+DESCRIPTION = "Session management library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+#PV="1:1.0.1"
+
+DEPENDS = "libx11 libice util-macros"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libSM"
+
+include xorg-xlibs.inc
--- /dev/null
+PV = "6.0.3+cvs${SRCDATE}"
+LICENSE = "MIT-X"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "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
+}
--- /dev/null
+SECTION = "x11/base"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+include libx11_${PV}.bb
+inherit native
+DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
+PROVIDES = ""
--- /dev/null
+SECTION = "x11/base"
+include libx11_cvs.bb
+inherit native
+DEPENDS = "xproto-native xextensions-native libxau-native xtrans-native libxdmcp-native"
+PROVIDES = ""
--- /dev/null
+
+#
+# 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
--- /dev/null
+--- 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 )
+ {
--- /dev/null
+SRCDATE = "20050226"
+
+include libx11_cvs.bb
+
+DEFAULT_PREFERENCE = "0"
+
--- /dev/null
+SECTION = "x11/libs"
+LICENSE = "XFree86"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto xextensions libxau xtrans libxdmcp"
+PROVIDES = "x11"
+DESCRIPTION = "Base X libs."
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+PR = "r4"
+
+SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
+ file://errordb-keysymdb-path-fix.patch;patch=1 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libX11-${PV}"
+
+inherit autotools pkgconfig
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+ oe_runmake -C src/util 'CFLAGS= -D_GNU_SOURCE' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys
+ )
+ 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}
+}
--- /dev/null
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+
+DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
+PROVIDES = "x11"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+
+XORG_PN = "libX11"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+ )
+ rm -f ${STAGING_INCDIR}/X11/Xlib.h
+ oe_runmake
+}
--- /dev/null
+DESCRIPTION = "Base X libs."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "XFree86"
+
+DEPENDS = "xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros"
+PROVIDES = "x11"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
+FILES_${PN}-locale += "${datadir}/X11/locale"
+
+XORG_PN = "libX11"
+XORG_RELEASE = "X11R7.1"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+ )
+ rm -f ${STAGING_INCDIR}/X11/Xlib.h
+ oe_runmake
+}
--- /dev/null
+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 = "x11"
+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}
+}
--- /dev/null
+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 = "x11"
+
+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
+}
--- /dev/null
+SECTION = "x11/base"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
+include libxau_${PV}.bb
+inherit native
+DEPENDS = "xproto-native"
+PROVIDES = ""
--- /dev/null
+SECTION = "x11/base"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xau"
+include libxau_cvs.bb
+inherit native
+DEPENDS = "xproto-native"
+PROVIDES = ""
--- /dev/null
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libXau-0.1.1/configure.ac~autofoo
++++ libXau-0.1.1/configure.ac
+@@ -25,11 +25,10 @@
+
+ AC_PREREQ([2.57])
+ AC_INIT(libXau, [0.1.1], [keithp@keithp.com],libXau)
+-AM_INIT_AUTOMAKE([dist-bzip2])
+-AM_MAINTAINER_MODE
+-
+ AM_CONFIG_HEADER(config.h)
+ AC_CONFIG_AUX_DIR(.)
++AM_INIT_AUTOMAKE([dist-bzip2])
++AM_MAINTAINER_MODE
+
+ AC_PROG_CC
+ AC_PROG_INSTALL
--- /dev/null
+SECTION = "x11/libs"
+LICENSE= "MIT"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto"
+PROVIDES = "xau"
+DESCRIPTION = "Authorization Protocol for X."
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXau-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "Authorization Protocol for X."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto util-macros"
+PROVIDES = "xau"
+
+XORG_PN = "libXau"
+
+include xorg-xlibs.inc
+
--- /dev/null
+DESCRIPTION = "Authorization Protocol for X."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto util-macros"
+PROVIDES = "xau"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXau"
+
+include xorg-xlibs.inc
+
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "MIT"
+PR = "r1"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto"
+PROVIDES = "xau"
+DESCRIPTION = "Authorization Protocol for X."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xau"
+S = "${WORKDIR}/Xau"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+--- /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
--- /dev/null
+SECTION = "x11/libs"
+LICENSE = "MIT"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "xproto 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
+}
--- /dev/null
+DESCRIPTION = "X Athena Widgets library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "xproto libx11 libxt libxmu libxpm"
+PROVIDES = "xaw"
+
+XORG_PN = "libXaw"
+
+include xorg-xlibs.inc
+
+# FIXME: libXaw needs a full x11, not diet
+BROKEN = "1"
--- /dev/null
+DESCRIPTION = "X Athena Widgets library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "xproto libx11 libxt libxmu libxpm"
+PROVIDES = "xaw"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXaw"
+
+include xorg-xlibs.inc
+
+# FIXME: libXaw needs a full x11, not diet
+BROKEN = "1"
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "xproto 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}
+}
--- /dev/null
+Index: libXcomposite-1.0.1/configure.ac
+===================================================================
+--- libXcomposite-1.0.1.orig/configure.ac 2004-01-15 03:59:12.000000000 -0500
++++ libXcomposite-1.0.1/configure.ac 2005-01-18 17:05:25.573929256 -0500
+@@ -33,11 +33,11 @@
+ dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
+ dnl
+ AC_INIT(libXcomposite, 1.0.1, [keithp@keithp.com], libXcomposite)
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+
+ # Check for progs
+ AC_PROG_CC
--- /dev/null
+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
+
--- /dev/null
+SECTION = "x11/libs"
+LICENSE= "BSD-X"
+DEPENDS = "libx11 compositeext xextensions libxfixes"
+PROVIDES = "xcomposite"
+DESCRIPTION = "X Composite extension library."
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXcomposite-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXcomposite-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X Composite extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 compositeproto xextproto libxfixes"
+PROVIDES = "xcomposite"
+
+XORG_PN = "libXcomposite"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXcomposite-${PV}.tar.bz2 \
+ file://change-include-order.patch;patch=1"
--- /dev/null
+DESCRIPTION = "X Composite extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 compositeproto libxfixes"
+PROVIDES = "xcomposite"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXcomposite"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/libXcomposite-${PV}.tar.bz2 \
+ file://change-include-order.patch;patch=1"
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "BSD-X"
+SECTION = "x11/libs"
+DEPENDS = "libx11 compositeext xextensions libxfixes"
+PROVIDES = "xcomposite"
+DESCRIPTION = "X Composite extension library."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcomposite"
+S = "${WORKDIR}/Xcomposite"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libXcursor-1.1.2/configure.ac~autofoo 2004-01-16 23:38:26.000000000 -0500
++++ libXcursor-1.1.2/configure.ac 2005-01-18 13:40:06.539707120 -0500
+@@ -31,11 +31,11 @@
+ dnl not possible to extract the version number here from Xcursor.h
+ dnl
+ AC_INIT([libXcursor],1.1.2,[keithp@keithp.com],[libXcursor])
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AM_MAINTAINER_MODE
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+
+ dnl libtool versioning
+
--- /dev/null
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+Index: Xcursor/configure.ac
+===================================================================
+--- Xcursor.orig/configure.ac 2004-04-12 10:11:12.000000000 -0400
++++ Xcursor/configure.ac 2005-01-18 16:04:36.860617992 -0500
+@@ -31,11 +31,11 @@
+ dnl not possible to extract the version number here from Xcursor.h
+ dnl
+ AC_INIT([libXcursor],1.1.3,[keithp@keithp.com],[libXcursor])
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AM_MAINTAINER_MODE
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+
+ dnl libtool versioning
+
--- /dev/null
+SECTION = "x11/libs"
+LICENSE= "BSD-X"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DESCRIPTION = "X Cursor library"
+DEPENDS = "libxfixes"
+PR = "r2"
+
+SRC_URI = "${XLIBS_MIRROR}/libXcursor-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXcursor-${PV}"
+FILES_${PN} += "${libdir}/libXcursor.so"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X Cursor library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libxfixes"
+
+XORG_PN = "libXcursor"
+
+include xorg-xlibs.inc
+
+FILES_${PN} += "${libdir}/libXcursor.so"
--- /dev/null
+DESCRIPTION = "X Cursor library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libxfixes"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXcursor"
+
+include xorg-xlibs.inc
+
+FILES_${PN} += "${libdir}/libXcursor.so"
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "BSD-X"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DESCRIPTION = "X Cursor library"
+DEPENDS = "libxfixes"
+PR = "r2"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xcursor"
+S = "${WORKDIR}/Xcursor"
+FILES_${PN} += "${libdir}/libXcursor.so"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+Index: libXdamage-1.0.1/configure.ac
+===================================================================
+--- libXdamage-1.0.1.orig/configure.ac 2004-01-15 03:54:55.000000000 -0500
++++ libXdamage-1.0.1/configure.ac 2005-01-18 19:07:16.951430928 -0500
+@@ -33,11 +33,11 @@
+ dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
+ dnl
+ AC_INIT(libXdamage, 1.0.1, [keithp@keithp.com], libXdamage)
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+
+ # Check for progs
+ AC_PROG_CC
--- /dev/null
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- /dev/null
++++ Xdamage/m4/pkg.m4
+@@ -0,0 +1,57 @@
++
++dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
++dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
++dnl also defines GSTUFF_PKG_ERRORS on error
++AC_DEFUN(PKG_CHECK_MODULES, [
++ succeeded=no
++
++ if test -z "$PKG_CONFIG"; then
++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++ fi
++
++ if test "$PKG_CONFIG" = "no" ; then
++ echo "*** The pkg-config script could not be found. Make sure it is"
++ echo "*** in your path, or set the PKG_CONFIG environment variable"
++ echo "*** to the full path to pkg-config."
++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++ else
++ PKG_CONFIG_MIN_VERSION=0.9.0
++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++ AC_MSG_CHECKING(for $2)
++
++ if $PKG_CONFIG --exists "$2" ; then
++ AC_MSG_RESULT(yes)
++ succeeded=yes
++
++ AC_MSG_CHECKING($1_CFLAGS)
++ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
++ AC_MSG_RESULT($$1_CFLAGS)
++
++ AC_MSG_CHECKING($1_LIBS)
++ $1_LIBS=`$PKG_CONFIG --libs "$2"`
++ AC_MSG_RESULT($$1_LIBS)
++ else
++ $1_CFLAGS=""
++ $1_LIBS=""
++ ## If we have a custom action on failure, don't print errors, but
++ ## do set a variable so people can do so.
++ $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ ifelse([$4], ,echo $$1_PKG_ERRORS,)
++ fi
++
++ AC_SUBST($1_CFLAGS)
++ AC_SUBST($1_LIBS)
++ else
++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++ echo "*** See http://www.freedesktop.org/software/pkgconfig"
++ fi
++ fi
++
++ if test $succeeded = yes; then
++ ifelse([$3], , :, [$3])
++ else
++ ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
++ fi
++])
++
++
--- /dev/null
+SECTION = "x11/libs"
+LICENSE= "BSD-X"
+DEPENDS = "libx11 damageext libxfixes xproto"
+PROVIDES = "xdamage"
+DESCRIPTION = "X Damage extension library."
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXdamage-${PV}.tar.bz2 \
+ file://m4.patch;patch=1 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXdamage-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X Damage extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 damageproto libxfixes xproto"
+PROVIDES = "xdamage"
+
+XORG_PN = "libXdamage"
+
+include xorg-xlibs.inc
--- /dev/null
+DESCRIPTION = "X Damage extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 damageproto libxfixes xproto"
+PROVIDES = "xdamage"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXdamage"
+
+include xorg-xlibs.inc
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "BSD-X"
+SECTION = "x11/libs"
+DEPENDS = "libx11 damageext libxfixes xproto"
+PROVIDES = "xdamage"
+DESCRIPTION = "X Damage extension library."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdamage \
+ file://m4.patch;patch=1"
+S = "${WORKDIR}/Xdamage"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+SECTION = "x11/libs"
+include libxdmcp_${PV}.bb
+inherit native
+DEPENDS = "xproto-native"
+PROVIDES = ""
--- /dev/null
+SECTION = "x11/libs"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxdmcp"
+include libxdmcp_${PV}.bb
+inherit native
+DEPENDS = "xproto-native"
+PROVIDES = ""
--- /dev/null
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libXdmcp-0.1.3/configure.ac~autofoo
++++ libXdmcp-0.1.3/configure.ac
+@@ -25,12 +25,11 @@
+
+ AC_PREREQ([2.57])
+ AC_INIT(libXdmcp, [0.1.3], [keithp@keithp.com],libXdmcp)
++AC_CONFIG_AUX_DIR(.)
++AC_CONFIG_HEADERS([include/X11/Xdmcpconf.h])
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+-
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+-AC_CONFIG_HEADERS([include/X11/Xdmcpconf.h])
+
+ AC_PROG_CC
+ AC_PROG_INSTALL
--- /dev/null
+SECTION = "x11/libs"
+LICENSE= "MIT"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto"
+PROVIDES = "xdmcp"
+DESCRIPTION = "X Display Manager Control Protocol library."
+PR = "r1"
+S = "${WORKDIR}/libXdmcp-${PV}"
+
+SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE= "MIT"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto"
+PROVIDES = "xdmcp"
+DESCRIPTION = "X Display Manager Control Protocol library."
+PR = "r1"
+S = "${WORKDIR}/libXdmcp-${PV}"
+
+SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X Display Manager Control Protocol library."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto util-macros"
+PROVIDES = "xdmcp"
+
+XORG_PN = "libXdmcp"
+
+include xorg-xlibs.inc
--- /dev/null
+DESCRIPTION = "X Display Manager Control Protocol library."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto util-macros"
+PROVIDES = "xdmcp"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXdmcp"
+
+include xorg-xlibs.inc
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "MIT"
+PR = "r1"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto"
+PROVIDES = "xdmcp"
+DESCRIPTION = "X Display Manager Control Protocol library."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xdmcp"
+S = "${WORKDIR}/Xdmcp"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+SECTION = "unknown"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xext"
+include libxext_${PV}.bb
+inherit native
+DEPENDS = "libx11-native xextensions-native"
+PROVIDES = ""
--- /dev/null
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- Xext/configure.ac~autofoo
++++ Xext/configure.ac
+@@ -8,9 +8,8 @@
+ libXext)
+
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_INIT_AUTOMAKE([dist-bzip2])
+-
+ AC_CONFIG_AUX_DIR(.)
++AM_INIT_AUTOMAKE([dist-bzip2])
+
+ AM_MAINTAINER_MODE
+
--- /dev/null
+DESCRIPTION = "X Server Extension library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto libx11 xextproto util-macros"
+PROVIDES = "xext"
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+XORG_PN = "libXext"
+
+include xorg-xlibs.inc
+
--- /dev/null
+DESCRIPTION = "X Server Extension library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE= "MIT"
+
+DEPENDS = "xproto libx11 util-macros"
+PROVIDES = "xext"
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXext"
+
+include xorg-xlibs.inc
+
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+PR = "r1"
+LICENSE= "MIT"
+DESCRIPTION = "X Server Extension library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "xproto libx11 xextensions"
+PROVIDES = "xext"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext"
+S = "${WORKDIR}/Xext"
+
+inherit autotools pkgconfig
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libXfixes-2.0.1/configure.ac~autofoo 2004-01-15 03:40:23.000000000 -0500
++++ libXfixes-2.0.1/configure.ac 2005-01-18 13:35:33.461221360 -0500
+@@ -33,11 +33,11 @@
+ dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
+ dnl
+ AC_INIT(libXfixes, 2.0.1, [keithp@keithp.com], libXfixes)
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+
+ # Check for progs
+ AC_PROG_CC
--- /dev/null
+SECTION = "x11/libs"
+LICENSE= "BSD-X"
+DEPENDS = "libx11 fixesext"
+DESCRIPTION = "X Fixes extension library."
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXfixes-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X Fixes extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 fixesproto"
+
+XORG_PN = "libXfixes"
+
+include xorg-xlibs.inc
--- /dev/null
+DESCRIPTION = "X Fixes extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE= "BSD-X"
+
+DEPENDS = "libx11 fixesproto"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXfixes"
+
+include xorg-xlibs.inc
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "BSD-X"
+SECTION = "x11/libs"
+DEPENDS = "libx11 fixesext"
+DESCRIPTION = "X Fixes extension library."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfixes"
+S = "${WORKDIR}/Xfixes"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libXfont-1.4.2/configure.ac~autofoo 2004-05-06 20:19:03.000000000 -0400
++++ libXfont-1.4.2/configure.ac 2005-01-16 12:14:14.042598720 -0500
+@@ -35,9 +35,9 @@
+ dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
+ dnl not possible to extract the version number here from Xfont.h
+ dnl
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+ AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h])
+
+ # Check for progs
--- /dev/null
+Index: fontfile/fontdir.c
+===================================================================
+RCS file: /cvs/xlibs/Xfont/fontfile/fontdir.c,v
+retrieving revision 3.22
+diff -u -r3.22 fontdir.c
+--- xfont/fontfile/fontdir.c 7 Jul 2003 16:40:11 -0000 3.22
++++ xfont/fontfile/fontdir.c 30 Dec 2004 20:37:12 -0000
+@@ -699,6 +699,11 @@
+ */
+ if (isscale)
+ {
++ /* If the fontname says it is scalable, make sure that the
++ * renderer supports OpenScalable and GetInfoScalable.
++ */
++ if (renderer->OpenScalable && renderer->GetInfoScalable)
++ {
+ if (vals.values_supplied & SIZE_SPECIFY_MASK)
+ {
+ bzero((char *)&zeroVals, sizeof(zeroVals));
+@@ -798,6 +803,7 @@
+ bitmap->name.name);
+ }
+ }
++ }
+ }
+ return TRUE;
+ }
--- /dev/null
+SECTION = "x11/libs"
+LICENSE = "BSD-X"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto xtrans zlib"
+PROVIDES = "xfont"
+DESCRIPTION = "X font library (used by the X server)."
+PR = "r2"
+
+SRC_URI = "${XLIBS_MIRROR}/libXfont-${PV}.tar.bz2 \
+ file://scalable.patch;patch=1 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXfont-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+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 freetype"
+PROVIDES = "xfont"
+
+XORG_PN = "libXfont"
+
+include xorg-xlibs.inc
--- /dev/null
+DESCRIPTION = "X font library (used by the X server)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype"
+PROVIDES = "xfont"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXfont"
+
+include xorg-xlibs.inc
--- /dev/null
+DESCRIPTION = "X font library (used by the X server)."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype"
+PROVIDES = "xfont"
+
+XORG_PN = "libXfont"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2"
+S = "${WORKDIR}/${XORG_PN}-1.2.0"
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "BSD-X"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto xtrans zlib"
+PROVIDES = "xfont"
+DESCRIPTION = "X font library (used by the X server)."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xfont \
+ file://scalable.patch;patch=1"
+S = "${WORKDIR}/Xfont"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libXft-2.1.6/configure.ac~autofoo 2004-03-22 10:02:59.000000000 -0500
++++ libXft-2.1.6/configure.ac 2005-01-17 02:08:10.165951760 -0500
+@@ -33,12 +33,12 @@
+ dnl Please bump the minor library number at each release as well.
+ dnl
+ AC_INIT(libXft, 2.1.6, [keithp@keithp.com], libXft)
++AC_CONFIG_AUX_DIR(.)
+
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+
+ # checks for progs
+ AC_PROG_CC
--- /dev/null
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+DEPENDS = "libx11 xproto libxrender freetype fontconfig"
+DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
+PROVIDES = "xft"
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXft-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+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)
+}
--- /dev/null
+DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
+LICENSE = "MIT-X"
+SECTION = "x11/libs"
+
+DEPENDS = "libx11 xproto libxrender freetype fontconfig"
+PROVIDES = "xft"
+
+
+XORG_PN = "libXft"
+
+include xorg-xlibs.inc
+
+FILES_${PN} = ${libdir}/lib*.so.*
+FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+ ${libdir}/*.a ${libdir}/pkgconfig \
+ ${datadir}/aclocal ${bindir} ${sbindir}
+
+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)
+}
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT-X"
+SECTION = "x11/libs"
+DEPENDS = "libx11 xproto libxrender freetype fontconfig"
+DESCRIPTION = "X FreeType library. Client-side fonts with FreeType."
+PROVIDES = "xft"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xft"
+S = "${WORKDIR}/Xft"
+
+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)
+}
--- /dev/null
+Index: libXi-6.0.1/configure.ac
+===================================================================
+--- libXi-6.0.1.orig/configure.ac 2003-11-01 04:11:49.000000000 -0500
++++ libXi-6.0.1/configure.ac 2005-01-20 11:34:06.878357352 -0500
+@@ -8,7 +8,6 @@
+ AM_MAINTAINER_MODE
+
+ AM_CONFIG_HEADER([config.h])
+-AC_CONFIG_AUX_DIR(.)
+
+ # Checks for programs.
+ AC_PROG_LIBTOOL
--- /dev/null
+DESCRIPTION = "X Input Extension library"
+LICENSE = "MIT-X"
+SECTION = "x11/libs"
+DEPENDS = "xproto libx11 xextensions"
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXi-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXi-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
--- /dev/null
+DESCRIPTION = "X Input extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+
+DEPENDS = "xproto libx11 libxext"
+
+XORG_PN = "libXi"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
--- /dev/null
+DESCRIPTION = "X Input extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT-X"
+
+DEPENDS = "xproto libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXi"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT-X"
+SECTION = "x11/libs"
+DEPENDS = "xproto libx11 xextensions"
+DESCRIPTION = "X Input extension library."
+PR = "r1"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xi \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/Xi"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "Xinerama library"
+LICENSE = "MIT"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "panoramixext xproto libx11 libxext"
+PROVIDES = "xinerama"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama;date=20050505"
+S = "${WORKDIR}/Xinerama"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+LICENSE = "MIT"
+DESCRIPTION = "Xinerama library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "panoramixext xproto libx11 libxext"
+PROVIDES = "xinerama"
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXinerama-${PV}.tar.bz2"
+S = "${WORKDIR}/libXinerama-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "Xinerama library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "xineramaproto xproto libx11 libxext"
+PROVIDES = "xinerama"
+
+XORG_PN = "libXinerama"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
--- /dev/null
+DESCRIPTION = "Xinerama library"
+LICENSE = "MIT"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "panoramixext xproto libx11 libxext"
+PROVIDES = "xinerama"
+PV = "0.0+cvs${SRCDATE}"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xinerama"
+S = "${WORKDIR}/Xinerama"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11"
+
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
--- /dev/null
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
--- /dev/null
+LICENSE = "GPL"
+PV = "0.0+cvs${SRCDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libx11"
+DESCRIPTION = "X11 keyboard library"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xkbfile"
+S = "${WORKDIR}/xkbfile"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11 libxt libxkbfile kbproto"
+
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
+
--- /dev/null
+DESCRIPTION = "X11 keyboard library"
+SECTION = "libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11 libxt libxkbfile"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
+
--- /dev/null
+DESCRIPTION = "X Window System miscellaneous utility library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "libxt libxext util-macros"
+PROVIDES = "xmu"
+
+XORG_PN = "libXmu"
+
+include xorg-xlibs.inc
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+
+LEAD_SONAME = "libXmu"
--- /dev/null
+DESCRIPTION = "X Window System miscellaneous utility library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "libxt libxext util-macros"
+PROVIDES = "xmu"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXmu"
+
+include xorg-xlibs.inc
+
+PACKAGES =+ "libxmuu libxmuu-dev"
+
+FILES_libxmuu = "${libdir}/libXmuu.so.*"
+FILES_libxmuu-dev = "${libdir}/libXmuu.so"
+
+LEAD_SONAME = "libXmu"
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "libxt libxext"
+PROVIDES = "xmu"
+PR = "r2"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xmu"
+S = "${WORKDIR}/Xmu"
+
+PACKAGES =+ "xmuu xmuu-dev"
+
+FILES_xmuu = "${libdir}/libXmuu.so.*"
+FILES_xmuu-dev = "${libdir}/libXmuu.so"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X print extension library."
+SECTION = "libs"
+#MAINTAINER = ""
+LICENSE = "MIT"
+
+DEPENDS = "libx11 libxext xextproto libxau printproto"
+
+XORG_PN = "libXp"
+
+include xorg-xlibs.inc
+
+CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+EXTRA_OECONF="--enable-malloc0returnsnull"
--- /dev/null
+
+LICENSE = "MIT"
+PV = "0.0+cvs${SRCDATE}"
+
+SECTION = "libs"
+DEPENDS = "libx11 libxext"
+DESCRIPTION = "X print extension library."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xp"
+S = "${WORKDIR}/Xp"
+
+inherit autotools pkgconfig
+
+CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+Index: libXpm-3.5.1/configure.ac
+===================================================================
+--- libXpm-3.5.1.orig/configure.ac 2004-05-11 02:00:35.000000000 -0400
++++ libXpm-3.5.1/configure.ac 2005-01-19 18:35:57.187402008 -0500
+@@ -1,12 +1,12 @@
+ AC_PREREQ(2.57)
+ AC_INIT([libXpm], 3.5.1, [daniel@freedesktop.org], libXpm)
+ AC_CONFIG_SRCDIR([Makefile.am])
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+
+ AM_MAINTAINER_MODE
+
+ AM_CONFIG_HEADER([lib/config.h])
+-AC_CONFIG_AUX_DIR(.)
+
+ # Checks for programs.
+ AC_PROG_LIBTOOL
--- /dev/null
+SECTION = "x11/libs"
+LICENSE = "X-BSD"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto libx11"
+PROVIDES = "xpm"
+DESCRIPTION = "X Pixmap library."
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXpm-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXpm-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h
+ oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR}
+}
--- /dev/null
+DESCRIPTION = "X Pixmap library."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "X-BSD"
+PR = "r1"
+
+DEPENDS = "xproto libx11 util-macros"
+
+XORG_PN = "libXpm"
+
+include xorg-xlibs.inc
+
+do_stage () {
+ install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h
+ oe_libinstall -a -so libXpm ${STAGING_LIBDIR}
+}
+
+PACKAGES =+ "sxpm cxpm"
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
--- /dev/null
+DESCRIPTION = "X Pixmap library."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "X-BSD"
+
+DEPENDS = "xproto libx11 util-macros"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXpm"
+
+include xorg-xlibs.inc
+
+do_stage () {
+ install -m 0644 ${S}/include/X11/xpm.h ${STAGING_INCDIR}/X11/xpm.h
+ oe_libinstall -a -so libXpm ${STAGING_LIBDIR}
+}
+
+PACKAGES =+ "sxpm cxpm"
+FILES_cxpm = "${bindir}/cxpm"
+FILES_sxpm = "${bindir}/sxpm"
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "X-BSD"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "xproto libx11"
+PROVIDES = "xpm"
+DESCRIPTION = "X Pixmap library."
+PR = "r1"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xpm"
+S = "${WORKDIR}/Xpm"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h
+ oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR}
+}
--- /dev/null
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libXrandr-1.0.2/configure.ac~autofoo 2004-01-15 03:23:00.000000000 -0500
++++ libXrandr-1.0.2/configure.ac 2005-01-16 11:18:35.924069872 -0500
+@@ -33,11 +33,11 @@
+ dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
+ dnl
+ AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr)
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+
+ # Check for progs
+ AC_PROG_CC
--- /dev/null
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- Xrandr/configure.ac~autofoo.patch 2004-07-01 15:01:55.000000000 -0400
++++ Xrandr/configure.ac 2005-01-16 11:22:09.169651616 -0500
+@@ -33,11 +33,11 @@
+ dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
+ dnl
+ AC_INIT(libXrandr, 1.0.2, [keithp@keithp.com], libXrandr)
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+
+ # Check for progs
+ AC_PROG_CC
+--- Xrandr/ChangeLog~autofoo.patch 2004-09-19 04:53:38.000000000 -0400
++++ Xrandr/ChangeLog 2005-01-16 11:52:29.694889712 -0500
+@@ -1,3 +1,7 @@
++2005-01-16 Chris Larson <kergoth@handhelds.org>
++
++ * configure.ac: Fix to work with automake 1.9.x.
++
+ 2004-09-19 Carlos Romero <kidcrash@freedesktop.org>
+
+ * Makefile.am:
--- /dev/null
+SECTION = "x11/libs"
+LICENSE = "BSD-X"
+DEPENDS = "randrext libx11 libxrender libxext"
+DESCRIPTION = "X Resize and Rotate extension library."
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXrandr-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXrandr-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X Resize and Rotate extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "randrproto libx11 libxrender libxext"
+
+XORG_PN = "libXrandr"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
--- /dev/null
+DESCRIPTION = "X Resize and Rotate extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "BSD-X"
+
+DEPENDS = "randrproto libx11 libxrender libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXrandr"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "BSD-X"
+SECTION = "x11/libs"
+DEPENDS = "randrext libx11 libxrender libxext"
+DESCRIPTION = "X Resize and Rotate extension library."
+PR = "r1"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrandr"
+S = "${WORKDIR}/Xrandr"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libXrender-0.8.4/configure.ac~autofoo
++++ libXrender-0.8.4/configure.ac
+@@ -33,11 +33,10 @@
+ dnl protocol, so Xrender version l.n.m corresponds to protocol version l.n
+ dnl
+ AC_INIT(libXrender, 0.8.4, [keithp@keithp.com], libXrender)
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+-
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+
+ # Check for progs
+ AC_PROG_CC
--- /dev/null
+SECTION = "libs"
+DEPENDS = "renderext libx11"
+DESCRIPTION = "X Render extension library."
+LICENSE = "BSD"
+PR = "r1"
+
+SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXrender-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X Render extension library."
+SECTION = "libs"
+#MAINTAINER = ""
+LICENSE = "BSD"
+
+DEPENDS = "renderproto libx11"
+
+XORG_PN = "libXrender"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
--- /dev/null
+DESCRIPTION = "X Render extension library."
+SECTION = "libs"
+#MAINTAINER = ""
+LICENSE = "BSD"
+
+DEPENDS = "renderproto libx11"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXrender"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+PR = "r1"
+SECTION = "libs"
+DEPENDS = "renderext libx11"
+DESCRIPTION = "X Render extension library."
+LICENSE = "BSD"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xrender"
+S = "${WORKDIR}/Xrender"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+SECTION = "x11/libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "libx11 xextensions libxext resourceext"
+PROVIDES = "xres"
+DESCRIPTION = "X Resource usage library."
+LICENSE = "X-MIT"
+SRC_URI = "${XLIBS_MIRROR}/libXres-${PV}.tar.bz2"
+S = "${WORKDIR}/libXres-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X Resource usage library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "X-MIT"
+
+DEPENDS = "libx11 xextproto libxext resourceproto"
+PROVIDES = "xres"
+
+XORG_PN = "libXres"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
--- /dev/null
+DESCRIPTION = "X Resource usage library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "X-MIT"
+
+DEPENDS = "libx11 libxext"
+PROVIDES = "xres"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXres"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+SECTION = "x11/libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "libx11 xextensions libxext resourceext"
+PROVIDES = "xres"
+DESCRIPTION = "X Resource usage library."
+LICENSE = "X-MIT"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XRes"
+S = "${WORKDIR}/XRes"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X screen saver extension library."
+SECTION = "libs"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11 libxext xextproto scrnsaverproto"
+PROVIDES = "libxss"
+RREPLACES = "libxss"
+
+XORG_PN = "libXScrnSaver"
+
+include xorg-xlibs.inc
+
+#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+EXTRA_OECONF="--enable-malloc0returnsnull"
--- /dev/null
+LICENSE = "GPL"
+
+PV = "0.0+cvs${SRCDATE}"
+PR = "r2"
+
+SECTION = "libs"
+DEPENDS = "libx11 libxext"
+DESCRIPTION = "X screen saver extension library."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xss"
+S = "${WORKDIR}/Xss"
+
+inherit autotools pkgconfig
+
+#CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libXt-0.1.5/configure.ac~autofoo 2004-05-06 20:19:04.000000000 -0400
++++ libXt-0.1.5/configure.ac 2005-01-18 13:10:13.683262728 -0500
+@@ -28,11 +28,11 @@
+ dnl
+ dnl
+ AC_INIT(libXt, 0.1.5, [keithp@keithp.com], libXt)
++AC_CONFIG_AUX_DIR(.)
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+
+ AM_CONFIG_HEADER(config.h)
+-AC_CONFIG_AUX_DIR(.)
+
+ # Check for progs
+ AC_PROG_CC
--- /dev/null
+SECTION = "x11/libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "libx11 libsm"
+PROVIDES = "xt"
+DESCRIPTION = "X Toolkit Intrinsics"
+LICENSE = "X-MIT"
+PR = "r1"
+SRC_URI = "${XLIBS_MIRROR}/libXt-${PV}.tar.bz2 \
+ file://autofoo.patch;patch=1"
+S = "${WORKDIR}/libXt-${PV}"
+
+PARALLEL_MAKE = ""
+
+inherit autotools pkgconfig
+
+#nasty hack as utils need to be native
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+ oe_runmake -C util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs
+ )
+ oe_runmake
+}
+
+do_stage () {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X Toolkit Intrinsics"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "X-MIT"
+
+DEPENDS = "libx11 libsm util-macros kbproto"
+PROVIDES = "xt"
+
+XORG_PN = "libXt"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
+ )
+ oe_runmake
+}
--- /dev/null
+DESCRIPTION = "X Toolkit Intrinsics"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "X-MIT"
+
+DEPENDS = "libx11 libsm util-macros"
+PROVIDES = "xt"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXt"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs
+ )
+ oe_runmake
+}
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "libx11 libsm"
+PROVIDES = "xt"
+DESCRIPTION = "X Toolkit Intrinsics"
+LICENSE = "X-MIT"
+PR = "r1"
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xt"
+S = "${WORKDIR}/Xt"
+
+inherit autotools pkgconfig
+
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD
+ oe_runmake -C util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs
+ )
+ oe_runmake
+}
+
+
+do_stage () {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X Test Extension: client side library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11 libxext recordproto xextproto inputproto"
+PROVIDES = "xtst"
+
+XORG_PN = "libXtst"
+
+include xorg-xlibs.inc
--- /dev/null
+LICENSE = "GPL"
+PV = "0.0+cvs${SRCDATE}"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+DEPENDS = "libx11 recordext libxext"
+PROVIDES = "xtst"
+DESCRIPTION = "X Test Extension: client side library"
+PR = "r3"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xtst"
+S = "${WORKDIR}/Xtst"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+LICENSE = "GPL"
+SECTION = "x11/libs"
+DEPENDS = "libx11 libxext"
+DESCRIPTION = "X Video extension library."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xv;date=20040918;method=pserver"
+S = "${WORKDIR}/Xv"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+LICENSE = "GPL"
+SECTION = "x11/libs"
+DEPENDS = "libx11 libxext"
+DESCRIPTION = "X Video extension library."
+
+SRC_URI = "${XLIBS_MIRROR}/libXv-${PV}.tar.bz2"
+S = "${WORKDIR}/libXv-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+DESCRIPTION = "X Video extension library."
+SECTION = "x11/libs"
+#MAINTAINER = ""
+LICENSE = "GPL"
+
+DEPENDS = "libx11 libxext xextproto videoproto"
+
+XORG_PN = "libXv"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
--- /dev/null
+--- XvMC/hw/via/Makefile.am.old 2005-03-06 11:25:11.000000000 +0000
++++ XvMC/hw/via/Makefile.am 2005-03-06 11:25:22.000000000 +0000
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = $(XVMC_CFLAGS)
+-libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
++libviaXvMC_la_LIBADD = $(XVMC_LIBS) -ldrm
+
+ lib_LTLIBRARIES = libviaXvMC.la
+
--- /dev/null
+--- XvMC/hw/via/viaXvMC.c.old 2004-10-18 20:54:49.000000000 +0100
++++ XvMC/hw/via/viaXvMC.c 2004-10-18 20:55:03.000000000 +0100
+@@ -43,6 +43,8 @@
+ #include <xf86drm.h>
+ #include <pthread.h>
+ #include "vldXvMC.h"
++
++#define TRUE 1
+
+ #define SAREAPTR(ctx) ((ViaXvMCSAreaPriv *) \
+ (((CARD8 *)(ctx)->sAreaAddress) + \
--- /dev/null
+--- XvMC/configure.ac.old 2004-09-18 13:16:31.000000000 +0100
++++ XvMC/configure.ac 2004-09-18 13:16:32.000000000 +0100
+@@ -14,4 +14,5 @@
+ AC_OUTPUT([Makefile
+ hw/Makefile
+ hw/i810/Makefile
++ hw/via/Makefile
+ xvmc.pc])
+--- /dev/null 2004-06-13 02:32:19.000000000 +0100
++++ XvMC/hw/via/Makefile.am 2004-09-18 13:16:01.000000000 +0100
+@@ -0,0 +1,7 @@
++AM_CFLAGS = $(XVMC_CFLAGS)
++libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
++
++lib_LTLIBRARIES = libviaXvMC.la
++
++libviaXvMC_la_SOURCES = viaXvMC.c viaXvMC.h viaLowLevel.c viaLowLevel.h \
++ viaXvMCPriv.h
+--- XvMC/hw/Makefile.am.old 2004-10-17 22:34:27.000000000 +0100
++++ XvMC/hw/Makefile.am 2004-10-17 22:34:31.000000000 +0100
+@@ -1 +1 @@
+-SUBDIRS = i810
++SUBDIRS = i810 via
--- /dev/null
+DESCRIPTION = "X Video Motion Compensation extension library."
+SECTION = "x11/libs"
+DEPENDS = "libx11 libxext libxv drm xserver-xorg"
+PR = "r2"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
+ cvs://anonymous@cvs.sourceforge.net/cvsroot/unichrome;module=libxvmc;date=${PV};method=pserver \
+ file://via.patch;patch=1 \
+ file://true.patch"
+S = "${WORKDIR}/XvMC"
+
+CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg"
+
+# this one is for via only atm.
+COMPATIBLE_HOST = 'i.86.*-linux'
+
+inherit autotools pkgconfig
+
+do_configure_prepend() {
+ install -d ${S}/hw/via
+ cp ${WORKDIR}/libxvmc/*.[ch] ${S}/hw/via/
+ ( cd ${S}/hw/via ; patch < ${WORKDIR}/true.patch )
+}
+
+do_compile() {
+ oe_runmake
+ oe_runmake -C hw/via
+}
+
+do_stage() {
+ oe_runmake install prefix=${STAGING_DIR} \
+ bindir=${STAGING_BINDIR} \
+ includedir=${STAGING_INCDIR} \
+ libdir=${STAGING_LIBDIR} \
+ datadir=${STAGING_DATADIR} \
+ mandir=${STAGING_DATADIR}/man
+ oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
+ install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
+}
--- /dev/null
+DESCRIPTION = "X Video Motion Compensation extension library."
+SECTION = "x11/libs"
+DEPENDS = "libx11 libxext libxv drm xserver-xorg"
+PR = "r2"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
+ file://true.patch;patch=1 file://drm.patch;patch=1"
+S = "${WORKDIR}/XvMC"
+
+CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE"
+
+# this one is for via only atm.
+COMPATIBLE_HOST = 'i.86.*-linux'
+
+inherit autotools pkgconfig
+
+do_compile() {
+ oe_runmake
+ oe_runmake -C hw/via
+}
+
+do_install() {
+ oe_runmake DESTDIR='${D}' install
+ oe_runmake -C hw/via DESTDIR='${D}' install
+}
+
+do_stage() {
+ oe_runmake install prefix=${STAGING_DIR} \
+ bindir=${STAGING_BINDIR} \
+ includedir=${STAGING_INCDIR} \
+ libdir=${STAGING_LIBDIR} \
+ datadir=${STAGING_DATADIR} \
+ mandir=${STAGING_DATADIR}/man
+ oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
+ install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
+}
--- /dev/null
+DESCRIPTION = "X Video Motion Compensation extension library."
+SECTION = "x11/libs"
+DEPENDS = "libx11 libxext libxv drm xserver-xorg"
+PR = "r0"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XvMC;date=${PV};method=pserver \
+ ${FREEDESKTOP_CVS}/xorg;module=xc/lib/XvMC;date=${PV};method=pserver \
+ file://true.patch;patch=1 file://drm.patch;patch=1"
+S = "${WORKDIR}/XvMC"
+
+CFLAGS += "-I${STAGING_INCDIR}/X11/extensions -I${STAGING_INCDIR}/xserver-xorg -D_BSD_SOURCE"
+
+# this one is for via only atm.
+COMPATIBLE_HOST = 'i.86.*-linux'
+
+inherit autotools pkgconfig
+
+do_compile() {
+ oe_runmake
+ oe_runmake -C hw/via
+}
+
+do_install() {
+ oe_runmake DESTDIR='${D}' install
+ oe_runmake -C hw/via DESTDIR='${D}' install
+}
+
+do_stage() {
+ oe_runmake install prefix=${STAGING_DIR} \
+ bindir=${STAGING_BINDIR} \
+ includedir=${STAGING_INCDIR} \
+ libdir=${STAGING_LIBDIR} \
+ datadir=${STAGING_DATADIR} \
+ mandir=${STAGING_DATADIR}/man
+ oe_libinstall -so -C hw/via libviaXvMC ${STAGING_LIBDIR}
+ install hw/via/vldXvMC.h ${STAGING_INCDIR}/X11/extensions/
+}
--- /dev/null
+DESCRIPTION = "Xxf86dga extension library."
+SECTION = "x11/libs"
+LICENSE = "XFree86"
+
+DEPENDS = "libx11 libxext xf86dgaproto"
+
+XORG_PN = "libXxf86dga"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
+}
--- /dev/null
+DESCRIPTION = "Xxf86dga extension library."
+SECTION = "x11/libs"
+LICENSE = "XFree86"
+
+DEPENDS = "libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXxf86dga"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
+do_stage() {
+ oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
+}
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "XFree86"
+
+SECTION = "x11/libs"
+DEPENDS = "libx11 libxext xxf86dgaext"
+DESCRIPTION = "Xxf86dga extension library."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86dga"
+S = "${WORKDIR}/Xxf86dga"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ oe_libinstall -so -a libXxf86dga ${STAGING_LIBDIR}
+}
--- /dev/null
+DESCRIPTION = "Xxf86vm extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT"
+DEPENDS = "libx11 libxext xf86miscproto"
+
+XORG_PN = "libXxf86misc"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
--- /dev/null
+DESCRIPTION = "Xxf86vm extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT"
+DEPENDS = "libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXxf86misc"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
--- /dev/null
+DESCRIPTION = "Xxf86vm extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT"
+
+DEPENDS = "libx11 libxext xf86vidmodeproto"
+
+XORG_PN = "libXxf86vm"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
--- /dev/null
+DESCRIPTION = "Xxf86vm extension library."
+SECTION = "x11/libs"
+LICENSE = "MIT"
+
+DEPENDS = "libx11 libxext"
+
+XORG_RELEASE = "X11R7.1"
+XORG_PN = "libXxf86vm"
+
+include xorg-xlibs.inc
+
+EXTRA_OECONF="--enable-malloc0returnsnull"
+
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT"
+
+SECTION = "x11/libs"
+DEPENDS = "libx11 libxext xxf86vmext"
+DESCRIPTION = "Xxf86vm extension library."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xxf86vm"
+S = "${WORKDIR}/Xxf86vm"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+XORG_PV = "${@['${XORG_RELEASE}-${PV}','${PV}'][bb.data.getVar('PV', d, 1)[0:4]=='X11R']}"
+XORG_RELEASE ?= "X11R7.0"
+
+SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/lib/${XORG_PN}-${XORG_PV}.tar.bz2"
+S = "${WORKDIR}/${XORG_PN}-${XORG_PV}"
+
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+SECTION = "x11/base"
+include xtrans_${PV}.bb
+inherit native
--- /dev/null
+SECTION = "x11/libs"
+LICENSE = "MIT"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DESCRIPTION = "network API translation layer to \
+insulate X applications and libraries from OS \
+network vageries."
+
+SRC_URI = "${XLIBS_MIRROR}/libXtrans-0.1.tar.bz2"
+S = "${WORKDIR}/libXtrans-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+LICENSE = "MIT"
+SECTION = "x11/libs"
+DESCRIPTION = "network API translation layer to \
+insulate X applications and libraries from OS \
+network vageries."
+
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE = "MIT"
+SECTION = "x11/libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DESCRIPTION = "network API translation layer to \
+insulate X applications and libraries from OS \
+network vageries."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=xtrans"
+S = "${WORKDIR}/xtrans"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
+
+CONFLICTS = "compositeext"
--- /dev/null
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
+CONFLICTS = "compositeext"
--- /dev/null
+include proto-common.inc
+
+CONFLICTS = "damageext"
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
+
+CONFLICTS = "fixesext"
--- /dev/null
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
+CONFLICTS = "fixesext"
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
+
+CONFLICTS = "randrext"
--- /dev/null
+include proto-common.inc
+
+CONFLICTS = "recordext"
--- /dev/null
+include proto-common.inc
+
+CONFLICTS = "renderext"
--- /dev/null
+include proto-common.inc
+
+CONFLICTS = "resourceext"
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
+
+PROVIDES = "xextensions"
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
+
+CONFLICTS = "xxf86dgaext"
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
+
+CONFLICTS = "xxf86vmext"
--- /dev/null
+include proto-common.inc
--- /dev/null
+DESCRIPTION = "X protocol headers"
+SECTION = "x11/libs"
+LICENSE= "MIT-X"
+#MAINTAINER = ""
+
+SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/proto/${PN}-${XORG_RELEASE}-${PV}.tar.bz2"
+
+S = "${WORKDIR}/${PN}-${XORG_RELEASE}-${PV}"
+
+XORG_RELEASE ?= "X11R7.0"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
--- /dev/null
+SECTION = "unknown"
+include xproto_${PV}.bb
+inherit native
+PROVIDES = ""
--- /dev/null
+SECTION = "unknown"
+include xproto_cvs.bb
+inherit native
+PROVIDES = ""
--- /dev/null
+LICENSE= "MIT"
+SECTION = "x11/libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DESCRIPTION = "X protocol and ancillary headers."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto;date=20050226"
+S = "${WORKDIR}/Xproto"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+SECTION = "x11/libs"
+LICENSE= "MIT"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DESCRIPTION = "X protocol and ancillary headers."
+
+SRC_URI = "${XLIBS_MIRROR}/xproto-${PV}.tar.gz"
+S = "${WORKDIR}/xproto-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+include proto-common.inc
--- /dev/null
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+LICENSE= "MIT"
+SECTION = "x11/libs"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DESCRIPTION = "X protocol and ancillary headers."
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto"
+S = "${WORKDIR}/Xproto"
+
+inherit autotools pkgconfig
+
+
+do_stage() {
+ autotools_stage_all
+}
--- /dev/null
+include proto-common.inc
--- /dev/null
+DESCRIPTION = "X autotools macros"
+SECTION = "x11/libs"
+LICENSE= "Xorg"
+#MAINTAINER = ""
+
+XORG_PN = "${PN}"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-X11R7.0-${PV}.tar.bz2"
--- /dev/null
+DESCRIPTION = "X autotools macros"
+SECTION = "x11/libs"
+LICENSE= "Xorg"
+#MAINTAINER = ""
+
+XORG_PN = "${PN}"
+XORG_RELEASE = "X11R7.1"
+
+include xorg-xlibs.inc
+
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/util/${PN}-X11R7.1-${PV}.tar.bz2"
--- /dev/null
+--- xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate.orig 2006-04-09 15:12:16.167950472 +0200
++++ xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate 2006-04-09 15:14:51.511334688 +0200
+@@ -2,4 +2,9 @@
+
+ if [ ! -f /etc/pointercal ]; then
+ /usr/bin/run-calibrate.sh
++
++ if [ -x /etc/init.d/zaurusd ]; then
++ /etc/init.d/zaurusd stop
++ /etc/init.d/zaurusd start
++ fi
+ fi
--- /dev/null
+diff -Nur xserver-common-1.8.orig/X11/Xinit.d/12keymap xserver-common-1.8/X11/Xinit.d/12keymap
+--- xserver-common-1.8.orig/X11/Xinit.d/12keymap 2006-05-17 12:02:52.645201000 +0200
++++ xserver-common-1.8/X11/Xinit.d/12keymap 2006-05-17 12:03:49.401573648 +0200
+@@ -9,6 +9,9 @@
+ "SHARP Akita" | "SHARP Borzoi" | "SHARP Spitz")
+ xmodmap - < /etc/X11/slcXXXX.xmodmap
+ ;;
++ "SHARP Poodle")
++ xmodmap - < /etc/X11/poodle.xmodmap
++ ;;
+ "Sharp-Collie")
+ xmodmap - < /etc/X11/collie.xmodmap
+ ;;
+diff -Nur xserver-common-1.8.orig/X11/poodle.xmodmap xserver-common-1.8/X11/poodle.xmodmap
+--- xserver-common-1.8.orig/X11/poodle.xmodmap 1970-01-01 01:00:00.000000000 +0100
++++ xserver-common-1.8/X11/poodle.xmodmap 2006-05-18 13:42:45.711264920 +0200
+@@ -0,0 +1,25 @@
++keycode 37 = Control_L
++keycode 64 = Alt_L
++
++
++keycode 50 = Shift_L
++keycode 62 = Shift_R
++keycode 75 = Mode_switch
++
++
++
++clear control
++clear shift
++clear lock
++clear mod4
++clear mod1
++
++add control = Control_L
++add shift = Shift_L Shift_R
++add lock = Caps_Lock
++
++! This is AltGr
++add mod4 = Mode_switch
++
++add mod1 = Alt_L
++
--- /dev/null
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: setDPI.sh
+# Date: 09-Apr-06
+
+# This script configures Xft.dpi dependent on your screens DPI. This insures that the same font-size
+# setting of 7 can be used on all machines.
+
+
+XDEFAULTS="/etc/X11/Xdefaults"
+
+
+
+set_dpi() {
+
+ CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Xft.dpi\:/s/.*\:\(.*\)/\1/p" | sed -n "s/\ //p"`"
+
+ if test "$CURRENT_SETTING" != "$1"
+ then
+ echo "Using Xft.dpi of $SET_SCREEN_DPI for your $SCREEN_DPI DPI screen"
+
+ if grep -q "Xft.dpi" "$XDEFAULTS"
+ then
+ cat "${XDEFAULTS}" | sed "s/^Xft.dpi\:.*/Xft.dpi\: $SET_SCREEN_DPI/" > "${XDEFAULTS}_"
+ mv "${XDEFAULTS}_" "${XDEFAULTS}"
+ else
+ echo -e "Xft.dpi: $SET_SCREEN_DPI\n" >> "$XDEFAULTS"
+ fi
+ else
+ echo "Your $SCREEN_DPI DPI screen is already configured."
+ fi
+}
+
+set_rxvt_font() {
+
+ CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Rxvt\*font/s/\(.*\pixelsize=\)\(.*\)/\2/p"`"
+
+ if test "$1" -gt 100
+ then
+
+ # Configure the rxvt font-size for your screen here:
+ test "$1" -gt 180 -a "$1" -lt "221" && RXVT_FONT_SIZE=16
+
+ if test -z "$RXVT_FONT_SIZE"
+ then
+ echo "WARNING: No rxvt font-size configured for a $SCREEN_DPI DPI screen!"
+ echo "Defaulting to size 9"
+ RXVT_FONT_SIZE=9
+ fi
+
+ if test "$CURRENT_SETTING" != "$RXVT_FONT_SIZE"
+ then
+ echo "Using a rxvt font-size of $RXVT_FONT_SIZE"
+ cat ${XDEFAULTS} | sed "/Rxvt\*font/s/\(.*\pixelsize\)\(=*.*\)/\1=$RXVT_FONT_SIZE/" > ${XDEFAULTS}_
+ mv ${XDEFAULTS}_ ${XDEFAULTS}
+ else
+ echo "The rxvt font-size is already configured"
+ fi
+ fi
+}
+
+if test -z "$DISPLAY"
+then
+ echo "DISPLAY is not set, aborting..."
+ exit 0
+fi
+
+SCREEN_DPI="`/usr/bin/xdpyinfo | grep "dots per inch" | awk '{print $2}'| sed -n "s/\(.*\)x\(.*\)/\2/p"`"
+
+if test -z "$SCREEN_DPI"
+then
+ echo "WARNING: Couldn't read your screens DPI, defaulting to 100"
+ SCREEN_DPI=100
+fi
+
+# Configure your screen here:
+test "$SCREEN_DPI" -gt 180 -a "$SCREEN_DPI" -lt "221" && SET_SCREEN_DPI=160
+test "$SCREEN_DPI" -gt 90 -a "$SCREEN_DPI" -lt "121" && SET_SCREEN_DPI=100
+
+
+if test -z "$SET_SCREEN_DPI"
+then
+ echo "WARNING: No default configuration found for your $SCREEN_DPI DPI screen!"
+ echo "Using 100 DPI"
+ SET_SCREEN_DPI=100
+fi
+
+set_dpi "$SET_SCREEN_DPI"
+set_rxvt_font "$SCREEN_DPI"
--- /dev/null
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r1"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh \
+ file://calibrate_zaurusd.patch;patch=1 \
+ file://poodle-xmodmap-2.6.patch;patch=1"
+
+do_install_append() {
+ install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
--- /dev/null
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r1"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
--- /dev/null
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r2"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh \
+ file://calibrate_zaurusd.patch;patch=1"
+
+do_install_append() {
+ install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
--- /dev/null
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r1"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh \
+ file://calibrate_zaurusd.patch;patch=1 \
+ file://poodle-xmodmap-2.6.patch;patch=1"
+
+do_install_append() {
+ install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
--- /dev/null
+--- configure.ac~ 2005-06-03 17:23:36.000000000 +0200
++++ configure.ac 2005-06-03 17:23:36.000000000 +0200
+@@ -447,10 +447,6 @@
+ KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
+ fi
+
+-if test "$TSLIB" = yes; then
+- KDRIVE_LIBS="${KDRIVE_LIBS} -lts"
+-fi
+-
+ AC_SUBST([KDRIVE_PURE_LIBS])
+ AC_SUBST([KDRIVE_PURE_INCS])
+ AC_SUBST([KDRIVE_LIBS])
--- /dev/null
+--- xserver/hw/kdrive/fbdev/fbdev.c~ 2004-09-15 00:08:10.000000000 +0100
++++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-13 17:47:02.000000000 +0000
+@@ -198,6 +198,11 @@
+ return FALSE;
+ }
+
++ /* Re-get the "fixed" parameters since they might have changed */
++ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
++ if (k < 0)
++ perror ("FBIOGET_FSCREENINFO");
++
+ /* Now get the new screeninfo */
+ ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
+ depth = priv->var.bits_per_pixel;
--- /dev/null
+Index: hw/kdrive/src/kmode.c
+===================================================================
+RCS file: /cvs/xserver/xserver/hw/kdrive/src/kmode.c,v
+retrieving revision 1.13
+diff -u -r1.13 kmode.c
+--- xserver/hw/kdrive/src/kmode.c 26 Jul 2004 17:14:26 -0000 1.13
++++ xserver/hw/kdrive/src/kmode.c 28 Aug 2004 14:04:19 -0000
+@@ -41,6 +41,11 @@
+ 1, 11, 14, KdSyncNegative,
+ },
+
++ { 240, 320, 64, 0,
++ 0, 0, 0, KdSyncNegative,
++ 0, 0, 0, KdSyncNegative,
++ },
++
+ /* Other VESA modes */
+ { 640, 350, 85, 31500, /* VESA */
+ 32, 96, 192, KdSyncPositive, /* 26.413 */
--- /dev/null
+LICENSE = "MIT"
+DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
+PROVIDES = "virtual/xserver"
+PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
+SECTION = "x11/base"
+DESCRIPTION = "X server from freedesktop.org"
+DESCRIPTION_xserver-kdrive-omap = "X server from freedesktop.org with patches from maemo.org, supporting X on OMAP based devices"
+
+PR = "r2"
+
+FILES_${PN} = "${bindir}/Xomap"
+
+SRC_URI = " http://stage.maemo.org/pool/maemo/ossw/source/x/xserver-kdrive/xserver-kdrive_${PV}-5.tar.gz \
+ file://kmode.patch;patch=1 \
+ file://fbdev-not-fix.patch;patch=1 \
+ file://configure-tslib.patch;patch=1;pnum=0"
+
+S = "${WORKDIR}/xserver"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-composite --disable-xinerama --enable-xomapserver \
+ --enable-xsp --disable-xlocale --disable-rpath --prefix=/usr"
--- /dev/null
+--- 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,
--- /dev/null
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- xserver/hw/kdrive/linux/linux.c~devfs
++++ xserver/hw/kdrive/linux/linux.c
+@@ -82,10 +82,10 @@
+ vtno = kdVirtualTerminal;
+ else
+ {
+- if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0)
++ if ((fd = open("/dev/vc/0",O_WRONLY,0)) < 0)
+ {
+ FatalError(
+- "LinuxInit: Cannot open /dev/tty0 (%s)\n",
++ "LinuxInit: Cannot open /dev/tty/0 (%s)\n",
+ strerror(errno));
+ }
+ if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) ||
+@@ -96,7 +96,7 @@
+ }
+ close(fd);
+
+- sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */
++ sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/tty1-64 */
+
+ if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0)
+ {
+@@ -113,7 +113,7 @@
+ *
+ * Why is this needed?
+ */
+- LinuxCheckChown ("/dev/tty0");
++ LinuxCheckChown ("/dev/vc/0");
+ /*
+ * Linux doesn't switch to an active vt after the last close of a vt,
+ * so we do this ourselves by remembering which is active now.
+@@ -453,7 +453,7 @@
+ activeVT = -1;
+ }
+ close(LinuxConsoleFd); /* make the vt-manager happy */
+- fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0);
++ fd = open ("/dev/vc/0", O_RDWR|O_NDELAY, 0);
+ if (fd >= 0)
+ {
+ memset (&vts, '\0', sizeof (vts)); /* valgrind */
--- /dev/null
+--- xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 +0000
++++ xserver/hw/kdrive/linux/linux.c 2005-04-23 15:57:05.001094192 +0000
+@@ -342,7 +342,7 @@
+ /*
+ * Open the APM driver
+ */
+- LinuxApmFd = open ("/dev/apm_bios", 2);
++ /*LinuxApmFd = open ("/dev/apm_bios", 2);
+ if (LinuxApmFd < 0 && errno == ENOENT)
+ LinuxApmFd = open ("/dev/misc/apm_bios", 2);
+ if (LinuxApmFd >= 0)
+@@ -352,7 +352,7 @@
+ RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
+ AddEnabledDevice (LinuxApmFd);
+ }
+-
++ */
+ /*
+ * now get the VT
+ */
--- /dev/null
+--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
+@@ -505,7 +505,11 @@
+ XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
+
+ dnl Core modules for most extensions, et al.
++if test "$KDRIVE" = yes; then
++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto"
++else
+ REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto"
++fi
+ REQUIRED_LIBS="xfont xau fontenc"
+
+ AM_CONDITIONAL(XV, [test "x$XV" = xyes])
+@@ -1514,7 +1526,9 @@
+ AC_SUBST(XKB_COMPILED_DIR)
+
+ dnl and the rest of these are generic, so they're in config.h
++if test ! x"$KDRIVE" = xyes; then
+ AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
++fi
+ AC_DEFINE(XResExtension, 1, [Build XRes extension])
+
+ dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined
+@@ -1534,10 +1548,12 @@
+
+ AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
+
++if test ! "x$KDRIVE" = xyes ; then
+ dnl xorgconfig CLI configuration utility
+ PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
+ AC_SUBST(XORGCONFIG_DEP_CFLAGS)
+ AC_SUBST(XORGCONFIG_DEP_LIBS)
++fi
+
+ dnl xorgcfg GUI configuration utility
+ AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg],
--- /dev/null
+--- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig 2006-06-08 14:49:12.158684250 +0200
++++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c 2006-06-08 14:49:52.493205000 +0200
+@@ -52,8 +52,8 @@
+ /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */
+
+ #define NEED_REPLIES
+ #ifdef HAVE_DIX_CONFIG_H
+-#include <dix-config.h>
++#include <kdrive-config.h>
+ #endif
+
+ #include <X11/X.h>
--- /dev/null
+--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
+@@ -1438,6 +1446,10 @@
+ fi
+
+- # tslib...
++ AC_CHECK_HEADERS([tslib.h])
++ if test "$ac_cv_header_tslib_h" = yes; then
++ AC_DEFINE(TSLIB, 1, [Build kdrive with tslib support])
++ AC_DEFINE(TOUCHSCREEN, 1, [Build kdrive with touchscreen support])
++ fi
+
+ # damage shadow extension glx (NOTYET) fb mi
+ KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'
+@@ -1467,7 +1479,7 @@
+ AC_SUBST(KDRIVE_CFLAGS)
+ AC_SUBST(KDRIVE_PURE_LIBS)
+ AC_SUBST(KDRIVE_LIBS)
+-AM_CONDITIONAL(TSLIB, false)
++AM_CONDITIONAL(TSLIB, [test x"$ac_cv_header_tslib_h" = xyes])
+ AM_CONDITIONAL(H3600_TS, false)
+ AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
+ AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
--- /dev/null
+--- xserver.orig/hw/kdrive/epson/epson13806stub.c 2004-10-20 10:20:51.000000000 +0200
++++ xserver/hw/kdrive/epson/epson13806stub.c 2005-03-17 14:38:22.000000000 +0100
+@@ -55,7 +55,7 @@
+ {
+ KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
+ #ifdef TOUCHSCREEN
+- KdInitTouchScreen (&TsFuncs);
++ KdAddMouseDriver (&TsFuncs);
+ #endif
+ }
+
--- /dev/null
+Index: xserver/miext/shadow/shrotate.c
+===================================================================
+RCS file: /scratch/openbsd/cvs/XF4/xc/programs/Xserver/miext/shadow/shrotate.c,v
+retrieving revision 1.2
+diff -u -r1.2 shrotate.c
+--- xserver/miext/shadow/shrotate.c 3 Nov 2004 00:09:54 -0000 1.2
++++ xserver/miext/shadow/shrotate.c 20 Sep 2005 23:07:58 -0000
+@@ -45,6 +45,106 @@
+ #define TOP_TO_BOTTOM 2
+ #define BOTTOM_TO_TOP -2
+
++
++static void
++shadowUpdateRotatePackedSubRectangle(shadowBufPtr pBuf,
++ FbBits *shaLine, int shaFirstShift,
++ int shaStepOverX, int shaStepOverY,
++ int shaStepDownX, int shaStepDownY,
++ int shaBpp, FbBits shaMask,
++ ScreenPtr pScreen,
++ int scr_x1, int scr_y,
++ int scr_h, int scr_w,
++ int pixelsPerBits)
++{
++ FbBits *sha;
++ int shaShift;
++ int scr_x;
++ int w;
++
++ /*
++ * Copy the bits, always write across the physical frame buffer
++ * to take advantage of write combining.
++ */
++ while (scr_h--)
++ {
++ int p;
++ FbBits bits;
++ FbBits *win;
++ int i;
++ CARD32 winSize;
++
++ sha = shaLine;
++ shaShift = shaFirstShift;
++ w = scr_w;
++ scr_x = scr_x1 * shaBpp >> FB_SHIFT;
++
++ while (w)
++ {
++ /*
++ * Map some of this line
++ */
++ win = (FbBits *) (*pBuf->window) (pScreen,
++ scr_y,
++ scr_x << 2,
++ SHADOW_WINDOW_WRITE,
++ &winSize,
++ pBuf->closure);
++ i = (winSize >> 2);
++ if (i > w)
++ i = w;
++ w -= i;
++ scr_x += i;
++ /*
++ * Copy the portion of the line mapped
++ */
++ while (i--)
++ {
++ bits = 0;
++ p = pixelsPerBits;
++ /*
++ * Build one word of output from multiple inputs
++ */
++ while (p--)
++ {
++ bits = FbScrLeft(bits, shaBpp);
++ bits |= FbScrRight (*sha, shaShift) & shaMask;
++
++ shaShift -= shaStepOverX;
++ if (shaShift >= FB_UNIT)
++ {
++ shaShift -= FB_UNIT;
++ sha--;
++ }
++ else if (shaShift < 0)
++ {
++ shaShift += FB_UNIT;
++ sha++;
++ }
++ sha += shaStepOverY;
++ }
++ *win++ = bits;
++ }
++ }
++ scr_y++;
++ shaFirstShift -= shaStepDownX;
++ if (shaFirstShift >= FB_UNIT)
++ {
++ shaFirstShift -= FB_UNIT;
++ shaLine--;
++ }
++ else if (shaFirstShift < 0)
++ {
++ shaFirstShift += FB_UNIT;
++ shaLine++;
++ }
++ shaLine += shaStepDownY;
++ }
++}
++
++#define BLOCKSIZE_HEIGHT 32
++#define BLOCKSIZE_WIDTH 32
++
+ void
+ shadowUpdateRotatePacked (ScreenPtr pScreen,
+ shadowBufPtr pBuf)
+@@ -61,7 +161,6 @@
+ int sha_x1 = 0, sha_y1 = 0;
+ int scr_x1 = 0, scr_x2 = 0, scr_y1 = 0, scr_y2 = 0, scr_w, scr_h;
+ int scr_x, scr_y;
+- int w;
+ int pixelsPerBits;
+ int pixelsMask;
+ FbStride shaStepOverY = 0, shaStepDownY = 0;
+@@ -221,86 +320,46 @@
+ ((sha_x1 * shaBpp) >> FB_SHIFT));
+
+ /*
+- * Copy the bits, always write across the physical frame buffer
+- * to take advantage of write combining.
++ * Copy in blocks of size BLOCKSIZE_WIDTH x BLOCKSIZE_HEIGHT
++ * to reduce the number of cache misses when rotating 90 or
++ * 270 degrees.
+ */
+- while (scr_h--)
++ for (scr_y = scr_y1; scr_y < scr_y2; scr_y += BLOCKSIZE_HEIGHT)
+ {
+- int p;
+- FbBits bits;
+- FbBits *win;
+- int i;
+- CARD32 winSize;
+-
+ sha = shaLine;
+ shaShift = shaFirstShift;
+- w = scr_w;
+- scr_x = scr_x1 * shaBpp >> FB_SHIFT;
+
+- while (w)
++ for (scr_x = scr_x1; scr_x < scr_x2; scr_x += BLOCKSIZE_WIDTH)
+ {
+- /*
+- * Map some of this line
+- */
+- win = (FbBits *) (*pBuf->window) (pScreen,
+- scr_y,
+- scr_x << 2,
+- SHADOW_WINDOW_WRITE,
+- &winSize,
+- pBuf->closure);
+- i = (winSize >> 2);
+- if (i > w)
+- i = w;
+- w -= i;
+- scr_x += i;
+- /*
+- * Copy the portion of the line mapped
+- */
+- while (i--)
+- {
+- bits = 0;
+- p = pixelsPerBits;
+- /*
+- * Build one word of output from multiple inputs
+- *
+- * Note that for 90/270 rotations, this will walk
+- * down the shadow hitting each scanline once.
+- * This is probably not very efficient.
+- */
+- while (p--)
+- {
+- bits = FbScrLeft(bits, shaBpp);
+- bits |= FbScrRight (*sha, shaShift) & shaMask;
++ int h = BLOCKSIZE_HEIGHT;
++ int w = BLOCKSIZE_WIDTH;
+
+- shaShift -= shaStepOverX;
+- if (shaShift >= FB_UNIT)
+- {
+- shaShift -= FB_UNIT;
+- sha--;
+- }
+- else if (shaShift < 0)
+- {
+- shaShift += FB_UNIT;
+- sha++;
+- }
+- sha += shaStepOverY;
+- }
+- *win++ = bits;
+- }
+- }
+- scr_y++;
+- shaFirstShift -= shaStepDownX;
+- if (shaFirstShift >= FB_UNIT)
+- {
+- shaFirstShift -= FB_UNIT;
+- shaLine--;
+- }
+- else if (shaFirstShift < 0)
+- {
+- shaFirstShift += FB_UNIT;
+- shaLine++;
++ if (scr_y + h > scr_y2)
++ h = scr_y2 - scr_y;
++ if (scr_x + w > scr_x2)
++ w = scr_x2 - scr_x;
++ w = (w * shaBpp) >> FB_SHIFT;
++
++ shadowUpdateRotatePackedSubRectangle
++ (pBuf,
++ sha, shaShift,
++ shaStepOverX, shaStepOverY,
++ shaStepDownX, shaStepDownY,
++ shaBpp, shaMask,
++ pScreen,
++ scr_x, scr_y,
++ h, w,
++ pixelsPerBits);
++
++ shaShift -= BLOCKSIZE_WIDTH * shaStepOverX;
++ sha += BLOCKSIZE_WIDTH * shaStepOverY;
++ sha -= (shaShift >> FB_SHIFT);
++ shaShift &= FB_MASK;
+ }
+- shaLine += shaStepDownY;
++ shaFirstShift -= BLOCKSIZE_HEIGHT * shaStepDownX;
++ shaLine += BLOCKSIZE_HEIGHT * shaStepDownY;
++ shaLine -= (shaFirstShift >> FB_SHIFT);
++ shaFirstShift &= FB_MASK;
+ }
+ }
+ }
--- /dev/null
+--- xserver/hw/kdrive/fbdev/fbdev.c~ 2004-09-15 00:08:10.000000000 +0100
++++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-13 17:47:02.000000000 +0000
+@@ -198,6 +198,11 @@
+ return FALSE;
+ }
+
++ /* Re-get the "fixed" parameters since they might have changed */
++ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
++ if (k < 0)
++ perror ("FBIOGET_FSCREENINFO");
++
+ /* Now get the new screeninfo */
+ ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
+ depth = priv->var.bits_per_pixel;
--- /dev/null
+# Kdrive evdev support patch, posted by Ander Conselvan de Oliveira at
+# http://lists.freedesktop.org/archives/xorg/2005-December/011635.html
+diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/linux/evdev.c xserver/hw/kdrive/linux/evdev.c
+--- xserver.original/hw/kdrive/linux/evdev.c 2005-12-16 10:36:05.000000000 -0200
++++ xserver/hw/kdrive/linux/evdev.c 2005-12-16 10:40:51.077410192 -0200
+@@ -31,9 +31,11 @@
+ #include <X11/X.h>
+ #include <X11/Xproto.h>
+ #include <X11/Xpoll.h>
++#include <X11/keysym.h>
+ #include "inputstr.h"
+ #include "scrnintstr.h"
+ #include "kdrive.h"
++#include "kkeymap.h"
+
+ #define NUM_EVENTS 128
+ #define ABS_UNSET -65535
+@@ -105,9 +107,10 @@
+ {
+ KdMouseInfo *mi = closure;
+ Kevdev *ke = mi->driver;
+- int i;
++ int i, j;
+ struct input_event events[NUM_EVENTS];
+ int n;
++ int flags;
+
+ n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event));
+ if (n <= 0)
+@@ -115,22 +118,64 @@
+ n /= sizeof (struct input_event);
+ for (i = 0; i < n; i++)
+ {
++ flags = KD_MOUSE_DELTA | kdMouseInfo->buttonState;
+ switch (events[i].type) {
+ case EV_SYN:
+ break;
+ case EV_KEY:
+- EvdevMotion (mi);
+- ASSIGNBIT(ke->key,events[i].code, events[i].value);
+- if (events[i].code < 0x100)
+- ErrorF ("key %d %d\n", events[i].code, events[i].value);
+- else
+- ErrorF ("key 0x%x %d\n", events[i].code, events[i].value);
++ if (events[i].code >= BTN_MOUSE && events[i].code < BTN_JOYSTICK) {
++ switch (events[i].code) {
++ case BTN_LEFT:
++ if (events[i].value == 1)
++ flags |= KD_BUTTON_1;
++ else
++ flags &= ~KD_BUTTON_1;
++ break;
++ case BTN_MIDDLE:
++ if (events[i].value == 1)
++ flags |= KD_BUTTON_2;
++ else
++ flags &= ~KD_BUTTON_2;
++ break;
++ case BTN_RIGHT:
++ if (events[i].value == 1)
++ flags |= KD_BUTTON_3;
++ else
++ flags &= ~KD_BUTTON_3;
++ break;
++ default:
++ /* Unknow button */
++ break;
++ }
++ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0);
++ }
+ break;
+ case EV_REL:
+- ke->rel[events[i].code] += events[i].value;
++ if (events[i].code == REL_X) {
++ KdEnqueueMouseEvent (kdMouseInfo, flags, events[i].value, 0);
++ }
++ else if (events[i].code == REL_Y) {
++ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, events[i].value);
++ }
++ else if (events[i].code == REL_WHEEL) {
++ for (j = 0; j < abs (events[i].value); j++) {
++ if (events[i].value > 0)
++ flags |= KD_BUTTON_4;
++ else
++ flags |= KD_BUTTON_5;
++
++ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0);
++
++ if (events[i].value > 0)
++ flags &= ~KD_BUTTON_4;
++ else
++ flags &= ~KD_BUTTON_5;
++
++ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0);
++ } /* events[i].code == REL_WHEEL */
++ }
+ break;
+ case EV_ABS:
+- ke->abs[events[i].code] = events[i].value;
+ break;
+ }
+ }
+@@ -173,6 +218,12 @@
+ fd = open (kdefaultEvdev[i], 2);
+ if (fd >= 0)
+ {
++ if (ioctl (fd, EVIOCGRAB, 1) < 0)
++ {
++ close (fd);
++ continue;
++ }
++
+ mi->name = KdSaveString (kdefaultEvdev[i]);
+ break;
+ }
+@@ -287,7 +338,319 @@
+ EvdevFini,
+ };
+
+-#if 0
++/* Keyboard */
++
++int kbd_fd = -1;
++int EvdevInputType = 0;
++
++KeySym evdevKeymap[(194 - 1 + 1) * 2] = {
++/* These are directly mapped from DOS scanset 0 */
++/* 1 8 */ XK_Escape, NoSymbol,
++/* 2 9 */ XK_1, XK_exclam,
++/* 3 10 */ XK_2, XK_at,
++/* 4 11 */ XK_3, XK_numbersign,
++/* 5 12 */ XK_4, XK_dollar,
++/* 6 13 */ XK_5, XK_percent,
++/* 7 14 */ XK_6, XK_asciicircum,
++/* 8 15 */ XK_7, XK_ampersand,
++/* 9 16 */ XK_8, XK_asterisk,
++/* 10 17 */ XK_9, XK_parenleft,
++/* 11 18 */ XK_0, XK_parenright,
++/* 12 19 */ XK_minus, XK_underscore,
++/* 13 20 */ XK_equal, XK_plus,
++/* 14 21 */ XK_BackSpace, NoSymbol,
++/* 15 22 */ XK_Tab, NoSymbol,
++/* 16 23 */ XK_Q, NoSymbol,
++/* 17 24 */ XK_W, NoSymbol,
++/* 18 25 */ XK_E, NoSymbol,
++/* 19 26 */ XK_R, NoSymbol,
++/* 20 27 */ XK_T, NoSymbol,
++/* 21 28 */ XK_Y, NoSymbol,
++/* 22 29 */ XK_U, NoSymbol,
++/* 23 30 */ XK_I, NoSymbol,
++/* 24 31 */ XK_O, NoSymbol,
++/* 25 32 */ XK_P, NoSymbol,
++/* 26 33 */ XK_bracketleft, XK_braceleft,
++/* 27 34 */ XK_bracketright, XK_braceright,
++/* 28 35 */ XK_Return, NoSymbol,
++/* 29 36 */ XK_Control_L, NoSymbol,
++/* 30 37 */ XK_A, NoSymbol,
++/* 31 38 */ XK_S, NoSymbol,
++/* 32 39 */ XK_D, NoSymbol,
++/* 33 40 */ XK_F, NoSymbol,
++/* 34 41 */ XK_G, NoSymbol,
++/* 35 42 */ XK_H, NoSymbol,
++/* 36 43 */ XK_J, NoSymbol,
++/* 37 44 */ XK_K, NoSymbol,
++/* 38 45 */ XK_L, NoSymbol,
++/* 39 46 */ XK_semicolon, XK_colon,
++/* 40 47 */ XK_apostrophe, XK_quotedbl,
++/* 41 48 */ XK_grave, XK_asciitilde,
++/* 42 49 */ XK_Shift_L, NoSymbol,
++/* 43 50 */ XK_backslash, XK_bar,
++/* 44 51 */ XK_Z, NoSymbol,
++/* 45 52 */ XK_X, NoSymbol,
++/* 46 53 */ XK_C, NoSymbol,
++/* 47 54 */ XK_V, NoSymbol,
++/* 48 55 */ XK_B, NoSymbol,
++/* 49 56 */ XK_N, NoSymbol,
++/* 50 57 */ XK_M, NoSymbol,
++/* 51 58 */ XK_comma, XK_less,
++/* 52 59 */ XK_period, XK_greater,
++/* 53 60 */ XK_slash, XK_question,
++/* 54 61 */ XK_Shift_R, NoSymbol,
++/* 55 62 */ XK_KP_Multiply, NoSymbol,
++/* 56 63 */ XK_Alt_L, XK_Meta_L,
++/* 57 64 */ XK_space, NoSymbol,
++/* 58 65 */ XK_Caps_Lock, NoSymbol,
++/* 59 66 */ XK_F1, NoSymbol,
++/* 60 67 */ XK_F2, NoSymbol,
++/* 61 68 */ XK_F3, NoSymbol,
++/* 62 69 */ XK_F4, NoSymbol,
++/* 63 70 */ XK_F5, NoSymbol,
++/* 64 71 */ XK_F6, NoSymbol,
++/* 65 72 */ XK_F7, NoSymbol,
++/* 66 73 */ XK_F8, NoSymbol,
++/* 67 74 */ XK_F9, NoSymbol,
++/* 68 75 */ XK_F10, NoSymbol,
++/* 69 76 */ XK_Break, XK_Pause,
++/* 70 77 */ XK_Scroll_Lock, NoSymbol,
++/* 71 78 */ XK_KP_Home, XK_KP_7,
++/* 72 79 */ XK_KP_Up, XK_KP_8,
++/* 73 80 */ XK_KP_Page_Up, XK_KP_9,
++/* 74 81 */ XK_KP_Subtract, NoSymbol,
++/* 75 82 */ XK_KP_Left, XK_KP_4,
++/* 76 83 */ XK_KP_5, NoSymbol,
++/* 77 84 */ XK_KP_Right, XK_KP_6,
++/* 78 85 */ XK_KP_Add, NoSymbol,
++/* 79 86 */ XK_KP_End, XK_KP_1,
++/* 80 87 */ XK_KP_Down, XK_KP_2,
++/* 81 88 */ XK_KP_Page_Down, XK_KP_3,
++/* 82 89 */ XK_KP_Insert, XK_KP_0,
++/* 83 90 */ XK_KP_Delete, XK_KP_Decimal,
++/* 84 91 */ NoSymbol, NoSymbol,
++/* 85 92 */ NoSymbol, NoSymbol,
++/* 86 93 */ NoSymbol, NoSymbol,
++/* 87 94 */ XK_F11, NoSymbol,
++/* 88 95 */ XK_F12, NoSymbol,
++
++/* These are remapped from the extended set (using ExtendMap) */
++
++/* 89 96 */ XK_Control_R, NoSymbol,
++/* 90 97 */ XK_KP_Enter, NoSymbol,
++/* 91 98 */ XK_KP_Divide, NoSymbol,
++/* 92 99 */ XK_Sys_Req, XK_Print,
++/* 93 100 */ XK_Alt_R, XK_Meta_R,
++/* 94 101 */ XK_Num_Lock, NoSymbol,
++/* 95 102 */ XK_Home, NoSymbol,
++/* 96 103 */ XK_Up, NoSymbol,
++/* 97 104 */ XK_Page_Up, NoSymbol,
++/* 98 105 */ XK_Left, NoSymbol,
++/* 99 106 */ XK_Right, NoSymbol,
++/* 100 107 */ XK_End, NoSymbol,
++/* 101 108 */ XK_Down, NoSymbol,
++/* 102 109 */ XK_Page_Down, NoSymbol,
++/* 103 110 */ XK_Insert, NoSymbol,
++/* 104 111 */ XK_Delete, NoSymbol,
++/* 105 112 */ XK_Super_L, NoSymbol,
++/* 106 113 */ XK_Super_R, NoSymbol,
++/* 107 114 */ XK_Menu, NoSymbol,
++/* 108 115 */ NoSymbol, NoSymbol,
++/* 109 116 */ NoSymbol, NoSymbol,
++/* 110 117 */ NoSymbol, NoSymbol,
++/* 111 118 */ NoSymbol, NoSymbol,
++/* 112 119 */ NoSymbol, NoSymbol,
++
++/* 113 120 */ NoSymbol, NoSymbol,
++/* 114 121 */ NoSymbol, NoSymbol,
++/* 115 122 */ NoSymbol, NoSymbol,
++/* 116 123 */ NoSymbol, NoSymbol,
++/* 117 124 */ NoSymbol, NoSymbol,
++/* 118 125 */ NoSymbol, NoSymbol,
++/* 119 126 */ NoSymbol, NoSymbol,
++/* 120 127 */ NoSymbol, NoSymbol,
++/* 121 128 */ NoSymbol, NoSymbol,
++/* 122 129 */ NoSymbol, NoSymbol,
++/* 123 130 */ NoSymbol, NoSymbol,
++/* 124 131 */ NoSymbol, NoSymbol,
++/* 125 132 */ NoSymbol, NoSymbol,
++/* 126 133 */ NoSymbol, NoSymbol,
++/* 127 134 */ NoSymbol, NoSymbol,
++/* 128 135 */ NoSymbol, NoSymbol,
++/* 129 136 */ NoSymbol, NoSymbol,
++/* 130 137 */ NoSymbol, NoSymbol,
++/* 131 138 */ NoSymbol, NoSymbol,
++/* 132 139 */ NoSymbol, NoSymbol,
++/* 133 140 */ NoSymbol, NoSymbol,
++/* 134 141 */ NoSymbol, NoSymbol,
++/* 135 142 */ NoSymbol, NoSymbol,
++/* 136 143 */ NoSymbol, NoSymbol,
++/* 137 144 */ NoSymbol, NoSymbol,
++/* 138 145 */ NoSymbol, NoSymbol,
++/* 139 146 */ NoSymbol, NoSymbol,
++/* 140 147 */ NoSymbol, NoSymbol,
++/* 141 148 */ NoSymbol, NoSymbol,
++/* 142 149 */ NoSymbol, NoSymbol,
++/* 143 150 */ NoSymbol, NoSymbol,
++/* 144 151 */ NoSymbol, NoSymbol,
++/* 145 152 */ NoSymbol, NoSymbol,
++/* 146 153 */ NoSymbol, NoSymbol,
++/* 147 154 */ NoSymbol, NoSymbol,
++/* 148 155 */ NoSymbol, NoSymbol,
++/* 149 156 */ NoSymbol, NoSymbol,
++/* 150 157 */ NoSymbol, NoSymbol,
++/* 151 158 */ NoSymbol, NoSymbol,
++/* 152 159 */ NoSymbol, NoSymbol,
++/* 153 160 */ NoSymbol, NoSymbol,
++/* 154 161 */ NoSymbol, NoSymbol,
++/* 155 162 */ NoSymbol, NoSymbol,
++/* 156 163 */ NoSymbol, NoSymbol,
++/* 157 164 */ NoSymbol, NoSymbol,
++/* 158 165 */ NoSymbol, NoSymbol,
++/* 159 166 */ NoSymbol, NoSymbol,
++/* 160 167 */ NoSymbol, NoSymbol,
++/* 161 168 */ NoSymbol, NoSymbol,
++/* 162 169 */ NoSymbol, NoSymbol,
++/* 163 170 */ NoSymbol, NoSymbol,
++/* 164 171 */ NoSymbol, NoSymbol,
++/* 165 172 */ NoSymbol, NoSymbol,
++/* 166 173 */ NoSymbol, NoSymbol,
++/* 167 174 */ NoSymbol, NoSymbol,
++/* 168 175 */ NoSymbol, NoSymbol,
++/* 169 176 */ NoSymbol, NoSymbol,
++/* 170 177 */ NoSymbol, NoSymbol,
++/* 171 178 */ NoSymbol, NoSymbol,
++/* 172 179 */ NoSymbol, NoSymbol,
++/* 173 180 */ NoSymbol, NoSymbol,
++/* 174 181 */ NoSymbol, NoSymbol,
++/* 175 182 */ NoSymbol, NoSymbol,
++/* 176 183 */ NoSymbol, NoSymbol,
++/* 177 184 */ NoSymbol, NoSymbol,
++/* 178 185 */ NoSymbol, NoSymbol,
++/* 179 186 */ NoSymbol, NoSymbol,
++/* 180 187 */ NoSymbol, NoSymbol,
++/* 181 188 */ NoSymbol, NoSymbol,
++/* 182 189 */ NoSymbol, NoSymbol,
++/* 183 190 */ NoSymbol, NoSymbol,
++/* 184 191 */ NoSymbol, NoSymbol,
++/* 185 192 */ NoSymbol, NoSymbol,
++/* 186 193 */ NoSymbol, NoSymbol,
++/* 187 194 */ NoSymbol, NoSymbol,
++/* 188 195 */ NoSymbol, NoSymbol,
++/* 189 196 */ NoSymbol, NoSymbol,
++/* 190 197 */ NoSymbol, NoSymbol,
++/* 191 198 */ NoSymbol, NoSymbol,
++/* 192 199 */ NoSymbol, NoSymbol,
++/* 193 200 */ NoSymbol, NoSymbol,
++/* 194 201 */ NoSymbol, NoSymbol,
++};
++
++static void
++EvdevKbdRead (int fd, void *closure)
++{
++ int i, n;
++ struct input_event events[NUM_EVENTS];
++
++ n = read (fd, &events, NUM_EVENTS * sizeof (struct input_event));
++ if (n <= 0)
++ return;
++
++ n /= sizeof (struct input_event);
++
++ for (i = 0; i < n; i++)
++ {
++ if (events[i].type == EV_KEY)
++ KdEnqueueKeyboardEvent (events[i].code, !events[i].value);
++ }
++}
++
++static void
++EvdevKbdLoad (void)
++{
++ kdMinScanCode = 0;
++ kdMaxScanCode = 193;
++ kdKeymapWidth = 2;
++ memcpy (kdKeymap, evdevKeymap, sizeof (evdevKeymap));
++}
++
++static int
++EvdevKbdInit (void)
++{
++ int fd, i;
++
++ if (!EvdevInputType)
++ EvdevInputType = KdAllocInputType ();
++
++ if (!kdKeyboard)
++ {
++ for (i = 0; i < NUM_DEFAULT_EVDEV; i++)
++ {
++ fd = open (kdefaultEvdev[i], 2);
++ if (fd >= 0)
++ {
++ kdKeyboard = KdSaveString (kdefaultEvdev[i]);
++ break;
++ }
++ }
++ }
++ else
++ {
++ fd = open (kdKeyboard, O_RDWR);
++ if (fd < 0)
++ return FALSE;
++ }
++
++ if (ioctl (fd, EVIOCGRAB, 1) < 0)
++ {
++ close (fd);
++ return FALSE;
++ }
++
++ if (!KdRegisterFd (EvdevInputType, fd, EvdevKbdRead, NULL))
++ return FALSE;
++
++ kbd_fd = fd;
++ return TRUE;
++}
++
++static void
++EvdevKbdFini (void)
++{
++}
++
++static void
++EvdevKbdLeds (int leds)
++{
++ struct input_event event;
++
++ memset(&event, 0, sizeof(event));
++
++ event.type = EV_LED;
++ event.code = LED_CAPSL;
++ event.value = leds & (1 << 0) ? 1 : 0;
++ write(kbd_fd, (char *) &event, sizeof(event));
++
++ event.type = EV_LED;
++ event.code = LED_NUML;
++ event.value = leds & (1 << 1) ? 1 : 0;
++ write(kbd_fd, (char *) &event, sizeof(event));
++
++ event.type = EV_LED;
++ event.code = LED_SCROLLL;
++ event.value = leds & (1 << 2) ? 1 : 0;
++ write(kbd_fd, (char *) &event, sizeof(event));
++
++ event.type = EV_LED;
++ event.code = LED_COMPOSE;
++ event.value = leds & (1 << 3) ? 1 : 0;
++ write(kbd_fd, (char *) &event, sizeof(event));
++}
++
++static void
++EvdevKbdBell (int volume, int frequency, int duration)
++{
++}
++
+ KdKeyboardFuncs LinuxEvdevKeyboardFuncs = {
+ EvdevKbdLoad,
+ EvdevKbdInit,
+@@ -296,4 +659,4 @@
+ EvdevKbdFini,
+ 0,
+ };
+-#endif
++
+diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kdrive.c xserver/hw/kdrive/src/kdrive.c
+--- xserver.original/hw/kdrive/src/kdrive.c 2005-12-16 10:36:07.000000000 -0200
++++ xserver/hw/kdrive/src/kdrive.c 2005-12-16 10:37:09.000000000 -0200
+@@ -73,6 +73,7 @@
+ Bool kdEnabled;
+ int kdSubpixelOrder;
+ int kdVirtualTerminal = -1;
++char *kdKeyboard = 0;
+ Bool kdSwitchPending;
+ char *kdSwitchCmd;
+ DDXPointRec kdOrigin;
+@@ -795,6 +796,14 @@
+ UseMsg ();
+ return 2;
+ }
++ if (!strcmp (argv[i], "-keyboard"))
++ {
++ if ((i+1) < argc)
++ kdKeyboard = argv[i+1];
++ else
++ UseMsg ();
++ return 2;
++ }
+ if (!strcmp (argv[i], "-rgba"))
+ {
+ if ((i+1) < argc)
+diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kdrive.h xserver/hw/kdrive/src/kdrive.h
+--- xserver.original/hw/kdrive/src/kdrive.h 2005-12-16 10:36:07.000000000 -0200
++++ xserver/hw/kdrive/src/kdrive.h 2005-12-16 10:37:09.000000000 -0200
+@@ -416,6 +416,7 @@
+ extern Bool kdDisableZaphod;
+ extern Bool kdDontZap;
+ extern int kdVirtualTerminal;
++extern char *kdKeyboard;
+ extern char *kdSwitchCmd;
+ extern KdOsFuncs *kdOsFuncs;
+
+@@ -769,7 +770,7 @@
+ ProcessInputEvents (void);
+
+ extern KdMouseFuncs LinuxMouseFuncs;
+-extern KdMouseFuncs LinuxEvdevFuncs;
++extern KdMouseFuncs LinuxEvdevMouseFuncs;
+ extern KdMouseFuncs Ps2MouseFuncs;
+ extern KdMouseFuncs BusMouseFuncs;
+ extern KdMouseFuncs MsMouseFuncs;
+@@ -777,6 +778,7 @@
+ extern KdMouseFuncs TsFuncs;
+ #endif
+ extern KdKeyboardFuncs LinuxKeyboardFuncs;
++extern KdKeyboardFuncs LinuxEvdevKeyboardFuncs;
+ extern KdOsFuncs LinuxFuncs;
+
+ extern KdMouseFuncs VxWorksMouseFuncs;
+diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kinput.c xserver/hw/kdrive/src/kinput.c
+--- xserver.original/hw/kdrive/src/kinput.c 2005-12-16 10:36:07.000000000 -0200
++++ xserver/hw/kdrive/src/kinput.c 2005-12-16 10:37:09.000000000 -0200
+@@ -1300,6 +1300,7 @@
+ xE.u.u.type = KeyPress;
+ xE.u.u.detail = key_code;
+
++#ifndef XKB
+ switch (KEYCOL1(key_code))
+ {
+ case XK_Num_Lock:
+@@ -1313,6 +1314,7 @@
+ else
+ xE.u.u.type = KeyPress;
+ }
++#endif
+
+ /*
+ * Check pressed keys which are already down
--- /dev/null
+--- xserver/hw/kdrive/fbdev/fbinit.c~ 2006-01-31 17:09:33.000000000 +0100
++++ xserver/hw/kdrive/fbdev/fbinit.c 2006-01-31 17:11:55.000000000 +0100
+@@ -28,6 +28,8 @@
+ #endif
+ #include <fbdev.h>
+
++extern int use_evdev;
++
+ void
+ InitCard (char *name)
+ {
+@@ -45,7 +47,10 @@
+ void
+ InitInput (int argc, char **argv)
+ {
+- KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
++ if (use_evdev)
++ KdInitInput (&LinuxEvdevMouseFuncs, &LinuxEvdevKeyboardFuncs);
++ else
++ KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
+ #ifdef TOUCHSCREEN
+ KdAddMouseDriver (&TsFuncs);
+ #endif
+--- xserver/hw/kdrive/src/kdrive.c.orig 2006-01-31 17:13:28.000000000 +0100
++++ xserver/hw/kdrive/src/kdrive.c 2006-01-31 17:15:28.000000000 +0100
+@@ -44,6 +44,8 @@
+ #include "dpmsproc.h"
+ #endif
+
++int use_evdev = 0;
++
+ typedef struct _kdDepths {
+ CARD8 depth;
+ CARD8 bpp;
+@@ -687,6 +689,7 @@
+ ErrorF("-videoTest Start the server, pause momentarily and exit\n");
+ ErrorF("-origin X,Y Locates the next screen in the the virtual screen (Xinerama)\n");
+ ErrorF("-mouse path[,n] Filename of mouse device, n is number of buttons\n");
++ ErrorF("-use-evdev Use Linux evdev input\n");
+ ErrorF("-switchCmd Command to execute on vt switch\n");
+ ErrorF("-nozap Don't terminate server on Ctrl+Alt+Backspace\n");
+ ErrorF("vtxx Use virtual terminal xx instead of the next available\n");
+@@ -796,6 +799,10 @@
+ UseMsg ();
+ return 2;
+ }
++ if (!strcmp (argv[i], "-use-evdev"))
++ {
++ use_evdev = 1;
++ }
+ if (!strcmp (argv[i], "-keyboard"))
+ {
+ if ((i+1) < argc)
--- /dev/null
+--- /tmp/kmode.c 2005-06-27 14:46:19.716843288 +0200
++++ xserver/hw/kdrive/src/kmode.c 2005-06-27 14:46:30.070269328 +0200
+@@ -41,6 +41,11 @@
+ 1, 11, 14, KdSyncNegative,
+ },
+
++ { 240, 320, 64, 0,
++ 0, 0, 0, KdSyncNegative,
++ 0, 0, 0, KdSyncNegative,
++ },
++
+ /* Other VESA modes */
+ { 640, 350, 85, 31500, /* VESA */
+ 32, 96, 192, KdSyncPositive, /* 26.413 */
+@@ -80,6 +85,13 @@
+ 16, 48, 160, KdSyncNegative, /* 31.469 */
+ 10, 33, 45, KdSyncNegative, /* 59.940 */
+ },
++
++
++ { 480, 640, 60, 0, /* VESA */
++ 0, 0, 0, KdSyncNegative, /* 31.469 */
++ 0, 0, 0, KdSyncNegative, /* 59.940 */
++ },
++
+
+ /* 800x600 modes */
+ { 800, 600, 85, 56250, /* VESA */
--- /dev/null
+--- xserver/hw/kdrive/linux/mouse.c.orig 2004-05-13 14:25:51.000000000 -0700
++++ xserver/hw/kdrive/linux/mouse.c 2005-09-22 12:20:47.000000000 -0700
+@@ -927,8 +927,10 @@ char *kdefaultMouse[] = {
+ "/dev/psaux",
+ "/dev/input/mice",
+ "/dev/adbmouse",
++#ifdef BREAK_MY_SERIAL_CONSOLE
+ "/dev/ttyS0",
+ "/dev/ttyS1",
++#endif
+ };
+
+ #define NUM_DEFAULT_MOUSE (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0]))
--- /dev/null
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- xserver/hw/kdrive/Makefile.am~onlyfb
++++ xserver/hw/kdrive/Makefile.am
+@@ -17,12 +17,4 @@
+ SUBDIRS = \
+ src \
+ linux \
+- $(XSDL_SUBDIRS) \
+- $(FBDEV_SUBDIRS) \
+- $(VESA_SUBDIRS) \
+- $(XEPHYR_SUBDIRS) \
+- ati \
+- fake \
+- ephyr \
+- i810 \
+- epson
++ $(FBDEV_SUBDIRS)
--- /dev/null
+--- git/Makefile.am.orig 2006-06-09 16:01:51.000000000 +0200
++++ git/Makefile.am 2006-06-09 16:02:59.000000000 +0200
+@@ -35,6 +35,10 @@
+ XINPUT_DIR=Xi
+ endif
+
++if XKB
++XKB_DIR=xkb
++endif
++
+ if DBE
+ DBE_DIR=dbe
+ endif
+@@ -51,7 +55,7 @@
+ randr \
+ render \
+ $(XINPUT_DIR) \
+- xkb \
++ $(XKB_DIR) \
+ $(DBE_DIR) \
+ $(MFB_DIR) \
+ $(AFB_DIR) \
+--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
+@@ -418,6 +418,7 @@
+ AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes])
+ AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMS=$enableval], [DPMSExtension=yes])
+ AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes])
++AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes])
+
+ dnl DDXes.
+ AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
+@@ -739,12 +740,15 @@
+
+ AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
+
+-AC_DEFINE(XKB, 1, [Build XKB])
+-AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
+-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
+-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
+-XKB_LIB='$(top_builddir)/xkb/libxkb.la'
+-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
++AM_CONDITIONAL(XKB, [test "x$XKB" = xyes])
++if test "x$XKB" = xyes; then
++ AC_DEFINE(XKB, 1, [Build XKB])
++ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
++ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
++ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
++ XKB_LIB='$(top_builddir)/xkb/libxkb.la'
++ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
++fi
+
+ AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
+ [Do not have `strcasecmp'.]))
--- /dev/null
+--- xorg-server-X11R7.1-1.1.0/mi/miinitext.c.orig 2006-06-22 14:11:46.000000000 +0200
++++ xorg-server-X11R7.1-1.1.0/mi/miinitext.c 2006-06-22 15:26:17.000000000 +0200
+@@ -385,6 +385,9 @@
+ #ifdef DMXEXT
+ extern void DMXExtensionInit(INITARGS);
+ #endif
++#ifdef XCALIBRATE
++extern void XCalibrateExtensionInit(INITARGS);
++#endif
+ #ifdef XEVIE
+ extern void XevieExtensionInit(INITARGS);
+ #endif
+@@ -679,6 +682,9 @@
+ #ifdef DAMAGE
+ if (!noDamageExtension) DamageExtensionInit();
+ #endif
++#ifdef XCALIBRATE
++ XCalibrateExtensionInit ();
++#endif
+ }
+
+ void
+--- xorg-server-X11R7.1-1.1.0/configure.ac.orig 2006-06-15 17:03:14.000000000 +0200
++++ xorg-server-X11R7.1-1.1.0/configure.ac 2006-06-24 08:21:25.000000000 +0200
+@@ -407,6 +407,7 @@
+ AC_ARG_ENABLE(xf86vidmode, AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: enabled)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=yes])
+ AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes])
+ AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=yes])
++AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--disable-xcalibrate], [Build XCalibrate extension (default: enabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=yes])
+ AC_ARG_ENABLE(xevie, AS_HELP_STRING([--disable-xevie], [Build XEvIE extension (default: enabled)]), [XEVIE=$enableval], [XEVIE=yes])
+ AC_ARG_ENABLE(lbx, AS_HELP_STRING([--disable-lbx], [Build LBX extension (default: no)]), [LBX=$enableval], [LBX=no])
+ AC_ARG_ENABLE(appgroup, AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=yes])
+@@ -641,6 +642,12 @@
+ AC_DEFINE(XCSECURITY, 1, [Build Security extension])
+ fi
+
++AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes])
++if test "x$XCALIBRATE" = xyes; then
++ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
++ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateext"
++fi
++
+ AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes])
+ if test "x$XEVIE" = xyes; then
+ AC_DEFINE(XEVIE, 1, [Build XEvIE extension])
+@@ -1466,7 +1473,7 @@
+ KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
+ KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
+ KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
+- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
++ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB"
+
+ # check if we can build Xephyr
+ PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
+--- xorg-server-X11R7.1-1.1.0/include/kdrive-config.h.in.orig 2006-06-22 14:22:07.000000000 +0200
++++ xorg-server-X11R7.1-1.1.0/include/kdrive-config.h.in 2006-06-22 14:33:29.000000000 +0200
+@@ -22,4 +22,7 @@
+ /* Support tslib touchscreen abstraction library */
+ #undef TSLIB
+
++/* Enable XCalibrate extension */
++#undef XCALIBRATE
++
+ #endif /* _KDRIVE_CONFIG_H_ */
+--- xorg-server-X11R7.1-1.1.0/Xext/Makefile.am.orig 2006-06-15 17:06:43.000000000 +0200
++++ xorg-server-X11R7.1-1.1.0/Xext/Makefile.am 2006-06-15 18:12:40.000000000 +0200
+@@ -78,6 +78,11 @@
+ AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\"
+ endif
+
++XCALIBRATE_SRCS = xcalibrate.c
++if XCALIBRATE
++BUILTIN_SRCS += $(XCALIBRATE_SRCS)
++endif
++
+ # X EVent Interception Extension: allows accessibility helpers & composite
+ # managers to intercept events from input devices and transform as needed
+ # before the clients see them.
+@@ -155,6 +160,7 @@
+ $(SCREENSAVER_SRCS) \
+ $(XCSECURITY_SRCS) \
+ $(XINERAMA_SRCS) \
++ $(XCALIBRATE_SRCS) \
+ $(XEVIE_SRCS) \
+ $(XPRINT_SRCS) \
+ $(APPGROUP_SRCS) \
+--- xorg-server-X11R7.1-1.1.0/Xext/xcalibrate.c.orig 2006-06-15 17:05:19.000000000 +0200
++++ xorg-server-X11R7.1-1.1.0/Xext/xcalibrate.c 2006-06-22 15:15:09.000000000 +0200
+@@ -0,0 +1,262 @@
++/*
++ * $Id: xcalibrate.c,v 3.1 2004/06/02 20:49:50 pb Exp $
++ *
++ * Copyright © 2003 Philip Blundell
++ *
++ * 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 Philip Blundell not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission. Philip Blundell makes no
++ * representations about the suitability of this software for any purpose. It
++ * is provided "as is" without express or implied warranty.
++ *
++ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL PHILIP BLUNDELL 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.
++ */
++
++#ifdef HAVE_KDRIVE_CONFIG_H
++#include <kdrive-config.h>
++#endif
++
++#define NEED_EVENTS
++#define NEED_REPLIES
++
++#include <X11/X.h>
++#include <X11/Xproto.h>
++#include "misc.h"
++#include "os.h"
++#include "dixstruct.h"
++#include "extnsionst.h"
++#include "swaprep.h"
++
++#include <X11/extensions/xcalibrateproto.h>
++#include <X11/extensions/xcalibratewire.h>
++
++extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure);
++extern void *tslib_raw_event_closure;
++
++static CARD8 XCalibrateReqCode;
++int XCalibrateEventBase;
++int XCalibrateReqBase;
++int XCalibrateErrorBase;
++
++static ClientPtr xcalibrate_client;
++
++static void
++xcalibrate_event_hook (int x, int y, int pressure, void *closure)
++{
++ ClientPtr pClient = (ClientPtr) closure;
++ xXCalibrateRawTouchscreenEvent ev;
++
++ ev.type = XCalibrateEventBase + X_XCalibrateRawTouchscreen;
++ ev.sequenceNumber = pClient->sequence;
++ ev.x = x;
++ ev.y = y;
++ ev.pressure = pressure;
++
++ if (!pClient->clientGone)
++ WriteEventsToClient (pClient, 1, (xEvent *) &ev);
++}
++
++static int
++ProcXCalibrateQueryVersion (ClientPtr client)
++{
++ REQUEST(xXCalibrateQueryVersionReq);
++ xXCalibrateQueryVersionReply rep;
++ CARD16 client_major, client_minor; /* not used */
++
++ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq);
++
++ client_major = stuff->majorVersion;
++ client_minor = stuff->minorVersion;
++
++ fprintf(stderr, "%s(): called\n", __func__);
++
++ rep.type = X_Reply;
++ rep.length = 0;
++ rep.sequenceNumber = client->sequence;
++ rep.majorVersion = XCALIBRATE_MAJOR_VERSION;
++ rep.minorVersion = XCALIBRATE_MINOR_VERSION;
++ if (client->swapped) {
++ int n;
++ swaps(&rep.sequenceNumber, n);
++ swapl(&rep.length, n);
++ swaps(&rep.majorVersion, n);
++ swaps(&rep.minorVersion, n);
++ }
++ WriteToClient(client, sizeof (xXCalibrateQueryVersionReply), (char *)&rep);
++ return (client->noClientException);
++}
++
++static int
++SProcXCalibrateQueryVersion (ClientPtr client)
++{
++ REQUEST(xXCalibrateQueryVersionReq);
++ int n;
++
++ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq);
++ swaps(&stuff->majorVersion,n);
++ swaps(&stuff->minorVersion,n);
++ return ProcXCalibrateQueryVersion(client);
++}
++
++static int
++ProcXCalibrateSetRawMode (ClientPtr client)
++{
++ REQUEST(xXCalibrateRawModeReq);
++ xXCalibrateRawModeReply rep;
++
++ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq);
++
++ memset (&rep, 0, sizeof (rep));
++ rep.type = X_Reply;
++ rep.sequenceNumber = client->sequence;
++
++ if (stuff->on)
++ {
++ if (xcalibrate_client == NULL)
++ {
++ /* Start calibrating. */
++ xcalibrate_client = client;
++ tslib_raw_event_hook = xcalibrate_event_hook;
++ tslib_raw_event_closure = client;
++ rep.status = GrabSuccess;
++ }
++ else
++ {
++ rep.status = AlreadyGrabbed;
++ }
++ }
++ else
++ {
++ if (xcalibrate_client == client)
++ {
++ /* Stop calibrating. */
++ xcalibrate_client = NULL;
++ tslib_raw_event_hook = NULL;
++ tslib_raw_event_closure = NULL;
++ rep.status = GrabSuccess;
++
++ /* Cycle input off and on to reload configuration. */
++ KdDisableInput ();
++ KdEnableInput ();
++ }
++ else
++ {
++ rep.status = AlreadyGrabbed;
++ }
++ }
++
++ if (client->swapped)
++ {
++ int n;
++
++ swaps (&rep.sequenceNumber, n);
++ swaps (&rep.status, n);
++ }
++ WriteToClient(client, sizeof (rep), (char *) &rep);
++ return (client->noClientException);
++}
++
++
++static int
++SProcXCalibrateSetRawMode (ClientPtr client)
++{
++ REQUEST(xXCalibrateRawModeReq);
++ int n;
++
++ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq);
++
++ swaps(&stuff->on, n);
++
++ return ProcXCalibrateSetRawMode(client);
++}
++
++static void
++XCalibrateResetProc (ExtensionEntry *extEntry)
++{
++}
++
++static int
++ProcXCalibrateDispatch (ClientPtr client)
++{
++ REQUEST(xReq);
++ switch (stuff->data) {
++ case X_XCalibrateQueryVersion:
++ return ProcXCalibrateQueryVersion(client);
++ case X_XCalibrateRawMode:
++ return ProcXCalibrateSetRawMode(client);
++ default: break;
++ }
++
++ return BadRequest;
++}
++
++static int
++SProcXCalibrateDispatch (ClientPtr client)
++{
++ REQUEST(xReq);
++ int n;
++
++ swaps(&stuff->length,n);
++
++ switch (stuff->data) {
++ case X_XCalibrateQueryVersion:
++ return SProcXCalibrateQueryVersion(client);
++ case X_XCalibrateRawMode:
++ return SProcXCalibrateSetRawMode(client);
++
++ default: break;
++ }
++
++ return BadRequest;
++}
++
++static void
++XCalibrateClientCallback (CallbackListPtr *list,
++ pointer closure,
++ pointer data)
++{
++ NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
++ ClientPtr pClient = clientinfo->client;
++
++ if (clientinfo->setup == NULL
++ && xcalibrate_client != NULL
++ && xcalibrate_client == pClient)
++ {
++ /* Stop calibrating. */
++ xcalibrate_client = NULL;
++ tslib_raw_event_hook = NULL;
++ tslib_raw_event_closure = NULL;
++ }
++}
++
++void
++XCalibrateExtensionInit(void)
++{
++ ExtensionEntry *extEntry;
++
++ if (!AddCallback (&ClientStateCallback, XCalibrateClientCallback, 0))
++ return;
++
++ extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors,
++ ProcXCalibrateDispatch, SProcXCalibrateDispatch,
++ XCalibrateResetProc, StandardMinorOpcode);
++
++ if (!extEntry)
++ return;
++
++ XCalibrateReqCode = (unsigned char)extEntry->base;
++ XCalibrateEventBase = extEntry->eventBase;
++ XCalibrateErrorBase = extEntry->errorBase;
++
++ xcalibrate_client = 0;
++}
--- /dev/null
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- xserver/hw/kdrive/fbdev/fbdev.c~xserver-kdrive-poodle.patch
++++ xserver/hw/kdrive/fbdev/fbdev.c
+@@ -190,6 +190,7 @@
+ var.nonstd = 0;
+ var.grayscale = 0;
+
++ /* commented out for poodle
+ k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var);
+
+ if (k < 0)
+@@ -198,10 +199,11 @@
+ return FALSE;
+ }
+
+- /* Re-get the "fixed" parameters since they might have changed */
++ // Re-get the "fixed" parameters since they might have changed
+ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
+ if (k < 0)
+ perror ("FBIOGET_FSCREENINFO");
++ */
+
+ /* Now get the new screeninfo */
+ ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
+@@ -659,13 +661,14 @@
+ priv->var.activate = FB_ACTIVATE_NOW|FB_CHANGE_CMAP_VBL;
+
+ /* display it on the LCD */
++ /* commented out for poodle
+ k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &priv->var);
+ if (k < 0)
+ {
+ perror ("FBIOPUT_VSCREENINFO");
+ return FALSE;
+ }
+-
++ */
+ if (priv->fix.visual == FB_VISUAL_DIRECTCOLOR)
+ {
+ struct fb_cmap cmap;
--- /dev/null
+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 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"
+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;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 "
+
+SRC_URI_h3600 = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
+ file://kmode.patch;patch=1 \
+ file://faster-rotated.patch;patch=1 \
+ file://fbdev-not-fix.patch;patch=1 "
+
+
+SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \
+ file://faster-rotated.patch;patch=1 \
+ file://devfs.patch;patch=1"
+SRC_URI_append_collie = " file://faster-rotated.patch;patch=1"
+SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1 \
+ file://faster-rotated.patch;patch=1"
+SRC_URI_append_spitz = " file://faster-rotated.patch;patch=1"
+SRC_URI_append_akita = " file://faster-rotated.patch;patch=1"
+
+PACKAGE_ARCH_mnci = "mnci"
+PACKAGE_ARCH_collie = "collie"
+PACKAGE_ARCH_poodle = "poodle"
+PACKAGE_ARCH_h3600 = "h3600"
+PACKAGE_ARCH_spitz = "spitz"
+PACKAGE_ARCH_akita = "akita"
+
+S = "${WORKDIR}/xserver"
+
+inherit autotools pkgconfig
+
+LDFLAGS += " -lXfont -lXdmcp -lXau "
+EXTRA_OECONF = "--enable-static=no --disable-static --enable-composite --disable-xinerama"
--- /dev/null
+PV = "0.0+cvs${FIXEDSRCDATE}"
+FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
+
+LICENSE = "MIT"
+DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
+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 = "r12"
+
+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;date=${FIXEDSRCDATE} \
+ file://kmode.patch;patch=1 \
+ file://no-serial-probing.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"
--- /dev/null
+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 videoproto scrnsaverproto"
+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"
--- /dev/null
+LICENSE = "MIT"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+
+PROVIDES = "virtual/xserver"
+RPROVIDES = "virtual/xserver"
+PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
+SECTION = "x11/base"
+DESCRIPTION = "X server from freedesktop.org"
+DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
+DESCRIPTION_xserver-kdrive-fake = "Fake X server"
+DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
+
+FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
+FILES_xserver-kdrive-fake = "${bindir}/Xfake"
+FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
+
+SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \
+ file://kmode.patch;patch=1 \
+ file://disable-apm.patch;patch=1 \
+ file://no-serial-probing.patch;patch=1 \
+ file://kdrive-evdev.patch;patch=1 \
+ file://kdrive-use-evdev.patch;patch=1 \
+ file://fbdev-not-fix.patch;patch=1 \
+ file://enable-builtin-fonts.patch;patch=1 \
+ file://optional-xkb.patch;patch=1 \
+ file://disable-xf86-dga-xorgcfg.patch;patch=1 \
+ file://enable-tslib.patch;patch=1 \
+ file://xcalibrate.patch;patch=1"
+
+SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
+SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
+PACKAGE_ARCH_poodle = "poodle"
+
+S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-composite --enable-kdrive \
+ --disable-dga --disable-dri --disable-xinerama \
+ --disable-xf86misc --disable-xf86vidmode \
+ --disable-xorg --disable-xorgcfg \
+ --disable-xkb --disable-xnest --disable-xvfb \
+ --disable-xevie --disable-xprint --disable-xtrap \
+ --with-default-font-path=built-ins \
+ ac_cv_file__usr_share_X11_sgml_defs_ent=no"
--- /dev/null
+PV = "0.0+cvs${SRCDATE}"
+DEFAULT_PREFERENCE = "-2"
+
+LICENSE = "MIT"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+PROVIDES = "virtual/xserver"
+RPROVIDES = "virtual/xserver"
+PACKAGES = "xserver-kdrive-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"
--- /dev/null
+PV = "0.0+git"
+DEFAULT_PREFERENCE = "-2"
+
+LICENSE = "MIT"
+DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+
+PROVIDES = "virtual/xserver"
+RPROVIDES = "virtual/xserver"
+PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
+SECTION = "x11/base"
+DESCRIPTION = "X server from freedesktop.org"
+DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
+DESCRIPTION_xserver-kdrive-fake = "Fake X server"
+DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
+
+FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
+FILES_xserver-kdrive-fake = "${bindir}/Xfake"
+FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
+
+SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
+ file://kmode.patch;patch=1 \
+ file://disable-apm.patch;patch=1 \
+ file://no-serial-probing.patch;patch=1 \
+ file://kdrive-evdev.patch;patch=1 \
+ file://kdrive-use-evdev.patch;patch=1 \
+ file://fbdev-not-fix.patch;patch=1 \
+ file://enable-builtin-fonts.patch;patch=1 \
+ file://optional-xkb.patch;patch=1 \
+ file://disable-xf86-dga-xorgcfg.patch;patch=1 \
+ file://enable-tslib.patch;patch=1"
+
+SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
+SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
+PACKAGE_ARCH_poodle = "poodle"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-composite --enable-kdrive \
+ --disable-dga --disable-dri --disable-xinerama \
+ --disable-xf86misc --disable-xf86vidmode \
+ --disable-xorg --disable-xorgcfg \
+ --disable-xkb --disable-xnest --disable-xvfb \
+ --disable-xevie --disable-xprint --disable-xtrap \
+ --with-default-font-path=built-ins \
+ ac_cv_file__usr_share_X11_sgml_defs_ent=no"
--- /dev/null
+--- xc/extras/drm/shared/drm.h.old 2004-09-14 21:42:45.000000000 +0100
++++ xc/extras/drm/shared/drm.h 2004-09-14 21:42:47.000000000 +0100
+@@ -38,7 +38,6 @@
+ #define _DRM_H_
+
+ #if defined(__linux__)
+-#include <linux/config.h>
+ #include <asm/ioctl.h> /* For _IO* macros */
+ #define DRM_IOCTL_NR(n) _IOC_NR(n)
+ #define DRM_IOC_VOID _IOC_NONE
--- /dev/null
+--- xc/lib/font/fontfile/Imakefile.old 2005-06-03 20:09:53.000000000 +0100
++++ xc/lib/font/fontfile/Imakefile 2005-06-03 20:09:57.000000000 +0100
+@@ -14,7 +14,7 @@
+ #endif
+
+ INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include \
+- -I$(INCLUDESRC)
++ -I$(INCLUDESRC) $(CC_STAGING)
+ HEADERS =
+ #ifdef FontFormatDefines
+ FORMAT_DEFS = FontFormatDefines
--- /dev/null
+--- xc/lib/font/FreeType/Imakefile.old 2005-06-03 20:18:51.000000000 +0100
++++ xc/lib/font/FreeType/Imakefile 2005-06-03 20:18:52.000000000 +0100
+@@ -20,7 +20,7 @@
+
+ INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \
+ -I$(SERVERSRC)/include $(EXTRAINCLUDES) \
+- -I$(INCLUDESRC)
++ -I$(INCLUDESRC) $(CC_STAGING)
+
+ SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c
+ OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o
+--- xc/config/cf/X11.tmpl.old 2005-06-03 20:40:24.000000000 +0100
++++ xc/config/cf/X11.tmpl 2005-06-03 20:40:40.000000000 +0100
+@@ -3371,7 +3371,7 @@
+
+ #if BuildFreetype2Library || HasFreetype2
+ #if Freetype2IncDirStandard
+-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
++FREETYPE2INCLUDES = `pkg-config --cflags freetype2`
+ #else
+ FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
+ #endif
--- /dev/null
+--- xc/config/cf/Imake.tmpl.old 2005-05-05 21:04:45.000000000 +0100
++++ xc/config/cf/Imake.tmpl 2005-05-05 21:04:49.000000000 +0100
+@@ -2058,7 +2058,7 @@
+ * INCLUDES contains client-specific includes set in Imakefile
+ * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
+ */
+- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
++ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
+ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
--- /dev/null
+--- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100
++++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100
+@@ -2038,11 +2038,11 @@
+ */
+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
++ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
+ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+ LDPRELIB = LdPreLib $(INSTALLED_LIBS)
+ LDPOSTLIB = LdPostLib
+- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
++ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING)
+ CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
+
+ LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
+--- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100
++++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100
+@@ -114,7 +114,7 @@
+ STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
+ CDEBUGFLAGS = LibraryCDebugFlags
+ CLIBDEBUGFLAGS = LibraryDebugOpt
+- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
++ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
+ # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
+ PICFLAGS = LargePositionIndependentCFlags
+ # endif
+--- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100
++++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100
+@@ -3359,7 +3359,7 @@
+ FREETYPE2LIBDIR = Freetype2LibDir
+ FREETYPE2INCDIR = Freetype2IncDir
+ #if Freetype2LibDirStandard
+-FREETYPE2LIB = -lfreetype
++FREETYPE2LIB = $(LD_STAGING) -lfreetype
+ #else
+ FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype
+ #endif
--- /dev/null
+SECTION = "x11/base"
+RPROVIDES = "virtual/xserver"
+PROVIDES = "virtual/xserver"
+LICENSE = "Xorg"
+PR = "r2"
+
+DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \
+ file://imake-staging.patch;patch=1 \
+ file://imake-installed.patch;patch=1 \
+ file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \
+ file://dri.patch;patch=1"
+
+PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
+
+S = "${WORKDIR}/xc"
+
+FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*"
+FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
+FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
+FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
+FILES_${PN}-doc += "${libdir}/X11/doc"
+
+do_configure() {
+ cat <<EOF > config/cf/host.def
+#define BuildServersOnly YES
+#define ProjectRoot ${prefix}
+#define XnestServer NO
+#define XdmxServer NO
+#define CcCmd gcc
+#define LdCmd ld
+#define HasFreetype2 YES
+#define HasFontconfig YES
+#define BuildDevelDRIDrivers YES
+#define BuildXF86DRI YES
+EOF
+ echo "" > config/cf/date.def
+ rm -f include/extensions/panoramiX.h
+ make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake
+ make CC="${BUILD_CC}" xmakefile
+ make Makefiles
+ make clean
+}
+
+do_compile() {
+ #make depend
+ make includes
+ make -C config/util CC="${BUILD_CC}"
+ for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
+ make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E"
+}
+
+do_install() {
+ make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
+ make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
+}
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/xserver-xorg
+ for i in i810 via; do
+ pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
+ done
+ install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
+}
--- /dev/null
+SECTION = "x11/base"
+RPROVIDES = "virtual/xserver"
+PROVIDES = "virtual/xserver"
+LICENSE = "Xorg"
+PR = "r0"
+
+DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_11 \
+ file://imake-staging.patch;patch=1 \
+ file://imake-installed.patch;patch=1 \
+ file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \
+ file://dri.patch;patch=1"
+
+PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
+
+S = "${WORKDIR}/xc"
+
+FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*"
+FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
+FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
+FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
+FILES_${PN}-doc += "${libdir}/X11/doc"
+
+do_configure() {
+ cat <<EOF > config/cf/host.def
+#define BuildServersOnly YES
+#define ProjectRoot ${prefix}
+#define XnestServer NO
+#define XdmxServer NO
+#define CcCmd gcc
+#define LdCmd ld
+#define HasFreetype2 YES
+#define HasFontconfig YES
+#define BuildDevelDRIDrivers YES
+#define BuildXF86DRI YES
+EOF
+ echo "" > config/cf/date.def
+ rm -f include/extensions/panoramiX.h
+ make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake
+ make CC="${BUILD_CC}" xmakefile
+ make Makefiles
+ make clean
+}
+
+do_compile() {
+ #make depend
+ make includes
+ make -C config/util CC="${BUILD_CC}"
+ for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
+ make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E"
+}
+
+do_install() {
+ make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
+ make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
+}
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/xserver-xorg
+ for i in i810 via; do
+ pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
+ done
+ install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
+}
--- /dev/null
+SECTION = "x11/base"
+LICENSE = "Xorg"
+RPROVIDES = "virtual/xserver"
+PROVIDES = "virtual/xserver"
+PR = "r3"
+PV = "6.8.1+cvs${SRCDATE}"
+
+DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver \
+ file://imake-staging.patch;patch=1 \
+ file://dri.patch;patch=1"
+
+PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
+
+S = "${WORKDIR}/xc"
+
+FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print"
+FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
+FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
+FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
+FILES_${PN}-doc += "${libdir}/X11/doc"
+
+do_configure() {
+ echo "#define BuildServersOnly YES" > config/cf/host.def
+ echo "#define ProjectRoot /usr" >> config/cf/host.def
+ echo "#define XnestServer NO" >> config/cf/host.def
+ echo "#define XdmxServer NO" >> config/cf/host.def
+ echo "#define CcCmd ${CC}" >> config/cf/host.def
+ echo "#define LdCmd ${LD}" >> config/cf/host.def
+ echo "#define HasFreetype2 YES" >> config/cf/host.def
+ echo "#define HasFontconfig YES" >> config/cf/host.def
+ echo "#define BuildDevelDRIDrivers YES" >>config/cf/host.def
+ echo "" > config/cf/date.def
+ rm -f include/extensions/panoramiX.h
+}
+
+do_compile() {
+ make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake
+ make CC="${BUILD_CC}" xmakefile
+ make Makefiles
+ make clean
+ #make depend
+ make includes
+ make -C config/util CC="${BUILD_CC}"
+ for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
+ make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS=""
+}
+
+do_install() {
+ make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
+ make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
+}
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/xserver-xorg
+ for i in i810 via; do
+ pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
+ done
+ install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
+}
+++ /dev/null
-diff -urN xprop.orig/Makefile.am xprop/Makefile.am
---- xprop.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xprop/Makefile.am 2004-08-15 18:49:43.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# 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 Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD 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.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XPROP_CFLAGS@
-+
-+bin_PROGRAMS = xprop
-+
-+xprop_SOURCES = dsimple.c dsimple.h xprop.c
-+
-+xprop_LDADD = @XPROP_LIBS@
-+
-+man5_MANS=xprop.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xprop.orig/configure.ac xprop/configure.ac
---- xprop.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xprop/configure.ac 2004-08-15 19:00:43.000000000 +0200
-@@ -0,0 +1,44 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xprop],4.4.0,[],xprop)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XPROP, xext xmuu x11)
-+
-+AC_CHECK_HEADERS([wchar.h])
-+AC_CHECK_HEADERS([wctype.h])
-+
-+AC_OUTPUT([Makefile])
-diff -urN xprop.orig/dsimple.c xprop/dsimple.c
---- xprop.orig/dsimple.c 2003-11-14 16:54:54.000000000 +0100
-+++ xprop/dsimple.c 2004-08-15 19:19:32.000000000 +0200
-@@ -27,11 +27,16 @@
-
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xos.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/cursorfont.h>
- #include <stdio.h>
-+#include <stdlib.h>
- /*
- * Other_stuff.h: Definitions of routines in other_stuff.
- *
-@@ -69,7 +74,7 @@
- char *Malloc(size)
- unsigned size;
- {
-- char *data, *malloc();
-+ char *data;
-
- if (!(data = malloc(size)))
- Fatal_Error("Out of memory!");
-@@ -85,7 +90,7 @@
- char *ptr;
- int size;
- {
-- char *new_ptr, *realloc();
-+ char *new_ptr;
-
- if (!ptr)
- return(Malloc(size));
-diff -urN xprop.orig/xprop.c xprop/xprop.c
---- xprop.orig/xprop.c 2004-04-23 21:55:03.000000000 +0200
-+++ xprop/xprop.c 2004-08-15 19:23:13.000000000 +0200
-@@ -30,6 +30,10 @@
- /* $XFree86: xc/programs/xprop/xprop.c,v 1.15 2003/09/24 02:43:38 dawes Exp $ */
-
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <X11/Xlib.h>
- #include <X11/Xos.h>
- #include <X11/Xfuncs.h>
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE = "MIT"
-DEPENDS = "libx11 libxmu libxext"
-DESCRIPTION = "property displayer for X"
-MAINTER = "Rene Wagner <rw@handhelds.org>"
-SECTION = "x11/base"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xprop;tag=XORG-MAIN \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xprop"
-
-inherit autotools pkgconfig
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
-
-CONFLICTS = "compositeext"
+++ /dev/null
-include proto-common.inc
-XORG_RELEASE = "X11R7.1"
-CONFLICTS = "compositeext"
+++ /dev/null
-include proto-common.inc
-
-CONFLICTS = "damageext"
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
-
-CONFLICTS = "fixesext"
+++ /dev/null
-include proto-common.inc
-XORG_RELEASE = "X11R7.1"
-CONFLICTS = "fixesext"
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
-XORG_RELEASE = "X11R7.1"
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-DESCRIPTION = "X protocol headers"
-SECTION = "x11/libs"
-LICENSE= "MIT-X"
-#MAINTAINER = ""
-
-SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/proto/${PN}-${XORG_RELEASE}-${PV}.tar.bz2"
-
-S = "${WORKDIR}/${PN}-${XORG_RELEASE}-${PV}"
-
-XORG_RELEASE ?= "X11R7.0"
-
-inherit autotools pkgconfig
-
-do_stage () {
- autotools_stage_all
-}
+++ /dev/null
-include proto-common.inc
-
-CONFLICTS = "randrext"
+++ /dev/null
-include proto-common.inc
-
-CONFLICTS = "recordext"
+++ /dev/null
-include proto-common.inc
-
-CONFLICTS = "renderext"
+++ /dev/null
-include proto-common.inc
-
-CONFLICTS = "resourceext"
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
-XORG_RELEASE = "X11R7.1"
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
-
-PROVIDES = "xextensions"
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
-
-CONFLICTS = "xxf86dgaext"
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
-
-CONFLICTS = "xxf86vmext"
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-SECTION = "unknown"
-include xproto_${PV}.bb
-inherit native
-PROVIDES = ""
+++ /dev/null
-SECTION = "unknown"
-include xproto_cvs.bb
-inherit native
-PROVIDES = ""
+++ /dev/null
-LICENSE= "MIT"
-SECTION = "x11/libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DESCRIPTION = "X protocol and ancillary headers."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto;date=20050226"
-S = "${WORKDIR}/Xproto"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-SECTION = "x11/libs"
-LICENSE= "MIT"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DESCRIPTION = "X protocol and ancillary headers."
-
-SRC_URI = "${XLIBS_MIRROR}/xproto-${PV}.tar.gz"
-S = "${WORKDIR}/xproto-${PV}"
-
-inherit autotools pkgconfig
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-include proto-common.inc
-XORG_RELEASE = "X11R7.1"
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "MIT"
-SECTION = "x11/libs"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DESCRIPTION = "X protocol and ancillary headers."
-
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xproto"
-S = "${WORKDIR}/Xproto"
-
-inherit autotools pkgconfig
-
-
-do_stage() {
- autotools_stage_all
-}
+++ /dev/null
-include proto-common.inc
+++ /dev/null
-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/${PN}-X11R7.0-1.0.1.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-inherit autotools pkgconfig
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-LICENSE= "BSD-X"
-DEPENDS = "libxrandr libx11 libxext"
-DESCRIPTION = "X Resize and Rotate extension command."
-SECTION = "x11/base"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xrandr"
-S = "${WORKDIR}/xrandr"
-
-inherit autotools pkgconfig
+++ /dev/null
-diff -urN xrdb.orig/Imakefile xrdb/Imakefile
---- xrdb.orig/Imakefile 2004-04-23 21:55:03.000000000 +0200
-+++ xrdb/Imakefile 1970-01-01 01:00:00.000000000 +0100
-@@ -1,19 +0,0 @@
--XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $
--
--
--
--
--XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.6tsi Exp $
--
--#ifdef PatheticCpp
-- CPPDEFS = -DPATHETICCPP
--#endif
--#if HasMkstemp
-- CPPDEFS = -DHAS_MKSTEMP
--#endif
--XCOMM Due to ill make parsing the cpp is passed directly in source file
-- DEFINES = -DCPP="\"$(CPP)\"" $(CPPDEFS)
-- DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB)
--LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB)
--
--SimpleProgramTarget(xrdb)
-diff -urN xrdb.orig/Makefile.am xrdb/Makefile.am
---- xrdb.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xrdb/Makefile.am 2004-08-14 16:05:01.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# 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 Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD 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.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XRDB_CFLAGS@
-+
-+bin_PROGRAMS = xrdb
-+
-+xrdb_SOURCES = xrdb.c
-+
-+xrdb_LDADD = @XRDB_LIBS@
-+
-+man5_MANS=xrdb.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xrdb.orig/autogen.sh xrdb/autogen.sh
---- xrdb.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ xrdb/autogen.sh 2004-08-14 15:57:35.000000000 +0200
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+autoreconf -v --install || exit 1
-+./configure --enable-maintainer-mode "$@"
-diff -urN xrdb.orig/configure.ac xrdb/configure.ac
---- xrdb.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xrdb/configure.ac 2004-08-14 16:03:31.000000000 +0200
-@@ -0,0 +1,41 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xrdb],4.4.0,[],xrdb)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XRDB, xext xmuu x11)
-+
-+AC_OUTPUT([Makefile])
+++ /dev/null
-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/${PN}-X11R7.0-1.0.1.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-inherit autotools pkgconfig
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-DEPENDS = "libx11 libxmu libxext"
-DESCRIPTION = "X server resource database utility"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
-SECTION = "x11/base"
-LICENSE = "xrdb"
-PR = "r2"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xrdb \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xrdb"
-
-inherit autotools pkgconfig
+++ /dev/null
---- xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate.orig 2006-04-09 15:12:16.167950472 +0200
-+++ xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate 2006-04-09 15:14:51.511334688 +0200
-@@ -2,4 +2,9 @@
-
- if [ ! -f /etc/pointercal ]; then
- /usr/bin/run-calibrate.sh
-+
-+ if [ -x /etc/init.d/zaurusd ]; then
-+ /etc/init.d/zaurusd stop
-+ /etc/init.d/zaurusd start
-+ fi
- fi
+++ /dev/null
-diff -Nur xserver-common-1.8.orig/X11/Xinit.d/12keymap xserver-common-1.8/X11/Xinit.d/12keymap
---- xserver-common-1.8.orig/X11/Xinit.d/12keymap 2006-05-17 12:02:52.645201000 +0200
-+++ xserver-common-1.8/X11/Xinit.d/12keymap 2006-05-17 12:03:49.401573648 +0200
-@@ -9,6 +9,9 @@
- "SHARP Akita" | "SHARP Borzoi" | "SHARP Spitz")
- xmodmap - < /etc/X11/slcXXXX.xmodmap
- ;;
-+ "SHARP Poodle")
-+ xmodmap - < /etc/X11/poodle.xmodmap
-+ ;;
- "Sharp-Collie")
- xmodmap - < /etc/X11/collie.xmodmap
- ;;
-diff -Nur xserver-common-1.8.orig/X11/poodle.xmodmap xserver-common-1.8/X11/poodle.xmodmap
---- xserver-common-1.8.orig/X11/poodle.xmodmap 1970-01-01 01:00:00.000000000 +0100
-+++ xserver-common-1.8/X11/poodle.xmodmap 2006-05-18 13:42:45.711264920 +0200
-@@ -0,0 +1,25 @@
-+keycode 37 = Control_L
-+keycode 64 = Alt_L
-+
-+
-+keycode 50 = Shift_L
-+keycode 62 = Shift_R
-+keycode 75 = Mode_switch
-+
-+
-+
-+clear control
-+clear shift
-+clear lock
-+clear mod4
-+clear mod1
-+
-+add control = Control_L
-+add shift = Shift_L Shift_R
-+add lock = Caps_Lock
-+
-+! This is AltGr
-+add mod4 = Mode_switch
-+
-+add mod1 = Alt_L
-+
+++ /dev/null
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: setDPI.sh
-# Date: 09-Apr-06
-
-# This script configures Xft.dpi dependent on your screens DPI. This insures that the same font-size
-# setting of 7 can be used on all machines.
-
-
-XDEFAULTS="/etc/X11/Xdefaults"
-
-
-
-set_dpi() {
-
- CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Xft.dpi\:/s/.*\:\(.*\)/\1/p" | sed -n "s/\ //p"`"
-
- if test "$CURRENT_SETTING" != "$1"
- then
- echo "Using Xft.dpi of $SET_SCREEN_DPI for your $SCREEN_DPI DPI screen"
-
- if grep -q "Xft.dpi" "$XDEFAULTS"
- then
- cat "${XDEFAULTS}" | sed "s/^Xft.dpi\:.*/Xft.dpi\: $SET_SCREEN_DPI/" > "${XDEFAULTS}_"
- mv "${XDEFAULTS}_" "${XDEFAULTS}"
- else
- echo -e "Xft.dpi: $SET_SCREEN_DPI\n" >> "$XDEFAULTS"
- fi
- else
- echo "Your $SCREEN_DPI DPI screen is already configured."
- fi
-}
-
-set_rxvt_font() {
-
- CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Rxvt\*font/s/\(.*\pixelsize=\)\(.*\)/\2/p"`"
-
- if test "$1" -gt 100
- then
-
- # Configure the rxvt font-size for your screen here:
- test "$1" -gt 180 -a "$1" -lt "221" && RXVT_FONT_SIZE=16
-
- if test -z "$RXVT_FONT_SIZE"
- then
- echo "WARNING: No rxvt font-size configured for a $SCREEN_DPI DPI screen!"
- echo "Defaulting to size 9"
- RXVT_FONT_SIZE=9
- fi
-
- if test "$CURRENT_SETTING" != "$RXVT_FONT_SIZE"
- then
- echo "Using a rxvt font-size of $RXVT_FONT_SIZE"
- cat ${XDEFAULTS} | sed "/Rxvt\*font/s/\(.*\pixelsize\)\(=*.*\)/\1=$RXVT_FONT_SIZE/" > ${XDEFAULTS}_
- mv ${XDEFAULTS}_ ${XDEFAULTS}
- else
- echo "The rxvt font-size is already configured"
- fi
- fi
-}
-
-if test -z "$DISPLAY"
-then
- echo "DISPLAY is not set, aborting..."
- exit 0
-fi
-
-SCREEN_DPI="`/usr/bin/xdpyinfo | grep "dots per inch" | awk '{print $2}'| sed -n "s/\(.*\)x\(.*\)/\2/p"`"
-
-if test -z "$SCREEN_DPI"
-then
- echo "WARNING: Couldn't read your screens DPI, defaulting to 100"
- SCREEN_DPI=100
-fi
-
-# Configure your screen here:
-test "$SCREEN_DPI" -gt 180 -a "$SCREEN_DPI" -lt "221" && SET_SCREEN_DPI=160
-test "$SCREEN_DPI" -gt 90 -a "$SCREEN_DPI" -lt "121" && SET_SCREEN_DPI=100
-
-
-if test -z "$SET_SCREEN_DPI"
-then
- echo "WARNING: No default configuration found for your $SCREEN_DPI DPI screen!"
- echo "Using 100 DPI"
- SET_SCREEN_DPI=100
-fi
-
-set_dpi "$SET_SCREEN_DPI"
-set_rxvt_font "$SCREEN_DPI"
+++ /dev/null
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
-
-PACKAGE_ARCH = "all"
-
-# we are using a gpe-style Makefile
-inherit gpe
-
-SRC_URI_append = " file://setDPI.sh \
- file://calibrate_zaurusd.patch;patch=1 \
- file://poodle-xmodmap-2.6.patch;patch=1"
-
-do_install_append() {
- install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
-}
+++ /dev/null
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
-
-PACKAGE_ARCH = "all"
-
-# we are using a gpe-style Makefile
-inherit gpe
-
+++ /dev/null
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r2"
-
-PACKAGE_ARCH = "all"
-
-# we are using a gpe-style Makefile
-inherit gpe
-
-SRC_URI_append = " file://setDPI.sh \
- file://calibrate_zaurusd.patch;patch=1"
-
-do_install_append() {
- install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
-}
+++ /dev/null
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
-
-PACKAGE_ARCH = "all"
-
-# we are using a gpe-style Makefile
-inherit gpe
-
-SRC_URI_append = " file://setDPI.sh \
- file://calibrate_zaurusd.patch;patch=1 \
- file://poodle-xmodmap-2.6.patch;patch=1"
-
-do_install_append() {
- install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
-}
+++ /dev/null
---- configure.ac~ 2005-06-03 17:23:36.000000000 +0200
-+++ configure.ac 2005-06-03 17:23:36.000000000 +0200
-@@ -447,10 +447,6 @@
- KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
- fi
-
--if test "$TSLIB" = yes; then
-- KDRIVE_LIBS="${KDRIVE_LIBS} -lts"
--fi
--
- AC_SUBST([KDRIVE_PURE_LIBS])
- AC_SUBST([KDRIVE_PURE_INCS])
- AC_SUBST([KDRIVE_LIBS])
+++ /dev/null
---- xserver/hw/kdrive/fbdev/fbdev.c~ 2004-09-15 00:08:10.000000000 +0100
-+++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-13 17:47:02.000000000 +0000
-@@ -198,6 +198,11 @@
- return FALSE;
- }
-
-+ /* Re-get the "fixed" parameters since they might have changed */
-+ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
-+ if (k < 0)
-+ perror ("FBIOGET_FSCREENINFO");
-+
- /* Now get the new screeninfo */
- ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
- depth = priv->var.bits_per_pixel;
+++ /dev/null
-Index: hw/kdrive/src/kmode.c
-===================================================================
-RCS file: /cvs/xserver/xserver/hw/kdrive/src/kmode.c,v
-retrieving revision 1.13
-diff -u -r1.13 kmode.c
---- xserver/hw/kdrive/src/kmode.c 26 Jul 2004 17:14:26 -0000 1.13
-+++ xserver/hw/kdrive/src/kmode.c 28 Aug 2004 14:04:19 -0000
-@@ -41,6 +41,11 @@
- 1, 11, 14, KdSyncNegative,
- },
-
-+ { 240, 320, 64, 0,
-+ 0, 0, 0, KdSyncNegative,
-+ 0, 0, 0, KdSyncNegative,
-+ },
-+
- /* Other VESA modes */
- { 640, 350, 85, 31500, /* VESA */
- 32, 96, 192, KdSyncPositive, /* 26.413 */
+++ /dev/null
-LICENSE = "MIT"
-DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
-PROVIDES = "virtual/xserver"
-PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
-SECTION = "x11/base"
-DESCRIPTION = "X server from freedesktop.org"
-DESCRIPTION_xserver-kdrive-omap = "X server from freedesktop.org with patches from maemo.org, supporting X on OMAP based devices"
-
-PR = "r2"
-
-FILES_${PN} = "${bindir}/Xomap"
-
-SRC_URI = " http://stage.maemo.org/pool/maemo/ossw/source/x/xserver-kdrive/xserver-kdrive_${PV}-5.tar.gz \
- file://kmode.patch;patch=1 \
- file://fbdev-not-fix.patch;patch=1 \
- file://configure-tslib.patch;patch=1;pnum=0"
-
-S = "${WORKDIR}/xserver"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-composite --disable-xinerama --enable-xomapserver \
- --enable-xsp --disable-xlocale --disable-rpath --prefix=/usr"
+++ /dev/null
---- 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,
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- xserver/hw/kdrive/linux/linux.c~devfs
-+++ xserver/hw/kdrive/linux/linux.c
-@@ -82,10 +82,10 @@
- vtno = kdVirtualTerminal;
- else
- {
-- if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0)
-+ if ((fd = open("/dev/vc/0",O_WRONLY,0)) < 0)
- {
- FatalError(
-- "LinuxInit: Cannot open /dev/tty0 (%s)\n",
-+ "LinuxInit: Cannot open /dev/tty/0 (%s)\n",
- strerror(errno));
- }
- if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) ||
-@@ -96,7 +96,7 @@
- }
- close(fd);
-
-- sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */
-+ sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/tty1-64 */
-
- if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0)
- {
-@@ -113,7 +113,7 @@
- *
- * Why is this needed?
- */
-- LinuxCheckChown ("/dev/tty0");
-+ LinuxCheckChown ("/dev/vc/0");
- /*
- * Linux doesn't switch to an active vt after the last close of a vt,
- * so we do this ourselves by remembering which is active now.
-@@ -453,7 +453,7 @@
- activeVT = -1;
- }
- close(LinuxConsoleFd); /* make the vt-manager happy */
-- fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0);
-+ fd = open ("/dev/vc/0", O_RDWR|O_NDELAY, 0);
- if (fd >= 0)
- {
- memset (&vts, '\0', sizeof (vts)); /* valgrind */
+++ /dev/null
---- xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 +0000
-+++ xserver/hw/kdrive/linux/linux.c 2005-04-23 15:57:05.001094192 +0000
-@@ -342,7 +342,7 @@
- /*
- * Open the APM driver
- */
-- LinuxApmFd = open ("/dev/apm_bios", 2);
-+ /*LinuxApmFd = open ("/dev/apm_bios", 2);
- if (LinuxApmFd < 0 && errno == ENOENT)
- LinuxApmFd = open ("/dev/misc/apm_bios", 2);
- if (LinuxApmFd >= 0)
-@@ -352,7 +352,7 @@
- RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
- AddEnabledDevice (LinuxApmFd);
- }
--
-+ */
- /*
- * now get the VT
- */
+++ /dev/null
---- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
-+++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
-@@ -505,7 +505,11 @@
- XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
-
- dnl Core modules for most extensions, et al.
-+if test "$KDRIVE" = yes; then
-+REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto"
-+else
- REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto"
-+fi
- REQUIRED_LIBS="xfont xau fontenc"
-
- AM_CONDITIONAL(XV, [test "x$XV" = xyes])
-@@ -1514,7 +1526,9 @@
- AC_SUBST(XKB_COMPILED_DIR)
-
- dnl and the rest of these are generic, so they're in config.h
-+if test ! x"$KDRIVE" = xyes; then
- AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
-+fi
- AC_DEFINE(XResExtension, 1, [Build XRes extension])
-
- dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined
-@@ -1534,10 +1548,12 @@
-
- AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
-
-+if test ! "x$KDRIVE" = xyes ; then
- dnl xorgconfig CLI configuration utility
- PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
- AC_SUBST(XORGCONFIG_DEP_CFLAGS)
- AC_SUBST(XORGCONFIG_DEP_LIBS)
-+fi
-
- dnl xorgcfg GUI configuration utility
- AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg],
+++ /dev/null
---- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig 2006-06-08 14:49:12.158684250 +0200
-+++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c 2006-06-08 14:49:52.493205000 +0200
-@@ -52,8 +52,8 @@
- /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */
-
- #define NEED_REPLIES
- #ifdef HAVE_DIX_CONFIG_H
--#include <dix-config.h>
-+#include <kdrive-config.h>
- #endif
-
- #include <X11/X.h>
+++ /dev/null
---- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
-+++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
-@@ -1438,6 +1446,10 @@
- fi
-
-- # tslib...
-+ AC_CHECK_HEADERS([tslib.h])
-+ if test "$ac_cv_header_tslib_h" = yes; then
-+ AC_DEFINE(TSLIB, 1, [Build kdrive with tslib support])
-+ AC_DEFINE(TOUCHSCREEN, 1, [Build kdrive with touchscreen support])
-+ fi
-
- # damage shadow extension glx (NOTYET) fb mi
- KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'
-@@ -1467,7 +1479,7 @@
- AC_SUBST(KDRIVE_CFLAGS)
- AC_SUBST(KDRIVE_PURE_LIBS)
- AC_SUBST(KDRIVE_LIBS)
--AM_CONDITIONAL(TSLIB, false)
-+AM_CONDITIONAL(TSLIB, [test x"$ac_cv_header_tslib_h" = xyes])
- AM_CONDITIONAL(H3600_TS, false)
- AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
- AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
+++ /dev/null
---- xserver.orig/hw/kdrive/epson/epson13806stub.c 2004-10-20 10:20:51.000000000 +0200
-+++ xserver/hw/kdrive/epson/epson13806stub.c 2005-03-17 14:38:22.000000000 +0100
-@@ -55,7 +55,7 @@
- {
- KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
- #ifdef TOUCHSCREEN
-- KdInitTouchScreen (&TsFuncs);
-+ KdAddMouseDriver (&TsFuncs);
- #endif
- }
-
+++ /dev/null
-Index: xserver/miext/shadow/shrotate.c
-===================================================================
-RCS file: /scratch/openbsd/cvs/XF4/xc/programs/Xserver/miext/shadow/shrotate.c,v
-retrieving revision 1.2
-diff -u -r1.2 shrotate.c
---- xserver/miext/shadow/shrotate.c 3 Nov 2004 00:09:54 -0000 1.2
-+++ xserver/miext/shadow/shrotate.c 20 Sep 2005 23:07:58 -0000
-@@ -45,6 +45,106 @@
- #define TOP_TO_BOTTOM 2
- #define BOTTOM_TO_TOP -2
-
-+
-+static void
-+shadowUpdateRotatePackedSubRectangle(shadowBufPtr pBuf,
-+ FbBits *shaLine, int shaFirstShift,
-+ int shaStepOverX, int shaStepOverY,
-+ int shaStepDownX, int shaStepDownY,
-+ int shaBpp, FbBits shaMask,
-+ ScreenPtr pScreen,
-+ int scr_x1, int scr_y,
-+ int scr_h, int scr_w,
-+ int pixelsPerBits)
-+{
-+ FbBits *sha;
-+ int shaShift;
-+ int scr_x;
-+ int w;
-+
-+ /*
-+ * Copy the bits, always write across the physical frame buffer
-+ * to take advantage of write combining.
-+ */
-+ while (scr_h--)
-+ {
-+ int p;
-+ FbBits bits;
-+ FbBits *win;
-+ int i;
-+ CARD32 winSize;
-+
-+ sha = shaLine;
-+ shaShift = shaFirstShift;
-+ w = scr_w;
-+ scr_x = scr_x1 * shaBpp >> FB_SHIFT;
-+
-+ while (w)
-+ {
-+ /*
-+ * Map some of this line
-+ */
-+ win = (FbBits *) (*pBuf->window) (pScreen,
-+ scr_y,
-+ scr_x << 2,
-+ SHADOW_WINDOW_WRITE,
-+ &winSize,
-+ pBuf->closure);
-+ i = (winSize >> 2);
-+ if (i > w)
-+ i = w;
-+ w -= i;
-+ scr_x += i;
-+ /*
-+ * Copy the portion of the line mapped
-+ */
-+ while (i--)
-+ {
-+ bits = 0;
-+ p = pixelsPerBits;
-+ /*
-+ * Build one word of output from multiple inputs
-+ */
-+ while (p--)
-+ {
-+ bits = FbScrLeft(bits, shaBpp);
-+ bits |= FbScrRight (*sha, shaShift) & shaMask;
-+
-+ shaShift -= shaStepOverX;
-+ if (shaShift >= FB_UNIT)
-+ {
-+ shaShift -= FB_UNIT;
-+ sha--;
-+ }
-+ else if (shaShift < 0)
-+ {
-+ shaShift += FB_UNIT;
-+ sha++;
-+ }
-+ sha += shaStepOverY;
-+ }
-+ *win++ = bits;
-+ }
-+ }
-+ scr_y++;
-+ shaFirstShift -= shaStepDownX;
-+ if (shaFirstShift >= FB_UNIT)
-+ {
-+ shaFirstShift -= FB_UNIT;
-+ shaLine--;
-+ }
-+ else if (shaFirstShift < 0)
-+ {
-+ shaFirstShift += FB_UNIT;
-+ shaLine++;
-+ }
-+ shaLine += shaStepDownY;
-+ }
-+}
-+
-+#define BLOCKSIZE_HEIGHT 32
-+#define BLOCKSIZE_WIDTH 32
-+
- void
- shadowUpdateRotatePacked (ScreenPtr pScreen,
- shadowBufPtr pBuf)
-@@ -61,7 +161,6 @@
- int sha_x1 = 0, sha_y1 = 0;
- int scr_x1 = 0, scr_x2 = 0, scr_y1 = 0, scr_y2 = 0, scr_w, scr_h;
- int scr_x, scr_y;
-- int w;
- int pixelsPerBits;
- int pixelsMask;
- FbStride shaStepOverY = 0, shaStepDownY = 0;
-@@ -221,86 +320,46 @@
- ((sha_x1 * shaBpp) >> FB_SHIFT));
-
- /*
-- * Copy the bits, always write across the physical frame buffer
-- * to take advantage of write combining.
-+ * Copy in blocks of size BLOCKSIZE_WIDTH x BLOCKSIZE_HEIGHT
-+ * to reduce the number of cache misses when rotating 90 or
-+ * 270 degrees.
- */
-- while (scr_h--)
-+ for (scr_y = scr_y1; scr_y < scr_y2; scr_y += BLOCKSIZE_HEIGHT)
- {
-- int p;
-- FbBits bits;
-- FbBits *win;
-- int i;
-- CARD32 winSize;
--
- sha = shaLine;
- shaShift = shaFirstShift;
-- w = scr_w;
-- scr_x = scr_x1 * shaBpp >> FB_SHIFT;
-
-- while (w)
-+ for (scr_x = scr_x1; scr_x < scr_x2; scr_x += BLOCKSIZE_WIDTH)
- {
-- /*
-- * Map some of this line
-- */
-- win = (FbBits *) (*pBuf->window) (pScreen,
-- scr_y,
-- scr_x << 2,
-- SHADOW_WINDOW_WRITE,
-- &winSize,
-- pBuf->closure);
-- i = (winSize >> 2);
-- if (i > w)
-- i = w;
-- w -= i;
-- scr_x += i;
-- /*
-- * Copy the portion of the line mapped
-- */
-- while (i--)
-- {
-- bits = 0;
-- p = pixelsPerBits;
-- /*
-- * Build one word of output from multiple inputs
-- *
-- * Note that for 90/270 rotations, this will walk
-- * down the shadow hitting each scanline once.
-- * This is probably not very efficient.
-- */
-- while (p--)
-- {
-- bits = FbScrLeft(bits, shaBpp);
-- bits |= FbScrRight (*sha, shaShift) & shaMask;
-+ int h = BLOCKSIZE_HEIGHT;
-+ int w = BLOCKSIZE_WIDTH;
-
-- shaShift -= shaStepOverX;
-- if (shaShift >= FB_UNIT)
-- {
-- shaShift -= FB_UNIT;
-- sha--;
-- }
-- else if (shaShift < 0)
-- {
-- shaShift += FB_UNIT;
-- sha++;
-- }
-- sha += shaStepOverY;
-- }
-- *win++ = bits;
-- }
-- }
-- scr_y++;
-- shaFirstShift -= shaStepDownX;
-- if (shaFirstShift >= FB_UNIT)
-- {
-- shaFirstShift -= FB_UNIT;
-- shaLine--;
-- }
-- else if (shaFirstShift < 0)
-- {
-- shaFirstShift += FB_UNIT;
-- shaLine++;
-+ if (scr_y + h > scr_y2)
-+ h = scr_y2 - scr_y;
-+ if (scr_x + w > scr_x2)
-+ w = scr_x2 - scr_x;
-+ w = (w * shaBpp) >> FB_SHIFT;
-+
-+ shadowUpdateRotatePackedSubRectangle
-+ (pBuf,
-+ sha, shaShift,
-+ shaStepOverX, shaStepOverY,
-+ shaStepDownX, shaStepDownY,
-+ shaBpp, shaMask,
-+ pScreen,
-+ scr_x, scr_y,
-+ h, w,
-+ pixelsPerBits);
-+
-+ shaShift -= BLOCKSIZE_WIDTH * shaStepOverX;
-+ sha += BLOCKSIZE_WIDTH * shaStepOverY;
-+ sha -= (shaShift >> FB_SHIFT);
-+ shaShift &= FB_MASK;
- }
-- shaLine += shaStepDownY;
-+ shaFirstShift -= BLOCKSIZE_HEIGHT * shaStepDownX;
-+ shaLine += BLOCKSIZE_HEIGHT * shaStepDownY;
-+ shaLine -= (shaFirstShift >> FB_SHIFT);
-+ shaFirstShift &= FB_MASK;
- }
- }
- }
+++ /dev/null
---- xserver/hw/kdrive/fbdev/fbdev.c~ 2004-09-15 00:08:10.000000000 +0100
-+++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-13 17:47:02.000000000 +0000
-@@ -198,6 +198,11 @@
- return FALSE;
- }
-
-+ /* Re-get the "fixed" parameters since they might have changed */
-+ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
-+ if (k < 0)
-+ perror ("FBIOGET_FSCREENINFO");
-+
- /* Now get the new screeninfo */
- ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
- depth = priv->var.bits_per_pixel;
+++ /dev/null
-# Kdrive evdev support patch, posted by Ander Conselvan de Oliveira at
-# http://lists.freedesktop.org/archives/xorg/2005-December/011635.html
-diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/linux/evdev.c xserver/hw/kdrive/linux/evdev.c
---- xserver.original/hw/kdrive/linux/evdev.c 2005-12-16 10:36:05.000000000 -0200
-+++ xserver/hw/kdrive/linux/evdev.c 2005-12-16 10:40:51.077410192 -0200
-@@ -31,9 +31,11 @@
- #include <X11/X.h>
- #include <X11/Xproto.h>
- #include <X11/Xpoll.h>
-+#include <X11/keysym.h>
- #include "inputstr.h"
- #include "scrnintstr.h"
- #include "kdrive.h"
-+#include "kkeymap.h"
-
- #define NUM_EVENTS 128
- #define ABS_UNSET -65535
-@@ -105,9 +107,10 @@
- {
- KdMouseInfo *mi = closure;
- Kevdev *ke = mi->driver;
-- int i;
-+ int i, j;
- struct input_event events[NUM_EVENTS];
- int n;
-+ int flags;
-
- n = read (evdevPort, &events, NUM_EVENTS * sizeof (struct input_event));
- if (n <= 0)
-@@ -115,22 +118,64 @@
- n /= sizeof (struct input_event);
- for (i = 0; i < n; i++)
- {
-+ flags = KD_MOUSE_DELTA | kdMouseInfo->buttonState;
- switch (events[i].type) {
- case EV_SYN:
- break;
- case EV_KEY:
-- EvdevMotion (mi);
-- ASSIGNBIT(ke->key,events[i].code, events[i].value);
-- if (events[i].code < 0x100)
-- ErrorF ("key %d %d\n", events[i].code, events[i].value);
-- else
-- ErrorF ("key 0x%x %d\n", events[i].code, events[i].value);
-+ if (events[i].code >= BTN_MOUSE && events[i].code < BTN_JOYSTICK) {
-+ switch (events[i].code) {
-+ case BTN_LEFT:
-+ if (events[i].value == 1)
-+ flags |= KD_BUTTON_1;
-+ else
-+ flags &= ~KD_BUTTON_1;
-+ break;
-+ case BTN_MIDDLE:
-+ if (events[i].value == 1)
-+ flags |= KD_BUTTON_2;
-+ else
-+ flags &= ~KD_BUTTON_2;
-+ break;
-+ case BTN_RIGHT:
-+ if (events[i].value == 1)
-+ flags |= KD_BUTTON_3;
-+ else
-+ flags &= ~KD_BUTTON_3;
-+ break;
-+ default:
-+ /* Unknow button */
-+ break;
-+ }
-+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0);
-+ }
- break;
- case EV_REL:
-- ke->rel[events[i].code] += events[i].value;
-+ if (events[i].code == REL_X) {
-+ KdEnqueueMouseEvent (kdMouseInfo, flags, events[i].value, 0);
-+ }
-+ else if (events[i].code == REL_Y) {
-+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, events[i].value);
-+ }
-+ else if (events[i].code == REL_WHEEL) {
-+ for (j = 0; j < abs (events[i].value); j++) {
-+ if (events[i].value > 0)
-+ flags |= KD_BUTTON_4;
-+ else
-+ flags |= KD_BUTTON_5;
-+
-+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0);
-+
-+ if (events[i].value > 0)
-+ flags &= ~KD_BUTTON_4;
-+ else
-+ flags &= ~KD_BUTTON_5;
-+
-+ KdEnqueueMouseEvent (kdMouseInfo, flags, 0, 0);
-+ } /* events[i].code == REL_WHEEL */
-+ }
- break;
- case EV_ABS:
-- ke->abs[events[i].code] = events[i].value;
- break;
- }
- }
-@@ -173,6 +218,12 @@
- fd = open (kdefaultEvdev[i], 2);
- if (fd >= 0)
- {
-+ if (ioctl (fd, EVIOCGRAB, 1) < 0)
-+ {
-+ close (fd);
-+ continue;
-+ }
-+
- mi->name = KdSaveString (kdefaultEvdev[i]);
- break;
- }
-@@ -287,7 +338,319 @@
- EvdevFini,
- };
-
--#if 0
-+/* Keyboard */
-+
-+int kbd_fd = -1;
-+int EvdevInputType = 0;
-+
-+KeySym evdevKeymap[(194 - 1 + 1) * 2] = {
-+/* These are directly mapped from DOS scanset 0 */
-+/* 1 8 */ XK_Escape, NoSymbol,
-+/* 2 9 */ XK_1, XK_exclam,
-+/* 3 10 */ XK_2, XK_at,
-+/* 4 11 */ XK_3, XK_numbersign,
-+/* 5 12 */ XK_4, XK_dollar,
-+/* 6 13 */ XK_5, XK_percent,
-+/* 7 14 */ XK_6, XK_asciicircum,
-+/* 8 15 */ XK_7, XK_ampersand,
-+/* 9 16 */ XK_8, XK_asterisk,
-+/* 10 17 */ XK_9, XK_parenleft,
-+/* 11 18 */ XK_0, XK_parenright,
-+/* 12 19 */ XK_minus, XK_underscore,
-+/* 13 20 */ XK_equal, XK_plus,
-+/* 14 21 */ XK_BackSpace, NoSymbol,
-+/* 15 22 */ XK_Tab, NoSymbol,
-+/* 16 23 */ XK_Q, NoSymbol,
-+/* 17 24 */ XK_W, NoSymbol,
-+/* 18 25 */ XK_E, NoSymbol,
-+/* 19 26 */ XK_R, NoSymbol,
-+/* 20 27 */ XK_T, NoSymbol,
-+/* 21 28 */ XK_Y, NoSymbol,
-+/* 22 29 */ XK_U, NoSymbol,
-+/* 23 30 */ XK_I, NoSymbol,
-+/* 24 31 */ XK_O, NoSymbol,
-+/* 25 32 */ XK_P, NoSymbol,
-+/* 26 33 */ XK_bracketleft, XK_braceleft,
-+/* 27 34 */ XK_bracketright, XK_braceright,
-+/* 28 35 */ XK_Return, NoSymbol,
-+/* 29 36 */ XK_Control_L, NoSymbol,
-+/* 30 37 */ XK_A, NoSymbol,
-+/* 31 38 */ XK_S, NoSymbol,
-+/* 32 39 */ XK_D, NoSymbol,
-+/* 33 40 */ XK_F, NoSymbol,
-+/* 34 41 */ XK_G, NoSymbol,
-+/* 35 42 */ XK_H, NoSymbol,
-+/* 36 43 */ XK_J, NoSymbol,
-+/* 37 44 */ XK_K, NoSymbol,
-+/* 38 45 */ XK_L, NoSymbol,
-+/* 39 46 */ XK_semicolon, XK_colon,
-+/* 40 47 */ XK_apostrophe, XK_quotedbl,
-+/* 41 48 */ XK_grave, XK_asciitilde,
-+/* 42 49 */ XK_Shift_L, NoSymbol,
-+/* 43 50 */ XK_backslash, XK_bar,
-+/* 44 51 */ XK_Z, NoSymbol,
-+/* 45 52 */ XK_X, NoSymbol,
-+/* 46 53 */ XK_C, NoSymbol,
-+/* 47 54 */ XK_V, NoSymbol,
-+/* 48 55 */ XK_B, NoSymbol,
-+/* 49 56 */ XK_N, NoSymbol,
-+/* 50 57 */ XK_M, NoSymbol,
-+/* 51 58 */ XK_comma, XK_less,
-+/* 52 59 */ XK_period, XK_greater,
-+/* 53 60 */ XK_slash, XK_question,
-+/* 54 61 */ XK_Shift_R, NoSymbol,
-+/* 55 62 */ XK_KP_Multiply, NoSymbol,
-+/* 56 63 */ XK_Alt_L, XK_Meta_L,
-+/* 57 64 */ XK_space, NoSymbol,
-+/* 58 65 */ XK_Caps_Lock, NoSymbol,
-+/* 59 66 */ XK_F1, NoSymbol,
-+/* 60 67 */ XK_F2, NoSymbol,
-+/* 61 68 */ XK_F3, NoSymbol,
-+/* 62 69 */ XK_F4, NoSymbol,
-+/* 63 70 */ XK_F5, NoSymbol,
-+/* 64 71 */ XK_F6, NoSymbol,
-+/* 65 72 */ XK_F7, NoSymbol,
-+/* 66 73 */ XK_F8, NoSymbol,
-+/* 67 74 */ XK_F9, NoSymbol,
-+/* 68 75 */ XK_F10, NoSymbol,
-+/* 69 76 */ XK_Break, XK_Pause,
-+/* 70 77 */ XK_Scroll_Lock, NoSymbol,
-+/* 71 78 */ XK_KP_Home, XK_KP_7,
-+/* 72 79 */ XK_KP_Up, XK_KP_8,
-+/* 73 80 */ XK_KP_Page_Up, XK_KP_9,
-+/* 74 81 */ XK_KP_Subtract, NoSymbol,
-+/* 75 82 */ XK_KP_Left, XK_KP_4,
-+/* 76 83 */ XK_KP_5, NoSymbol,
-+/* 77 84 */ XK_KP_Right, XK_KP_6,
-+/* 78 85 */ XK_KP_Add, NoSymbol,
-+/* 79 86 */ XK_KP_End, XK_KP_1,
-+/* 80 87 */ XK_KP_Down, XK_KP_2,
-+/* 81 88 */ XK_KP_Page_Down, XK_KP_3,
-+/* 82 89 */ XK_KP_Insert, XK_KP_0,
-+/* 83 90 */ XK_KP_Delete, XK_KP_Decimal,
-+/* 84 91 */ NoSymbol, NoSymbol,
-+/* 85 92 */ NoSymbol, NoSymbol,
-+/* 86 93 */ NoSymbol, NoSymbol,
-+/* 87 94 */ XK_F11, NoSymbol,
-+/* 88 95 */ XK_F12, NoSymbol,
-+
-+/* These are remapped from the extended set (using ExtendMap) */
-+
-+/* 89 96 */ XK_Control_R, NoSymbol,
-+/* 90 97 */ XK_KP_Enter, NoSymbol,
-+/* 91 98 */ XK_KP_Divide, NoSymbol,
-+/* 92 99 */ XK_Sys_Req, XK_Print,
-+/* 93 100 */ XK_Alt_R, XK_Meta_R,
-+/* 94 101 */ XK_Num_Lock, NoSymbol,
-+/* 95 102 */ XK_Home, NoSymbol,
-+/* 96 103 */ XK_Up, NoSymbol,
-+/* 97 104 */ XK_Page_Up, NoSymbol,
-+/* 98 105 */ XK_Left, NoSymbol,
-+/* 99 106 */ XK_Right, NoSymbol,
-+/* 100 107 */ XK_End, NoSymbol,
-+/* 101 108 */ XK_Down, NoSymbol,
-+/* 102 109 */ XK_Page_Down, NoSymbol,
-+/* 103 110 */ XK_Insert, NoSymbol,
-+/* 104 111 */ XK_Delete, NoSymbol,
-+/* 105 112 */ XK_Super_L, NoSymbol,
-+/* 106 113 */ XK_Super_R, NoSymbol,
-+/* 107 114 */ XK_Menu, NoSymbol,
-+/* 108 115 */ NoSymbol, NoSymbol,
-+/* 109 116 */ NoSymbol, NoSymbol,
-+/* 110 117 */ NoSymbol, NoSymbol,
-+/* 111 118 */ NoSymbol, NoSymbol,
-+/* 112 119 */ NoSymbol, NoSymbol,
-+
-+/* 113 120 */ NoSymbol, NoSymbol,
-+/* 114 121 */ NoSymbol, NoSymbol,
-+/* 115 122 */ NoSymbol, NoSymbol,
-+/* 116 123 */ NoSymbol, NoSymbol,
-+/* 117 124 */ NoSymbol, NoSymbol,
-+/* 118 125 */ NoSymbol, NoSymbol,
-+/* 119 126 */ NoSymbol, NoSymbol,
-+/* 120 127 */ NoSymbol, NoSymbol,
-+/* 121 128 */ NoSymbol, NoSymbol,
-+/* 122 129 */ NoSymbol, NoSymbol,
-+/* 123 130 */ NoSymbol, NoSymbol,
-+/* 124 131 */ NoSymbol, NoSymbol,
-+/* 125 132 */ NoSymbol, NoSymbol,
-+/* 126 133 */ NoSymbol, NoSymbol,
-+/* 127 134 */ NoSymbol, NoSymbol,
-+/* 128 135 */ NoSymbol, NoSymbol,
-+/* 129 136 */ NoSymbol, NoSymbol,
-+/* 130 137 */ NoSymbol, NoSymbol,
-+/* 131 138 */ NoSymbol, NoSymbol,
-+/* 132 139 */ NoSymbol, NoSymbol,
-+/* 133 140 */ NoSymbol, NoSymbol,
-+/* 134 141 */ NoSymbol, NoSymbol,
-+/* 135 142 */ NoSymbol, NoSymbol,
-+/* 136 143 */ NoSymbol, NoSymbol,
-+/* 137 144 */ NoSymbol, NoSymbol,
-+/* 138 145 */ NoSymbol, NoSymbol,
-+/* 139 146 */ NoSymbol, NoSymbol,
-+/* 140 147 */ NoSymbol, NoSymbol,
-+/* 141 148 */ NoSymbol, NoSymbol,
-+/* 142 149 */ NoSymbol, NoSymbol,
-+/* 143 150 */ NoSymbol, NoSymbol,
-+/* 144 151 */ NoSymbol, NoSymbol,
-+/* 145 152 */ NoSymbol, NoSymbol,
-+/* 146 153 */ NoSymbol, NoSymbol,
-+/* 147 154 */ NoSymbol, NoSymbol,
-+/* 148 155 */ NoSymbol, NoSymbol,
-+/* 149 156 */ NoSymbol, NoSymbol,
-+/* 150 157 */ NoSymbol, NoSymbol,
-+/* 151 158 */ NoSymbol, NoSymbol,
-+/* 152 159 */ NoSymbol, NoSymbol,
-+/* 153 160 */ NoSymbol, NoSymbol,
-+/* 154 161 */ NoSymbol, NoSymbol,
-+/* 155 162 */ NoSymbol, NoSymbol,
-+/* 156 163 */ NoSymbol, NoSymbol,
-+/* 157 164 */ NoSymbol, NoSymbol,
-+/* 158 165 */ NoSymbol, NoSymbol,
-+/* 159 166 */ NoSymbol, NoSymbol,
-+/* 160 167 */ NoSymbol, NoSymbol,
-+/* 161 168 */ NoSymbol, NoSymbol,
-+/* 162 169 */ NoSymbol, NoSymbol,
-+/* 163 170 */ NoSymbol, NoSymbol,
-+/* 164 171 */ NoSymbol, NoSymbol,
-+/* 165 172 */ NoSymbol, NoSymbol,
-+/* 166 173 */ NoSymbol, NoSymbol,
-+/* 167 174 */ NoSymbol, NoSymbol,
-+/* 168 175 */ NoSymbol, NoSymbol,
-+/* 169 176 */ NoSymbol, NoSymbol,
-+/* 170 177 */ NoSymbol, NoSymbol,
-+/* 171 178 */ NoSymbol, NoSymbol,
-+/* 172 179 */ NoSymbol, NoSymbol,
-+/* 173 180 */ NoSymbol, NoSymbol,
-+/* 174 181 */ NoSymbol, NoSymbol,
-+/* 175 182 */ NoSymbol, NoSymbol,
-+/* 176 183 */ NoSymbol, NoSymbol,
-+/* 177 184 */ NoSymbol, NoSymbol,
-+/* 178 185 */ NoSymbol, NoSymbol,
-+/* 179 186 */ NoSymbol, NoSymbol,
-+/* 180 187 */ NoSymbol, NoSymbol,
-+/* 181 188 */ NoSymbol, NoSymbol,
-+/* 182 189 */ NoSymbol, NoSymbol,
-+/* 183 190 */ NoSymbol, NoSymbol,
-+/* 184 191 */ NoSymbol, NoSymbol,
-+/* 185 192 */ NoSymbol, NoSymbol,
-+/* 186 193 */ NoSymbol, NoSymbol,
-+/* 187 194 */ NoSymbol, NoSymbol,
-+/* 188 195 */ NoSymbol, NoSymbol,
-+/* 189 196 */ NoSymbol, NoSymbol,
-+/* 190 197 */ NoSymbol, NoSymbol,
-+/* 191 198 */ NoSymbol, NoSymbol,
-+/* 192 199 */ NoSymbol, NoSymbol,
-+/* 193 200 */ NoSymbol, NoSymbol,
-+/* 194 201 */ NoSymbol, NoSymbol,
-+};
-+
-+static void
-+EvdevKbdRead (int fd, void *closure)
-+{
-+ int i, n;
-+ struct input_event events[NUM_EVENTS];
-+
-+ n = read (fd, &events, NUM_EVENTS * sizeof (struct input_event));
-+ if (n <= 0)
-+ return;
-+
-+ n /= sizeof (struct input_event);
-+
-+ for (i = 0; i < n; i++)
-+ {
-+ if (events[i].type == EV_KEY)
-+ KdEnqueueKeyboardEvent (events[i].code, !events[i].value);
-+ }
-+}
-+
-+static void
-+EvdevKbdLoad (void)
-+{
-+ kdMinScanCode = 0;
-+ kdMaxScanCode = 193;
-+ kdKeymapWidth = 2;
-+ memcpy (kdKeymap, evdevKeymap, sizeof (evdevKeymap));
-+}
-+
-+static int
-+EvdevKbdInit (void)
-+{
-+ int fd, i;
-+
-+ if (!EvdevInputType)
-+ EvdevInputType = KdAllocInputType ();
-+
-+ if (!kdKeyboard)
-+ {
-+ for (i = 0; i < NUM_DEFAULT_EVDEV; i++)
-+ {
-+ fd = open (kdefaultEvdev[i], 2);
-+ if (fd >= 0)
-+ {
-+ kdKeyboard = KdSaveString (kdefaultEvdev[i]);
-+ break;
-+ }
-+ }
-+ }
-+ else
-+ {
-+ fd = open (kdKeyboard, O_RDWR);
-+ if (fd < 0)
-+ return FALSE;
-+ }
-+
-+ if (ioctl (fd, EVIOCGRAB, 1) < 0)
-+ {
-+ close (fd);
-+ return FALSE;
-+ }
-+
-+ if (!KdRegisterFd (EvdevInputType, fd, EvdevKbdRead, NULL))
-+ return FALSE;
-+
-+ kbd_fd = fd;
-+ return TRUE;
-+}
-+
-+static void
-+EvdevKbdFini (void)
-+{
-+}
-+
-+static void
-+EvdevKbdLeds (int leds)
-+{
-+ struct input_event event;
-+
-+ memset(&event, 0, sizeof(event));
-+
-+ event.type = EV_LED;
-+ event.code = LED_CAPSL;
-+ event.value = leds & (1 << 0) ? 1 : 0;
-+ write(kbd_fd, (char *) &event, sizeof(event));
-+
-+ event.type = EV_LED;
-+ event.code = LED_NUML;
-+ event.value = leds & (1 << 1) ? 1 : 0;
-+ write(kbd_fd, (char *) &event, sizeof(event));
-+
-+ event.type = EV_LED;
-+ event.code = LED_SCROLLL;
-+ event.value = leds & (1 << 2) ? 1 : 0;
-+ write(kbd_fd, (char *) &event, sizeof(event));
-+
-+ event.type = EV_LED;
-+ event.code = LED_COMPOSE;
-+ event.value = leds & (1 << 3) ? 1 : 0;
-+ write(kbd_fd, (char *) &event, sizeof(event));
-+}
-+
-+static void
-+EvdevKbdBell (int volume, int frequency, int duration)
-+{
-+}
-+
- KdKeyboardFuncs LinuxEvdevKeyboardFuncs = {
- EvdevKbdLoad,
- EvdevKbdInit,
-@@ -296,4 +659,4 @@
- EvdevKbdFini,
- 0,
- };
--#endif
-+
-diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kdrive.c xserver/hw/kdrive/src/kdrive.c
---- xserver.original/hw/kdrive/src/kdrive.c 2005-12-16 10:36:07.000000000 -0200
-+++ xserver/hw/kdrive/src/kdrive.c 2005-12-16 10:37:09.000000000 -0200
-@@ -73,6 +73,7 @@
- Bool kdEnabled;
- int kdSubpixelOrder;
- int kdVirtualTerminal = -1;
-+char *kdKeyboard = 0;
- Bool kdSwitchPending;
- char *kdSwitchCmd;
- DDXPointRec kdOrigin;
-@@ -795,6 +796,14 @@
- UseMsg ();
- return 2;
- }
-+ if (!strcmp (argv[i], "-keyboard"))
-+ {
-+ if ((i+1) < argc)
-+ kdKeyboard = argv[i+1];
-+ else
-+ UseMsg ();
-+ return 2;
-+ }
- if (!strcmp (argv[i], "-rgba"))
- {
- if ((i+1) < argc)
-diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kdrive.h xserver/hw/kdrive/src/kdrive.h
---- xserver.original/hw/kdrive/src/kdrive.h 2005-12-16 10:36:07.000000000 -0200
-+++ xserver/hw/kdrive/src/kdrive.h 2005-12-16 10:37:09.000000000 -0200
-@@ -416,6 +416,7 @@
- extern Bool kdDisableZaphod;
- extern Bool kdDontZap;
- extern int kdVirtualTerminal;
-+extern char *kdKeyboard;
- extern char *kdSwitchCmd;
- extern KdOsFuncs *kdOsFuncs;
-
-@@ -769,7 +770,7 @@
- ProcessInputEvents (void);
-
- extern KdMouseFuncs LinuxMouseFuncs;
--extern KdMouseFuncs LinuxEvdevFuncs;
-+extern KdMouseFuncs LinuxEvdevMouseFuncs;
- extern KdMouseFuncs Ps2MouseFuncs;
- extern KdMouseFuncs BusMouseFuncs;
- extern KdMouseFuncs MsMouseFuncs;
-@@ -777,6 +778,7 @@
- extern KdMouseFuncs TsFuncs;
- #endif
- extern KdKeyboardFuncs LinuxKeyboardFuncs;
-+extern KdKeyboardFuncs LinuxEvdevKeyboardFuncs;
- extern KdOsFuncs LinuxFuncs;
-
- extern KdMouseFuncs VxWorksMouseFuncs;
-diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/src/kinput.c xserver/hw/kdrive/src/kinput.c
---- xserver.original/hw/kdrive/src/kinput.c 2005-12-16 10:36:07.000000000 -0200
-+++ xserver/hw/kdrive/src/kinput.c 2005-12-16 10:37:09.000000000 -0200
-@@ -1300,6 +1300,7 @@
- xE.u.u.type = KeyPress;
- xE.u.u.detail = key_code;
-
-+#ifndef XKB
- switch (KEYCOL1(key_code))
- {
- case XK_Num_Lock:
-@@ -1313,6 +1314,7 @@
- else
- xE.u.u.type = KeyPress;
- }
-+#endif
-
- /*
- * Check pressed keys which are already down
+++ /dev/null
---- xserver/hw/kdrive/fbdev/fbinit.c~ 2006-01-31 17:09:33.000000000 +0100
-+++ xserver/hw/kdrive/fbdev/fbinit.c 2006-01-31 17:11:55.000000000 +0100
-@@ -28,6 +28,8 @@
- #endif
- #include <fbdev.h>
-
-+extern int use_evdev;
-+
- void
- InitCard (char *name)
- {
-@@ -45,7 +47,10 @@
- void
- InitInput (int argc, char **argv)
- {
-- KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
-+ if (use_evdev)
-+ KdInitInput (&LinuxEvdevMouseFuncs, &LinuxEvdevKeyboardFuncs);
-+ else
-+ KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
- #ifdef TOUCHSCREEN
- KdAddMouseDriver (&TsFuncs);
- #endif
---- xserver/hw/kdrive/src/kdrive.c.orig 2006-01-31 17:13:28.000000000 +0100
-+++ xserver/hw/kdrive/src/kdrive.c 2006-01-31 17:15:28.000000000 +0100
-@@ -44,6 +44,8 @@
- #include "dpmsproc.h"
- #endif
-
-+int use_evdev = 0;
-+
- typedef struct _kdDepths {
- CARD8 depth;
- CARD8 bpp;
-@@ -687,6 +689,7 @@
- ErrorF("-videoTest Start the server, pause momentarily and exit\n");
- ErrorF("-origin X,Y Locates the next screen in the the virtual screen (Xinerama)\n");
- ErrorF("-mouse path[,n] Filename of mouse device, n is number of buttons\n");
-+ ErrorF("-use-evdev Use Linux evdev input\n");
- ErrorF("-switchCmd Command to execute on vt switch\n");
- ErrorF("-nozap Don't terminate server on Ctrl+Alt+Backspace\n");
- ErrorF("vtxx Use virtual terminal xx instead of the next available\n");
-@@ -796,6 +799,10 @@
- UseMsg ();
- return 2;
- }
-+ if (!strcmp (argv[i], "-use-evdev"))
-+ {
-+ use_evdev = 1;
-+ }
- if (!strcmp (argv[i], "-keyboard"))
- {
- if ((i+1) < argc)
+++ /dev/null
---- /tmp/kmode.c 2005-06-27 14:46:19.716843288 +0200
-+++ xserver/hw/kdrive/src/kmode.c 2005-06-27 14:46:30.070269328 +0200
-@@ -41,6 +41,11 @@
- 1, 11, 14, KdSyncNegative,
- },
-
-+ { 240, 320, 64, 0,
-+ 0, 0, 0, KdSyncNegative,
-+ 0, 0, 0, KdSyncNegative,
-+ },
-+
- /* Other VESA modes */
- { 640, 350, 85, 31500, /* VESA */
- 32, 96, 192, KdSyncPositive, /* 26.413 */
-@@ -80,6 +85,13 @@
- 16, 48, 160, KdSyncNegative, /* 31.469 */
- 10, 33, 45, KdSyncNegative, /* 59.940 */
- },
-+
-+
-+ { 480, 640, 60, 0, /* VESA */
-+ 0, 0, 0, KdSyncNegative, /* 31.469 */
-+ 0, 0, 0, KdSyncNegative, /* 59.940 */
-+ },
-+
-
- /* 800x600 modes */
- { 800, 600, 85, 56250, /* VESA */
+++ /dev/null
---- xserver/hw/kdrive/linux/mouse.c.orig 2004-05-13 14:25:51.000000000 -0700
-+++ xserver/hw/kdrive/linux/mouse.c 2005-09-22 12:20:47.000000000 -0700
-@@ -927,8 +927,10 @@ char *kdefaultMouse[] = {
- "/dev/psaux",
- "/dev/input/mice",
- "/dev/adbmouse",
-+#ifdef BREAK_MY_SERIAL_CONSOLE
- "/dev/ttyS0",
- "/dev/ttyS1",
-+#endif
- };
-
- #define NUM_DEFAULT_MOUSE (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0]))
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- xserver/hw/kdrive/Makefile.am~onlyfb
-+++ xserver/hw/kdrive/Makefile.am
-@@ -17,12 +17,4 @@
- SUBDIRS = \
- src \
- linux \
-- $(XSDL_SUBDIRS) \
-- $(FBDEV_SUBDIRS) \
-- $(VESA_SUBDIRS) \
-- $(XEPHYR_SUBDIRS) \
-- ati \
-- fake \
-- ephyr \
-- i810 \
-- epson
-+ $(FBDEV_SUBDIRS)
+++ /dev/null
---- git/Makefile.am.orig 2006-06-09 16:01:51.000000000 +0200
-+++ git/Makefile.am 2006-06-09 16:02:59.000000000 +0200
-@@ -35,6 +35,10 @@
- XINPUT_DIR=Xi
- endif
-
-+if XKB
-+XKB_DIR=xkb
-+endif
-+
- if DBE
- DBE_DIR=dbe
- endif
-@@ -51,7 +55,7 @@
- randr \
- render \
- $(XINPUT_DIR) \
-- xkb \
-+ $(XKB_DIR) \
- $(DBE_DIR) \
- $(MFB_DIR) \
- $(AFB_DIR) \
---- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
-+++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
-@@ -418,6 +418,7 @@
- AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes])
- AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMS=$enableval], [DPMSExtension=yes])
- AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes])
-+AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes])
-
- dnl DDXes.
- AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
-@@ -739,12 +740,15 @@
-
- AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
-
--AC_DEFINE(XKB, 1, [Build XKB])
--AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
--AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
--REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
--XKB_LIB='$(top_builddir)/xkb/libxkb.la'
--XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
-+AM_CONDITIONAL(XKB, [test "x$XKB" = xyes])
-+if test "x$XKB" = xyes; then
-+ AC_DEFINE(XKB, 1, [Build XKB])
-+ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
-+ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
-+ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
-+ XKB_LIB='$(top_builddir)/xkb/libxkb.la'
-+ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
-+fi
-
- AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
- [Do not have `strcasecmp'.]))
+++ /dev/null
---- xorg-server-X11R7.1-1.1.0/mi/miinitext.c.orig 2006-06-22 14:11:46.000000000 +0200
-+++ xorg-server-X11R7.1-1.1.0/mi/miinitext.c 2006-06-22 15:26:17.000000000 +0200
-@@ -385,6 +385,9 @@
- #ifdef DMXEXT
- extern void DMXExtensionInit(INITARGS);
- #endif
-+#ifdef XCALIBRATE
-+extern void XCalibrateExtensionInit(INITARGS);
-+#endif
- #ifdef XEVIE
- extern void XevieExtensionInit(INITARGS);
- #endif
-@@ -679,6 +682,9 @@
- #ifdef DAMAGE
- if (!noDamageExtension) DamageExtensionInit();
- #endif
-+#ifdef XCALIBRATE
-+ XCalibrateExtensionInit ();
-+#endif
- }
-
- void
---- xorg-server-X11R7.1-1.1.0/configure.ac.orig 2006-06-15 17:03:14.000000000 +0200
-+++ xorg-server-X11R7.1-1.1.0/configure.ac 2006-06-24 08:21:25.000000000 +0200
-@@ -407,6 +407,7 @@
- AC_ARG_ENABLE(xf86vidmode, AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: enabled)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=yes])
- AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes])
- AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=yes])
-+AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--disable-xcalibrate], [Build XCalibrate extension (default: enabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=yes])
- AC_ARG_ENABLE(xevie, AS_HELP_STRING([--disable-xevie], [Build XEvIE extension (default: enabled)]), [XEVIE=$enableval], [XEVIE=yes])
- AC_ARG_ENABLE(lbx, AS_HELP_STRING([--disable-lbx], [Build LBX extension (default: no)]), [LBX=$enableval], [LBX=no])
- AC_ARG_ENABLE(appgroup, AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=yes])
-@@ -641,6 +642,12 @@
- AC_DEFINE(XCSECURITY, 1, [Build Security extension])
- fi
-
-+AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes])
-+if test "x$XCALIBRATE" = xyes; then
-+ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
-+ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateext"
-+fi
-+
- AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes])
- if test "x$XEVIE" = xyes; then
- AC_DEFINE(XEVIE, 1, [Build XEvIE extension])
-@@ -1466,7 +1473,7 @@
- KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
- KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
- KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
-- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB"
-+ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB"
-
- # check if we can build Xephyr
- PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
---- xorg-server-X11R7.1-1.1.0/include/kdrive-config.h.in.orig 2006-06-22 14:22:07.000000000 +0200
-+++ xorg-server-X11R7.1-1.1.0/include/kdrive-config.h.in 2006-06-22 14:33:29.000000000 +0200
-@@ -22,4 +22,7 @@
- /* Support tslib touchscreen abstraction library */
- #undef TSLIB
-
-+/* Enable XCalibrate extension */
-+#undef XCALIBRATE
-+
- #endif /* _KDRIVE_CONFIG_H_ */
---- xorg-server-X11R7.1-1.1.0/Xext/Makefile.am.orig 2006-06-15 17:06:43.000000000 +0200
-+++ xorg-server-X11R7.1-1.1.0/Xext/Makefile.am 2006-06-15 18:12:40.000000000 +0200
-@@ -78,6 +78,11 @@
- AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\"
- endif
-
-+XCALIBRATE_SRCS = xcalibrate.c
-+if XCALIBRATE
-+BUILTIN_SRCS += $(XCALIBRATE_SRCS)
-+endif
-+
- # X EVent Interception Extension: allows accessibility helpers & composite
- # managers to intercept events from input devices and transform as needed
- # before the clients see them.
-@@ -155,6 +160,7 @@
- $(SCREENSAVER_SRCS) \
- $(XCSECURITY_SRCS) \
- $(XINERAMA_SRCS) \
-+ $(XCALIBRATE_SRCS) \
- $(XEVIE_SRCS) \
- $(XPRINT_SRCS) \
- $(APPGROUP_SRCS) \
---- xorg-server-X11R7.1-1.1.0/Xext/xcalibrate.c.orig 2006-06-15 17:05:19.000000000 +0200
-+++ xorg-server-X11R7.1-1.1.0/Xext/xcalibrate.c 2006-06-22 15:15:09.000000000 +0200
-@@ -0,0 +1,262 @@
-+/*
-+ * $Id: xcalibrate.c,v 3.1 2004/06/02 20:49:50 pb Exp $
-+ *
-+ * Copyright © 2003 Philip Blundell
-+ *
-+ * 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 Philip Blundell not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Philip Blundell makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL PHILIP BLUNDELL 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.
-+ */
-+
-+#ifdef HAVE_KDRIVE_CONFIG_H
-+#include <kdrive-config.h>
-+#endif
-+
-+#define NEED_EVENTS
-+#define NEED_REPLIES
-+
-+#include <X11/X.h>
-+#include <X11/Xproto.h>
-+#include "misc.h"
-+#include "os.h"
-+#include "dixstruct.h"
-+#include "extnsionst.h"
-+#include "swaprep.h"
-+
-+#include <X11/extensions/xcalibrateproto.h>
-+#include <X11/extensions/xcalibratewire.h>
-+
-+extern void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure);
-+extern void *tslib_raw_event_closure;
-+
-+static CARD8 XCalibrateReqCode;
-+int XCalibrateEventBase;
-+int XCalibrateReqBase;
-+int XCalibrateErrorBase;
-+
-+static ClientPtr xcalibrate_client;
-+
-+static void
-+xcalibrate_event_hook (int x, int y, int pressure, void *closure)
-+{
-+ ClientPtr pClient = (ClientPtr) closure;
-+ xXCalibrateRawTouchscreenEvent ev;
-+
-+ ev.type = XCalibrateEventBase + X_XCalibrateRawTouchscreen;
-+ ev.sequenceNumber = pClient->sequence;
-+ ev.x = x;
-+ ev.y = y;
-+ ev.pressure = pressure;
-+
-+ if (!pClient->clientGone)
-+ WriteEventsToClient (pClient, 1, (xEvent *) &ev);
-+}
-+
-+static int
-+ProcXCalibrateQueryVersion (ClientPtr client)
-+{
-+ REQUEST(xXCalibrateQueryVersionReq);
-+ xXCalibrateQueryVersionReply rep;
-+ CARD16 client_major, client_minor; /* not used */
-+
-+ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq);
-+
-+ client_major = stuff->majorVersion;
-+ client_minor = stuff->minorVersion;
-+
-+ fprintf(stderr, "%s(): called\n", __func__);
-+
-+ rep.type = X_Reply;
-+ rep.length = 0;
-+ rep.sequenceNumber = client->sequence;
-+ rep.majorVersion = XCALIBRATE_MAJOR_VERSION;
-+ rep.minorVersion = XCALIBRATE_MINOR_VERSION;
-+ if (client->swapped) {
-+ int n;
-+ swaps(&rep.sequenceNumber, n);
-+ swapl(&rep.length, n);
-+ swaps(&rep.majorVersion, n);
-+ swaps(&rep.minorVersion, n);
-+ }
-+ WriteToClient(client, sizeof (xXCalibrateQueryVersionReply), (char *)&rep);
-+ return (client->noClientException);
-+}
-+
-+static int
-+SProcXCalibrateQueryVersion (ClientPtr client)
-+{
-+ REQUEST(xXCalibrateQueryVersionReq);
-+ int n;
-+
-+ REQUEST_SIZE_MATCH (xXCalibrateQueryVersionReq);
-+ swaps(&stuff->majorVersion,n);
-+ swaps(&stuff->minorVersion,n);
-+ return ProcXCalibrateQueryVersion(client);
-+}
-+
-+static int
-+ProcXCalibrateSetRawMode (ClientPtr client)
-+{
-+ REQUEST(xXCalibrateRawModeReq);
-+ xXCalibrateRawModeReply rep;
-+
-+ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq);
-+
-+ memset (&rep, 0, sizeof (rep));
-+ rep.type = X_Reply;
-+ rep.sequenceNumber = client->sequence;
-+
-+ if (stuff->on)
-+ {
-+ if (xcalibrate_client == NULL)
-+ {
-+ /* Start calibrating. */
-+ xcalibrate_client = client;
-+ tslib_raw_event_hook = xcalibrate_event_hook;
-+ tslib_raw_event_closure = client;
-+ rep.status = GrabSuccess;
-+ }
-+ else
-+ {
-+ rep.status = AlreadyGrabbed;
-+ }
-+ }
-+ else
-+ {
-+ if (xcalibrate_client == client)
-+ {
-+ /* Stop calibrating. */
-+ xcalibrate_client = NULL;
-+ tslib_raw_event_hook = NULL;
-+ tslib_raw_event_closure = NULL;
-+ rep.status = GrabSuccess;
-+
-+ /* Cycle input off and on to reload configuration. */
-+ KdDisableInput ();
-+ KdEnableInput ();
-+ }
-+ else
-+ {
-+ rep.status = AlreadyGrabbed;
-+ }
-+ }
-+
-+ if (client->swapped)
-+ {
-+ int n;
-+
-+ swaps (&rep.sequenceNumber, n);
-+ swaps (&rep.status, n);
-+ }
-+ WriteToClient(client, sizeof (rep), (char *) &rep);
-+ return (client->noClientException);
-+}
-+
-+
-+static int
-+SProcXCalibrateSetRawMode (ClientPtr client)
-+{
-+ REQUEST(xXCalibrateRawModeReq);
-+ int n;
-+
-+ REQUEST_SIZE_MATCH (xXCalibrateRawModeReq);
-+
-+ swaps(&stuff->on, n);
-+
-+ return ProcXCalibrateSetRawMode(client);
-+}
-+
-+static void
-+XCalibrateResetProc (ExtensionEntry *extEntry)
-+{
-+}
-+
-+static int
-+ProcXCalibrateDispatch (ClientPtr client)
-+{
-+ REQUEST(xReq);
-+ switch (stuff->data) {
-+ case X_XCalibrateQueryVersion:
-+ return ProcXCalibrateQueryVersion(client);
-+ case X_XCalibrateRawMode:
-+ return ProcXCalibrateSetRawMode(client);
-+ default: break;
-+ }
-+
-+ return BadRequest;
-+}
-+
-+static int
-+SProcXCalibrateDispatch (ClientPtr client)
-+{
-+ REQUEST(xReq);
-+ int n;
-+
-+ swaps(&stuff->length,n);
-+
-+ switch (stuff->data) {
-+ case X_XCalibrateQueryVersion:
-+ return SProcXCalibrateQueryVersion(client);
-+ case X_XCalibrateRawMode:
-+ return SProcXCalibrateSetRawMode(client);
-+
-+ default: break;
-+ }
-+
-+ return BadRequest;
-+}
-+
-+static void
-+XCalibrateClientCallback (CallbackListPtr *list,
-+ pointer closure,
-+ pointer data)
-+{
-+ NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
-+ ClientPtr pClient = clientinfo->client;
-+
-+ if (clientinfo->setup == NULL
-+ && xcalibrate_client != NULL
-+ && xcalibrate_client == pClient)
-+ {
-+ /* Stop calibrating. */
-+ xcalibrate_client = NULL;
-+ tslib_raw_event_hook = NULL;
-+ tslib_raw_event_closure = NULL;
-+ }
-+}
-+
-+void
-+XCalibrateExtensionInit(void)
-+{
-+ ExtensionEntry *extEntry;
-+
-+ if (!AddCallback (&ClientStateCallback, XCalibrateClientCallback, 0))
-+ return;
-+
-+ extEntry = AddExtension(XCALIBRATE_NAME, XCalibrateNumberEvents, XCalibrateNumberErrors,
-+ ProcXCalibrateDispatch, SProcXCalibrateDispatch,
-+ XCalibrateResetProc, StandardMinorOpcode);
-+
-+ if (!extEntry)
-+ return;
-+
-+ XCalibrateReqCode = (unsigned char)extEntry->base;
-+ XCalibrateEventBase = extEntry->eventBase;
-+ XCalibrateErrorBase = extEntry->errorBase;
-+
-+ xcalibrate_client = 0;
-+}
+++ /dev/null
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- xserver/hw/kdrive/fbdev/fbdev.c~xserver-kdrive-poodle.patch
-+++ xserver/hw/kdrive/fbdev/fbdev.c
-@@ -190,6 +190,7 @@
- var.nonstd = 0;
- var.grayscale = 0;
-
-+ /* commented out for poodle
- k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var);
-
- if (k < 0)
-@@ -198,10 +199,11 @@
- return FALSE;
- }
-
-- /* Re-get the "fixed" parameters since they might have changed */
-+ // Re-get the "fixed" parameters since they might have changed
- k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
- if (k < 0)
- perror ("FBIOGET_FSCREENINFO");
-+ */
-
- /* Now get the new screeninfo */
- ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
-@@ -659,13 +661,14 @@
- priv->var.activate = FB_ACTIVATE_NOW|FB_CHANGE_CMAP_VBL;
-
- /* display it on the LCD */
-+ /* commented out for poodle
- k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &priv->var);
- if (k < 0)
- {
- perror ("FBIOPUT_VSCREENINFO");
- return FALSE;
- }
--
-+ */
- if (priv->fix.visual == FB_VISUAL_DIRECTCOLOR)
- {
- struct fb_cmap cmap;
+++ /dev/null
-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 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"
-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;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 "
-
-SRC_URI_h3600 = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
- file://kmode.patch;patch=1 \
- file://faster-rotated.patch;patch=1 \
- file://fbdev-not-fix.patch;patch=1 "
-
-
-SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \
- file://faster-rotated.patch;patch=1 \
- file://devfs.patch;patch=1"
-SRC_URI_append_collie = " file://faster-rotated.patch;patch=1"
-SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1 \
- file://faster-rotated.patch;patch=1"
-SRC_URI_append_spitz = " file://faster-rotated.patch;patch=1"
-SRC_URI_append_akita = " file://faster-rotated.patch;patch=1"
-
-PACKAGE_ARCH_mnci = "mnci"
-PACKAGE_ARCH_collie = "collie"
-PACKAGE_ARCH_poodle = "poodle"
-PACKAGE_ARCH_h3600 = "h3600"
-PACKAGE_ARCH_spitz = "spitz"
-PACKAGE_ARCH_akita = "akita"
-
-S = "${WORKDIR}/xserver"
-
-inherit autotools pkgconfig
-
-LDFLAGS += " -lXfont -lXdmcp -lXau "
-EXTRA_OECONF = "--enable-static=no --disable-static --enable-composite --disable-xinerama"
+++ /dev/null
-PV = "0.0+cvs${FIXEDSRCDATE}"
-FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
-
-LICENSE = "MIT"
-DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
-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 = "r12"
-
-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;date=${FIXEDSRCDATE} \
- file://kmode.patch;patch=1 \
- file://no-serial-probing.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"
+++ /dev/null
-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 videoproto scrnsaverproto"
-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"
+++ /dev/null
-LICENSE = "MIT"
-DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
-
-PROVIDES = "virtual/xserver"
-RPROVIDES = "virtual/xserver"
-PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
-SECTION = "x11/base"
-DESCRIPTION = "X server from freedesktop.org"
-DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
-DESCRIPTION_xserver-kdrive-fake = "Fake X server"
-DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
-
-FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
-FILES_xserver-kdrive-fake = "${bindir}/Xfake"
-FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
-
-SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \
- file://kmode.patch;patch=1 \
- file://disable-apm.patch;patch=1 \
- file://no-serial-probing.patch;patch=1 \
- file://kdrive-evdev.patch;patch=1 \
- file://kdrive-use-evdev.patch;patch=1 \
- file://fbdev-not-fix.patch;patch=1 \
- file://enable-builtin-fonts.patch;patch=1 \
- file://optional-xkb.patch;patch=1 \
- file://disable-xf86-dga-xorgcfg.patch;patch=1 \
- file://enable-tslib.patch;patch=1 \
- file://xcalibrate.patch;patch=1"
-
-SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
-SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
-PACKAGE_ARCH_poodle = "poodle"
-
-S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-composite --enable-kdrive \
- --disable-dga --disable-dri --disable-xinerama \
- --disable-xf86misc --disable-xf86vidmode \
- --disable-xorg --disable-xorgcfg \
- --disable-xkb --disable-xnest --disable-xvfb \
- --disable-xevie --disable-xprint --disable-xtrap \
- --with-default-font-path=built-ins \
- ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+++ /dev/null
-PV = "0.0+cvs${SRCDATE}"
-DEFAULT_PREFERENCE = "-2"
-
-LICENSE = "MIT"
-DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
-PROVIDES = "virtual/xserver"
-RPROVIDES = "virtual/xserver"
-PACKAGES = "xserver-kdrive-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"
+++ /dev/null
-PV = "0.0+git"
-DEFAULT_PREFERENCE = "-2"
-
-LICENSE = "MIT"
-DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
-
-PROVIDES = "virtual/xserver"
-RPROVIDES = "virtual/xserver"
-PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
-SECTION = "x11/base"
-DESCRIPTION = "X server from freedesktop.org"
-DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
-DESCRIPTION_xserver-kdrive-fake = "Fake X server"
-DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
-
-FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
-FILES_xserver-kdrive-fake = "${bindir}/Xfake"
-FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
-
-SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
- file://kmode.patch;patch=1 \
- file://disable-apm.patch;patch=1 \
- file://no-serial-probing.patch;patch=1 \
- file://kdrive-evdev.patch;patch=1 \
- file://kdrive-use-evdev.patch;patch=1 \
- file://fbdev-not-fix.patch;patch=1 \
- file://enable-builtin-fonts.patch;patch=1 \
- file://optional-xkb.patch;patch=1 \
- file://disable-xf86-dga-xorgcfg.patch;patch=1 \
- file://enable-tslib.patch;patch=1"
-
-SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
-SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
-PACKAGE_ARCH_poodle = "poodle"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-composite --enable-kdrive \
- --disable-dga --disable-dri --disable-xinerama \
- --disable-xf86misc --disable-xf86vidmode \
- --disable-xorg --disable-xorgcfg \
- --disable-xkb --disable-xnest --disable-xvfb \
- --disable-xevie --disable-xprint --disable-xtrap \
- --with-default-font-path=built-ins \
- ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+++ /dev/null
---- xc/extras/drm/shared/drm.h.old 2004-09-14 21:42:45.000000000 +0100
-+++ xc/extras/drm/shared/drm.h 2004-09-14 21:42:47.000000000 +0100
-@@ -38,7 +38,6 @@
- #define _DRM_H_
-
- #if defined(__linux__)
--#include <linux/config.h>
- #include <asm/ioctl.h> /* For _IO* macros */
- #define DRM_IOCTL_NR(n) _IOC_NR(n)
- #define DRM_IOC_VOID _IOC_NONE
+++ /dev/null
---- xc/lib/font/fontfile/Imakefile.old 2005-06-03 20:09:53.000000000 +0100
-+++ xc/lib/font/fontfile/Imakefile 2005-06-03 20:09:57.000000000 +0100
-@@ -14,7 +14,7 @@
- #endif
-
- INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include \
-- -I$(INCLUDESRC)
-+ -I$(INCLUDESRC) $(CC_STAGING)
- HEADERS =
- #ifdef FontFormatDefines
- FORMAT_DEFS = FontFormatDefines
+++ /dev/null
---- xc/lib/font/FreeType/Imakefile.old 2005-06-03 20:18:51.000000000 +0100
-+++ xc/lib/font/FreeType/Imakefile 2005-06-03 20:18:52.000000000 +0100
-@@ -20,7 +20,7 @@
-
- INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \
- -I$(SERVERSRC)/include $(EXTRAINCLUDES) \
-- -I$(INCLUDESRC)
-+ -I$(INCLUDESRC) $(CC_STAGING)
-
- SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c
- OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o
---- xc/config/cf/X11.tmpl.old 2005-06-03 20:40:24.000000000 +0100
-+++ xc/config/cf/X11.tmpl 2005-06-03 20:40:40.000000000 +0100
-@@ -3371,7 +3371,7 @@
-
- #if BuildFreetype2Library || HasFreetype2
- #if Freetype2IncDirStandard
--FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
-+FREETYPE2INCLUDES = `pkg-config --cflags freetype2`
- #else
- FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config
- #endif
+++ /dev/null
---- xc/config/cf/Imake.tmpl.old 2005-05-05 21:04:45.000000000 +0100
-+++ xc/config/cf/Imake.tmpl 2005-05-05 21:04:49.000000000 +0100
-@@ -2058,7 +2058,7 @@
- * INCLUDES contains client-specific includes set in Imakefile
- * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
- */
-- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
-+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
- ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
- LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+++ /dev/null
---- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100
-+++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100
-@@ -2038,11 +2038,11 @@
- */
- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
- ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
-- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
- LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
- LDPRELIB = LdPreLib $(INSTALLED_LIBS)
- LDPOSTLIB = LdPostLib
-- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING)
- CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-
- LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
---- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100
-+++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100
-@@ -114,7 +114,7 @@
- STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
- CDEBUGFLAGS = LibraryCDebugFlags
- CLIBDEBUGFLAGS = LibraryDebugOpt
-- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
-+ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
- # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
- PICFLAGS = LargePositionIndependentCFlags
- # endif
---- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100
-+++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100
-@@ -3359,7 +3359,7 @@
- FREETYPE2LIBDIR = Freetype2LibDir
- FREETYPE2INCDIR = Freetype2IncDir
- #if Freetype2LibDirStandard
--FREETYPE2LIB = -lfreetype
-+FREETYPE2LIB = $(LD_STAGING) -lfreetype
- #else
- FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype
- #endif
+++ /dev/null
-SECTION = "x11/base"
-RPROVIDES = "virtual/xserver"
-PROVIDES = "virtual/xserver"
-LICENSE = "Xorg"
-PR = "r2"
-
-DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \
- file://imake-staging.patch;patch=1 \
- file://imake-installed.patch;patch=1 \
- file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \
- file://dri.patch;patch=1"
-
-PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
-
-S = "${WORKDIR}/xc"
-
-FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*"
-FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
-FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
-FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
-FILES_${PN}-doc += "${libdir}/X11/doc"
-
-do_configure() {
- cat <<EOF > config/cf/host.def
-#define BuildServersOnly YES
-#define ProjectRoot ${prefix}
-#define XnestServer NO
-#define XdmxServer NO
-#define CcCmd gcc
-#define LdCmd ld
-#define HasFreetype2 YES
-#define HasFontconfig YES
-#define BuildDevelDRIDrivers YES
-#define BuildXF86DRI YES
-EOF
- echo "" > config/cf/date.def
- rm -f include/extensions/panoramiX.h
- make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake
- make CC="${BUILD_CC}" xmakefile
- make Makefiles
- make clean
-}
-
-do_compile() {
- #make depend
- make includes
- make -C config/util CC="${BUILD_CC}"
- for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
- make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E"
-}
-
-do_install() {
- make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
- make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
-}
-
-do_stage() {
- install -d ${STAGING_INCDIR}/xserver-xorg
- for i in i810 via; do
- pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
- done
- install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
-}
+++ /dev/null
-SECTION = "x11/base"
-RPROVIDES = "virtual/xserver"
-PROVIDES = "virtual/xserver"
-LICENSE = "Xorg"
-PR = "r0"
-
-DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_11 \
- file://imake-staging.patch;patch=1 \
- file://imake-installed.patch;patch=1 \
- file://fontfile.patch;patch=1 file://freetype.patch;patch=1 \
- file://dri.patch;patch=1"
-
-PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
-
-S = "${WORKDIR}/xc"
-
-FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print ${sysconfdir}/profile.d/xprint.*"
-FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
-FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
-FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
-FILES_${PN}-doc += "${libdir}/X11/doc"
-
-do_configure() {
- cat <<EOF > config/cf/host.def
-#define BuildServersOnly YES
-#define ProjectRoot ${prefix}
-#define XnestServer NO
-#define XdmxServer NO
-#define CcCmd gcc
-#define LdCmd ld
-#define HasFreetype2 YES
-#define HasFontconfig YES
-#define BuildDevelDRIDrivers YES
-#define BuildXF86DRI YES
-EOF
- echo "" > config/cf/date.def
- rm -f include/extensions/panoramiX.h
- make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" CROSSCOMPILEDIR="${CROSS_DIR}/${TARGET_SYS}/bin" PREPROCESS_CMD="gcc -E" clean imake
- make CC="${BUILD_CC}" xmakefile
- make Makefiles
- make clean
-}
-
-do_compile() {
- #make depend
- make includes
- make -C config/util CC="${BUILD_CC}"
- for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
- make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E"
-}
-
-do_install() {
- make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
- make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
-}
-
-do_stage() {
- install -d ${STAGING_INCDIR}/xserver-xorg
- for i in i810 via; do
- pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
- done
- install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
-}
+++ /dev/null
-SECTION = "x11/base"
-LICENSE = "Xorg"
-RPROVIDES = "virtual/xserver"
-PROVIDES = "virtual/xserver"
-PR = "r3"
-PV = "6.8.1+cvs${SRCDATE}"
-
-DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver \
- file://imake-staging.patch;patch=1 \
- file://dri.patch;patch=1"
-
-PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
-
-S = "${WORKDIR}/xc"
-
-FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print"
-FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
-FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
-FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
-FILES_${PN}-doc += "${libdir}/X11/doc"
-
-do_configure() {
- echo "#define BuildServersOnly YES" > config/cf/host.def
- echo "#define ProjectRoot /usr" >> config/cf/host.def
- echo "#define XnestServer NO" >> config/cf/host.def
- echo "#define XdmxServer NO" >> config/cf/host.def
- echo "#define CcCmd ${CC}" >> config/cf/host.def
- echo "#define LdCmd ${LD}" >> config/cf/host.def
- echo "#define HasFreetype2 YES" >> config/cf/host.def
- echo "#define HasFontconfig YES" >> config/cf/host.def
- echo "#define BuildDevelDRIDrivers YES" >>config/cf/host.def
- echo "" > config/cf/date.def
- rm -f include/extensions/panoramiX.h
-}
-
-do_compile() {
- make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake
- make CC="${BUILD_CC}" xmakefile
- make Makefiles
- make clean
- #make depend
- make includes
- make -C config/util CC="${BUILD_CC}"
- for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
- make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS=""
-}
-
-do_install() {
- make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
- make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
-}
-
-do_stage() {
- install -d ${STAGING_INCDIR}/xserver-xorg
- for i in i810 via; do
- pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
- done
- install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
-}
+++ /dev/null
-diff -urN xset.orig/Makefile.am xset/Makefile.am
---- xset.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xset/Makefile.am 2004-08-14 16:32:10.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
-+#
-+# Copyright © 2003 Keith Packard
-+#
-+# 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 Keith Packard not be used in
-+# advertising or publicity pertaining to distribution of the software without
-+# specific, written prior permission. Keith Packard makes no
-+# representations about the suitability of this software for any purpose. It
-+# is provided "as is" without express or implied warranty.
-+#
-+# KEITH PACKARD 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.
-+#
-+
-+AUTOMAKE_OPTIONS = 1.7 foreign
-+
-+AM_CFLAGS = @XSET_CFLAGS@
-+
-+bin_PROGRAMS = xset
-+
-+xset_SOURCES = xset.c
-+
-+xset_LDADD = @XSET_LIBS@
-+
-+man5_MANS=xset.man
-+
-+EXTRA_DIST= $(man5_MANS)
-+
-+MAINTAINERCLEANFILES = configure \
-+config.guess \
-+config.sub \
-+install-sh \
-+ltmain.sh \
-+missing \
-+mkinstalldirs \
-+aclocal.m4 \
-+Makefile.in \
-+depcomp \
-+autoscan.log \
-+configure.scan \
-+config.h \
-+config.h.in \
-+$(man5_MANS)
-diff -urN xset.orig/autogen.sh xset/autogen.sh
---- xset.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ xset/autogen.sh 2004-08-14 16:27:56.000000000 +0200
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+autoreconf -v --install || exit 1
-+./configure --enable-maintainer-mode "$@"
-diff -urN xset.orig/configure.ac xset/configure.ac
---- xset.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xset/configure.ac 2004-08-17 14:21:25.000000000 +0200
-@@ -0,0 +1,41 @@
-+dnl
-+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
-+dnl
-+dnl Copyright © 2003 Keith Packard
-+dnl
-+dnl Permission to use, copy, modify, distribute, and sell this software and its
-+dnl documentation for any purpose is hereby granted without fee, provided that
-+dnl the above copyright notice appear in all copies and that both that
-+dnl copyright notice and this permission notice appear in supporting
-+dnl documentation, and that the name of Keith Packard not be used in
-+dnl advertising or publicity pertaining to distribution of the software without
-+dnl specific, written prior permission. Keith Packard makes no
-+dnl representations about the suitability of this software for any purpose. It
-+dnl is provided "as is" without express or implied warranty.
-+dnl
-+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+dnl PERFORMANCE OF THIS SOFTWARE.
-+dnl
-+
-+AC_PREREQ(2.57)
-+AC_INIT([xset],4.4.0,[],xset)
-+AC_CONFIG_SRCDIR([Makefile.am])
-+AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_MAINTAINER_MODE
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+AC_LIBTOOL_WIN32_DLL
-+AM_PROG_LIBTOOL
-+AC_PROG_MAKE_SET
-+
-+PKG_CHECK_MODULES(XSET, xext xextensions xmuu x11)
-+
-+AC_OUTPUT([Makefile])
+++ /dev/null
---- 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"
+++ /dev/null
-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}-X11R7.0-${PV}.tar.bz2 \
- file://disable-xkb.patch;patch=1"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-EXTRA_OECONF = "--disable-xkb"
-
-inherit autotools pkgconfig
+++ /dev/null
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
-PV = "0.0+cvs${FIXEDSRCDATE}"
-PR = "r1"
-
-DEPENDS = "libx11 libxext xextensions libxmu"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-SECTION = "x11/base"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xset;date=${FIXEDSRCDATE} \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xset"
-
-inherit autotools pkgconfig
projects / vuplus_openembedded / commitdiff