mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3466 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-01-11 13:59:40 +00:00
parent a30424c269
commit d56b65fcbd
8 changed files with 146 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
Vendored
+19 -10
View File
@@ -1,14 +1,14 @@
---
Xext/Makefile.am | 6 ++++++
configure.ac | 9 ++++++++-
configure.ac | 11 +++++++++--
include/kdrive-config.h.in | 3 +++
mi/miinitext.c | 6 ++++++
4 files changed, 23 insertions(+), 1 deletion(-)
4 files changed, 24 insertions(+), 2 deletions(-)
Index: xorg-server-1.3.0.0/mi/miinitext.c
===================================================================
--- xorg-server-1.3.0.0.orig/mi/miinitext.c 2007-05-15 16:05:34.000000000 +0100
+++ xorg-server-1.3.0.0/mi/miinitext.c 2007-05-15 16:05:39.000000000 +0100
--- xorg-server-1.3.0.0.orig/mi/miinitext.c 2006-11-16 18:01:26.000000000 +0000
+++ xorg-server-1.3.0.0/mi/miinitext.c 2008-01-11 13:45:57.000000000 +0000
@@ -372,6 +372,9 @@ extern void ResExtensionInit(INITARGS);
#ifdef DMXEXT
extern void DMXExtensionInit(INITARGS);
@@ -31,8 +31,8 @@ Index: xorg-server-1.3.0.0/mi/miinitext.c
void
Index: xorg-server-1.3.0.0/configure.ac
===================================================================
--- xorg-server-1.3.0.0.orig/configure.ac 2007-05-15 16:05:34.000000000 +0100
+++ xorg-server-1.3.0.0/configure.ac 2007-05-15 16:17:54.000000000 +0100
--- xorg-server-1.3.0.0.orig/configure.ac 2008-01-11 13:45:57.000000000 +0000
+++ xorg-server-1.3.0.0/configure.ac 2008-01-11 13:45:58.000000000 +0000
@@ -421,6 +421,7 @@ AC_ARG_ENABLE(xf86vidmode, AS_HELP_ST
AC_ARG_ENABLE(xf86misc, AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes])
AC_ARG_ENABLE(xace, AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
@@ -54,6 +54,15 @@ Index: xorg-server-1.3.0.0/configure.ac
AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes])
if test "x$XEVIE" = xyes; then
AC_DEFINE(XEVIE, 1, [Build XEvIE extension])
@@ -1519,7 +1526,7 @@ if test "$KDRIVE" = yes; then
# tslib...
if test "x$TSLIB" = xyes; then
- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
+ PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
if test "x$HAVE_TSLIB" = xno; then
AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])
fi
@@ -1547,7 +1554,7 @@ if test "$KDRIVE" = yes; then
;;
esac
@@ -65,8 +74,8 @@ Index: xorg-server-1.3.0.0/configure.ac
PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
Index: xorg-server-1.3.0.0/include/kdrive-config.h.in
===================================================================
--- xorg-server-1.3.0.0.orig/include/kdrive-config.h.in 2007-05-15 16:05:34.000000000 +0100
+++ xorg-server-1.3.0.0/include/kdrive-config.h.in 2007-05-15 16:05:39.000000000 +0100
--- xorg-server-1.3.0.0.orig/include/kdrive-config.h.in 2006-11-16 18:01:26.000000000 +0000
+++ xorg-server-1.3.0.0/include/kdrive-config.h.in 2008-01-11 13:45:57.000000000 +0000
@@ -25,4 +25,7 @@
/* Verbose debugging output hilarity */
#undef DEBUG
@@ -77,8 +86,8 @@ Index: xorg-server-1.3.0.0/include/kdrive-config.h.in
#endif /* _KDRIVE_CONFIG_H_ */
Index: xorg-server-1.3.0.0/Xext/Makefile.am
===================================================================
--- xorg-server-1.3.0.0.orig/Xext/Makefile.am 2007-05-15 16:05:34.000000000 +0100
+++ xorg-server-1.3.0.0/Xext/Makefile.am 2007-05-15 16:05:39.000000000 +0100
--- xorg-server-1.3.0.0.orig/Xext/Makefile.am 2006-10-25 01:25:19.000000000 +0100
+++ xorg-server-1.3.0.0/Xext/Makefile.am 2008-01-11 13:45:57.000000000 +0000
@@ -91,6 +91,11 @@ BUILTIN_SRCS += $(XCALIBRATE_SRCS)
# XCalibrare needs tslib
endif
meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/extra-kmodes.patch
Vendored
+83
View File
@@ -0,0 +1,83 @@
Add some extra video modes and change the default to VGA.
---
hw/kdrive/src/kmode.c | 41 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 39 insertions(+), 2 deletions(-)
Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
===================================================================
--- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c 2008-01-11 14:20:47.000000000 +0000
+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2008-01-11 14:21:18.000000000 +0000
@@ -32,6 +32,31 @@ const KdMonitorTiming kdMonitorTimings[
/* H V Hz KHz */
/* FP BP BLANK POLARITY */
+ /* Treo 650 */
+
+ { 320, 320, 64, 16256,
+ 17, 12, 32, KdSyncNegative,
+ 1, 11, 14, KdSyncNegative,
+ },
+
+ { 320, 320, 64, 0,
+ 0, 0, 0, KdSyncNegative,
+ 0, 0, 0, KdSyncNegative,
+ },
+
+ /* LifeDrive/T3/TX modes */
+
+ { 320, 480, 64, 16256,
+ 17, 12, 32, KdSyncNegative,
+ 1, 11, 14, KdSyncNegative,
+ },
+
+ { 480, 320, 64, 0,
+ 0, 0, 0, KdSyncNegative,
+ 0, 0, 0, KdSyncNegative,
+ },
+
+
/* IPAQ modeline:
*
* Modeline "320x240" 5.7222 320 337 340 352 240 241 244 254"
@@ -41,6 +66,11 @@ const KdMonitorTiming kdMonitorTimings[
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 */
@@ -76,10 +106,19 @@ const KdMonitorTiming kdMonitorTimings[
16, 120, 176, KdSyncNegative, /* 37.861 */
1, 20, 24, KdSyncNegative, /* 72.809 */
},
+ /* DEFAULT */
+#define MONITOR_TIMING_DEFAULT 13
{ 640, 480, 60, 25175, /* VESA */
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 */
@@ -90,8 +129,6 @@ const KdMonitorTiming kdMonitorTimings[
16, 160, 256, KdSyncPositive, /* 46.875 */
1, 21, 25, KdSyncPositive, /* 75.000 */
},
- /* DEFAULT */
-#define MONITOR_TIMING_DEFAULT 9
{ 800, 600, 72, 50000, /* VESA */
56, 64, 240, KdSyncPositive, /* 48.077 */
37, 23, 66, KdSyncPositive, /* 72.188 */
meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev-not-fix.patch
Vendored
-14
View File
@@ -1,14 +0,0 @@
--- 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;
meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fbdev_use_current.patch
Vendored
+41
View File
@@ -0,0 +1,41 @@
---
hw/kdrive/fbdev/fbdev.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
===================================================================
--- xorg-server-1.3.0.0.orig/hw/kdrive/fbdev/fbdev.c 2008-01-11 14:40:16.000000000 +0000
+++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2008-01-11 14:40:59.000000000 +0000
@@ -182,16 +182,24 @@ fbdevScreenInitialize (KdScreenInfo *scr
screen->rate = 103; /* FIXME: should get proper value from fb driver */
}
if (!screen->fb[0].depth)
- screen->fb[0].depth = 16;
+ {
+ if (k >= 0)
+ screen->fb[0].depth = var.bits_per_pixel;
+ else
+ screen->fb[0].depth = 16;
+ }
- t = KdFindMode (screen, fbdevModeSupported);
- screen->rate = t->rate;
- screen->width = t->horizontal;
- screen->height = t->vertical;
+ if ((screen->width != var.xres) || (screen->height != var.yres))
+ {
+ t = KdFindMode (screen, fbdevModeSupported);
+ screen->rate = t->rate;
+ screen->width = t->horizontal;
+ screen->height = t->vertical;
- /* Now try setting the mode */
- if (k < 0 || (t->horizontal != var.xres || t->vertical != var.yres))
- fbdevConvertMonitorTiming (t, &var);
+ /* Now try setting the mode */
+ if (k < 0 || (t->horizontal != var.xres || t->vertical != var.yres))
+ fbdevConvertMonitorTiming (t, &var);
+ }
var.activate = FB_ACTIVATE_NOW;
var.bits_per_pixel = screen->fb[0].depth;
meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/fix_default_mode.patch
Vendored
-26
View File
@@ -1,26 +0,0 @@
---
hw/kdrive/src/kmode.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
===================================================================
--- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c 2007-05-16 10:30:29.000000000 +0100
+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2007-05-16 10:31:08.000000000 +0100
@@ -106,6 +106,8 @@ const KdMonitorTiming kdMonitorTimings[
16, 120, 176, KdSyncNegative, /* 37.861 */
1, 20, 24, KdSyncNegative, /* 72.809 */
},
+ /* DEFAULT */
+#define MONITOR_TIMING_DEFAULT 13
{ 640, 480, 60, 25175, /* VESA */
16, 48, 160, KdSyncNegative, /* 31.469 */
10, 33, 45, KdSyncNegative, /* 59.940 */
@@ -127,8 +129,6 @@ const KdMonitorTiming kdMonitorTimings[
16, 160, 256, KdSyncPositive, /* 46.875 */
1, 21, 25, KdSyncPositive, /* 75.000 */
},
- /* DEFAULT */
-#define MONITOR_TIMING_DEFAULT 9
{ 800, 600, 72, 50000, /* VESA */
56, 64, 240, KdSyncPositive, /* 48.077 */
37, 23, 66, KdSyncPositive, /* 72.188 */
meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kmode-palm.patch
Vendored
-34
View File
@@ -1,34 +0,0 @@
--- kmode.c 2006-05-03 19:48:42.000000000 +0200
+++ xserver/hw/kdrive/src/kmode.c 2006-05-03 19:50:43.000000000 +0200
@@ -32,6 +32,31 @@
/* H V Hz KHz */
/* FP BP BLANK POLARITY */
+ /* Treo 650 */
+
+ { 320, 320, 64, 16256,
+ 17, 12, 32, KdSyncNegative,
+ 1, 11, 14, KdSyncNegative,
+ },
+
+ { 320, 320, 64, 0,
+ 0, 0, 0, KdSyncNegative,
+ 0, 0, 0, KdSyncNegative,
+ },
+
+ /* LifeDrive/T3/TX modes */
+
+ { 320, 480, 64, 16256,
+ 17, 12, 32, KdSyncNegative,
+ 1, 11, 14, KdSyncNegative,
+ },
+
+ { 480, 320, 64, 0,
+ 0, 0, 0, KdSyncNegative,
+ 0, 0, 0, KdSyncNegative,
+ },
+
+
/* IPAQ modeline:
*
* Modeline "320x240" 5.7222 320 337 340 352 240 241 244 254"
meta/packages/xorg-xserver/xserver-kdrive-1.3.0.0/kmode.patch
Vendored
-28
View File
@@ -1,28 +0,0 @@
--- /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 */
meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+3 -5
View File
@@ -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"