xserver-kdrive: Remove bogus fbdev patch, merge kmode patches, add a patch to allow the existing framebuffer mode to be reused if appropriate

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3466 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 3 insertions, 5 deletions

diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 65a9009ad4..fa1563d549 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,22 +3,20 @@ require xserver-kdrive.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r16"
+PR = "r17"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
-        file://kmode.patch;patch=1 \
+        file://extra-kmodes.patch;patch=1 \
+        file://fbdev_use_current.patch;patch=1 \
         file://disable-apm.patch;patch=1 \
         file://no-serial-probing.patch;patch=1 \
         file://kdrive-evdev.patch;patch=1  \
         file://kdrive-use-evdev.patch;patch=1  \
-        file://fbdev-not-fix.patch;patch=1  \
         file://enable-builtin-fonts.patch;patch=1 \
         file://disable-xf86-dga-xorgcfg.patch;patch=1 \
         file://optional-xkb.patch;patch=1 \
         file://enable-epson.patch;patch=1 \
         file://enable-tslib.patch;patch=1 \
-        file://kmode-palm.patch;patch=1 \
-        file://fix_default_mode.patch;patch=1 \
         file://enable-xcalibrate.patch;patch=1 \
         file://hide-cursor-and-ppm-root.patch;patch=1 \
         file://xcalibrate_coords.patch;patch=1"