summaryrefslogtreecommitdiff
path: root/packages/xorg-xserver
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-08-29 21:34:04 +0000
committerKoen Kooi <koen@openembedded.org>2006-08-29 21:34:04 +0000
commita350439c9ae71b8d437730e8659a9f5561d0b0d5 (patch)
tree3e655b8d9a8939d6299a39d9d4070816a5cc67c7 /packages/xorg-xserver
parent806294f16a8f9ee061cfd99adeb2087f3538c998 (diff)
xserver-kdrive git: remove tslib and xcalibrate patches that have been applied upstream (yay!) and enable tslib in EXTRA_OECONF
Diffstat (limited to 'packages/xorg-xserver')
-rw-r--r--packages/xorg-xserver/xserver-kdrive_git.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb
index 33e15bab86..bf6fd92d61 100644
--- 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"