merge of 11b7563c2a1e1db7d344182fdb34864de1d1f04c

     and 416f85f7a01f217e51a4cde5c03a5c7436c29749

6 files changed, 66 insertions, 10 deletions

diff --git a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch
new file mode 100644
index 0000000000..4b7e41e3e9
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch
@@ -0,0 +1,39 @@
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac	2006-08-31 22:44:06.000000000 +0200
++++ git/configure.ac	2006-08-31 22:49:39.000000000 +0200
+@@ -513,7 +513,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 [kbproto >= 1.0.3]"
++else
+ REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]"
++fi
+ REQUIRED_LIBS="xfont xau fontenc"
+ 
+ AM_CONDITIONAL(XV, [test "x$XV" = xyes])
+@@ -1540,7 +1544,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
+@@ -1560,10 +1566,12 @@
+ 
+ AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
+ 
++if test ! "x$KDRIVE" = xyes ; then
+ dnl xorgconfig CLI configuration utility
+ PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
+ AC_SUBST(XORGCONFIG_DEP_CFLAGS)
+ AC_SUBST(XORGCONFIG_DEP_LIBS)
++fi
+ 
+ dnl xorgcfg GUI configuration utility
+ AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], 
diff --git a/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch b/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch
index d4f885ee26..28d7325601 100644
--- a/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch
+++ b/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch
@@ -40,13 +40,14 @@
      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 @@
+@@ -796,6 +799,11 @@
  	    UseMsg ();
  	return 2;
      }
 +    if (!strcmp (argv[i], "-use-evdev"))
 +    {
 +	use_evdev = 1;
++	return 1;
 +    }
      if (!strcmp (argv[i], "-keyboard"))
      {
diff --git a/packages/xorg-xserver/xserver-kdrive_20060312.bb b/packages/xorg-xserver/xserver-kdrive_20060312.bb
index 594b6d74ec..c5080452ae 100644
--- a/packages/xorg-xserver/xserver-kdrive_20060312.bb
+++ b/packages/xorg-xserver/xserver-kdrive_20060312.bb
@@ -20,7 +20,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep
 DESCRIPTION_xserver-kdrive-fake = "Fake X server"
 DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
 
-PR = "r11"
+PR = "r12"
 
 FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
 FILES_xserver-kdrive-ati = "${bindir}/Xati"
diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
index cfb1294c09..78b4054232 100644
--- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
@@ -1,18 +1,32 @@
 LICENSE = "MIT"
-DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
+
+PR = "r2"
 
 PROVIDES = "virtual/xserver"
 RPROVIDES = "virtual/xserver"
-PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson ${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"
+DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
+DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, SDL version"
+
+FILES_${PN} += "${libdir}/xserver/SecurityPolicy"
 
 FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
 FILES_xserver-kdrive-fake = "${bindir}/Xfake"
 FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
+FILES_xserver-kdrive-epson = "${bindir}/Xepson"
+FILES_xserver-kdrive-sdl = "${bindir}/Xsdl"
+
+RDEPENDS_xserver-kdrive-fbdev = "${PN}"
+RDEPENDS_xserver-kdrive-fake = "${PN}"
+RDEPENDS_xserver-kdrive-xephyr = "${PN}"
+RDEPENDS_xserver-kdrive-epson = "${PN}"
+RDEPENDS_xserver-kdrive-sdl = "${PN}"
 
 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 \
@@ -23,6 +37,7 @@ SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.ta
 	file://fbdev-not-fix.patch;patch=1  \
 	file://enable-builtin-fonts.patch;patch=1 \
 	file://optional-xkb.patch;patch=1 \
+	file://enable-epson.patch;patch=1 \
 	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
 	file://enable-tslib.patch;patch=1 \
 	file://xcalibrate.patch;patch=1"
@@ -39,8 +54,10 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \
 		--disable-dga --disable-dri --disable-xinerama \
 		--disable-xf86misc --disable-xf86vidmode \
 		--disable-xorg --disable-xorgcfg \
-		--disable-dmx \ 
 		--disable-xkb --disable-xnest --disable-xvfb \
 		--disable-xevie --disable-xprint --disable-xtrap \
+		--disable-dmx \
 		--with-default-font-path=built-ins \
+		--enable-tslib --enable-xcalibrate \
 		ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+
diff --git a/packages/xorg-xserver/xserver-kdrive_cvs.bb b/packages/xorg-xserver/xserver-kdrive_cvs.bb
index c2b25973fb..e0e24065e6 100644
--- a/packages/xorg-xserver/xserver-kdrive_cvs.bb
+++ b/packages/xorg-xserver/xserver-kdrive_cvs.bb
@@ -19,7 +19,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep
 DESCRIPTION_xserver-kdrive-fake = "Fake X server"
 DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
 
-PR = "r11"
+PR = "r12"
 
 FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
 FILES_xserver-kdrive-ati = "${bindir}/Xati"
diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
index 9c967db254..bffcc4cdee 100644
--- a/packages/xorg-xserver/xserver-kdrive_git.bb
+++ b/packages/xorg-xserver/xserver-kdrive_git.bb
@@ -1,10 +1,10 @@
 PV = "1.1.0+git${SRCDATE}"
 DEFAULT_PREFERENCE = "-2"
 
-PR = "r3"
+PR = "r4"
 
 LICENSE = "MIT"
-DEPENDS = "tslib virtual/libsdl libxkbfile xf86dgaproto xf86vidmodeproto xf86miscproto xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto"
+DEPENDS = "tslib virtual/libsdl libxkbfile xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto"
 
 PROVIDES = "virtual/xserver"
 RPROVIDES = "virtual/xserver"
@@ -41,7 +41,7 @@ SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \
 	file://enable-builtin-fonts.patch;patch=1 \
 	file://optional-xkb.patch;patch=1 \
 	file://enable-epson.patch;patch=1 \
-#	file://disable-xf86-dga-xorgcfg.patch;patch=1 \
+	file://disable-xf86-dga-xorgcfg-git.patch;patch=1 \
 	"
 
 SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"
@@ -63,4 +63,3 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \
 		--enable-tslib --enable-xcalibrate \
 		ac_cv_file__usr_share_X11_sgml_defs_ent=no"
 
-