aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-11-29 22:32:10 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-11-29 22:32:10 +0000
commit3971b0cd586bdc29ce405dd9e33e31321c888758 (patch)
treed08214c740f87474fbe9028204d5cedc91307539
parentdbbfeda944e95e29f62b157e32d62cb0b37c3ed0 (diff)
downloadopenembedded-3971b0cd586bdc29ce405dd9e33e31321c888758.tar.gz
fix the xserver-kdrive-poodle patch to make it compile ;)
BKrev: 41aba36a6u6QEB5Bl9d-C9XPFaj0pw
-rw-r--r--xserver/xserver-kdrive/xserver-kdrive-poodle.patch16
-rw-r--r--xserver/xserver-kdrive_cvs.oe2
2 files changed, 14 insertions, 4 deletions
diff --git a/xserver/xserver-kdrive/xserver-kdrive-poodle.patch b/xserver/xserver-kdrive/xserver-kdrive-poodle.patch
index 6192a45065..ce80a7e389 100644
--- a/xserver/xserver-kdrive/xserver-kdrive-poodle.patch
+++ b/xserver/xserver-kdrive/xserver-kdrive-poodle.patch
@@ -1,5 +1,10 @@
---- xserver/hw/kdrive/fbdev/fbdev.c.orig 2004-11-29 20:00:00.000000000 +0000
-+++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-29 20:04:10.000000000 +0000
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- xserver/hw/kdrive/fbdev/fbdev.c~xserver-kdrive-poodle.patch
++++ xserver/hw/kdrive/fbdev/fbdev.c
@@ -190,6 +190,7 @@
var.nonstd = 0;
var.grayscale = 0;
@@ -8,7 +13,12 @@
k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var);
if (k < 0)
-@@ -202,6 +203,7 @@
+@@ -198,10 +199,11 @@
+ return FALSE;
+ }
+
+- /* Re-get the "fixed" parameters since they might have changed */
++ // Re-get the "fixed" parameters since they might have changed
k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
if (k < 0)
perror ("FBIOGET_FSCREENINFO");
diff --git a/xserver/xserver-kdrive_cvs.oe b/xserver/xserver-kdrive_cvs.oe
index ac6f08141e..babd0d60f6 100644
--- a/xserver/xserver-kdrive_cvs.oe
+++ b/xserver/xserver-kdrive_cvs.oe
@@ -15,7 +15,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep
DESCRIPTION_xserver-kdrive-fake = "Fake X server"
DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
-PR = "r7"
+PR = "r8"
FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
FILES_xserver-kdrive-ati = "${bindir}/Xati"