diff options
Diffstat (limited to 'openembedded/packages/xserver/xserver-kdrive')
7 files changed, 185 insertions, 0 deletions
diff --git a/openembedded/packages/xserver/xserver-kdrive/devfs.patch b/openembedded/packages/xserver/xserver-kdrive/devfs.patch new file mode 100644 index 000000000..a6238126c --- /dev/null +++ b/openembedded/packages/xserver/xserver-kdrive/devfs.patch @@ -0,0 +1,47 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- xserver/hw/kdrive/linux/linux.c~devfs ++++ xserver/hw/kdrive/linux/linux.c +@@ -82,10 +82,10 @@ + vtno = kdVirtualTerminal; + else + { +- if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0) ++ if ((fd = open("/dev/vc/0",O_WRONLY,0)) < 0) + { + FatalError( +- "LinuxInit: Cannot open /dev/tty0 (%s)\n", ++ "LinuxInit: Cannot open /dev/tty/0 (%s)\n", + strerror(errno)); + } + if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || +@@ -96,7 +96,7 @@ + } + close(fd); + +- sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */ ++ sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/tty1-64 */ + + if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0) + { +@@ -113,7 +113,7 @@ + * + * Why is this needed? + */ +- LinuxCheckChown ("/dev/tty0"); ++ LinuxCheckChown ("/dev/vc/0"); + /* + * Linux doesn't switch to an active vt after the last close of a vt, + * so we do this ourselves by remembering which is active now. +@@ -453,7 +453,7 @@ + activeVT = -1; + } + close(LinuxConsoleFd); /* make the vt-manager happy */ +- fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0); ++ fd = open ("/dev/vc/0", O_RDWR|O_NDELAY, 0); + if (fd >= 0) + { + memset (&vts, '\0', sizeof (vts)); /* valgrind */ diff --git a/openembedded/packages/xserver/xserver-kdrive/disable-apm.patch b/openembedded/packages/xserver/xserver-kdrive/disable-apm.patch new file mode 100644 index 000000000..bd8842721 --- /dev/null +++ b/openembedded/packages/xserver/xserver-kdrive/disable-apm.patch @@ -0,0 +1,20 @@ +--- xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 +0000 ++++ xserver/hw/kdrive/linux/linux.c 2005-04-23 15:57:05.001094192 +0000 +@@ -342,7 +342,7 @@ + /* + * Open the APM driver + */ +- LinuxApmFd = open ("/dev/apm_bios", 2); ++ /*LinuxApmFd = open ("/dev/apm_bios", 2); + if (LinuxApmFd < 0 && errno == ENOENT) + LinuxApmFd = open ("/dev/misc/apm_bios", 2); + if (LinuxApmFd >= 0) +@@ -352,7 +352,7 @@ + RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0); + AddEnabledDevice (LinuxApmFd); + } +- ++ */ + /* + * now get the VT + */ diff --git a/openembedded/packages/xserver/xserver-kdrive/epson.patch b/openembedded/packages/xserver/xserver-kdrive/epson.patch new file mode 100644 index 000000000..07009bdc4 --- /dev/null +++ b/openembedded/packages/xserver/xserver-kdrive/epson.patch @@ -0,0 +1,11 @@ +--- xserver.orig/hw/kdrive/epson/epson13806stub.c 2004-10-20 10:20:51.000000000 +0200 ++++ xserver/hw/kdrive/epson/epson13806stub.c 2005-03-17 14:38:22.000000000 +0100 +@@ -55,7 +55,7 @@ + { + KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs); + #ifdef TOUCHSCREEN +- KdInitTouchScreen (&TsFuncs); ++ KdAddMouseDriver (&TsFuncs); + #endif + } + diff --git a/openembedded/packages/xserver/xserver-kdrive/fbdev-not-fix.patch b/openembedded/packages/xserver/xserver-kdrive/fbdev-not-fix.patch new file mode 100644 index 000000000..f87e7cc2c --- /dev/null +++ b/openembedded/packages/xserver/xserver-kdrive/fbdev-not-fix.patch @@ -0,0 +1,14 @@ +--- xserver/hw/kdrive/fbdev/fbdev.c~ 2004-09-15 00:08:10.000000000 +0100 ++++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-13 17:47:02.000000000 +0000 +@@ -198,6 +198,11 @@ + return FALSE; + } + ++ /* Re-get the "fixed" parameters since they might have changed */ ++ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix); ++ if (k < 0) ++ perror ("FBIOGET_FSCREENINFO"); ++ + /* Now get the new screeninfo */ + ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var); + depth = priv->var.bits_per_pixel; diff --git a/openembedded/packages/xserver/xserver-kdrive/kmode.patch b/openembedded/packages/xserver/xserver-kdrive/kmode.patch new file mode 100644 index 000000000..5ad3e4e27 --- /dev/null +++ b/openembedded/packages/xserver/xserver-kdrive/kmode.patch @@ -0,0 +1,28 @@ +--- /tmp/kmode.c 2005-06-27 14:46:19.716843288 +0200 ++++ xserver/hw/kdrive/src/kmode.c 2005-06-27 14:46:30.070269328 +0200 +@@ -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 */ +@@ -80,6 +85,13 @@ + 16, 48, 160, KdSyncNegative, /* 31.469 */ + 10, 33, 45, KdSyncNegative, /* 59.940 */ + }, ++ ++ ++ { 480, 640, 60, 0, /* VESA */ ++ 0, 0, 0, KdSyncNegative, /* 31.469 */ ++ 0, 0, 0, KdSyncNegative, /* 59.940 */ ++ }, ++ + + /* 800x600 modes */ + { 800, 600, 85, 56250, /* VESA */ diff --git a/openembedded/packages/xserver/xserver-kdrive/onlyfb.patch b/openembedded/packages/xserver/xserver-kdrive/onlyfb.patch new file mode 100644 index 000000000..e77332498 --- /dev/null +++ b/openembedded/packages/xserver/xserver-kdrive/onlyfb.patch @@ -0,0 +1,21 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- xserver/hw/kdrive/Makefile.am~onlyfb ++++ xserver/hw/kdrive/Makefile.am +@@ -17,12 +17,4 @@ + SUBDIRS = \ + src \ + linux \ +- $(XSDL_SUBDIRS) \ +- $(FBDEV_SUBDIRS) \ +- $(VESA_SUBDIRS) \ +- $(XEPHYR_SUBDIRS) \ +- ati \ +- fake \ +- ephyr \ +- i810 \ +- epson ++ $(FBDEV_SUBDIRS) diff --git a/openembedded/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch b/openembedded/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch new file mode 100644 index 000000000..ce80a7e38 --- /dev/null +++ b/openembedded/packages/xserver/xserver-kdrive/xserver-kdrive-poodle.patch @@ -0,0 +1,44 @@ + +# +# 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; + ++ /* commented out for poodle + k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var); + + if (k < 0) +@@ -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"); ++ */ + + /* Now get the new screeninfo */ + ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var); +@@ -659,13 +661,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; |