[oe-commits] org.oe.dev xserver-kdrive git: remove tslib and xcalibrate patches that have been applied upstream (yay!) and enable tslib in EXTRA_OECONF

[koen commit]

xserver-kdrive git: remove tslib and xcalibrate patches that have been applied upstream (yay!) and enable tslib in EXTRA_OECONF

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 43921a863340a7eae6a5f33d7d3a1fa6c76bacca
ViewMTN: http://monotone.openembedded.org/revision.psp?id=43921a863340a7eae6a5f33d7d3a1fa6c76bacca
Files:
1
packages/xorg-xserver/xserver-kdrive_git.bb
Diffs:

#
# mt diff -rb0f19e032dfccb39dc71a25c1ac7044dca095197 -r43921a863340a7eae6a5f33d7d3a1fa6c76bacca
#
# 
# 
# patch "packages/xorg-xserver/xserver-kdrive_git.bb"
#  from [fa5df9859fdc017bffd650aa23153da95ccfcd10]
#    to [0e40a5d22eab803618bd477ce207f9e0951f7177]
# 
============================================================
--- packages/xorg-xserver/xserver-kdrive_git.bb	fa5df9859fdc017bffd650aa23153da95ccfcd10
+++ packages/xorg-xserver/xserver-kdrive_git.bb	0e40a5d22eab803618bd477ce207f9e0951f7177
@@ -1,7 +1,7 @@ DEFAULT_PREFERENCE = "-2"
 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
 	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 --ena
 		--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"