Merged revisions 5203,5235-5236,5278-5279 via svnmerge from

https://svn.o-hand.com/repos/poky/trunk

........
  r5203 | richard | 2008-09-19 18:32:35 +0100 (Fri, 19 Sep 2008) | 1 line
  
  tune-xscale.inc: Compile cairo for armv4 to avoid alighment trap issues with double instruction
........
  r5235 | ross | 2008-09-23 10:54:16 +0100 (Tue, 23 Sep 2008) | 1 line
  
  poky-fixed-revisions.inc: bump matchbox-desktop srvrev to fix icon loading bug
........
  r5236 | ross | 2008-09-23 11:14:38 +0100 (Tue, 23 Sep 2008) | 1 line
  
  poky-fixed-revisions.inc: fix typo
........
  r5278 | ross | 2008-09-25 21:52:29 +0100 (Thu, 25 Sep 2008) | 1 line
  
  dialer: specify revision instead of using autorev
........
  r5279 | richard | 2008-09-25 22:03:38 +0100 (Thu, 25 Sep 2008) | 1 line
  
  xserver-kdrive: Feed xrandr calls to the framebuffer driver in case it can do better than software rotation
........


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

1 files changed, 2 insertions, 1 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 6b494d3e45..b1d654b391 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,7 +3,7 @@ require xserver-kdrive.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r18"
+PR = "r21"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
         file://extra-kmodes.patch;patch=1 \
@@ -20,6 +20,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
         file://enable-xcalibrate.patch;patch=1 \
         file://hide-cursor-and-ppm-root.patch;patch=1 \
         file://xcalibrate_coords.patch;patch=1 \
+        file://fbdev_xrandr_ioctl.patch;patch=1 \
         file://scheduler.patch;patch=1"
 
 S = "${WORKDIR}/xorg-server-${PV}"