xserver-kdrive git: remove tslib and xcalibrate patches that have been applied upstre...

diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
index 33e15ba..bf6fd92 100644 (file)
--- a/packages/xorg-xserver/xserver-kdrive_git.bb
+++ b/packages/xorg-xserver/xserver-kdrive_git.bb
@@ -1,7 +1,7 @@
 PV = "1.1.0+git${SRCDATE}"
 DEFAULT_PREFERENCE = "-2"
 
-PR = "r2"
+PR = "r3"
 
 LICENSE = "MIT"
 DEPENDS = "tslib libxkbfile xf86dgaproto xf86vidmodeproto xf86miscproto xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
@@ -35,8 +35,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://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"
@@ -54,4 +53,5 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \
                --disable-xevie --disable-xprint --disable-xtrap \
                --disable-dmx \
                --with-default-font-path=built-ins \
+               --enable-tslib \
                ac_cv_file__usr_share_X11_sgml_defs_ent=no"