rendered paste body# # old_revision [e16e6a228ba05836f11e6096da8531c66005dd42]# # add_file "packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch"# content [2fbfd2c318d15cd18e87568ad5058819943a4100]# # patch "packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch"# from [3f6ee860cd1b75ef883f99b0531f96d609275974]# to [318e1f97d6099864f9314ad0f3efb0133d66e872]# # patch "packages/xorg-xserver/xserver-kdrive_20060312.bb"# from [a6462e59a197eab9aafd0539726373ca39af7957]# to [278f33602406ba6cb171651a4f6253acd4fa2c6e]# # patch "packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb"# from [deee07c429d4716c14023fd510664e763cf91ac3]# to [3816eebd1881e5dae175f1edc34c694e035f432e]# # patch "packages/xorg-xserver/xserver-kdrive_cvs.bb"# from [b15f008c43dcbbb2641351644884cc8ab0cf1a2e]# to [727db4c13ca1cd8efcebc9f5e6eeb57bea61e4b6]# # patch "packages/xorg-xserver/xserver-kdrive_git.bb"# from [03350063e5025d055b267de2a3815ad9245ae59d]# to [59d851e236105006bff320a999466a3c08d8bed3]# ============================================================--- packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch 2fbfd2c318d15cd18e87568ad5058819943a4100+++ packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch 2fbfd2c318d15cd18e87568ad5058819943a4100@@ -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], ============================================================--- packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch 3f6ee860cd1b75ef883f99b0531f96d609275974+++ packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch 318e1f97d6099864f9314ad0f3efb0133d66e872@@ -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")) {============================================================--- packages/xorg-xserver/xserver-kdrive_20060312.bb a6462e59a197eab9aafd0539726373ca39af7957+++ packages/xorg-xserver/xserver-kdrive_20060312.bb 278f33602406ba6cb171651a4f6253acd4fa2c6e@@ -20,7 +20,7 @@ DESCRIPTION_xserver-kdrive-xephyr = "X s 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"============================================================--- packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb deee07c429d4716c14023fd510664e763cf91ac3+++ packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb 3816eebd1881e5dae175f1edc34c694e035f432e@@ -1,19 +1,33 @@ LICENSE = "MIT" 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 \ file://disable-apm.patch;patch=1 \@@ -23,6 +37,7 @@ SRC_URI = "http://ftp.x.org/pub/X11R7.1/ 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 --ena --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"+============================================================--- packages/xorg-xserver/xserver-kdrive_cvs.bb b15f008c43dcbbb2641351644884cc8ab0cf1a2e+++ packages/xorg-xserver/xserver-kdrive_cvs.bb 727db4c13ca1cd8efcebc9f5e6eeb57bea61e4b6@@ -19,7 +19,7 @@ DESCRIPTION_xserver-kdrive-xephyr = "X s 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"============================================================--- packages/xorg-xserver/xserver-kdrive_git.bb 03350063e5025d055b267de2a3815ad9245ae59d+++ packages/xorg-xserver/xserver-kdrive_git.bb 59d851e236105006bff320a999466a3c08d8bed3@@ -1,10 +1,10 @@ DEFAULT_PREFERENCE = "-2" 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 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 --ena --enable-tslib --enable-xcalibrate \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" -