diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /xserver/xserver-kdrive | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'xserver/xserver-kdrive')
| -rw-r--r-- | xserver/xserver-kdrive/kmode.patch | 19 | ||||
| -rw-r--r-- | xserver/xserver-kdrive/xserver-kdrive-poodle.patch | 37 |
2 files changed, 56 insertions, 0 deletions
diff --git a/xserver/xserver-kdrive/kmode.patch b/xserver/xserver-kdrive/kmode.patch index e69de29bb2..22ad51c5ad 100644 --- a/xserver/xserver-kdrive/kmode.patch +++ b/xserver/xserver-kdrive/kmode.patch @@ -0,0 +1,19 @@ +Index: hw/kdrive/src/kmode.c +=================================================================== +RCS file: /cvs/xserver/xserver/hw/kdrive/src/kmode.c,v +retrieving revision 1.13 +diff -u -r1.13 kmode.c +--- xserver/hw/kdrive/src/kmode.c 26 Jul 2004 17:14:26 -0000 1.13 ++++ xserver/hw/kdrive/src/kmode.c 28 Aug 2004 14:04:19 -0000 +@@ -41,6 +41,11 @@ + 1, 11, 14, KdSyncNegative, + }, + ++ { 240, 320, 64, 0, ++ 0, 0, 0, KdSyncNegative, ++ 0, 0, 0, KdSyncNegative, ++ }, ++ + /* Other VESA modes */ + { 640, 350, 85, 31500, /* VESA */ + 32, 96, 192, KdSyncPositive, /* 26.413 */ diff --git a/xserver/xserver-kdrive/xserver-kdrive-poodle.patch b/xserver/xserver-kdrive/xserver-kdrive-poodle.patch index e69de29bb2..9700e4a58c 100644 --- a/xserver/xserver-kdrive/xserver-kdrive-poodle.patch +++ b/xserver/xserver-kdrive/xserver-kdrive-poodle.patch @@ -0,0 +1,37 @@ +--- xserver/hw/kdrive/fbdev/fbdev.c.old 2004-06-28 01:48:51.000000000 +0100 ++++ xserver/hw/kdrive/fbdev/fbdev.c 2004-07-28 15:05:55.000000000 +0100 +@@ -190,6 +190,7 @@ + var.nonstd = 0; + var.grayscale = 0; + ++ /* commented out for poodle + k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var); + + if (k < 0) +@@ -197,7 +198,9 @@ + fprintf (stderr, "error: %s\n", strerror (errno)); + return FALSE; + } +- ++ */ ++ ++ + /* Now get the new screeninfo */ + ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var); + depth = priv->var.bits_per_pixel; +@@ -623,13 +626,14 @@ + priv->var.activate = FB_ACTIVATE_NOW|FB_CHANGE_CMAP_VBL; + + /* display it on the LCD */ ++ /* commented out for poodle + k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &priv->var); + if (k < 0) + { + perror ("FBIOPUT_VSCREENINFO"); + return FALSE; + } +- ++ */ + if (priv->fix.visual == FB_VISUAL_DIRECTCOLOR) + { + struct fb_cmap cmap; |