summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-03 13:29:24 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-11 18:08:35 +0100
commite65e8ff4bedb9a36563d5ddfe8e36b4b243b20d3 (patch)
tree1ebcc4c25b2e5dc7efc5514a0b695bb92de9e060
parent4c80e07e6ca8d1ad13938067c66dd0801da90fb6 (diff)
downloadpoky-e65e8ff4bedb9a36563d5ddfe8e36b4b243b20d3.tar.gz
xserver-kdrive: drop unused files (same files are in xserver-kdrive-1.7.99.2 directory
(From OE-Core rev: c7b77b3a1f34f3d2536251c0ad9e43031473e57e) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch24
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch43
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch87
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch63
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch17
5 files changed, 0 insertions, 234 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
deleted file mode 100644
index c22b1c06e2..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Upstream-Status: Inappropriate [disable feature]
2
3Signed-off-by: Yu Ke <ke.yu@intel.com>
4
5--- xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 +0000
6+++ xserver/hw/kdrive/linux/linux.c 2005-04-23 15:57:05.001094192 +0000
7@@ -342,7 +342,7 @@
8 /*
9 * Open the APM driver
10 */
11- LinuxApmFd = open ("/dev/apm_bios", 2);
12+ /*LinuxApmFd = open ("/dev/apm_bios", 2);
13 if (LinuxApmFd < 0 && errno == ENOENT)
14 LinuxApmFd = open ("/dev/misc/apm_bios", 2);
15 if (LinuxApmFd >= 0)
16@@ -352,7 +352,7 @@
17 RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
18 AddEnabledDevice (LinuxApmFd);
19 }
20-
21+ */
22 /*
23 * now get the VT
24 */
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
deleted file mode 100644
index 631c111df7..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1Upstream-Status: Inappropriate [disable feature]
2
3Signed-off-by: Yu Ke <ke.yu@intel.com>
4
5Index: xorg-server-1.3.0.0/configure.ac
6===================================================================
7--- xorg-server-1.3.0.0.orig/configure.ac 2007-04-20 03:23:40.000000000 +0200
8+++ xorg-server-1.3.0.0/configure.ac 2007-05-09 16:51:34.000000000 +0200
9@@ -520,7 +520,11 @@
10 XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
11
12 dnl Core modules for most extensions, et al.
13+if test "$KDRIVE" = yes; then
14+REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]"
15+else
16 REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]"
17+fi
18 REQUIRED_LIBS="xfont xau fontenc"
19
20 AM_CONDITIONAL(XV, [test "x$XV" = xyes])
21@@ -1603,7 +1607,9 @@
22 AC_SUBST(XKB_COMPILED_DIR)
23
24 dnl and the rest of these are generic, so they're in config.h
25+if test ! x"$KDRIVE" = xyes; then
26 AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
27+fi
28 AC_DEFINE(XResExtension, 1, [Build XRes extension])
29
30 AC_TRY_COMPILE([
31@@ -1616,10 +1622,12 @@
32
33 AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
34
35+if test ! "x$KDRIVE" = xyes ; then
36 dnl xorgconfig CLI configuration utility
37 PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
38 AC_SUBST(XORGCONFIG_DEP_CFLAGS)
39 AC_SUBST(XORGCONFIG_DEP_LIBS)
40+fi
41
42 dnl xorgcfg GUI configuration utility
43 AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg],
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
deleted file mode 100644
index 896c0332b1..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
+++ /dev/null
@@ -1,87 +0,0 @@
1Add some extra video modes and change the default to VGA.
2
3Upstream-Status: Pending
4
5Signed-off-by: Yu Ke <ke.yu@intel.com>
6
7---
8 hw/kdrive/src/kmode.c | 41 +++++++++++++++++++++++++++++++++++++++--
9 1 file changed, 39 insertions(+), 2 deletions(-)
10
11Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
12===================================================================
13--- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c 2008-01-11 14:20:47.000000000 +0000
14+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2008-01-11 14:21:18.000000000 +0000
15@@ -32,6 +32,31 @@ const KdMonitorTiming kdMonitorTimings[
16 /* H V Hz KHz */
17 /* FP BP BLANK POLARITY */
18
19+ /* Treo 650 */
20+
21+ { 320, 320, 64, 16256,
22+ 17, 12, 32, KdSyncNegative,
23+ 1, 11, 14, KdSyncNegative,
24+ },
25+
26+ { 320, 320, 64, 0,
27+ 0, 0, 0, KdSyncNegative,
28+ 0, 0, 0, KdSyncNegative,
29+ },
30+
31+ /* LifeDrive/T3/TX modes */
32+
33+ { 320, 480, 64, 16256,
34+ 17, 12, 32, KdSyncNegative,
35+ 1, 11, 14, KdSyncNegative,
36+ },
37+
38+ { 480, 320, 64, 0,
39+ 0, 0, 0, KdSyncNegative,
40+ 0, 0, 0, KdSyncNegative,
41+ },
42+
43+
44 /* IPAQ modeline:
45 *
46 * Modeline "320x240" 5.7222 320 337 340 352 240 241 244 254"
47@@ -41,6 +66,11 @@ const KdMonitorTiming kdMonitorTimings[
48 1, 11, 14, KdSyncNegative,
49 },
50
51+ { 240, 320, 64, 0,
52+ 0, 0, 0, KdSyncNegative,
53+ 0, 0, 0, KdSyncNegative,
54+ },
55+
56 /* Other VESA modes */
57 { 640, 350, 85, 31500, /* VESA */
58 32, 96, 192, KdSyncPositive, /* 26.413 */
59@@ -76,10 +106,19 @@ const KdMonitorTiming kdMonitorTimings[
60 16, 120, 176, KdSyncNegative, /* 37.861 */
61 1, 20, 24, KdSyncNegative, /* 72.809 */
62 },
63+ /* DEFAULT */
64+#define MONITOR_TIMING_DEFAULT 13
65 { 640, 480, 60, 25175, /* VESA */
66 16, 48, 160, KdSyncNegative, /* 31.469 */
67 10, 33, 45, KdSyncNegative, /* 59.940 */
68 },
69+
70+
71+ { 480, 640, 60, 0, /* VESA */
72+ 0, 0, 0, KdSyncNegative, /* 31.469 */
73+ 0, 0, 0, KdSyncNegative, /* 59.940 */
74+ },
75+
76
77 /* 800x600 modes */
78 { 800, 600, 85, 56250, /* VESA */
79@@ -90,8 +129,6 @@ const KdMonitorTiming kdMonitorTimings[
80 16, 160, 256, KdSyncPositive, /* 46.875 */
81 1, 21, 25, KdSyncPositive, /* 75.000 */
82 },
83- /* DEFAULT */
84-#define MONITOR_TIMING_DEFAULT 9
85 { 800, 600, 72, 50000, /* VESA */
86 56, 64, 240, KdSyncPositive, /* 48.077 */
87 37, 23, 66, KdSyncPositive, /* 72.188 */
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
deleted file mode 100644
index 07348dc512..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1Upstream-Status: Pending
2
3Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
4===================================================================
5--- xorg-server-1.3.0.0.orig/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:12.000000000 +0100
6+++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:46.000000000 +0100
7@@ -498,6 +498,7 @@
8 KdScreenInfo *screen = pScreenPriv->screen;
9 FbdevScrPriv *scrpriv = screen->driver;
10 Bool wasEnabled = pScreenPriv->enabled;
11+ FbdevPriv *priv = screen->card->driver;
12 FbdevScrPriv oldscr;
13 int oldwidth;
14 int oldheight;
15@@ -525,11 +526,46 @@
16 oldheight = screen->height;
17 oldmmwidth = pScreen->mmWidth;
18 oldmmheight = pScreen->mmHeight;
19-
20+
21 /*
22 * Set new configuration
23 */
24-
25+
26+ if (newwidth != oldwidth || newheight != oldheight)
27+ {
28+ struct fb_var_screeninfo var;
29+ int k;
30+
31+ k = ioctl (priv->fd, FBIOGET_VSCREENINFO, &var);
32+
33+ if (k < 0)
34+ {
35+ ErrorF("Error with framebuffer ioctl FBIOGET_VSCREENINFO: %s", strerror (errno));
36+ return FALSE;
37+ }
38+
39+ var.xres = newwidth;
40+ var.yres = newheight;
41+ var.activate = FB_ACTIVATE_NOW;
42+
43+ k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var);
44+
45+ if (k >= 0)
46+ {
47+ if ((k=ioctl(priv->fd, FBIOGET_FSCREENINFO, &priv->fix)) < 0)
48+ {
49+ perror("Error with framebuffer ioctl FIOGET_FSCREENINFO");
50+ close (priv->fd);
51+ return FALSE;
52+ }
53+ if ((k=ioctl(priv->fd, FBIOGET_VSCREENINFO, &priv->var)) < 0) {
54+ perror("Error framebuffer ioctl FIOGET_VSCREENINFO");
55+ close (priv->fd);
56+ return FALSE;
57+ }
58+ }
59+ }
60+
61 scrpriv->randr = KdAddRotation (screen->randr, randr);
62
63 KdOffscreenSwapOut (screen->pScreen);
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch
deleted file mode 100644
index 6acb83440c..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Upstream-Status: Pending
2
3Signed-off-by: Yu Ke <ke.yu@intel.com>
4
5--- xserver/hw/kdrive/linux/mouse.c.orig 2004-05-13 14:25:51.000000000 -0700
6+++ xserver/hw/kdrive/linux/mouse.c 2005-09-22 12:20:47.000000000 -0700
7@@ -927,8 +927,10 @@ char *kdefaultMouse[] = {
8 "/dev/psaux",
9 "/dev/input/mice",
10 "/dev/adbmouse",
11+#ifdef BREAK_MY_SERIAL_CONSOLE
12 "/dev/ttyS0",
13 "/dev/ttyS1",
14+#endif
15 };
16
17 #define NUM_DEFAULT_MOUSE (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0]))
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 05:11:18 +0000